Changeset 12214

Timestamp:

Mar 2, 2007, 5:43:57 PM (19 years ago)

Author:

Paul Price

Message:

Updating to use new ippTools system, where the chip and camera phases take identifiers for those phases, instead of exp_tag. Also want exp_id so the filename can be set.

Location:

trunk/ippTasks

Files:

• camera.pro (modified) (3 diffs)
• chip.pro (modified) (3 diffs)

trunk/ippTasks/camera.pro

@@ -77 +77 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout camPendingExp -key exp_tag -uniq -setword dbname $options:0
+    ipptool2book stdout camPendingExp -key cam_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
       book listbook camPendingExp
@@ -114 +114 @@
     book setword camPendingExp $pageName state RUN
     book getword camPendingExp $pageName camera -var CAMERA
-    book getword camPendingExp $pageName exp_tag -var EXP_TAG
+    book getword camPendingExp $pageName exp_id -var EXP_ID
+    book getword camPendingExp $pageName cam_id -var CAM_ID
     book getword camPendingExp $pageName workdir -var WORKDIR
     book getword camPendingExp $pageName dbname -var DBNAME
@@ -139 +140 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command camera_exp.pl --exp_tag $EXP_TAG $ARGS
+      echo command camera_exp.pl --exp_id $EXP_ID --cam_id $CAM_ID --camera $CAMERA $ARGS
     end
-    command camera_exp.pl --exp_tag $EXP_TAG --camera $CAMERA $ARGS
+    command camera_exp.pl --exp_id $EXP_ID --cam_id $CAM_ID --camera $CAMERA $ARGS
   end
 

trunk/ippTasks/chip.pro

@@ -81 +81 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout chipPendingImfile -key exp_tag:class_id -uniq -setword dbname $options:0
+    ipptool2book stdout chipPendingImfile -key chip_id:class_id -uniq -setword dbname $options:0
     if ($VERBOSE > 2)
       book listbook chipPendingImfile
@@ -118 +118 @@
     book setword chipPendingImfile $pageName state RUN
     book getword chipPendingImfile $pageName camera -var CAMERA
-    book getword chipPendingImfile $pageName exp_tag -var EXP_TAG
+    book getword chipPendingImfile $pageName exp_id -var EXP_ID
+    book getword chipPendingImfile $pageName chip_id -var CHIP_ID
     book getword chipPendingImfile $pageName workdir -var WORKDIR
     book getword chipPendingImfile $pageName class_id -var CLASS_ID
@@ -146 +147 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command chip_imfile.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI --camera $CAMERA $ARGS
+      echo command chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA $ARGS
     end
-    command chip_imfile.pl --exp_tag $EXP_TAG --class_id $CLASS_ID --uri $URI --camera $CAMERA $ARGS
+    command chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA $ARGS
   end