Changeset 19545 for trunk/ippTasks/diff.pro

Timestamp:

Sep 12, 2008, 4:20:57 PM (18 years ago)

Author:

eugene

Message:

convert chiphost tables to ipphosts tables, add lookups for skycellID to host, add in the redirect-output option to stack and diff

File:

• trunk/ippTasks/diff.pro (modified) (1 diff)

trunk/ippTasks/diff.pro

@@ -142 +142 @@
     book getword diffSkyfile $pageName dbname -var DBNAME
 
-    ### XXX Instead of setting these by camera, need to set by skycell_id
-    ### XXX change these to use the --redirect scheme
-#    set.host.for.camera $CAMERA $DIFF_ID
-#    set.workdir.by.camera $CAMERA $DIFF_ID $WORKDIR_TEMPLATE $default_host WORKDIR
-    host anyhost
-    $WORKDIR = $WORKDIR_TEMPLATE
+    # set the host and workdir based on the skycell hash
+    set.host.for.skycell $SKYCELL_ID
+    set.workdir.by.skycell $SKYCELL_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+
+    # XXX old code:
+    # host anyhost
+    # $WORKDIR = $WORKDIR_TEMPLATE
 
     basename $TESS_DIR -var TESS_ID
     sprintf outroot "%s/%s/%s/%s.%s.dif.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $DIFF_ID
 
-    ## generate output log based on filerule (convert the URI to a PATH)
-    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id $DIFF_ID --basename $outroot`
-    if ("$logfile" == "") 
-      echo "WARNING: logfile not defined in diff.skycell.run"
-      break
-    end
-
-    stdout $logfile
-    stderr $logfile
-    dirname $logfile -var outpath
-    mkdir $outpath
-
-    $run = diff_skycell.pl --threads @MAX_THREADS@ --diff_id $DIFF_ID --outroot $outroot
+    stdout $LOGDIR/diff.skycell.log
+    stderr $LOGDIR/diff.skycell.log
+
+    $run = diff_skycell.pl --threads @MAX_THREADS@ --diff_id $DIFF_ID --outroot $outroot --redirect-output
     add_standard_args run