Changeset 12371

Timestamp:

Mar 8, 2007, 6:33:15 PM (19 years ago)

Author:

Paul Price

Message:

WORKDIR shouldn't be outroot, since the scripts add their own stuff on the end.

Location:

trunk/ippTasks

Files:

• camera.pro (modified) (1 diff)
• chip.pro (modified) (1 diff)
• detrend.norm.pro (modified) (3 diffs)
• detrend.process.pro (modified) (2 diffs)
• detrend.reject.pro (modified) (1 diff)
• detrend.resid.pro (modified) (2 diffs)
• detrend.stack.pro (modified) (1 diff)
• diff.pro (modified) (1 diff)
• stack.pro (modified) (1 diff)
• warp.pro (modified) (1 diff)

trunk/ippTasks/camera.pro

@@ -145 +145 @@
     $run = camera_exp.pl --exp_id $EXP_ID --cam_id $CAM_ID --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/chip.pro

@@ -148 +148 @@
     $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --uri $URI --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/detrend.norm.pro

@@ -177 +177 @@
     $run = detrend_norm_calc.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 
@@ -300 +300 @@
     $run = detrend_norm_apply.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --value $NORM --input_uri $URI --camera $CAMERA --det_type $DET_TYPE $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
     
@@ -420 +420 @@
     $run = detrend_norm_exp.pl --det_id $DET_ID --iteration $ITERATION --camera $CAMERA --det_type $DET_TYPE  $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/detrend.process.pro

@@ -167 +167 @@
     $run = detrend_process_imfile.pl --det_id $DET_ID --det_type $DET_TYPE --exp_tag $EXP_TAG --class_id $CLASS_ID --input_uri $URI --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 
@@ -289 +289 @@
     $run = detrend_process_exp.pl --det_id $DET_ID --exp_tag $EXP_TAG --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/detrend.reject.pro

@@ -146 +146 @@
     $run = detrend_reject_exp.pl --det_id $DET_ID --iteration $ITERATION --det_type $DET_TYPE --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/detrend.resid.pro

@@ -167 +167 @@
     $run = detrend_resid.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --class_id $CLASS_ID --det_type $DET_TYPE --detrend $DET_URI --input_uri $URI --camera $CAMERA --mode $MODE $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 
@@ -290 +290 @@
     $run = detrend_reject_imfile.pl --det_id $DET_ID --iteration $ITERATION --exp_tag $EXP_TAG --det_type $DET_TYPE --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/detrend.stack.pro

@@ -150 +150 @@
     $run = detrend_stack.pl --det_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --det_type $DET_TYPE --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/diff.pro

@@ -154 +154 @@
     $run = diff_skycell.pl --diff_id $DIFF_ID $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/stack.pro

@@ -154 +154 @@
     $run = stack_skycell.pl --stack_id $STACK_ID $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end
 

trunk/ippTasks/warp.pro

@@ -294 +294 @@
     $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA $ARGS
     if ("$WORKDIR" != "NULL")
-      $run = $run --workdir $outroot
+      $run = $run --workdir $WORKDIR
     end