Changeset 23998

Timestamp:

Apr 29, 2009, 11:26:47 AM (17 years ago)

Author:

eugene

Message:

detRuns with NULL values for exp_time_min, etc should not constrain the selection (exp_time_min is NULL means no min exp_time limit)

File:

• trunk/ippTools/src/detselect.c (modified) (2 diffs)

trunk/ippTools/src/detselect.c

@@ -71 +71 @@
 }
 
+# define PXOPT_COPY_NULLTEST_F32(from, to, oldname, newname, comment) \
+{ \
+    bool status = false; \
+    psF32 var = psMetadataLookupF32(&status, from, oldname); \
+    if (!status) { \
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for " oldname); \
+        return false; \
+    } \
+    if (!isnan(var)) { \
+        if (!psMetadataAddF32(to, PS_LIST_TAIL, newname, PS_META_DUPLICATE_OK, comment, var)) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to add item " newname); \
+            psFree(to); \
+            return false; \
+        } \
+        if (!psMetadataAddTime(to, PS_LIST_TAIL, newname, PS_META_DUPLICATE_OK, "==", NULL)) { \
+            psError(PS_ERR_UNKNOWN, false, "failed to add NULL test " newname); \
+            psFree(to); \
+            return false; \
+        } \
+    } \
+}
+
 static bool searchMode(pxConfig *config)
 {
@@ -89 +111 @@
 
     // airmass_min  < airmass  < airmass_max
-    PXOPT_COPY_F32(config->args, where, "-airmass", "airmass_min", "<=");
-    PXOPT_COPY_F32(config->args, where, "-airmass", "airmass_max", ">=");
+    PXOPT_COPY_NULLTEST_F32(config->args, where, "-airmass", "airmass_min", "<=");
+    PXOPT_COPY_NULLTEST_F32(config->args, where, "-airmass", "airmass_max", ">=");
 
     // exp_time_min < exp_time < exp_time_max
-    PXOPT_COPY_F32(config->args, where, "-exp_time", "exp_time_min", "<=");
-    PXOPT_COPY_F32(config->args, where, "-exp_time", "exp_time_max", ">=");
+    PXOPT_COPY_NULLTEST_F32(config->args, where, "-exp_time", "exp_time_min", "<=");
+    PXOPT_COPY_NULLTEST_F32(config->args, where, "-exp_time", "exp_time_max", ">=");
 
     // ccd_temp_min < ccd_temp < ccd_temp_max
-    PXOPT_COPY_F32(config->args, where, "-ccd_temp", "ccd_temp_min", "<=");
-    PXOPT_COPY_F32(config->args, where, "-ccd_temp", "ccd_temp_max", ">=");
+    PXOPT_COPY_NULLTEST_F32(config->args, where, "-ccd_temp", "ccd_temp_min", "<=");
+    PXOPT_COPY_NULLTEST_F32(config->args, where, "-ccd_temp", "ccd_temp_max", ">=");
 
     PXOPT_COPY_F64(config->args, where, "-posang", "posang_min", "<=");