Changeset 9109

Timestamp:

Oct 2, 2006, 2:02:55 PM (20 years ago)

Author:

jhoblitt

Message:

remove detStackedImfile.normalize

Location:

trunk/ippTools

Files:

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

trunk/ippTools/scripts/dettest.sh

@@ -17 +17 @@
 
 dettool -tostack || exit 1
+
 for ID in `seq 0 3` ; do
-    dettool -addstacked -det_id 1 -uri file://stacked-$ID -class_id $ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -pleasenormalize || exit 1
+    dettool -addstacked -det_id 1 -uri file://stacked-$ID -class_id $ID -recip myrecipe -bg 1 -bg_stdev 2 -bg_mean_stdev 3 || exit 1
 done;
 

trunk/ippTools/src/dettool.c

@@ -1875 +1875 @@
         return false;
     }
-    // pleasenormalize has a default value
-    psS32 normalize = psMetadataLookupS32(&status, config->args, "-pleasenormalize");
-    if (!status) {
-        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -pleasenormalize");
-        return false;
-    }
 
     // correlate the class_id against the input exposure(s)
@@ -1923 +1917 @@
             bg,
             bg_stdev,
-            bg_mean_stdev,
-            normalize
+            bg_mean_stdev
         );
 
@@ -2123 +2116 @@
         "     ON detInputExp.det_id = detStackedImfile.det_id"
         "     AND detInputExp.iteration = detStackedImfile.iteration"
-        " WHERE"
-        "   detStackedImfile.normalize = 1"
         " GROUP BY"
         "     rawDetrendExp.exp_tag"
@@ -2624 +2615 @@
 id, iteration, class id, uri, type) for which the appropriate stacked
 imfile has been normalised, and which have not been masked out by
-detResidImfileAnalysis; it also returns stackedImfiles that have
-"-pleasenormalize" set to false.
+detResidImfileAnalysis;
 */
 
@@ -2658 +2648 @@
         "   AND detResidImfile.exp_tag IS NULL"
         "   AND detResidImfile.class_id IS NULL"
-        " UNION"
-        " SELECT"
-        "   detRun.iteration,"
-        "   detRun.det_type,"
-        "   detProcessedImfile.*,"
-        "   detProcessedImfile.uri,"
-        "   rawDetrendExp.camera"
-        " FROM detRun"
-        " JOIN detInputExp"
-        "   ON detRun.position = detInputExp.det_id"
-        "   AND detRun.iteration = detInputExp.iteration"
-        " JOIN rawDetrendExp"
-        "   ON detInputExp.exp_tag = rawDetrendExp.exp_tag"
-        " JOIN detProcessedImfile"
-        "   ON detRun.position = detProcessedImfile.det_id"
-        "   AND detInputExp.exp_tag = detProcessedImfile.exp_tag"
-        " JOIN detStackedImfile"
-        "   ON detRun.position = detStackedImfile.det_id"
-        "   AND detRun.iteration = detStackedImfile.iteration"
-        "   AND detProcessedImfile.class_id = detStackedImfile.class_id"
-        " LEFT JOIN detResidImfile"
-        "   ON detRun.position = detResidImfile.det_id"
-        "   AND detRun.iteration = detResidImfile.iteration"
-        "   AND detProcessedImfile.exp_tag = detResidImfile.exp_tag"
-        "   AND detStackedImfile.class_id = detResidImfile.class_id"
-        " WHERE"
-        "   detResidImfile.det_id IS NULL"
-        "   AND detResidImfile.iteration IS NULL"
-        "   AND detResidImfile.exp_tag IS NULL"
-        "   AND detResidImfile.class_id IS NULL"
-        "   AND detStackedImfile.normalize = 0"
         );
 
@@ -2930 +2889 @@
         "  AND detResidImfile.class_id IS NULL"
         "  AND detInputExp.exp_tag = '%s'"
-        " UNION"
-        " SELECT"
-        "   detStackedImfile.det_id,"
-        "   detStackedImfile.iteration,"
-        "   detStackedImfile.class_id,"
-        "   detStackedImfile.uri"
-        " FROM detStackedImfile"
-        " JOIN detInputExp"
-        "   USING(det_id, iteration)"
-        " LEFT JOIN detResidImfile"
-        "   ON detStackedImfile.det_id = detResidImfile.det_id"
-        "   AND detStackedImfile.iteration= detResidImfile.iteration"
-        "   AND detInputExp.exp_tag = detResidImfile.exp_tag"
-        "   AND detStackedImfile.class_id = detResidImfile.class_id"
-        " WHERE"
-        "   detResidImfile.det_id IS NULL"
-        "   AND detResidImfile.iteration IS NULL"
-        "   AND detResidImfile.exp_tag IS NULL"
-        "   AND detResidImfile.class_id IS NULL"
-        "   AND detInputExp.exp_tag = '%s'"
-        "   AND detStackedImfile.normalize = 0"
-        " ) as detNormStackedImfile"
+        " ) AS detNormStackedImfile"
         );
 

trunk/ippTools/src/dettoolConfig.c

@@ -212 +212 @@
     psMetadataAddStr(addstacArgs, PS_LIST_TAIL, "-uri",  0,
         "define URI (required)", NULL);
-    psMetadataAddBool(addstacArgs, PS_LIST_TAIL, "-pleasenormalize",  0,
-        "dude, make me normal", false);
 
     // -tonormalize