Changeset 23395

Timestamp:

Mar 18, 2009, 10:25:01 AM (17 years ago)

Author:

bills

Message:

pass magicked status of rawImfile to script
set magicked status for the chipProcessedImfile when it's created

Location:

trunk

Files:

• ippScripts/scripts/chip_imfile.pl (modified) (3 diffs)
• ippTasks/chip.pro (modified) (3 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -37 +37 @@
 # Parse the command-line arguments
 my ( $exp_id, $chip_id, $class_id, $chip_imfile_id, $uri, $camera, $outroot, $dbname, $run_state, $reduction, $threads, $verbose,
-     $no_update, $no_op, $redirect );
+     $no_update, $no_op, $redirect, $magicked );
 GetOptions(
     'exp_id=s'          => \$exp_id,    # Exposure identifier
@@ -49 +49 @@
     'reduction=s'       => \$reduction, # Reduction class
     'run-state=s'       => \$run_state, # current state of the run (new, update)
+    'magicked'          => \$magicked,  # magicked state of intput file
     'threads=s'         => \$threads,   # Number of threads to use for ppImage
     'verbose'           => \$verbose,   # Print to stdout
@@ -215 +216 @@
     $command .= " -uri $outputImage";
     $command .= " -path_base $outroot";
+    $command .= " -magicked" if $magicked;
     $command .= " -hostname $host" if defined $host;
     $command .= " -dbname $dbname" if defined $dbname;

trunk/ippTasks/chip.pro

@@ -142 +142 @@
     book getword chipPendingImfile $pageName exp_id -var EXP_ID
     book getword chipPendingImfile $pageName exp_tag -var EXP_TAG
+    book getword chipPendingImfile $pageName raw_magicked -var RAW_MAGICKED
     book getword chipPendingImfile $pageName chip_id -var CHIP_ID
     book getword chipPendingImfile $pageName chip_imfile_id -var CHIP_IMFILE_ID
@@ -151 +152 @@
     book getword chipPendingImfile $pageName state -var RUN_STATE
 
+    if ("$RAW_MAGICKED" == "T")
+        $MAGICKED_ARG = "-magicked"
+    else 
+        $MAGICKED_ARG = ""
+    end
+
     # specify choice of local or remote host based on camera and chip (class_id)
     set.host.for.camera $CAMERA $CLASS_ID
@@ -171 +178 @@
     stderr $LOGDIR/chip.imfile.log
 
-    $run = chip_imfile.pl --threads @MAX_THREADS@ --exp_id $EXP_ID --chip_id $CHIP_ID --chip_imfile_id $CHIP_IMFILE_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA --run-state $RUN_STATE --outroot $outroot --redirect-output 
+    $run = chip_imfile.pl --threads @MAX_THREADS@ --exp_id $EXP_ID --chip_id $CHIP_ID --chip_imfile_id $CHIP_IMFILE_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA --run-state $RUN_STATE $MAGICKED_ARG --outroot $outroot --redirect-output
     if ("$REDUCTION" != "NULL")
       $run = $run --reduction $REDUCTION