Changeset 36480 for branches/eam_branches/ipp-20131211/ippTasks

Timestamp:

Feb 6, 2014, 11:48:53 AM (12 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20131211

Files:

• . (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/Makefile.am (modified) (1 diff)
• ippTasks/fullforce.pro (copied) (copied from trunk/ippTasks/fullforce.pro )
• ippTasks/pstamp.pro (modified) (2 diffs)
• ippTasks/rawcheck.pro (modified) (1 diff)

branches/eam_branches/ipp-20131211/ippTasks/Makefile.am

@@ -46 +46 @@
         diffphot.pro \
         lap.pro \
+        lapgroup.pro \
         vp.pro \
-        bg.regeneration.pro
+        bg.regeneration.pro \
+        fullforce.pro
 
 other_files = \

branches/eam_branches/ipp-20131211/ippTasks/pstamp.pro

@@ -825 +825 @@
         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 +847 @@
         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

branches/eam_branches/ipp-20131211/ippTasks/rawcheck.pro

@@ -75 +75 @@
   task.exec
       book npages rawcheckPending -var N
-      if ($N > 2000)
+      if ($N > 200)
         process_cleanup rawcheckPending
         break