Changeset 9113

Timestamp:

Oct 2, 2006, 2:25:43 PM (20 years ago)

Author:

jhoblitt

Message:

remove -processed -unmask (behavior is now as if -unmask is always set)

Location:

trunk/ippTools

Files:

• scripts/dettest.sh (modified) (1 diff)
• src/dettool.c (modified) (1 diff)
• src/dettoolConfig.c (modified) (1 diff)

trunk/ippTools/scripts/dettest.sh

@@ -27 +27 @@
 done;
 
-dettool -normstat || exit 1
+dettool -tonormstat || exit 1
 for ID in `seq 0 3` ; do
     dettool -addnormalizedimfile -det_id 1 -class_id $ID -uri file://normalized-$ID || exit 1
 done;
+
+dettool -tonormalizedexp || exit 1
+dettool -addnormalizedexp -det_id 1 -exp_tag t10  -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file://normalizedexp -b2_uri file://normlalizedexp|| exit 1
+dettool -addnormalizedexp -det_id 1 -exp_tag t11  -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri file://normalizedexp -b2_uri file://normlalizedexp|| exit 1
 
 dettool -toresid || exit 1

trunk/ippTools/src/dettool.c

@@ -1444 +1444 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    bool unmask = false;
-    {
-        bool status = false;
-        unmask = psMetadataLookupBool(&status, config->args, "-unmask");
-        if (!status) {
-            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -unmask");
-            return false;
-        }
-    }
-
-    psString query = NULL;
-    if (unmask) {
-        // select detRun.det_type
-        // select detProcessedImfile.*
-        query = psStringCopy(
-            " SELECT"
-            "   detRun.det_type,"
-            "   detProcessedImfile.*"
-            " FROM detProcessedImfile"
-            " JOIN detRun"
-            "   ON detProcessedImfile.det_id = detRun.position"
-        );
-    } else {
-        // select detRun.det_type
-        // select detProcessedImfile.*
-        // where
-        // det_id is not in detStackedImfile
-        // iteration is not in detStackedImfile
-        // detProcessedImfile.exp_tag is not in detStackedImfile
-        // detProcessedImfile.class_id is not in detStackedImfile
-        // and detInputExp.include is 1
-        query = psStringCopy(
-            " SELECT * FROM"
-            "   (SELECT"
-            "       detRun.iteration,"
-            "       detRun.det_type,"
-            "       detProcessedImfile.*"
-            "   FROM detProcessedImfile"
-            "   JOIN detRun"
-            "       ON detProcessedImfile.det_id = detRun.position"
-            "   JOIN detInputExp"
-            "       ON detRun.position = detInputExp.det_id"
-            "       AND detRun.iteration = detInputExp.iteration"
-            "       AND detProcessedImfile.exp_tag = detInputExp.exp_tag"
-            "   LEFT JOIN detStackedImfile"
-            "       ON detRun.position = detStackedImfile.det_id"
-            "       AND detRun.iteration = detStackedImfile.iteration"
-            "       AND detProcessedImfile.class_id = detStackedImfile.class_id"
-            "   WHERE"
-            "       detStackedImfile.det_id IS NULL"
-            "       AND detStackedImfile.iteration IS NULL"
-            "       AND detStackedImfile.class_id IS NULL"
-            "       AND detInputExp.include = 1"
-            "   ) as detProcessedImfile"
-        );
-    }
+    psString query = psStringCopy(
+        " SELECT"
+        "   detRun.det_type,"
+        "   detProcessedImfile.*"
+        " FROM detProcessedImfile"
+        " JOIN detRun"
+        "   ON detProcessedImfile.det_id = detRun.position"
+    );
 
     if (config->where) {

trunk/ippTools/src/dettoolConfig.c

@@ -151 +151 @@
     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-exp",  0,
         "restrict results to complete 'exposures'", false);
-    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-unmask",  0,
-        "don't mask out 'stacked' imfiles", false);
     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,
         "use the simple output format", false);