Index: branches/eam_branches/ipp-20110213/ippTasks/destreak.pro
===================================================================
--- branches/eam_branches/ipp-20110213/ippTasks/destreak.pro	(revision 30676)
+++ branches/eam_branches/ipp-20110213/ippTasks/destreak.pro	(revision 30812)
@@ -204,17 +204,20 @@
     book getword magicToDS $pageName dbname -var DBNAME
 
-    sprintf logfile "%s/%s.mds.%s.%s.%s.log" $OUTROOT $EXP_ID $MAGIC_DS_ID $STAGE_ID $COMPONENT
 
     substr $COMPONENT 0 3 COMP_HEAD
     if ("$COMP_HEAD" == "sky")
         set.host.for.skycell $COMPONENT
+        set.workdir.by.skycell $COMPONENT $OUTROOT $default_host WORKDIR
     else 
         # assume component is a class_id, if not we will default to anyhost
         set.host.for.camera $CAMERA $COMPONENT
-    end
+        set.workdir.by.camera $CAMERA $COMPONENT $OUTROOT $default_host WORKDIR
+    end
+
+    sprintf logfile "%s/%s.mds.%s.%s.%s.log" $WORKDIR $EXP_ID $MAGIC_DS_ID $STAGE_ID $COMPONENT
 
     # TODO: do not add recoveryroot or replace if they are null or zero
 
-    $run = magic_destreak.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --exp_id $EXP_ID --streaks_path_base $STREAKS_PATH_BASE --inv_streaks_path_base $INV_STREAKS_PATH_BASE --streaks $STREAKS --inv_streaks $INV_STREAKS --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --uri $URI --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $OUTROOT --logfile $logfile --recoveryroot $RECROOT --replace $REPLACE --magicked $MAGICKED --run-state $RUN_STATE
+    $run = magic_destreak.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --exp_id $EXP_ID --streaks_path_base $STREAKS_PATH_BASE --inv_streaks_path_base $INV_STREAKS_PATH_BASE --streaks $STREAKS --inv_streaks $INV_STREAKS --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --uri $URI --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $WORKDIR --logfile $logfile --recoveryroot $RECROOT --replace $REPLACE --magicked $MAGICKED --run-state $RUN_STATE
 
     add_standard_args run
@@ -407,15 +410,16 @@
     book getword magicDSToRevert $pageName dbname -var DBNAME
 
-    sprintf logfile "%s/%s.mds.revert.%s.%s.%s.log" $OUTROOT $EXP_ID $MAGIC_DS_ID $STAGE_ID $COMPONENT
-
     substr $COMPONENT 0 3 COMP_HEAD
     if ("$COMP_HEAD" == "sky")
         set.host.for.skycell $COMPONENT
+        set.workdir.by.skycell $COMPONENT $OUTROOT $default_host WORKDIR
     else 
         # assume component is a class_id, if not we will default to anyhost
         set.host.for.camera $CAMERA $COMPONENT
-    end
-
-    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $OUTROOT --logfile $logfile --replace $REPLACE --bothways $BOTHWAYS --magicked $MAGICKED --run-state $RUN_STATE --recovery_path_base $RECOVERY_PATH_BASE
+        set.workdir.by.camera $CAMERA $COMPONENT $OUTROOT $default_host WORKDIR
+    end
+    sprintf logfile "%s/%s.mds.revert.%s.%s.%s.log" $WORKDIR $EXP_ID $MAGIC_DS_ID $STAGE_ID $COMPONENT
+
+    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --cam_reduction $CAM_REDUCTION --outroot $WORKDIR --logfile $logfile --replace $REPLACE --bothways $BOTHWAYS --magicked $MAGICKED --run-state $RUN_STATE --recovery_path_base $RECOVERY_PATH_BASE
 
     add_standard_args run
Index: branches/eam_branches/ipp-20110213/ippTasks/pstamp.pro
===================================================================
--- branches/eam_branches/ipp-20110213/ippTasks/pstamp.pro	(revision 30676)
+++ branches/eam_branches/ipp-20110213/ippTasks/pstamp.pro	(revision 30812)
@@ -19,5 +19,5 @@
 
 # give up on dependents with fault_count >= $PSTAMP_MAX_FAULT_COUNT
-$PSTAMP_MAX_FAULT_COUNT = 5
+$PSTAMP_MAX_FAULT_COUNT = 3
 macro set.max.fault.count
     $PSTAMP_MAX_FAULT_COUNT = $1
@@ -717,8 +717,8 @@
 
         $MYLOGFILE = $OUTDIR/checkdep.$DEP_ID.log
-        stdout $MYLOGFILE
+        stdout NULL
         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
+        $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
 
         add_standard_args run
@@ -928,7 +928,7 @@
 
     task.exec
+        stdout $LOGSUBDIR/pstamp.stopfaulted.log
         stderr $LOGSUBDIR/pstamp.stopfaulted.log
-        stderr $LOGSUBDIR/pstamp.stopfaulted.log
-        $run = pstampstopfaulted
+        $run = pstampstopfaulted -fault_count $PSTAMP_MAX_FAULT_COUNT
         if ($DB:n == 0)
             option DEFAULT
Index: branches/eam_branches/ipp-20110213/ippTasks/register.pro
===================================================================
--- branches/eam_branches/ipp-20110213/ippTasks/register.pro	(revision 30676)
+++ branches/eam_branches/ipp-20110213/ippTasks/register.pro	(revision 30812)
@@ -203,5 +203,5 @@
 $regRevertImfile_DB = 0
 $regPendingExp_DB = 0
-
+$reg_datePAGE = 0
 # select images ready for register analysis
 # new entries are added to regPendingImfile