(file) Return to sharp.c CVS log (file) (dir) Up to [Development] / JSOC / proj / sharp / apps

Diff for /JSOC/proj/sharp/apps/sharp.c between version 1.26 and 1.28

version 1.26, 2014/03/19 20:37:18 version 1.28, 2014/05/16 21:56:11
Line 1936  void computeSWIndex(struct swIndex *swKe
Line 1936  void computeSWIndex(struct swIndex *swKe
  
     // convert cdelt1_orig from degrees to arcsec     // convert cdelt1_orig from degrees to arcsec
     float cdelt1       = (atan((rsun_ref*cdelt1_orig*RADSINDEG)/(dsun_obs)))*(1/RADSINDEG)*(3600.);     float cdelt1       = (atan((rsun_ref*cdelt1_orig*RADSINDEG)/(dsun_obs)))*(1/RADSINDEG)*(3600.);
     int nx1 = nx*cdelt1/2;  
     int ny1 = ny*cdelt1/2;          // define some values for the R calculation
           int scale = round(2.0/cdelt1);
           int nx1 = nx/scale;
           int ny1 = ny/scale;
   
           if (nx1 > floor((nx-1)/scale + 1) )
                   DIE("X-dimension of output array in fsample() is too large.");
           if (ny1 > floor((ny-1)/scale + 1) )
                   DIE("Y-dimension of output array in fsample() is too large.");
  
         // Temp arrays         // Temp arrays
         float *bh      = (float *) (malloc(nxny * sizeof(float)));         float *bh      = (float *) (malloc(nxny * sizeof(float)));
Line 2236  void setKeys(DRMS_Record_t *outRec, DRMS
Line 2244  void setKeys(DRMS_Record_t *outRec, DRMS
         // Mar 19 XS         // Mar 19 XS
         if (fullDisk) {         if (fullDisk) {
                 drms_setkey_int(outRec, "AMBPATCH", 0);                 drms_setkey_int(outRec, "AMBPATCH", 0);
                   drms_setkey_int(outRec, "AMBWEAK", 2);
         } else {         } else {
                 drms_setkey_int(outRec, "AMBPATCH", 1);                 drms_setkey_int(outRec, "AMBPATCH", 1);
         }         }


Legend:
Removed from v.1.26  
changed lines
  Added in v.1.28

Karen Tian
Powered by
ViewCVS 0.9.4