Changeset 13723 for trunk/ippTools/src/dettool.c

Timestamp:

Jun 8, 2007, 12:53:06 PM (19 years ago)

Author:

eugene

Message:

added support for solar angle (was in db, not in options)

File:

• trunk/ippTools/src/dettool.c (modified) (13 diffs)

trunk/ippTools/src/dettool.c

@@ -342 +342 @@
         return false;
     }
+    psF64 solang_min = psMetadataLookupF32(&status, config->args, "-solang_min");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -solang_min");
+        return false;
+    }
+
+    psF64 solang_max = psMetadataLookupF32(&status, config->args, "-solang_max");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -solang_max");
+        return false;
+    }
 
     psTime *registered = NULL;
@@ -541 +552 @@
             use_begin,
             use_end,
-            0.0,    // solang min
-            0.0,    // solang max
+            solang_min,
+            solang_max,
             label,
             0       // parent
@@ -894 +905 @@
         }
         if (isfinite(select_ccd_temp_min)) {
-            if (!psMetadataAddF32(where, PS_LIST_TAIL, "ccd_temp", PS_META_DUPLICATE_OK, "<=", select_ccd_temp_min)) {
+            if (!psMetadataAddF32(where, PS_LIST_TAIL, "ccd_temp", PS_META_DUPLICATE_OK, ">=", select_ccd_temp_min)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp");
                 psFree(where);
@@ -907 +918 @@
         }
         if (isfinite(select_ccd_temp_max)) {
-            if (!psMetadataAddF32(where, PS_LIST_TAIL, "ccd_temp", PS_META_DUPLICATE_OK, ">=", select_ccd_temp_max)) {
+            if (!psMetadataAddF32(where, PS_LIST_TAIL, "ccd_temp", PS_META_DUPLICATE_OK, "<=", select_ccd_temp_max)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item ccd_temp");
                 psFree(where);
@@ -922 +933 @@
         }
         if (isfinite(select_posang_min)) {
-            if (!psMetadataAddF32(where, PS_LIST_TAIL, "posang", PS_META_DUPLICATE_OK, "<=", select_posang_min)) {
+            if (!psMetadataAddF32(where, PS_LIST_TAIL, "posang", PS_META_DUPLICATE_OK, ">=", select_posang_min)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
                 psFree(where);
@@ -935 +946 @@
         }
         if (isfinite(select_posang_max)) {
-            if (!psMetadataAddF32(where, PS_LIST_TAIL, "posang", PS_META_DUPLICATE_OK, ">=", select_posang_max)) {
+            if (!psMetadataAddF32(where, PS_LIST_TAIL, "posang", PS_META_DUPLICATE_OK, "<=", select_posang_max)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to add item posang");
                 psFree(where);
@@ -942 +953 @@
         }
 
+        /** selection based on solang **/
+        psF32 select_solang_min = psMetadataLookupF32(&status, config->args, "-select_solang_min");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_solang_min");
+            psFree(where);
+            return false;
+        }
+        if (isfinite(select_solang_min)) {
+            if (!psMetadataAddF32(where, PS_LIST_TAIL, "solang", PS_META_DUPLICATE_OK, ">=", select_solang_min)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item solang");
+                psFree(where);
+                return false;
+            }
+        }
+        psF32 select_solang_max = psMetadataLookupF32(&status, config->args, "-select_solang_max");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -select_solang_max");
+            psFree(where);
+            return false;
+        }
+        if (isfinite(select_solang_max)) {
+            if (!psMetadataAddF32(where, PS_LIST_TAIL, "solang", PS_META_DUPLICATE_OK, "<=", select_solang_max)) {
+                psError(PS_ERR_UNKNOWN, false, "failed to add item solang");
+                psFree(where);
+                return false;
+            }
+        }
+
     }
 
@@ -1023 +1062 @@
     if (!status) {
         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -posang_max");
+        return false;
+    }
+
+    psF64 solang_min = psMetadataLookupF32(&status, config->args, "-solang_min");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -solang_min");
+        return false;
+    }
+
+    psF64 solang_max = psMetadataLookupF32(&status, config->args, "-solang_max");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -solang_max");
         return false;
     }
@@ -1224 +1275 @@
             use_begin,
             use_end,
-            0.0,    // solang min
-            0.0,    // solang max
+            solang_min,
+            solang_max,
             label,
             0       // parent
@@ -1513 +1564 @@
     if (!isnan(posang_max)) {
         detRun->posang_max = posang_max;
+    }
+
+    psF64 solang_min = psMetadataLookupF32(&status, config->args, "-set_solang_min");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_solang_min");
+        return false;
+    }
+    if (!isnan(solang_min)) {
+        detRun->solang_min = solang_min;
+    }
+
+    psF64 solang_max = psMetadataLookupF32(&status, config->args, "-set_solang_max");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_solang_max");
+        return false;
+    }
+    if (!isnan(solang_max)) {
+        detRun->solang_max = solang_max;
     }
 
@@ -4912 +4981 @@
         "   detRun.det_type,"
         "   detRun.mode,"
-        "   detResidImfile.*"
+        "   detResidImfile.*,"
+        "   rawExp.exp_time"
         " FROM detResidImfile"
         " JOIN detRun"
         "   USING(det_id, iteration)"
+        " JOIN rawExp"
+        "   USING(exp_tag)"
         " WHERE"
         "   detRun.state = 'run'"
@@ -6566 +6638 @@
     }
 
+    psF64 solang_min = psMetadataLookupF32(&status, config->args, "-solang_min");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -solang_min");
+        return false;
+    }
+
+    psF64 solang_max = psMetadataLookupF32(&status, config->args, "-solang_max");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -solang_max");
+        return false;
+    }
+
     psTime *registered = NULL;
     {
@@ -6701 +6785 @@
             use_begin,
             use_end,
-            0.0,        // solang min
-            0.0,        // solang max
+            solang_min,
+            solang_max,
             label,      // label
             parent ? (psS64)atoll(parent) : 0