Changeset 16572

Timestamp:

Feb 21, 2008, 2:15:21 PM (18 years ago)

Author:

eugene

Message:

adding various additional fields as options to -runs

Location:

branches/eam_branch_20080219/ippTools/src

Files:

• dettool.c (modified) (1 diff)
• dettoolConfig.c (modified) (1 diff)

branches/eam_branch_20080219/ippTools/src/dettool.c

@@ -1012 +1012 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
 
+    PXOPT_COPY_STR(config->args, config->where, "-inst", "camera", "==");
+    PXOPT_COPY_STR(config->args, config->where, "-telescope", "telescope", "==");
+    PXOPT_COPY_STR(config->args, config->where, "-filter", "filter", "==");
+
+    // airmass_min  < airmass  < airmass_max
+    PXOPT_COPY_F32(config->args, config->where, "-airmass", "airmass_min", "<=");
+    PXOPT_COPY_F32(config->args, config->where, "-airmass", "airmass_max", ">=");
+
+    // exp_time_min < exp_time < exp_time_max
+    PXOPT_COPY_F32(config->args, config->where, "-exp_time", "exp_time_min", "<=");
+    PXOPT_COPY_F32(config->args, config->where, "-exp_time", "exp_time_max", ">=");
+
+    // ccd_temp_min < ccd_temp < ccd_temp_max
+    PXOPT_COPY_F32(config->args, config->where, "-ccd_temp", "ccd_temp_min", "<=");
+    PXOPT_COPY_F32(config->args, config->where, "-ccd_temp", "ccd_temp_max", ">=");
+
+    PXOPT_COPY_F64(config->args, config->where, "-posang", "posang_min", "<=");
+    PXOPT_COPY_F64(config->args, config->where, "-posang", "posang_max", ">=");
+
     // XXX fix the hard coding of the table name
     psArray *runs = psDBSelectRows(config->dbh, "detRun", config->where, 0);

branches/eam_branch_20080219/ippTools/src/dettoolConfig.c

@@ -327 +327 @@
             "search for detrend ID", NULL);
 
+    psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-inst", 0,
+            "search for camera (instrument)", NULL);
+    psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-telescope", 0,
+            "search for telescope", NULL);
+    psMetadataAddStr(runsArgs, PS_LIST_TAIL, "-filter", 0,
+            "search for filter", NULL);
+
+    psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-airmass", 0,
+            "match airmass", NAN);
+    psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-exp_time", 0,
+            "match exp time", NAN);
+    psMetadataAddF32(runsArgs, PS_LIST_TAIL, "-ccd_temp", 0,
+            "match ccd temp", NAN);
+    psMetadataAddF64(runsArgs, PS_LIST_TAIL, "-posang", 0,
+            "match posang", NAN);
+
     // -childlessrun
     psMetadata *childlessrunArgs = psMetadataAlloc();