Changeset 18607 for trunk/ippTasks/warp.pro

Timestamp:

Jul 17, 2008, 3:07:11 PM (18 years ago)

Author:

eugene

Message:

updates from eam_branch_20080706

File:

• trunk/ippTasks/warp.pro (modified) (5 diffs)

trunk/ippTasks/warp.pro

@@ -8 +8 @@
 ### Setups
 check.globals
-
-$LOGSUBDIR = $LOGDIR/warp
-exec mkdir -p $LOGSUBDIR
 
 ### Initialise the books containing the tasks to do
@@ -75 +72 @@
 
   stdout NULL
-  stderr $LOGSUBDIR/warp.exp.log
+  stderr $LOGDIR/warp.exp.log
 
   task.exec
@@ -142 +139 @@
     set.workdir.by.camera $CAMERA $WARP_ID $WORKDIR_TEMPLATE $default_host WORKDIR
 
-    sprintf outroot "%s/%s/%s.wrp.%s" $WORKDIR $EXP_ID $EXP_ID $WARP_ID
-
-    ## generate output log based on filerule (convert the URI to a PATH)
-    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $WARP_ID --basename $outroot`
-
-    stdout $logfile
-    stderr $logfile
-    dirname $logfile -var outpath
-    mkdir $outpath
-
-    $run = warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --tess_dir $TESS_DIR
+    ## generate outroot specific to this exposure
+    sprintf logfile "%s/%s/%s.wrp.%s.log" $WORKDIR $EXP_ID $EXP_ID $WARP_ID
+
+    stdout $LOGDIR/warp.exp.log
+    stderr $LOGDIR/warp.exp.log
+
+    # XXX warp_overlap.pl differs from the standard script : it does not have an 'outroot' argument, and it does not take '--redirect'
+    $run = warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --tess_dir $TESS_DIR --logfile $logfile
     add_standard_args run
 
@@ -189 +183 @@
 
   stdout NULL
-  stderr $LOGSUBDIR/warp.skycell.log
+  stderr $LOGDIR/warp.skycell.log
 
   task.exec
@@ -261 +255 @@
     sprintf outroot "%s/%s/%s/%s.%s.wrp.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $WARP_ID
 
-    ## generate output log based on filerule (convert the URI to a PATH)
-    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $WARP_ID --basename $outroot`
-
-    stdout $logfile
-    stderr $logfile
-    dirname $logfile -var outpath
-    mkdir $outpath
-
-    $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_dir $TESS_DIR --camera $CAMERA --outroot $outroot
+    stdout $LOGDIR/warp.skycell.log
+    stderr $LOGDIR/warp.skycell.log
+
+    $run = warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_dir $TESS_DIR --camera $CAMERA --outroot $outroot --redirect-output
     add_standard_args run