JSOC/proj/sharp/apps/sharp.c - diff

Return to sharp.c CVS log

Up to [Development] / JSOC / proj / sharp / apps

Diff for /JSOC/proj/sharp/apps/sharp.c between version 1.15 and 1.16

version 1.15, 2013/06/27 01:58:39

version 1.16, 2013/07/04 02:14:14

Line 92

// Nyqvist rate at disk center is 0.03 degree. Oversample above 0.015 degree

#define NYQVIST (0.015)

// Some other things

#ifndef MIN

#define MIN(a,b) (((a)<(b)) ? (a) : (b))

#endif

Line 119

Line 120

#define INTERP 0

#define dpath "/home/jsoc/cvs/Development/JSOC"

/* ========================================================================================================== */

// Space weather keywords

Line 197 struct mapInfo {

Line 199 struct mapInfo {

float *xi_out, *zeta_out; // coordinate on full disk image to sample at

};

/* ========================================================================================================== */

/* Get all input data series */

Line 1003 int getEphemeris(DRMS_Record_t *inRec, s

Line 1004 int getEphemeris(DRMS_Record_t *inRec, s

float crpix1 = drms_getkey_float(inRec, "IMCRPIX1", &status);

float crpix2 = drms_getkey_float(inRec, "IMCRPIX2", &status);

float cdelt = drms_getkey_float(inRec, "CDELT1", &status); // in arcsec, assumimg dx=dy

printf("cdelt=%f\n",cdelt);

ephem->disk_xc = PIX_X(0.0,0.0) - 1.0; // Center of disk in pixel, starting at 0

ephem->disk_yc = PIX_Y(0.0,0.0) - 1.0;

Line 1722 void computeSWIndex(struct swIndex *swKe

float *bx_err = (float *) bx_errArray->data; // bx_err

// Get emphemeris

float cdelt1_orig = drms_getkey_float(inRec, "CDELT1", &status);

//float cdelt1_orig = drms_getkey_float(inRec, "CDELT1", &status);

float cdelt1 = drms_getkey_float(inRec, "CDELT1", &status);

float dsun_obs = drms_getkey_float(inRec, "DSUN_OBS", &status);

double rsun_ref = drms_getkey_double(inRec, "RSUN_REF", &status);

double rsun_obs = drms_getkey_double(inRec, "RSUN_OBS", &status);

Line 1733 void computeSWIndex(struct swIndex *swKe

Line 1731 void computeSWIndex(struct swIndex *swKe

float crpix1 = drms_getkey_float(inRec, "CRPIX1", &status);

float crpix2 = drms_getkey_float(inRec, "CRPIX2", &status);

// Temp arrays

// convert cdelt1_orig from degrees to arcsec

float cdelt1 = (atan((rsun_ref*cdelt1_orig*RADSINDEG)/(dsun_obs)))*(1/RADSINDEG)*(3600.);

// Temp arrays

float *bh = (float *) (malloc(nxny * sizeof(float)));

float *bt = (float *) (malloc(nxny * sizeof(float)));

float *jz = (float *) (malloc(nxny * sizeof(float)));

Line 1975 void setKeys(DRMS_Record_t *outRec, DRMS

// set cvs commit version into keyword HEADER

char *cvsinfo = strdup("$Id$");

// status = drms_setkey_string(outRec, "HEADER", cvsinfo);

char *cvsinfo2 = sw_functions_version();

status = drms_setkey_string(outRec, "CODEVER7", cvsinfo);

char cvsinfoall[2048];

strcat(cvsinfoall,cvsinfo);

strcat(cvsinfoall,"\n");

strcat(cvsinfoall,cvsinfo2);

status = drms_setkey_string(outRec, "CODEVER7", cvsinfoall);

};

Legend:

Removed from v.1.15
changed lines
	Added in v.1.16

Karen Tian