Index: branches/eam_branches/ipp-20140610/ippTasks/remote.pro
===================================================================
--- branches/eam_branches/ipp-20140610/ippTasks/remote.pro	(revision 37026)
+++ branches/eam_branches/ipp-20140610/ippTasks/remote.pro	(revision 37027)
@@ -10,4 +10,5 @@
 
 $remote_label_iter = 0
+$remote_label_iter2 = 0
 $remote_stage_iter = 0
 $remoteP_DB = 0
@@ -18,12 +19,67 @@
   chip
   camera
-  warp
+#  warp
   stack
 end
 
-task          remote.define.chip
+macro  remote.off
+  task  remote.define
+    active false
+  end
+  task  remote.define.warp
+    active false
+  end
+  task  remote.prep.load
+    active false
+  end
+  task  remote.prep.run
+    active false
+  end
+  task  remote.exec.load
+    active false
+  end
+  task  remote.exec.run
+    active false
+  end
+  task  remote.poll.load
+    active false
+  end
+  task  remote.poll.run
+    active false
+  end
+end
+
+macro  remote.on
+  task  remote.define
+    active true
+  end
+  task  remote.define.warp
+    active true
+  end
+  task  remote.prep.load
+    active true
+  end
+  task  remote.prep.run
+    active true
+  end
+  task  remote.exec.load
+    active true
+  end
+  task  remote.exec.run
+    active true
+  end
+  task  remote.poll.load
+    active true
+  end
+  task  remote.poll.run
+    active true
+  end
+end
+
+
+task          remote.define
   host        local
   periods     -poll $LOADPOLL
-  periods     -exec $LOADEXEC
+  periods     -exec 300
   periods     -timeout 30
   npending    1
@@ -45,38 +101,5 @@
     end
 
-    $run = remotetool -definebyquery -label $label -stage $stage -path_base neb://@HOST@.0/remote/$label
-    echo $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         remote.prep.load
-  host       local
-  periods    -poll $LOADPOLL
-  periods    -exec $LOADEXEC
-  npending   1
-
-  task.exec
-    stdout NULL
-    stderr $LOGDIR/remote.prep.load
-
-    $run = remotetool -listrun -state new
-
+    $run = remotetool -definebyquery -label $label -stage $stage -path_base neb://@HOST@.0/remote/$label -limit 500
     if ($DB:n == 0)
       option DEFAULT
@@ -88,4 +111,91 @@
     end
 
+    echo $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          remote.define.warp
+  host        local
+  periods     -poll $LOADPOLL
+  periods     -exec 1800
+  periods     -timeout 30
+  npending    1
+
+  task.exec
+    stdout NULL
+    stderr $LOGDIR/remote.define.chip
+
+    $label = $LABEL:$remote_label_iter2
+
+    if ($remote_label_iter >= $LABEL:n) set remote_label_iter = 0
+    echo  $remote_label_iter $label warp
+
+    $run = remotetool -definebyquery -label $label -stage warp -path_base neb://@HOST@.0/remote/$label -limit 500
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      option $DB:$remoteP_DB
+      $run = $run -dbname $DB:$remoteP_DB
+      $remoteP_DB ++
+      if ($remoteP_DB >= $DB:n) set remoteP_DB = 0
+    end
+
+    echo $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         remote.prep.load
+  host       local
+  periods    -poll $LOADPOLL
+  periods    -exec 30
+  npending   1
+
+  task.exec
+    stdout NULL
+    stderr $LOGDIR/remote.prep.load
+
+    $run = remotetool -listrun -state new
+
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      option $DB:$remoteP_DB
+      $run = $run -dbname $DB:$remoteP_DB
+      $remoteP_DB ++
+      if ($remoteP_DB >= $DB:n) set remoteP_DB = 0
+    end
+
     add_poll_labels run
     command $run
@@ -118,5 +228,5 @@
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
-  periods      -timeout 60000
+  periods      -timeout 600000
   active       true
   npending     10
@@ -228,8 +338,8 @@
   host         local
   periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 60000
+  periods      -exec 30
+  periods      -timeout 6000000
   active       true
-  npending     1
+  npending     3
 
   task.exec
@@ -328,8 +438,8 @@
   host         local
   periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
-  periods      -timeout 60000
+  periods      -exec 30
+  periods      -timeout 6000000
   active       true
-  npending     1
+  npending     3
 
   task.exec
Index: branches/eam_branches/ipp-20140610/pstamp/scripts/pstamp_checkdependent.pl
===================================================================
--- branches/eam_branches/ipp-20140610/pstamp/scripts/pstamp_checkdependent.pl	(revision 37026)
+++ branches/eam_branches/ipp-20140610/pstamp/scripts/pstamp_checkdependent.pl	(revision 37027)
@@ -318,8 +318,15 @@
             $command .= " -set_label $rlabel" if $rlabel;
 
-            # if this is one of the chipRuns from the PV1 LAP regenerate without using the ppImage configdump file
+            my $update_mode;
             if ($chip->{data_group} =~ /^LAP.ThreePi.20120706/) {
-                $command .= ' -set_update_mode 1';
+                # if this is one of the chipRuns from the PV1 LAP regenerate without using the ppImage configdump file.
+                # XXX: PV2 processing is complete. Don't do this anymore
+                # $update_mode = 1;
+            } elsif ($chip->{data_group} =~ /^M31.rp.2013/) {
+                # Version of M31 processed with recipes and auxiliary masks incompatible with the
+                # current code. Run from scratch which will use compatible versions of the same masks..
+                $update_mode = 1;
             } 
+            $command .= " -set_update_mode $update_mode" if $update_mode;
 
             if (!$no_update) {