Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ippTasks

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/Makefile.am (modified) (2 diffs)
• ippTasks/diff.pro (modified) (4 diffs)
• ippTasks/dist.pro (modified) (1 diff)
• ippTasks/fullforce.pro (copied) (copied from trunk/ippTasks/fullforce.pro )
• ippTasks/nightly_science.pro (modified) (1 diff)
• ippTasks/pantasks.pro (modified) (1 diff)
• ippTasks/pstamp.pro (modified) (6 diffs)
• ippTasks/rawcheck.pro (copied) (copied from trunk/ippTasks/rawcheck.pro )
• ippTasks/register.pro (modified) (1 diff)
• ippTasks/staticsky.pro (modified) (2 diffs)
• ippTasks/summit.copy.pro (modified) (1 diff)
• ippTasks/survey.pro (modified) (3 diffs)
• ippTasks/warp.pro (modified) (4 diffs)

branches/eam_branches/ps2-tc3-20130727/ippTasks/Makefile.am

@@ -27 +27 @@
         survey.pro \
         replicate.pro \
+        rawcheck.pro \
         diskbalance.pro \
         dist.pro \
@@ -45 +46 @@
         diffphot.pro \
         lap.pro \
+        lapgroup.pro \
         vp.pro \
-        bg.regeneration.pro
+        bg.regeneration.pro \
+        fullforce.pro
 
 other_files = \

branches/eam_branches/ps2-tc3-20130727/ippTasks/diff.pro

@@ -47 +47 @@
     active true
   end
-  task diff.summary.load
-    active true
-  end
-  task diff.summary.run
-    active true
-  end
 end
 
@@ -67 +61 @@
   end
   task diff.revert
-    active false
-  end
-  task diff.summary.load
-    active false
-  end
-  task diff.summary.run
     active false
   end
@@ -499 +487 @@
 task           diff.summary.load
   host         local
+  active       false
 
   periods      -poll $LOADPOLL
@@ -559 +548 @@
   periods      -exec $RUNEXEC
   periods      -timeout 60
+  active       false
 
   task.exec

branches/eam_branches/ps2-tc3-20130727/ippTasks/dist.pro

@@ -31 +31 @@
 list DIST_STAGE -add "warp_bg"
 list DIST_STAGE -add "sky"
+list DIST_STAGE -add "skycal"
+list DIST_STAGE -add "ff"
 
 $currentStage = 0

branches/eam_branches/ps2-tc3-20130727/ippTasks/nightly_science.pro

@@ -370 +370 @@
   periods         -poll $LOADPOLL
   periods         -exec $LOADEXEC
-  periods         -timeout 480
+  periods         -timeout 1000
   npending        1
 

branches/eam_branches/ps2-tc3-20130727/ippTasks/pantasks.pro

@@ -490 +490 @@
     book delpage $1 -key pantaskState UNKNOWN_ERR
     book delpage $1 -key pantaskState CRASH_ERR
+    book delpage $1 -key pantaskState CRASH
+    book delpage $1 -key pantaskState TIMEOUT
   end
 end

branches/eam_branches/ps2-tc3-20130727/ippTasks/pstamp.pro

@@ -152 +152 @@
         active true
     end
+    task pstamp.queue.cleanup
+        active true
+    end
 end
 macro pstamp.cleanup.off
@@ -158 +161 @@
     end
     task pstamp.cleanup.run
+        active false
+    end
+    task pstamp.queue.cleanup
         active false
     end
@@ -825 +831 @@
         book getword pstampDependent $pageName imagedb    -var IMAGEDB
         book getword pstampDependent $pageName rlabel     -var RLABEL
+        book getword pstampDependent $pageName label      -var LABEL
         book getword pstampDependent $pageName outdir     -var OUTDIR
         book getword pstampDependent $pageName need_magic -var NEED_MAGIC
@@ -846 +853 @@
         stderr $MYLOGFILE
 
-        $run = pstamp_checkdependent.pl --dep_id $DEP_ID --stage_id $STAGE_ID --stage $STAGE --component $COMPONENT --imagedb $IMAGEDB --rlabel $RLABEL $NEED_MAGIC --fault_count $FAULT_COUNT --max_fault_count $PSTAMP_MAX_FAULT_COUNT --logfile $MYLOGFILE
+        $run = pstamp_checkdependent.pl --dep_id $DEP_ID --stage_id $STAGE_ID --stage $STAGE --component $COMPONENT --imagedb $IMAGEDB --rlabel $RLABEL --label $LABEL $NEED_MAGIC --fault_count $FAULT_COUNT --max_fault_count $PSTAMP_MAX_FAULT_COUNT --logfile $MYLOGFILE
 
         add_standard_args run
