(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.24 and 1.28

version 1.24, 2014/03/07 21:15:54 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 2069  void computeSWIndex(struct swIndex *swKe
Line 2077  void computeSWIndex(struct swIndex *swKe
         swKeys_ptr->meanshear_angle_err= DRMS_MISSING_FLOAT;         swKeys_ptr->meanshear_angle_err= DRMS_MISSING_FLOAT;
         }         }
  
     /*  
         if (computeR(bz_err, los , dims, &(swKeys_ptr->Rparam), cdelt1, rim, p1p0, p1n0,         if (computeR(bz_err, los , dims, &(swKeys_ptr->Rparam), cdelt1, rim, p1p0, p1n0,
                  p1p, p1n, p1, pmap, nx1, ny1))                  p1p, p1n, p1, pmap, nx1, ny1))
     {     {
                 swKeys_ptr->Rparam = DRMS_MISSING_FLOAT;                // If fail, fill in NaN                 swKeys_ptr->Rparam = DRMS_MISSING_FLOAT;                // If fail, fill in NaN
         }         }
     */  
  
         // Clean up the arrays         // Clean up the arrays
  
Line 2234  void setKeys(DRMS_Record_t *outRec, DRMS
Line 2241  void setKeys(DRMS_Record_t *outRec, DRMS
  
         }         }
  
           // Mar 19 XS
           if (fullDisk) {
                   drms_setkey_int(outRec, "AMBPATCH", 0);
                   drms_setkey_int(outRec, "AMBWEAK", 2);
           } else {
                   drms_setkey_int(outRec, "AMBPATCH", 1);
           }
   
     TIME val, trec, tnow, UNIX_epoch = -220924792.000; /* 1970.01.01_00:00:00_UTC */     TIME val, trec, tnow, UNIX_epoch = -220924792.000; /* 1970.01.01_00:00:00_UTC */
     tnow = (double)time(NULL);     tnow = (double)time(NULL);
     tnow += UNIX_epoch;     tnow += UNIX_epoch;


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

Karen Tian
Powered by
ViewCVS 0.9.4