Changeset 23613
- Timestamp:
- Mar 30, 2009, 2:52:04 PM (17 years ago)
- Location:
- trunk/ippTools
- Files:
-
- 5 edited
-
share/warptool_definebyquery.sql (modified) (1 diff)
-
src/pxwarp.c (modified) (1 diff)
-
src/pxwarp.h (modified) (1 diff)
-
src/warptool.c (modified) (10 diffs)
-
src/warptoolConfig.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ippTools/share/warptool_definebyquery.sql
r23612 r23613 1 SELECT 2 * 3 FROM ( 4 SELECT DISTINCT 5 fakeRun.*, 6 chipRun.chip_id, 7 rawExp.camera, 8 rawExp.telescope, 9 rawExp.dateobs, 10 rawExp.exp_id, 11 rawExp.exp_tag, 12 rawExp.exp_name, 13 rawExp.exp_type, 14 rawExp.filelevel, 15 rawExp.filter, 16 rawExp.airmass, 17 rawExp.ra, 18 rawExp.decl, 19 rawExp.exp_time, 20 rawExp.sat_pixel_frac, 21 rawExp.bg, 22 rawExp.bg_stdev, 23 rawExp.bg_mean_stdev, 24 rawExp.alt, 25 rawExp.az, 26 rawExp.ccd_temp, 27 rawExp.posang, 28 rawExp.object, 29 rawExp.sun_angle 30 FROM fakeRun 31 JOIN camRun USING(cam_id) 32 JOIN chipRun USING(chip_id) 33 JOIN rawExp USING(exp_id) 34 WHERE 35 fakeRun.state = 'full') AS possibleWarps 1 SELECT DISTINCT 2 fakeRun.*, 3 chipRun.chip_id, 4 rawExp.camera, 5 rawExp.telescope, 6 rawExp.dateobs, 7 rawExp.exp_id, 8 rawExp.exp_tag, 9 rawExp.exp_name, 10 rawExp.exp_type, 11 rawExp.filelevel, 12 rawExp.filter, 13 rawExp.airmass, 14 rawExp.ra, 15 rawExp.decl, 16 rawExp.exp_time, 17 rawExp.sat_pixel_frac, 18 rawExp.bg, 19 rawExp.bg_stdev, 20 rawExp.bg_mean_stdev, 21 rawExp.alt, 22 rawExp.az, 23 rawExp.ccd_temp, 24 rawExp.posang, 25 rawExp.object, 26 rawExp.sun_angle 27 FROM fakeRun 28 JOIN camRun USING(cam_id) 29 JOIN chipRun USING(chip_id) 30 JOIN rawExp USING(exp_id) 31 WHERE fakeRun.state = 'full' -
trunk/ippTools/src/pxwarp.c
r23610 r23613 28 28 #include "pxtools.h" 29 29 #include "pxwarp.h" 30 31 bool pxwarpSetSearchArgs (psMetadata *md) {32 psMetadataAddS64(md, PS_LIST_TAIL, "-fake_id", 0, "search by fake_id", 0);33 psMetadataAddS64(md, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0);34 psMetadataAddS64(md, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0);35 psMetadataAddS64(md, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0);36 psMetadataAddStr(md, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL);37 psMetadataAddStr(md, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL);38 psMetadataAddStr(md, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL);39 psMetadataAddTime(md, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL);40 psMetadataAddTime(md, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL);41 psMetadataAddStr(md, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL);42 psMetadataAddStr(md, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL);43 psMetadataAddStr(md, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL);44 psMetadataAddStr(md, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL);45 psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN);46 psMetadataAddF64(md, PS_LIST_TAIL, "-airmass_max", 0, "search by max airmass", NAN);47 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_min", 0, "search by min", NAN);48 psMetadataAddF64(md, PS_LIST_TAIL, "-ra_max", 0, "search by max", NAN);49 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_min", 0, "search by min", NAN);50 psMetadataAddF64(md, PS_LIST_TAIL, "-decl_max", 0, "search by max", NAN);51 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_min", 0, "search by min", NAN);52 psMetadataAddF32(md, PS_LIST_TAIL, "-exp_time_max", 0, "search by max", NAN);53 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_min", 0, "search by max fraction of saturated pixels", NAN);54 psMetadataAddF32(md, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by min fraction of saturated pixels", NAN);55 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_min", 0, "search by max", NAN);56 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_max", 0, "search by max", NAN);57 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_min", 0, "search by max", NAN);58 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_stdev_max", 0, "search by max", NAN);59 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_min", 0, "search by max", NAN);60 psMetadataAddF64(md, PS_LIST_TAIL, "-bg_mean_stdev_max", 0, "search by max", NAN);61 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_min", 0, "search by min", NAN);62 psMetadataAddF64(md, PS_LIST_TAIL, "-alt_max", 0, "search by max", NAN);63 psMetadataAddF64(md, PS_LIST_TAIL, "-az_min", 0, "search by min", NAN);64 psMetadataAddF64(md, PS_LIST_TAIL, "-az_max", 0, "search by max", NAN);65 psMetadataAddF32(md, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN);66 psMetadataAddF32(md, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN);67 psMetadataAddF64(md, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN);68 psMetadataAddF64(md, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN);69 psMetadataAddStr(md, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL);70 psMetadataAddF32(md, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN);71 psMetadataAddF32(md, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN);72 return true;73 }74 75 bool pxwarpGetSearchArgs (pxConfig *config, psMetadata *where) {76 PXOPT_COPY_S64(config->args, where, "-fake_id", "fakeRun.fake_id", "==");77 PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "==");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, "-filelevel", "rawExp.filelevel", "==");88 PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "==");89 PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">=");90 PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<");91 PXOPT_COPY_F64(config->args, where, "-ra_min", "rawExp.ra", ">=");92 PXOPT_COPY_F64(config->args, where, "-ra_max", "rawExp.ra", "<");93 PXOPT_COPY_F64(config->args, where, "-decl_min", "rawExp.decl", ">=");94 PXOPT_COPY_F64(config->args, where, "-decl_max", "rawExp.decl", "<");95 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">=");96 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<");97 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "rawExp.sat_pixel_frac", ">=");98 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "rawExp.sat_pixel_frac", "<");99 PXOPT_COPY_F64(config->args, where, "-bg_min", "rawExp.bg", ">=");100 PXOPT_COPY_F64(config->args, where, "-bg_max", "rawExp.bg", "<");101 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "rawExp.bg_stdev", ">=");102 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "rawExp.bg_stdev", "<");103 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "rawExp.bg_mean_stdev", ">=");104 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "rawExp.bg_mean_stdev", "<");105 PXOPT_COPY_F64(config->args, where, "-alt_min", "rawExp.alt", ">=");106 PXOPT_COPY_F64(config->args, where, "-alt_max", "rawExp.alt", "<");107 PXOPT_COPY_F64(config->args, where, "-az_min", "rawExp.az", ">=");108 PXOPT_COPY_F64(config->args, where, "-az_max", "rawExp.az", "<");109 PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "rawExp.ccd_temp", ">=");110 PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "rawExp.ccd_temp", "<");111 PXOPT_COPY_F64(config->args, where, "-posang_min", "rawExp.posang", ">=");112 PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<");113 PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "==");114 PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">=");115 PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<");116 return true;117 }118 30 119 31 bool pxwarpRunSetState(pxConfig *config, psS64 warp_id, const char *state) -
trunk/ippTools/src/pxwarp.h
r23418 r23613 25 25 #include "pxtools.h" 26 26 27 bool pxwarpGetSearchArgs (pxConfig *config, psMetadata *where);28 bool pxwarpSetSearchArgs (psMetadata *md);29 30 27 bool pxwarpRunSetState(pxConfig *config, psS64 warp_id, const char *state); 31 28 bool pxwarpRunSetStateByQuery(pxConfig *config, psMetadata *where, const char *state); -
trunk/ippTools/src/warptool.c
r23459 r23613 30 30 #include "pxtools.h" 31 31 #include "warptool.h" 32 #include "pxwarp.h"33 32 34 33 static psS64 definerunMode(pxConfig *config); … … 191 190 192 191 psMetadata *where = psMetadataAlloc(); 193 pxwarpGetSearchArgs (config, where); 192 PXOPT_COPY_S64(config->args, where, "-fake_id", "fakeRun.fake_id", "=="); 193 PXOPT_COPY_S64(config->args, where, "-cam_id", "camRun.cam_id", "=="); 194 PXOPT_COPY_S64(config->args, where, "-chip_id", "chipRun.chip_id", "=="); 195 PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "=="); 196 PXOPT_COPY_STR(config->args, where, "-exp_name", "rawExp.exp_name", "=="); 197 PXOPT_COPY_STR(config->args, where, "-inst", "rawExp.camera", "=="); 198 PXOPT_COPY_STR(config->args, where, "-telescope", "rawExp.telescope", "=="); 199 PXOPT_COPY_TIME(config->args, where, "-dateobs_begin", "rawExp.dateobs", ">="); 200 PXOPT_COPY_TIME(config->args, where, "-dateobs_end", "rawExp.dateobs", "<="); 201 PXOPT_COPY_STR(config->args, where, "-exp_tag", "rawExp.exp_tag", "=="); 202 PXOPT_COPY_STR(config->args, where, "-exp_type", "rawExp.exp_type", "=="); 203 PXOPT_COPY_STR(config->args, where, "-filelevel", "rawExp.filelevel", "=="); 204 PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "=="); 205 PXOPT_COPY_F64(config->args, where, "-airmass_min", "rawExp.airmass", ">="); 206 PXOPT_COPY_F64(config->args, where, "-airmass_max", "rawExp.airmass", "<"); 207 PXOPT_COPY_F64(config->args, where, "-ra_min", "rawExp.ra", ">="); 208 PXOPT_COPY_F64(config->args, where, "-ra_max", "rawExp.ra", "<"); 209 PXOPT_COPY_F64(config->args, where, "-decl_min", "rawExp.decl", ">="); 210 PXOPT_COPY_F64(config->args, where, "-decl_max", "rawExp.decl", "<"); 211 PXOPT_COPY_F32(config->args, where, "-exp_time_min", "rawExp.exp_time", ">="); 212 PXOPT_COPY_F32(config->args, where, "-exp_time_max", "rawExp.exp_time", "<"); 213 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_min", "rawExp.sat_pixel_frac", ">="); 214 PXOPT_COPY_F32(config->args, where, "-sat_pixel_frac_max", "rawExp.sat_pixel_frac", "<"); 215 PXOPT_COPY_F64(config->args, where, "-bg_min", "rawExp.bg", ">="); 216 PXOPT_COPY_F64(config->args, where, "-bg_max", "rawExp.bg", "<"); 217 PXOPT_COPY_F64(config->args, where, "-bg_stdev_min", "rawExp.bg_stdev", ">="); 218 PXOPT_COPY_F64(config->args, where, "-bg_stdev_max", "rawExp.bg_stdev", "<"); 219 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_min", "rawExp.bg_mean_stdev", ">="); 220 PXOPT_COPY_F64(config->args, where, "-bg_mean_stdev_max", "rawExp.bg_mean_stdev", "<"); 221 PXOPT_COPY_F64(config->args, where, "-alt_min", "rawExp.alt", ">="); 222 PXOPT_COPY_F64(config->args, where, "-alt_max", "rawExp.alt", "<"); 223 PXOPT_COPY_F64(config->args, where, "-az_min", "rawExp.az", ">="); 224 PXOPT_COPY_F64(config->args, where, "-az_max", "rawExp.az", "<"); 225 PXOPT_COPY_F32(config->args, where, "-ccd_temp_min", "rawExp.ccd_temp", ">="); 226 PXOPT_COPY_F32(config->args, where, "-ccd_temp_max", "rawExp.ccd_temp", "<"); 227 PXOPT_COPY_F64(config->args, where, "-posang_min", "rawExp.posang", ">="); 228 PXOPT_COPY_F64(config->args, where, "-posang_max", "rawExp.posang", "<"); 229 PXOPT_COPY_STR(config->args, where, "-object", "rawExp.object", "=="); 230 PXOPT_COPY_F32(config->args, where, "-solang_min", "rawExp.solang", ">="); 231 PXOPT_COPY_F32(config->args, where, "-solang_max", "rawExp.solang", "<"); 194 232 PXOPT_COPY_STR(config->args, where, "-reduction", "fakeRun.reduction", "=="); 195 233 PXOPT_COPY_STR(config->args, where, "-label", "fakeRun.label", "=="); … … 227 265 228 266 // use psDBGenerateWhereSQL because the SQL yields an intermediate table 229 if ( where &&psListLength(where->list)) {230 psString whereClause = psDBGenerateWhere SQL(where, NULL);231 psStringAppend(&query, " %s", whereClause);267 if (psListLength(where->list)) { 268 psString whereClause = psDBGenerateWhereConditionSQL(where, NULL); 269 psStringAppend(&query, "AND %s", whereClause); 232 270 psFree(whereClause); 233 271 } … … 299 337 300 338 psMetadata *where = psMetadataAlloc(); 301 pxwarpGetSearchArgs (config, where);302 339 PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "=="); 303 340 PXOPT_COPY_STR(config->args, where, "-reduction", "warpRun.reduction", "=="); 304 PXOPT_COPY_STR(config->args, where, "-label", "warpRun.label", 305 PXOPT_COPY_STR(config->args, where, "-state", "warpRun.state", 341 PXOPT_COPY_STR(config->args, where, "-label", "warpRun.label", "=="); 342 PXOPT_COPY_STR(config->args, where, "-state", "warpRun.state", "=="); 306 343 307 344 if (!psListLength(where->list) … … 1070 1107 1071 1108 psMetadata *where = psMetadataAlloc(); 1072 pxwarpGetSearchArgs (config, where);1073 1109 PXOPT_COPY_S64(config->args, where, "-warp_id", "warpSkyfile.warp_id", "=="); 1074 1110 PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpSkyfile.skycell_id", "=="); … … 1627 1663 1628 1664 int numImportTables = 3; 1629 1665 1630 1666 char tables[3] [80] = {"warpImfile", "warpSkyfile", "warpSkyCellMap"}; 1631 1667 1632 1668 PS_ASSERT_PTR_NON_NULL(config, NULL); 1633 1669 1634 1670 PXOPT_LOOKUP_STR(infile, config->args, "-infile", true, false); 1635 1671 … … 1642 1678 psAssert (item, "entry not in input?"); 1643 1679 psAssert (item->type == PS_DATA_METADATA_MULTI, "entry not multi?"); 1644 1680 1645 1681 psMetadataItem *entry = psListGet (item->data.list, 0); 1646 1682 assert (entry); … … 1656 1692 psAssert (item, "entry not in input?"); 1657 1693 psAssert (item->type == PS_DATA_METADATA_MULTI, "entry not multi?"); 1658 1694 1659 1695 switch (i) { 1660 case 0: 1696 case 0: 1661 1697 for (int i = 0; i < item->data.list->n; i++) { 1662 1698 entry = psListGet (item->data.list, i); … … 1670 1706 } 1671 1707 break; 1672 1673 case 1: 1708 1709 case 1: 1674 1710 for (int i = 0; i < item->data.list->n; i++) { 1675 1711 entry = psListGet (item->data.list, i); … … 1683 1719 } 1684 1720 break; 1685 1686 case 2: 1721 1722 case 2: 1687 1723 for (int i = 0; i < item->data.list->n; i++) { 1688 1724 entry = psListGet (item->data.list, i); -
trunk/ippTools/src/warptoolConfig.c
r23418 r23613 51 51 // XXX need to allow multiple exp_ids 52 52 psMetadata *definebyqueryArgs = psMetadataAlloc(); 53 pxwarpSetSearchArgs (definebyqueryArgs); 53 psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-fake_id", 0, "search by fake_id", 0); 54 psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-cam_id", 0, "search by cam_id", 0); 55 psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0); 56 psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exp_id", 0); 57 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_name", 0, "search by exp_name", NULL); 58 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst", 0, "search for camera", NULL); 59 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope", 0, "search for telescope", NULL); 60 psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0, "search for exposures by time (>=)", NULL); 61 psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0, "search for exposures by time (<)", NULL); 62 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL); 63 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL); 64 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL); 65 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter", 0, "search for filter", NULL); 66 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min", 0, "search by min airmass", NAN); 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 max fraction of saturated pixels", NAN); 75 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max", 0, "search by min fraction of saturated pixels", NAN); 76 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-bg_min", 0, "search by max", 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 max", 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 max", 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); 86 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min", 0, "search by min ccd tempature", NAN); 87 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max", 0, "search by max ccd tempature", NAN); 88 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min", 0, "search by min rotator position angle", NAN); 89 psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max", 0, "search by max rotator position angle", NAN); 90 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-object", 0, "search by exposure object", NULL); 91 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_min", 0, "search by min solar angle", NAN); 92 psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-solang_max", 0, "search by max solar angle", NAN); 54 93 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction", 0, "search by fakeRun reduction class", NULL); 55 94 psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label", 0, "search on fakeRun label", NULL); … … 83 122 // XXX need to allow multiple exp_ids 84 123 psMetadata *updaterunArgs = psMetadataAlloc(); 85 pxwarpSetSearchArgs (updaterunArgs);86 124 psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); 87 125 psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction", 0, "search by warpRun reduction class", NULL); … … 173 211 // XXX need to allow multiple exp_ids 174 212 psMetadata *revertwarpedArgs = psMetadataAlloc(); 175 pxwarpSetSearchArgs(revertwarpedArgs); // XXX does this work here?176 213 psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warptool ID", 0); 177 214 psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL);
Note:
See TracChangeset
for help on using the changeset viewer.