@@ -944 +951 @@
     # overloading nfs
 
-    npending    10
+    npending    5
 
     task.exec
@@ -1118 +1125 @@
     end
 end
+
+task pstamp.queue.cleanup
+    host        local
+
+    periods     -poll $RUNPOLL
+    periods     -exec 600
+    periods     -timeout 120
+    npending    1
+
+    task.exec
+        stdout NULL
+        stderr $LOGSUBDIR/pstamp.queue.cleanup.log
+
+        $run = pstamp_queue_cleanup.pl
+        command $run
+    end
+
+    task.exit $EXIT_SUCCESS
+        # echo nothing to do
+    end
+
+    task.exit   default
+        showcommand failure
+    end
+
+    task.exit   crash
+        showcommand crash
+    end
+
+    task.exit   timeout
+        showcommand timeout
+    end
+end

branches/eam_branches/ps2-tc3-20130727/ippTasks/register.pro

@@ -267 +267 @@
 task           register.imfile.run
   periods      -poll $RUNPOLL
-  periods      -exec $RUNEXEC
+  periods      -exec 1.0
   periods      -timeout 30
 

branches/eam_branches/ps2-tc3-20130727/ippTasks/staticsky.pro

@@ -64 +64 @@
 end
 
+$RA_POLL_MAX = 0
+
+macro set.ra.max
+    if ($0 != 2) 
+        echo "USAGE: set.ra.max (ra_max_deg)"
+        break
+    end
+    $RA_POLL_MAX = $1
+end
+macro get.ra.max
+    echo $RA_POLL_MAX
+end
+
 ### Load tasks for staticsky
 ### Tasks are loaded into staticskyResult.
@@ -80 +93 @@
     if ($LABEL:n == 0) break
     $run = staticskytool -todo
+    if ($RA_POLL_MAX > 0) 
+        $run = $run -ra_max $RA_POLL_MAX
+    end
     if ($DB:n == 0)
       option DEFAULT

branches/eam_branches/ps2-tc3-20130727/ippTasks/summit.copy.pro

@@ -34 +34 @@
 macro copy.status
     book listbook pzPendingImfile
+end
+
+macro copy.reset
+    book init pzPendingExp
+    book init pzPendingImfile
+    book init pzPendingAdvance
+end
+
+# aliases because copy.* isn't intuitive
+macro pztool.reset
+    copy.reset
+end
+
+macro summitcopy.reset
+    summitcopy.reset
 end
 

branches/eam_branches/ps2-tc3-20130727/ippTasks/survey.pro

@@ -583 +583 @@
 
 macro survey.add.relstack
-  if ($0 != 3)
-    echo "USAGE: survey.add.relstack (label) (releasename)"
+  if ($0 != 4)
+    echo "USAGE: survey.add.relstack (label) (releasename) (stacktype)"
     break
   end
@@ -590 +590 @@
   book setword SURVEY_RELSTACK $1 LABEL $1
   book setword SURVEY_RELSTACK $1 RELEASE_NAME $2
+  book setword SURVEY_RELSTACK $1 STACK_TYPE $3
   book setword SURVEY_RELSTACK $1 STATE PENDING
 end
@@ -1846 +1847 @@
     book setword SURVEY_RELSTACK $label STATE DONE
     book getword SURVEY_RELSTACK $label RELEASE_NAME -var RELEASE_NAME
+    book getword SURVEY_RELSTACK $label STACK_TYPE -var STACK_TYPE
 
     # XXX: Can we use the survey task for stack types other than nightly?
-    $run = releasetool -definerelstack -label $label -release_name $RELEASE_NAME -set_state processed -set_stack_type nightly
+    $run = releasetool -definerelstack -label $label -release_name $RELEASE_NAME -set_state processed -set_stack_type $STACK_TYPE
 
     if ($DB:n == 0)

branches/eam_branches/ps2-tc3-20130727/ippTasks/warp.pro

@@ -58 +58 @@
     active true
   end
-  task warp.summary.load
-    active true
-  end
-  task warp.summary.run
-    active true
-  end
 end
 
@@ -87 +81 @@
   end
   task warp.revert.warped
-    active false
-  end
-  task warp.summary.load
-    active false
-  end
-  task warp.summary.run
     active false
   end
@@ -545 +533 @@
 task           warp.summary.load
   host         local
-
+  active       false
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
@@ -605 +593 @@
   periods      -exec $RUNEXEC
   periods      -timeout 60
+  active       false
 
   task.exec