Changeset 23702 for trunk/ippTasks

Timestamp:

Apr 3, 2009, 11:01:48 AM (17 years ago)

Author:

bills

Message:

pass distRun.no_magic to dist_component.pl to support cameras that don't require destreaking

File:

• trunk/ippTasks/dist.pro (modified) (3 diffs)

trunk/ippTasks/dist.pro

@@ -131 +131 @@
     book getword distToProcess $pageName state -var STATE
     book getword distToProcess $pageName data_state -var DATA_STATE
+    book getword distToProcess $pageName no_magic -var NO_MAGIC
     book getword distToProcess $pageName magicked -var MAGICKED
     book getword distToProcess $pageName outroot -var OUTROOT
     book getword distToProcess $pageName dbname -var DBNAME
+
+    $EXTRA_FLAGS = ""
     if ("$CLEAN" == "T")
-        $CLEAN_ARG = "--clean"
-    else
-        $CLEAN_ARG = ""
+        $EXTRA_FLAGS = --clean
     end
     # magicked is output as integer due to the union in the sql
     if ($MAGICKED)
-        $MAGICKED_ARG = "--magicked"
-    else
-        $MAGICKED_ARG = ""
+        $EXTRA_FLAGS = $EXTRA_FLAGS --magicked
+    end
+    # no_magic is output as integer due to the union in the sql
+    if ($NO_MAGIC)
+        $EXTRA_FLAGS = $EXTRA_FLAGS --no_magic
     end
 
@@ -151 +154 @@
 
     sprintf logfile "%s/dist.%s.%s.log" $OUTROOT $DIST_ID $COMPONENT
-
-    $run = dist_component.pl --dist_id $DIST_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --chip_path_base $CHIP_PATH_BASE --state $STATE --data_state $DATA_STATE $MAGICKED_ARG $CLEAN_ARG --outroot $OUTROOT --logfile $logfile
+    stdout $logfile
+    stderr $logfile
+
+    $run = dist_component.pl --dist_id $DIST_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --chip_path_base $CHIP_PATH_BASE --state $STATE --data_state $DATA_STATE $EXTRA_FLAGS --outroot $OUTROOT --logfile $logfile
 
     add_standard_args run
@@ -251 +256 @@
 
     sprintf logfile "%s/dist.advance.%s.log" $OUTROOT $DIST_ID
+    stdout $logfile
+    stderr $logfile
 
     $run = dist_advancerun.pl --dist_id $DIST_ID --stage $STAGE --stage_id $STAGE_ID --outroot $OUTROOT --logfile $logfile