Changeset 34041 for branches/meh_branches/ppstack_test/ippTasks/addstar.pro

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippTasks/addstar.pro (modified) (13 diffs)

branches/meh_branches/ppstack_test/ippTasks/addstar.pro

@@ -26 +26 @@
     active true
   end
-  task addstar.exp.load.staticsky_multi
-    active true
-  end  
   task addstar.exp.run
     active true
@@ -44 +41 @@
     active false
   end
-  task addstar.exp.load.staticsky_multi
-    active false
-  end
   task addstar.exp.run
     active false
@@ -62 +56 @@
     active false
   end
- task addstar.revert.staticsky_multi
-    active false
-  end
 end
 macro addstar.revert.on
@@ -71 +62 @@
   end
   task addstar.revert.stack
-    active true
-  end
-  task addstar.revert.staticsky_multi
     active true
   end
@@ -90 +78 @@
 $addstar_revert_DB_SSM = 0
 
+$LOADEXEX_ADD = 300
+
+
 
 # select images ready for addstar analysis
@@ -98 +89 @@
 
   periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 30
+  periods      -exec $LOADEXEC_ADD
+  periods      -timeout 300
   npending     1
 
@@ -153 +144 @@
 
   periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 30
+  periods      -exec $LOADEXEC_ADD
+  periods      -timeout 300
   npending     1
 
@@ -206 +197 @@
 task           addstar.exp.load.staticsky
   host         local
-
   periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 30
+  periods      -exec 300
+  periods      -timeout 300
   npending     1
 
@@ -218 +208 @@
    # if ($LABEL:n == 0) break
     $run = addtool -pendingexp -stage staticsky
-    if ($DB:n == 0)
-      option DEFAULT
-    else
-      # save the DB name for the exit tasks
-      option $DB:$addstar_DB
-      $run = $run -dbname $DB:$addstar_DB
-      $addstar_DB ++
-      if ($addstar_DB >= $DB:n) set addstar_DB = 0
-    end
-    add_poll_args run
-    add_poll_labels run
-    command $run
-  end
-
-  # success
-  task.exit    0
-    # convert 'stdout' to book format
-    ipptool2book stdout addPendingExp -key add_id -uniq -setword dbname $options:0 -setword pantaskState INIT
-    if ($VERBOSE > 2)
-      book listbook addPendingExp
-    end
-
-    # delete existing entries in the appropriate pantaskStates
-    process_cleanup addPendingExp
-  end
-
-  # default exit status
-  task.exit    default
-    showcommand failure
-  end
-
-  task.exit    crash
-    showcommand crash
-  end
-
-  # operation times out?
-  task.exit    timeout
-    showcommand timeout
-  end
-end
-
-task           addstar.exp.load.staticsky_multi
-  host         local
-
-  periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 30
-  npending     1
-
-  stdout NULL
-  stderr $LOGDIR/addstar.exp.log
-
-  task.exec
-   # if ($LABEL:n == 0) break
-    $run = addtool -pendingexp -stage staticsky_multi
     if ($DB:n == 0)
       option DEFAULT
@@ -373 +308 @@
         sprintf outroot "%s.add.%s" $STAGEROOT $ADD_ID
     end
-    if ("$STAGE" == "staticsky_multi")
-        sprintf outroot "%s.add.%s" $STAGEROOT $ADD_ID
-    end
     if ("$STAGE" == "stack")
         sprintf outroot "%s.add.%s" $STAGEROOT $ADD_ID
@@ -388 +320 @@
       $run = $run --reduction $REDUCTION
     end
-    if ("$STAGE" == "staticsky_multi")
-      $run = $run --multi_num $STAGE_EXTRA1
+    if ("$STAGE" == "staticsky")
+      $run = $run --stage_extra1 $STAGE_EXTRA1  --stage_id $STAGE_ID
     end
     if ("$STAGE" == "cam") 
@@ -529 +461 @@
   end
 end
+
 task addstar.revert.staticsky
   host         local
@@ -544 +477 @@
     if ($LABEL:n == 0) break
     $run = addtool -revertprocessedexp -stage staticsky
-    if ($DB:n == 0)
-      option DEFAULT
-    else
-      # save the DB name for the exit tasks
-      option $DB:$addstar_revert_DB_SS
-      $run = $run -dbname $DB:$addstar_revert_DB_SS
-      $addstar_revert_DB_SS ++
-      if ($addstar_revert_DB_SS >= $DB:n) set addstar_revert_DB_SS = 0
-    end
-    add_poll_labels run
-    command $run
-  end
-
-  # success
-  task.exit    0
-  end
-
-  # locked list
-  task.exit    default
-    showcommand failure
-  end
-
-  task.exit    crash
-    showcommand crash
-  end
-
-  # operation times out?
-  task.exit    timeout
-    showcommand timeout
-  end
-end
-task addstar.revert.staticsky_multi
-  host         local
-
-  periods      -poll 5.0
-  periods      -exec 60.0
-  periods      -timeout 1200
-  npending     1
-  active        false
-
-  stdout NULL
-  stderr $LOGDIR/revert.log
-
-  task.exec
-    if ($LABEL:n == 0) break
-    $run = addtool -revertprocessedexp -stage staticsky_multi
     if ($DB:n == 0)
       option DEFAULT