Changeset 9417

Timestamp:

Oct 9, 2006, 11:43:26 AM (20 years ago)

Author:

jhoblitt

Message:

add dettool -processedimfile -included suboption

Location:

trunk

Files:

• ippScripts/scripts/detrend_stack.pl (modified) (1 diff)
• ippTools/src/dettool.c (modified) (2 diffs)
• ippTools/src/dettoolConfig.c (modified) (1 diff)

trunk/ippScripts/scripts/detrend_stack.pl

@@ -61 +61 @@
 my $files;                      # Array of files to be stacked
 {
-    my $command = "$dettool -tostack -det_id $det_id -class_id $class_id"; # Command to run
+    my $command = "$dettool -processedimfile -det_id $det_id -class_id $class_id -included"; # Command to run
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
-    die "Unable to perform dettool -tostack: $error_code\n" if not $success;
+    die "Unable to perform dettool -processedimfile: $error_code\n" if not $success;
     my $metadata = $mdcParser->parse(join "", @$stdout_buf)
         or die "unable to parse metadata config doc";

trunk/ippTools/src/dettool.c

@@ -1430 +1430 @@
         " JOIN detRun"
         "   ON detRun.position = detProcessedImfile.det_id"
+        " JOIN detInputExp"
+        "   ON detRun.position = detInputExp.det_id"
+        "   AND detRun.iteration = detInputExp.iteration"
         " WHERE"
         "   detRun.state = 'run'"
@@ -1438 +1441 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
+    }
+
+    {
+        bool status = false;
+        bool included = psMetadataLookupBool(&status, config->args, "-included");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            return false;
+        }
+        // restrict search to included imfiles
+        if (included) {
+            psStringAppend(&query, " AND detInputExp.include = 1");
+        }
     }
 

trunk/ippTools/src/dettoolConfig.c

@@ -153 +153 @@
     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-exp",  0,
         "restrict results to complete 'exposures'", false);
+    psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-included",  0,
+        "restrict results to exposures 'includeded' in the current iteration", false);
     psMetadataAddBool(processedimfileArgs, PS_LIST_TAIL, "-simple",  0,
         "use the simple output format", false);