Changeset 26889

Timestamp:

Feb 10, 2010, 7:20:44 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201

Location:

trunk/ippTasks

Files:

• diff.pro (modified) (2 diffs)
• flatcorr.pro (modified) (2 diffs)
• magic.pro (modified) (2 diffs)

trunk/ippTasks/diff.pro

@@ -157 +157 @@
     book getword diffSkyfile $pageName state -var RUN_STATE
     book getword diffSkyfile $pageName dbname -var DBNAME
+    book getword diffSkyfile $pageName reduction -var REDUCTION
 
     # set the host and workdir based on the skycell hash
@@ -175 +176 @@
     if ("$BOTHWAYS" == "T")
        $run = $run --inverse
+    end
+    if ("$REDUCTION" != "NULL")
+      $run = $run --reduction $REDUCTION
     end
     add_standard_args run

trunk/ippTasks/flatcorr.pro

@@ -251 +251 @@
 task           flatcorr.run
   host         local
+  npending     1
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
-  periods      -timeout 60
+  periods      -timeout 3600
 
   # silently drop stdout
@@ -282 +283 @@
     book getword flatcorrBook $pageName workdir     -var WORKDIR_TEMPLATE
 
-    # specify choice of remote host
-    # set a specific DVO host here 
-    if ($PARALLEL)
-      host anyhost
-    else
-      host local
-    end
-
     # save the pageName for future reference below
     options $pageName

trunk/ippTasks/magic.pro

@@ -305 +305 @@
     $WORKDIR = $WORKDIR_TEMPLATE
 
-    sprintf outroot "%s/%s/%s.mgc.%s.%s" $WORKDIR $EXP_ID $EXP_ID $MAGIC_ID $NODE
-
-    ## generate output log based on filerule (convert the URI to a PATH)
-    ## caution with neb:// names here:
-    # $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $MAGIC_ID --basename $outroot`
-    $logfile = $outroot.log
+    sprintf baseroot "%s/%s/%s.mgc.%s" $WORKDIR $EXP_ID $EXP_ID $MAGIC_ID
+
+    $logfile = $baseroot.$NODE.log
     if ("$logfile" == "") 
       echo "WARNING: logfile not defined in magic.process.run"
@@ -321 +318 @@
     mkdir $outpath
 
-    $run = magic_process.pl --magic_id $MAGIC_ID --camera $CAMERA --node $NODE --outroot $outroot --logfile $logfile
+    $run = magic_process.pl --magic_id $MAGIC_ID --camera $CAMERA --node $NODE --baseroot $baseroot --logfile $logfile
     add_standard_args run