Changeset 12368 for trunk/ippTasks/warp.pro

Timestamp:

Mar 8, 2007, 5:41:36 PM (19 years ago)

Author:

Paul Price

Message:

Fixing up workdir, so that operations go into the current directory if workdir is NULL

File:

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

trunk/ippTasks/warp.pro

@@ -158 +158 @@
 
     ## generate output log based on filerule
-    $outroot = `ipp_datapath.pl $WORKDIR`
+    if ($WORKDIR == NULL)
+      $outroot = `pwd`
+    else
+      $outroot = `ipp_datapath.pl $WORKDIR`
+    end
     $outroot = $outroot/warp$WARP_ID
     $logfile = $outroot/overlap.log
@@ -170 +174 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --workdir $WORKDIR $ARGS
-    end
-    command warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --workdir $WORKDIR $ARGS
+      echo command warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --workdir $outroot $ARGS
+    end
+    command warp_overlap.pl --warp_id $WARP_ID --camera $CAMERA --workdir $outroot $ARGS
   end
 
@@ -272 +276 @@
 
     ## generate output log based on filerule
-    $outroot = `ipp_datapath.pl $WORKDIR`
+    if ($WORKDIR == NULL)
+      $outroot = `pwd`
+    else
+      $outroot = `ipp_datapath.pl $WORKDIR`
+    end
     $outroot = $outroot/warp$WARP_ID
     $logfile = $outroot/skycell.log
@@ -284 +292 @@
     # create the command line
     if ($VERBOSE > 1)
-      echo command warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA --workdir $WORKDIR $ARGS
-    end
-    command warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA --workdir $WORKDIR $ARGS
+      echo command warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA --workdir $outroot $ARGS
+    end
+    command warp_skycell.pl --warp_id $WARP_ID --skycell_id $SKYCELL_ID --tess_id $TESS_ID --camera $CAMERA --workdir $outroot $ARGS
   end