Changeset 25027 for branches/pap/ippTools/src/pxcam.c
- Timestamp:
- Aug 7, 2009, 4:08:25 PM (17 years ago)
- Location:
- branches/pap
- Files:
-
- 3 edited
-
. (modified) (1 prop)
-
ippTools/src (modified) (1 prop)
-
ippTools/src/pxcam.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/pap
- Property svn:mergeinfo changed
-
branches/pap/ippTools/src
- Property svn:ignore
-
old new 34 34 disttool 35 35 receivetool 36 37 pubtool
-
- Property svn:ignore
-
branches/pap/ippTools/src/pxcam.c
r23590 r25027 45 45 psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); 46 46 psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); 47 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "define min ", NAN);48 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "define max ", NAN);49 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "define min ", NAN);50 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "define max ", NAN);51 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "define min ", NAN);52 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "define max ", NAN);47 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "define min RA (degrees) ", NAN); 48 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "define max RA (degrees) ", NAN); 49 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "define min DEC (degrees)", NAN); 50 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "define max DEC (degrees)", NAN); 51 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "define min exposure time", NAN); 52 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "define max exposure time", NAN); 53 53 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "define max fraction of saturated pixels", NAN); 54 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define m infraction of saturated pixels", NAN);55 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "define m ax", NAN);56 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "define max ", NAN);57 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "define m ax", NAN);58 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max ", NAN);59 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define m ax", NAN);60 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max ", NAN);61 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "define min ", NAN);62 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "define max ", NAN);63 psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "define min ", NAN);64 psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "define max ", NAN);54 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "define max fraction of saturated pixels", NAN); 55 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "define min background", NAN); 56 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "define max background", NAN); 57 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "define min background standard deviation", NAN); 58 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "define max background standard deviation", NAN); 59 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "define min background mean standard deviation (across imfiles)", NAN); 60 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "define max background mean standard deviation (across imfiles)", NAN); 61 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "define min altitude", NAN); 62 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "define max altitude", NAN); 63 psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "define min azimuth ", NAN); 64 psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "define max azimuth ", NAN); 65 65 psMetadataAddF32(md, PS_LIST_TAIL, "-ccd_temp_min", 0, "define min ccd tempature", NAN); 66 66 psMetadataAddF32(md, PS_LIST_TAIL, "-ccd_temp_max", 0, "define max ccd tempature", NAN); … … 68 68 psMetadataAddF64(md, PS_LIST_TAIL, "-posang_max", 0, "define max rotator position angle", NAN); 69 69 psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); 70 psMetadataAddF32(md, PS_LIST_TAIL, "-s olang_min", 0, "define min solar angle", NAN);71 psMetadataAddF32(md, PS_LIST_TAIL, "-s olang_max", 0, "define max solar angle", NAN);70 psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_min", 0, "define min solar angle", NAN); 71 psMetadataAddF32(md, PS_LIST_TAIL, "-sun_angle_max", 0, "define max solar angle", NAN); 72 72 73 73 return true; … … 76 76 bool pxcamGetSearchArgs (pxConfig *config, psMetadata *where) { 77 77 78 PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "==");79 PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");80 PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");81 PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "==");82 PXOPT_COPY_STR(config->args, where, "-telescope", "rawExp.telescope", "==");83 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs", ">=");84 PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "rawExp.dateobs", "<=");85 PXOPT_COPY_STR(config->args, where, "-exp_tag", "rawExp.exp_tag", "==");86 PXOPT_COPY_STR(config->args, where, "-exp_type", "rawExp.exp_type", "==");87 PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE");88 PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "==");89 PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "==");90 PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">=");91 PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<");92 PXOPT_COPY_ F64(config->args,where, "-ra_min", "rawExp.ra", ">=");93 PXOPT_COPY_ F64(config->args,where, "-ra_max", "rawExp.ra", "<");94 PXOPT_COPY_ F64(config->args,where, "-decl_min", "rawExp.decl", ">=");95 PXOPT_COPY_ F64(config->args,where, "-decl_max", "rawExp.decl", "<");96 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">=");97 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<");98 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "rawExp.sat_pixel_frac", ">=");99 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "rawExp.sat_pixel_frac", "<");100 PXOPT_COPY_F64(config->args, where, "-bg_min", "rawExp.bg", ">=");101 PXOPT_COPY_F64(config->args, where, "-bg_max", "rawExp.bg", "<");102 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "rawExp.bg_stdev", ">=");103 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "rawExp.bg_stdev", "<");104 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "rawExp.bg_mean_stdev", ">=");105 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "rawExp.bg_mean_stdev", "<");106 PXOPT_COPY_F64(config->args, where, "-alt_min", "rawExp.alt", ">=");107 PXOPT_COPY_F64(config->args, where, "-alt_max", "rawExp.alt", "<");108 PXOPT_COPY_F64(config->args, where, "-az_min", "rawExp.az", ">=");109 PXOPT_COPY_F64(config->args, where, "-az_max", "rawExp.az", "<");110 PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "rawExp.ccd_temp", ">=");111 PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "rawExp.ccd_temp", "<");112 PXOPT_COPY_F64(config->args, where, "-posang_min", "rawExp.posang", ">=");113 PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<");114 PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "==");115 PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">=");116 PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<");117 118 return true; 119 } 120 121 bool pxcamRunSetState(pxConfig *config, psS64 cam_id, const char *state )78 PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "=="); 79 PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); 80 PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); 81 PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "=="); 82 PXOPT_COPY_STR(config->args, where, "-telescope", "rawExp.telescope", "=="); 83 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs", ">="); 84 PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "rawExp.dateobs", "<="); 85 PXOPT_COPY_STR(config->args, where, "-exp_tag", "rawExp.exp_tag", "=="); 86 PXOPT_COPY_STR(config->args, where, "-exp_type", "rawExp.exp_type", "=="); 87 PXOPT_COPY_STR(config->args, where, "-comment", "rawExp.comment", "LIKE"); 88 PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "=="); 89 PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "=="); 90 PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">="); 91 PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<"); 92 PXOPT_COPY_RADEC(config->args, where, "-ra_min", "rawExp.ra", ">="); 93 PXOPT_COPY_RADEC(config->args, where, "-ra_max", "rawExp.ra", "<"); 94 PXOPT_COPY_RADEC(config->args, where, "-decl_min", "rawExp.decl", ">="); 95 PXOPT_COPY_RADEC(config->args, where, "-decl_max", "rawExp.decl", "<"); 96 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">="); 97 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<"); 98 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "rawExp.sat_pixel_frac", ">="); 99 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "rawExp.sat_pixel_frac", "<"); 100 PXOPT_COPY_F64(config->args, where, "-bg_min", "rawExp.bg", ">="); 101 PXOPT_COPY_F64(config->args, where, "-bg_max", "rawExp.bg", "<"); 102 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "rawExp.bg_stdev", ">="); 103 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "rawExp.bg_stdev", "<"); 104 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "rawExp.bg_mean_stdev", ">="); 105 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "rawExp.bg_mean_stdev", "<"); 106 PXOPT_COPY_F64(config->args, where, "-alt_min", "rawExp.alt", ">="); 107 PXOPT_COPY_F64(config->args, where, "-alt_max", "rawExp.alt", "<"); 108 PXOPT_COPY_F64(config->args, where, "-az_min", "rawExp.az", ">="); 109 PXOPT_COPY_F64(config->args, where, "-az_max", "rawExp.az", "<"); 110 PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "rawExp.ccd_temp", ">="); 111 PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "rawExp.ccd_temp", "<"); 112 PXOPT_COPY_F64(config->args, where, "-posang_min", "rawExp.posang", ">="); 113 PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); 114 PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); 115 PXOPT_COPY_F32(config->args, where, "-sun_angle_min", "rawExp.sun_angle", ">="); 116 PXOPT_COPY_F32(config->args, where, "-sun_angle_max", "rawExp.sun_angle", "<"); 117 118 return true; 119 } 120 121 bool pxcamRunSetState(pxConfig *config, psS64 cam_id, const char *state, psS64 magicked) 122 122 { 123 123 PS_ASSERT_PTR_NON_NULL(config, false); … … 131 131 } 132 132 133 char *query = "UPDATE camRun SET state = '%s' WHERE cam_id = %" PRId64;134 if (!p_psDBRunQueryF(config->dbh, query, state, cam_id)) {133 char *query = "UPDATE camRun SET state = '%s', magicked = %" PRId64 " WHERE cam_id = %" PRId64; 134 if (!p_psDBRunQueryF(config->dbh, query, state, magicked, cam_id)) { 135 135 psError(PS_ERR_UNKNOWN, false, 136 136 "failed to change state for cam_id %" PRId64, cam_id);
Note:
See TracChangeset
for help on using the changeset viewer.
