Changeset 25027 for branches/pap/ippTasks/simtest.pro

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippTasks/simtest.pro (modified) (5 diffs)

branches/pap/ippTasks/simtest.pro

@@ -27 +27 @@
 end
 
+$SIMTEST_RAWDIR = raw
+$SIMTEST_WORKDIR = work
+  
+
 macro simtest
   if ($0 != 4)
@@ -38 +42 @@
     echo "  SIMTEST_CAMERA   : define an alternate camera (otherwise uses entry in sequence file)"
     echo "  SIMTEST_SEQUENCE : define the set of observations generated (simtest.basic.config)"
-    echo "  SIMTEST_AUTO     : define the analysis steps to perform (simtest.auto)"
+    echo "  SIMTEST_AUTO     : define the analysis steps to perform (simtest.basic.auto)"
     echo "  SIMTEST_THREADS  : set the number of threads for the processing node (0)"
     echo ""
@@ -70 +74 @@
       # the labels "wait" and "proc" are special names used in automate.pro
     
-      $ppsim = "ppSimSequence $MODULES:0/$SIMTEST_SEQUENCE simtest.mkimages simtest.inject -path raw -workdir work -dbname $dbname -label wait -dvodb DVO -tess_id TESS"
+      $ppsim = "ppSimSequence $MODULES:0/$SIMTEST_SEQUENCE simtest.mkimages simtest.inject -path $SIMTEST_RAWDIR -workdir $SIMTEST_WORKDIR -dbname $dbname -label wait -dvodb DVO -tess_id TESS"
       if ("$PPSIM_RECIPE" != "default") 
          $ppsim = $ppsim -ppsim_recipe $PPSIM_RECIPE
@@ -95 +99 @@
 
   module.tasks
+
+  add.label proc
 
   if ($SIMTEST_THREADS == 0) 
@@ -121 +127 @@
 end
 
+macro simtest.setup.nebulous.basic
+  $PPSIM_RECIPE = default
+  $SIMTEST_SEQUENCE = simtest.basic.config
+  $SIMTEST_AUTO = simtest.nebulous.basic.auto
+  $SIMTEST_USER = `whoami`
+  $SIMTEST_RAWDIR = neb://anyhost/simtest.$SIMTEST_USER/raw
+  $SIMTEST_WORKDIR = neb://anyhost/simtest.$SIMTEST_USER/work
+end
+
 macro simtest.setup.detverify
   $PPSIM_RECIPE = default