Changeset 24733
- Timestamp:
- Jul 9, 2009, 8:41:52 AM (17 years ago)
- Location:
- trunk/ippTools/src
- Files:
-
- 9 edited
-
faketool.c (modified) (3 diffs)
-
faketoolConfig.c (modified) (3 diffs)
-
pxcam.c (modified) (2 diffs)
-
pxchip.c (modified) (2 diffs)
-
pxtools.h (modified) (1 diff)
-
regtool.c (modified) (1 diff)
-
regtoolConfig.c (modified) (3 diffs)
-
warptool.c (modified) (1 diff)
-
warptoolConfig.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTools/src/faketool.c
r24562 r24733 134 134 PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); 135 135 PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); 136 PXOPT_COPY_ F64(config->args, where, "-ra_min", "ra", ">=");137 PXOPT_COPY_ F64(config->args, where, "-ra_max", "ra", "<");138 PXOPT_COPY_ F64(config->args, where, "-decl_min", "decl", ">=");139 PXOPT_COPY_ F64(config->args, where, "-decl_max", "decl", "<");136 PXOPT_COPY_RADEC(config->args, where, "-ra_min", "ra", ">="); 137 PXOPT_COPY_RADEC(config->args, where, "-ra_max", "ra", "<"); 138 PXOPT_COPY_RADEC(config->args, where, "-decl_min", "decl", ">="); 139 PXOPT_COPY_RADEC(config->args, where, "-decl_max", "decl", "<"); 140 140 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); 141 141 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); … … 302 302 PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); 303 303 PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); 304 PXOPT_COPY_ F64(config->args, where, "-ra_min", "ra", ">=");305 PXOPT_COPY_ F64(config->args, where, "-ra_max", "ra", "<");306 PXOPT_COPY_ F64(config->args, where, "-decl_min", "decl", ">=");307 PXOPT_COPY_ F64(config->args, where, "-decl_max", "decl", "<");304 PXOPT_COPY_RADEC(config->args, where, "-ra_min", "ra", ">="); 305 PXOPT_COPY_RADEC(config->args, where, "-ra_max", "ra", "<"); 306 PXOPT_COPY_RADEC(config->args, where, "-decl_min", "decl", ">="); 307 PXOPT_COPY_RADEC(config->args, where, "-decl_max", "decl", "<"); 308 308 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); 309 309 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); … … 646 646 PXOPT_COPY_F64(config->args, where, "-airmass_min", "airmass", ">="); 647 647 PXOPT_COPY_F64(config->args, where, "-airmass_max", "airmass", "<"); 648 PXOPT_COPY_ F64(config->args, where, "-ra_min", "ra", ">=");649 PXOPT_COPY_ F64(config->args, where, "-ra_max", "ra", "<");650 PXOPT_COPY_ F64(config->args, where, "-decl_min", "decl", ">=");651 PXOPT_COPY_ F64(config->args, where, "-decl_max", "decl", "<");648 PXOPT_COPY_RADEC(config->args, where, "-ra_min", "ra", ">="); 649 PXOPT_COPY_RADEC(config->args, where, "-ra_max", "ra", "<"); 650 PXOPT_COPY_RADEC(config->args, where, "-decl_min", "decl", ">="); 651 PXOPT_COPY_RADEC(config->args, where, "-decl_max", "decl", "<"); 652 652 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); 653 653 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); -
trunk/ippTools/src/faketoolConfig.c
r24562 r24733 61 61 psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); 62 62 psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); 63 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min", 0, "define min ", NAN);64 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max", 0, "define max ", NAN);65 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min", 0, "define min ", NAN);66 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max", 0, "define max ", NAN);63 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min", 0, "define min RA (degrees)", NAN); 64 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max", 0, "define max RA (degrees)", NAN); 65 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min", 0, "define min DEC (degrees)", NAN); 66 psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max", 0, "define max DEC (degrees)", NAN); 67 67 psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); 68 68 psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); … … 114 114 psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); 115 115 psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); 116 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "define min ", NAN);117 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "define max ", NAN);118 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "define min ", NAN);119 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "define max ", NAN);116 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min", 0, "define min RA (degrees)", NAN); 117 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max", 0, "define max RA (degrees)", NAN); 118 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min", 0, "define min DEC (degrees)", NAN); 119 psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max", 0, "define max DEC (degrees)", NAN); 120 120 psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); 121 121 psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); … … 212 212 psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_min", 0, "define min airmass", NAN); 213 213 psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-airmass_max", 0, "define max airmass", NAN); 214 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_min", 0, "define min ", NAN);215 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_max", 0, "define max ", NAN);216 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_min", 0, "define min ", NAN);217 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_max", 0, "define max ", NAN);214 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_min", 0, "define min RA (degrees)", NAN); 215 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-ra_max", 0, "define max RA (degrees)", NAN); 216 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_min", 0, "define min DEC (degrees)", NAN); 217 psMetadataAddF64(revertprocessedimfileArgs, PS_LIST_TAIL, "-decl_max", 0, "define max DEC (degrees)", NAN); 218 218 psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_min", 0, "define min", NAN); 219 219 psMetadataAddF32(revertprocessedimfileArgs, PS_LIST_TAIL, "-exp_time_max", 0, "define max", NAN); -
trunk/ippTools/src/pxcam.c
r24708 r24733 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); … … 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", "<");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, "-solang_min", "rawExp.solang", ">="); 116 PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<"); 117 117 118 118 return true; -
trunk/ippTools/src/pxchip.c
r24371 r24733 47 47 psMetadataAddF32(md, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); 48 48 psMetadataAddF32(md, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); 49 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "search by min ", NAN);50 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "search by max ", NAN);51 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "search by min ", NAN);52 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "search by max ", NAN);53 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "search by min ", NAN);54 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "search by max ", NAN);55 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by m axfraction of saturated pixels", NAN);56 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by m infraction of saturated pixels", NAN);57 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "search by m ax", NAN);58 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "search by max ", NAN);59 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by m ax", NAN);60 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max ", NAN);61 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by m ax", NAN);62 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max ", NAN);63 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "search by min ", NAN);64 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "search by max ", NAN);65 psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "search by min ", NAN);66 psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "search by max ", NAN);49 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "search by min RA (degrees) ", NAN); 50 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "search by max RA (degrees) ", NAN); 51 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "search by min DEC (degrees)", NAN); 52 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "search by max DEC (degrees)", NAN); 53 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "search by min exposure time", NAN); 54 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "search by max exposure time", NAN); 55 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by min fraction of saturated pixels", NAN); 56 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by max fraction of saturated pixels", NAN); 57 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "search by min background", NAN); 58 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "search by max background", NAN); 59 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by min background standard deviation", NAN); 60 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max background standard deviation", NAN); 61 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by min background mean standard deviation (across imfiles)", NAN); 62 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max background mean standard deviation (across imfiles)", NAN); 63 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "search by min altitude", NAN); 64 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "search by max altitude", NAN); 65 psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "search by min azimuth ", NAN); 66 psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "search by max azimuth ", NAN); 67 67 psMetadataAddF64(md, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); 68 68 psMetadataAddF64(md, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); 69 69 psMetadataAddF64(md, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); 70 70 psMetadataAddF64(md, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); 71 psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL);72 71 psMetadataAddF32(md, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN); 73 72 psMetadataAddF32(md, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); 73 psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); 74 74 psMetadataAddStr(md, PS_LIST_TAIL, "-comment", 0, "search by comment field (LIKE comparison)", NULL); 75 75 psMetadataAddStr(md, PS_LIST_TAIL, "-obs_mode", 0, "search by observation mode", NULL); … … 99 99 PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">="); 100 100 PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<"); 101 PXOPT_COPY_ F64(config->args, where, "-ra_min", "rawExp.ra", ">=");102 PXOPT_COPY_ F64(config->args, where, "-ra_max", "rawExp.ra", "<");103 PXOPT_COPY_ F64(config->args, where, "-decl_min", "rawExp.decl", ">=");104 PXOPT_COPY_ F64(config->args, where, "-decl_max", "rawExp.decl", "<");101 PXOPT_COPY_RADEC(config->args, where, "-ra_min", "rawExp.ra", ">="); 102 PXOPT_COPY_RADEC(config->args, where, "-ra_max", "rawExp.ra", "<"); 103 PXOPT_COPY_RADEC(config->args, where, "-decl_min", "rawExp.decl", ">="); 104 PXOPT_COPY_RADEC(config->args, where, "-decl_max", "rawExp.decl", "<"); 105 105 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">="); 106 106 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<"); -
trunk/ippTools/src/pxtools.h
r23918 r24733 231 231 } 232 232 233 // convert the supplied value from degrees (external) to radians (internal) 234 #define PXOPT_COPY_RADEC(from, to, oldname, newname, comment) \ 235 { \ 236 bool status = false; \ 237 psF64 var = psMetadataLookupF64(&status, from, oldname); \ 238 if (!status) { \ 239 psError(PS_ERR_UNKNOWN, false, "failed to lookup value for " oldname); \ 240 return false; \ 241 } \ 242 if (!isnan(var)) { \ 243 if (!psMetadataAddF64(to, PS_LIST_TAIL, newname, PS_META_DUPLICATE_OK, comment, PS_RAD_DEG*var)) { \ 244 psError(PS_ERR_UNKNOWN, false, "failed to add item " newname); \ 245 psFree(to); \ 246 return false; \ 247 } \ 248 } \ 249 } 250 233 251 #define PXOPT_COPY_F32(from, to, oldname, newname, comment) \ 234 252 PXOPT_COPY_F(from, to, F32, oldname, newname, comment) -
trunk/ippTools/src/regtool.c
r24014 r24733 887 887 // XX test this out; need to make this consistent with the list in regtoolConfig.c 888 888 psMetadata *where = psMetadataAlloc(); 889 PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");890 PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "==");891 PXOPT_COPY_STR(config->args, where, "-inst", "camera", "==");892 PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "==");893 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs", ">=");894 PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<=");895 PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "==");896 PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "==");897 PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "==");898 PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "==");899 PXOPT_COPY_STR(config->args, where, "-filter", "filter", "==");900 PXOPT_COPY_F32(config->args, where, "-airmass_min", "airmass", ">=");901 PXOPT_COPY_F32(config->args, where, "-airmass_max", "airmass", "<");902 PXOPT_COPY_ F64(config->args, where, "-ra_min", "ra", ">=");903 PXOPT_COPY_ F64(config->args, where, "-ra_max", "ra", "<");904 PXOPT_COPY_ F64(config->args, where, "-decl_min", "decl", ">=");905 PXOPT_COPY_ F64(config->args, where, "-decl_max", "decl", "<");906 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">=");907 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<");908 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "sat_pixel_frac", ">=");909 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "sat_pixel_frac", "<");910 PXOPT_COPY_F64(config->args, where, "-bg_min", "bg", ">=");911 PXOPT_COPY_F64(config->args, where, "-bg_max", "bg", "<");912 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "bg_stdev", ">=");913 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "bg_stdev", "<");914 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "bg_mean_stdev", ">=");915 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "bg_mean_stdev", "<");916 PXOPT_COPY_F64(config->args, where, "-alt_min", "alt", ">=");917 PXOPT_COPY_F64(config->args, where, "-alt_max", "alt", "<");918 PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">=");919 PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<");920 PXOPT_COPY_F64(config->args, where, "-ccd_temp_min", "ccd_temp", ">=");921 PXOPT_COPY_F64(config->args, where, "-ccd_temp_max", "ccd_temp", "<");922 PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">=");923 PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<");924 PXOPT_COPY_STR(config->args, where, "-object", "object", "==");925 PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">=");926 PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<");889 PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "=="); 890 PXOPT_COPY_STR(config->args, where, "-exp_name", "exp_name", "=="); 891 PXOPT_COPY_STR(config->args, where, "-inst", "camera", "=="); 892 PXOPT_COPY_STR(config->args, where, "-telescope", "telescope", "=="); 893 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "dateobs", ">="); 894 PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "dateobs", "<="); 895 PXOPT_COPY_STR(config->args, where, "-exp_tag", "exp_tag", "=="); 896 PXOPT_COPY_STR(config->args, where, "-exp_type", "exp_type", "=="); 897 PXOPT_COPY_STR(config->args, where, "-filelevel", "filelevel", "=="); 898 PXOPT_COPY_STR(config->args, where, "-reduction", "reduction", "=="); 899 PXOPT_COPY_STR(config->args, where, "-filter", "filter", "=="); 900 PXOPT_COPY_F32(config->args, where, "-airmass_min", "airmass", ">="); 901 PXOPT_COPY_F32(config->args, where, "-airmass_max", "airmass", "<"); 902 PXOPT_COPY_RADEC(config->args, where, "-ra_min", "ra", ">="); 903 PXOPT_COPY_RADEC(config->args, where, "-ra_max", "ra", "<"); 904 PXOPT_COPY_RADEC(config->args, where, "-decl_min", "decl", ">="); 905 PXOPT_COPY_RADEC(config->args, where, "-decl_max", "decl", "<"); 906 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "exp_time", ">="); 907 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "exp_time", "<"); 908 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "sat_pixel_frac", ">="); 909 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "sat_pixel_frac", "<"); 910 PXOPT_COPY_F64(config->args, where, "-bg_min", "bg", ">="); 911 PXOPT_COPY_F64(config->args, where, "-bg_max", "bg", "<"); 912 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "bg_stdev", ">="); 913 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "bg_stdev", "<"); 914 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "bg_mean_stdev", ">="); 915 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "bg_mean_stdev", "<"); 916 PXOPT_COPY_F64(config->args, where, "-alt_min", "alt", ">="); 917 PXOPT_COPY_F64(config->args, where, "-alt_max", "alt", "<"); 918 PXOPT_COPY_F64(config->args, where, "-az_min", "az", ">="); 919 PXOPT_COPY_F64(config->args, where, "-az_max", "az", "<"); 920 PXOPT_COPY_F64(config->args, where, "-ccd_temp_min", "ccd_temp", ">="); 921 PXOPT_COPY_F64(config->args, where, "-ccd_temp_max", "ccd_temp", "<"); 922 PXOPT_COPY_F64(config->args, where, "-posang_min", "posang", ">="); 923 PXOPT_COPY_F64(config->args, where, "-posang_max", "posang", "<"); 924 PXOPT_COPY_STR(config->args, where, "-object", "object", "=="); 925 PXOPT_COPY_F32(config->args, where, "-solang_min", "solang", ">="); 926 PXOPT_COPY_F32(config->args, where, "-solang_max", "solang", "<"); 927 927 928 928 PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false); -
trunk/ippTools/src/regtoolConfig.c
r24014 r24733 74 74 ADD_OPT(Str, addprocessedimfileArgs, "-obs_group", "define observing group (set of associated observations)", NULL); 75 75 76 // Note: RA & DEC are supplied here in radians, but the query options use degrees. This 77 // can be justified by the fact that this option (addprocessedimfile) is a software 78 // interface, but the query mechanisms are human user interfaces. 79 ADD_OPT(F64, addprocessedimfileArgs, "-ra", "define RA (NOTE: radians)", NAN); 80 ADD_OPT(F64, addprocessedimfileArgs, "-decl", "define DEC (NOTE: radians)", NAN); 76 81 ADD_OPT(F32, addprocessedimfileArgs, "-airmass", "define airmass", NAN); 77 ADD_OPT(F64, addprocessedimfileArgs, "-ra", "define RA", NAN);78 ADD_OPT(F64, addprocessedimfileArgs, "-decl", "define DEC", NAN);79 82 ADD_OPT(F32, addprocessedimfileArgs, "-exp_time", "define exposure time", NAN); 80 83 ADD_OPT(F32, addprocessedimfileArgs, "-sat_pixel_frac", "define fraction of saturated pixels", NAN); … … 181 184 ADD_OPT(Str, addprocessedexpArgs, "-obs_group", "define observing group (set of associated observations)", NULL); 182 185 186 // Note: RA & DEC are supplied here in radians, but the query options use degrees. This 187 // can be justified by the fact that this option (addprocessedexp) is a software 188 // interface, but the query mechanisms are human user interfaces. 189 ADD_OPT(F64, addprocessedexpArgs, "-ra", "define RA (NOTE: radians)", NAN); 190 ADD_OPT(F64, addprocessedexpArgs, "-decl", "define DEC (NOTE: radians)", NAN); 183 191 ADD_OPT(F32, addprocessedexpArgs, "-airmass", "define airmass", NAN); 184 ADD_OPT(F64, addprocessedexpArgs, "-ra", "define RA", NAN);185 ADD_OPT(F64, addprocessedexpArgs, "-decl", "define DEC", NAN);186 192 ADD_OPT(F32, addprocessedexpArgs, "-exp_time", "define exposure time", NAN); 187 193 ADD_OPT(F32, addprocessedexpArgs, "-sat_pixel_frac", "define fraction of saturated pixels", NAN); … … 244 250 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); 245 251 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); 246 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min ", NAN);247 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max ", NAN);248 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min ", NAN);249 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max ", NAN);250 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min ", NAN);251 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max ", NAN);252 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by m axfraction of saturated pixels", NAN);253 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by m infraction of saturated pixels", NAN);254 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_min", 0, "search by m ax", NAN);255 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max ", NAN);256 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by m ax", NAN);257 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max ", NAN);258 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by m ax", NAN);259 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max ", NAN);260 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min ", NAN);261 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max ", NAN);262 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_min", 0, "search by min ", NAN);263 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_max", 0, "search by max ", NAN);252 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min RA (degrees) ", NAN); 253 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max RA (degrees) ", NAN); 254 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min DEC (degrees)", NAN); 255 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max DEC (degrees)", NAN); 256 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min exposure time", NAN); 257 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max exposure time", NAN); 258 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by min fraction of saturated pixels", NAN); 259 psMetadataAddF32(processedexpArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by max fraction of saturated pixels", NAN); 260 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_min", 0, "search by min background", NAN); 261 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max background", NAN); 262 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by min background standard deviation", NAN); 263 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max background standard deviation", NAN); 264 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by min background mean standard deviation (across imfiles)", NAN); 265 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max background mean standard deviation (across imfiles)", NAN); 266 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min altitude", NAN); 267 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max altitude", NAN); 268 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_min", 0, "search by min azimuth ", NAN); 269 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-az_max", 0, "search by max azimuth ", NAN); 264 270 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); 265 271 psMetadataAddF64(processedexpArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); -
trunk/ippTools/src/warptool.c
r24562 r24733 196 196 197 197 psMetadata *where = psMetadataAlloc(); 198 PXOPT_COPY_S64(config->args, where, "-fake_id", "fakeRun.fake_id", "==");199 PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "==");200 PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "==");201 PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");202 PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "==");203 PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "==");204 PXOPT_COPY_STR(config->args, where, "-telescope", "rawExp.telescope", "==");205 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs", ">=");206 PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "rawExp.dateobs", "<=");207 PXOPT_COPY_STR(config->args, where, "-exp_tag", "rawExp.exp_tag", "==");208 PXOPT_COPY_STR(config->args, where, "-exp_type", "rawExp.exp_type", "==");209 PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "==");210 PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "==");211 PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">=");212 PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<");213 PXOPT_COPY_ F64(config->args, where, "-ra_min", "rawExp.ra", ">=");214 PXOPT_COPY_ F64(config->args, where, "-ra_max", "rawExp.ra", "<");215 PXOPT_COPY_ F64(config->args, where, "-decl_min", "rawExp.decl", ">=");216 PXOPT_COPY_ F64(config->args, where, "-decl_max", "rawExp.decl", "<");217 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">=");218 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<");219 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "rawExp.sat_pixel_frac", ">=");220 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "rawExp.sat_pixel_frac", "<");221 PXOPT_COPY_F64(config->args, where, "-bg_min", "rawExp.bg", ">=");222 PXOPT_COPY_F64(config->args, where, "-bg_max", "rawExp.bg", "<");223 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "rawExp.bg_stdev", ">=");224 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "rawExp.bg_stdev", "<");225 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "rawExp.bg_mean_stdev", ">=");226 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "rawExp.bg_mean_stdev", "<");227 PXOPT_COPY_F64(config->args, where, "-alt_min", "rawExp.alt", ">=");228 PXOPT_COPY_F64(config->args, where, "-alt_max", "rawExp.alt", "<");229 PXOPT_COPY_F64(config->args, where, "-az_min", "rawExp.az", ">=");230 PXOPT_COPY_F64(config->args, where, "-az_max", "rawExp.az", "<");231 PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "rawExp.ccd_temp", ">=");232 PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "rawExp.ccd_temp", "<");233 PXOPT_COPY_F64(config->args, where, "-posang_min", "rawExp.posang", ">=");234 PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<");235 PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "==");236 PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">=");237 PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<");238 PXOPT_COPY_STR(config->args, where, "-reduction", "fakeRun.reduction", "==");239 pxAddLabelSearchArgs (config, where, "-label", "fakeRun.label", "==");198 PXOPT_COPY_S64(config->args, where, "-fake_id", "fakeRun.fake_id", "=="); 199 PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); 200 PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "=="); 201 PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); 202 PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); 203 PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "=="); 204 PXOPT_COPY_STR(config->args, where, "-telescope", "rawExp.telescope", "=="); 205 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs", ">="); 206 PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "rawExp.dateobs", "<="); 207 PXOPT_COPY_STR(config->args, where, "-exp_tag", "rawExp.exp_tag", "=="); 208 PXOPT_COPY_STR(config->args, where, "-exp_type", "rawExp.exp_type", "=="); 209 PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "=="); 210 PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "=="); 211 PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">="); 212 PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<"); 213 PXOPT_COPY_RADEC(config->args, where, "-ra_min", "rawExp.ra", ">="); 214 PXOPT_COPY_RADEC(config->args, where, "-ra_max", "rawExp.ra", "<"); 215 PXOPT_COPY_RADEC(config->args, where, "-decl_min", "rawExp.decl", ">="); 216 PXOPT_COPY_RADEC(config->args, where, "-decl_max", "rawExp.decl", "<"); 217 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">="); 218 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<"); 219 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "rawExp.sat_pixel_frac", ">="); 220 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "rawExp.sat_pixel_frac", "<"); 221 PXOPT_COPY_F64(config->args, where, "-bg_min", "rawExp.bg", ">="); 222 PXOPT_COPY_F64(config->args, where, "-bg_max", "rawExp.bg", "<"); 223 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "rawExp.bg_stdev", ">="); 224 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "rawExp.bg_stdev", "<"); 225 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "rawExp.bg_mean_stdev", ">="); 226 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "rawExp.bg_mean_stdev", "<"); 227 PXOPT_COPY_F64(config->args, where, "-alt_min", "rawExp.alt", ">="); 228 PXOPT_COPY_F64(config->args, where, "-alt_max", "rawExp.alt", "<"); 229 PXOPT_COPY_F64(config->args, where, "-az_min", "rawExp.az", ">="); 230 PXOPT_COPY_F64(config->args, where, "-az_max", "rawExp.az", "<"); 231 PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "rawExp.ccd_temp", ">="); 232 PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "rawExp.ccd_temp", "<"); 233 PXOPT_COPY_F64(config->args, where, "-posang_min", "rawExp.posang", ">="); 234 PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); 235 PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); 236 PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">="); 237 PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<"); 238 PXOPT_COPY_STR(config->args, where, "-reduction", "fakeRun.reduction", "=="); 239 pxAddLabelSearchArgs (config, where, "-label", "fakeRun.label", "=="); 240 240 241 241 if (!psListLength(where->list) && -
trunk/ippTools/src/warptoolConfig.c
r24562 r24733 66 66 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); 67 67 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN); 68 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min ", NAN);69 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max ", NAN);70 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min ", NAN);71 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max ", NAN);72 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min ", NAN);73 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max ", NAN);74 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by m axfraction of saturated pixels", NAN);75 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by m infraction of saturated pixels", NAN);76 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, "search by m ax", NAN);77 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max ", NAN);78 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by m ax", NAN);79 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max ", NAN);80 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by m ax", NAN);81 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max ", NAN);82 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min ", NAN);83 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max ", NAN);84 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_min", 0, "search by min ", NAN);85 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_max", 0, "search by max ", NAN);68 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_min", 0, "search by min RA (degrees) ", NAN); 69 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ra_max", 0, "search by max RA (degrees) ", NAN); 70 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_min", 0, "search by min DEC (degrees)", NAN); 71 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-decl_max", 0, "search by max DEC (degrees)", NAN); 72 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min", 0, "search by min exposure time", NAN); 73 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max", 0, "search by max exposure time", NAN); 74 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by min fraction of saturated pixels", NAN); 75 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by max fraction of saturated pixels", NAN); 76 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, "search by min background", NAN); 77 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_max", 0, "search by max background", NAN); 78 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by min background standard deviation", NAN); 79 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max background standard deviation", NAN); 80 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by min background mean standard deviation (across imfiles)", NAN); 81 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max background mean standard deviation (across imfiles)", NAN); 82 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_min", 0, "search by min altitude", NAN); 83 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-alt_max", 0, "search by max altitude", NAN); 84 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_min", 0, "search by min azimuth ", NAN); 85 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-az_max", 0, "search by max azimuth ", NAN); 86 86 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); 87 87 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN);
Note:
See TracChangeset
for help on using the changeset viewer.
