Index: branches/ccl_branches/ipponly-20191108/ippTasks/addstar.pro
===================================================================
--- branches/ccl_branches/ipponly-20191108/ippTasks/addstar.pro	(revision 41106)
+++ branches/ccl_branches/ipponly-20191108/ippTasks/addstar.pro	(revision 41211)
@@ -405,6 +405,6 @@
 
   ## we want only a single outstanding addstar job.  
-  host         local
-  npending     1
+#  host         local
+  npending     50
 
   task.exec
@@ -433,8 +433,14 @@
     book getword addPendingExp $pageName image_only -var IMAGE_ONLY
     book getword addPendingExp $pageName dbname -var DBNAME
-
+    book getword addPendingExp $pageName dvodbhost  -var DVODBHOST
+
+    echo $DBNAME
+    echo $MINIDVODB_NAME
+    echo $DVODBHOST
+
+    host -required $DVODBHOST
 
     # specify choice of remote host based on camera and chip (class_id)
-    # set.host.for.camera $CAMERA FPA
+    #set.host.for.camera $CAMERA FPA
 
     # set the WORKDIR variable
@@ -473,10 +479,9 @@
     end
 
-  
-
     stdout $LOGDIR/addstar.exp.log
     stderr $LOGDIR/addstar.exp.log
 
-    $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output
+    $run = addstar_run.pl --add_id $ADD_ID --camera $CAMERA --dvodb $DVODB --stage $STAGE --stageroot $STAGEROOT --outroot $outroot --redirect-output --dvodbhost $DVODBHOST
+
     if ("$REDUCTION" != "NULL")
       $run = $run --reduction $REDUCTION
@@ -503,5 +508,5 @@
     end
 
-
+    echo $run
 
     if ("$IMAGE_ONLY" == "T")
@@ -527,4 +532,5 @@
     end
     command $run
+    showcommand
   end
 
@@ -546,4 +552,5 @@
     book setword addPendingExp $options:0 pantaskState TIMEOUT
   end
+
 end
 
Index: branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro
===================================================================
--- branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro	(revision 41106)
+++ branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro	(revision 41211)
@@ -131,6 +131,6 @@
 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
 macro add.minidvodb
-  if ($0 != 7)
-    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera)"
+  if ($0 != 8)
+    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera) (minidvodb_host)"
     break
   end
@@ -145,5 +145,5 @@
   book setword MINIDVODB_PREMERGE $1 MINIDVODB_GROUP $1
   book setword MINIDVODB_PREMERGE $1 DVODB $3
-  book setword MINIDVODB_PREMERGE $1 CAMERA $5
+  book setword MINIDVODB_PREMERGE $1 CAMERA $6
   book setword MINIDVODB_PREMERGE $1 STATE PENDING
   #active  
@@ -161,4 +161,5 @@
   book setword MINIDVODB_CREATE $1 DVODB_NUM $5
   book setword MINIDVODB_CREATE $1 CAMERA $6  
+  book setword MINIDVODB_CREATE $1 MINIDVODB_HOST $7
   book setword MINIDVODB_CREATE $1 STATE PENDING  
 end
@@ -180,7 +181,7 @@
     break
   end
-  echo "minidvodb wait"
+  echo "minidvodb_wait"
   book listbook MINIDVODB
-  echo "minidvodb premerge"
+  echo "minidvodb_premerge"
   book listbook MINIDVODB_PREMERGE
   echo "minidvodb create"
@@ -191,8 +192,9 @@
 
 
-$LOADEXEC_MDB = 300
-
-
-
+#$LOADEXEC_MDB = 300
+$LOADEXEC_MDB = 2
+$timeout_mdb  = 2
+$LOADPOLL = 2
+$RUNEXEC = 2
 
 
@@ -202,5 +204,6 @@
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
-  periods      -timeout 300
+#  periods      -timeout 300
+  periods      -timeout $timeout_mdb
   npending     1
 
@@ -211,5 +214,5 @@
     book npages MINIDVODB -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing minidvodb.wait.load"
       break
     endif
@@ -279,5 +282,6 @@
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
-  periods      -timeout 60
+#  periods      -timeout 60
+  periods      -timeout $timeout_mdb
 
   task.exec
@@ -511,10 +515,11 @@
 
 task           minidvodb.create
-  host         local
+#  host         local
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
-  periods      -timeout 240
-  npending     1
+#  periods      -timeout 240
+  periods      -timeout $timeout_mdb
+#  npending     1
 
   stdout NULL
@@ -523,10 +528,10 @@
   task.exec
     
- periods      -poll 60
+# periods      -poll 60
 #wait a bit before trying again
 
     book npages MINIDVODB_CREATE -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing on minidvodb_create"
       break
     endif
@@ -552,5 +557,6 @@
     book getword MINIDVODB_CREATE $minidvodb_group DVODB_NUM -var dvodb_num
     book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera
-    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num
+    book getword MINIDVODB_CREATE $minidvodb_group MINIDVODB_HOST -var minidvodbhost
+    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num --minidvodb_host $minidvodbhost
  
     if ($DB:n == 0)
@@ -593,10 +599,11 @@
 
 task           minidvodb.active.load
-  host         local
+#  host         local
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
-  periods      -timeout 30
-  npending     1
+#  periods      -timeout 30
+  periods      -timeout $timeout_mdb
+#  npending     1
 
   stdout NULL
@@ -606,5 +613,5 @@
     book npages MINIDVODB_ACTIVE -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing minidvodb.active.load"
       break
     endif
@@ -674,5 +681,6 @@
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
-  periods      -timeout 60
+#  periods      -timeout 60
+  periods      -timeout $timeout_mdb
 
   task.exec
@@ -693,5 +701,4 @@
 
     $run = addtool -flipminidvodbrun -minidvodb_group $MINIDVODB_GROUP
-    
    
 if ($DB:n == 0)
Index: branches/ccl_branches/ipponly-20191108/ippTasks/survey.pro
===================================================================
--- branches/ccl_branches/ipponly-20191108/ippTasks/survey.pro	(revision 41106)
+++ branches/ccl_branches/ipponly-20191108/ippTasks/survey.pro	(revision 41211)
@@ -40,7 +40,9 @@
 $SURVEY_RELSTACK_DB = 0
 $SURVEY_STATICSKYSINGLE_DB = 0
-$SURVEY_EXEC = 120
+$SURVEY_EXEC = 30
 $SURVEY_POLL = 10
-$SURVEY_TIMEOUT = 600
+$SURVEY_TIMEOUT = 30
+# $SURVEY_EXEC = 120
+# $SURVEY_TIMEOUT = 600
 # the tasks for loading the release tabels for nightly science do not need to run very often
 $SURVEY_RELEASE_EXEC = 300
@@ -947,9 +949,9 @@
 
 task survey.addstar
-  host local
- 
   periods      -poll $SURVEY_POLL
   periods      -exec $SURVEY_EXEC
   periods      -timeout $SURVEY_TIMEOUT
+
+  host local
   npending     1
 
@@ -961,5 +963,5 @@
     book npages SURVEY_ADDSTAR -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing survey.addstar"
       break
     endif
@@ -997,13 +999,12 @@
     
     $run = $run -definebyquery -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group -stage $stage
-    # echo $run
     if ("$stage" == "cam") 
-        #only queue destreaked cams. stacks and staticsky don't need this
-    #    if ("$DB:$SURVEY_ADDSTAR_DB" == "isp")
-            #this is the only way I can think of how to handle this (but it is messy). If it is a database that we KNOW doesn't use magicked (ie, isp), then do not queue destreaked
+        #only queue destreaked cams. stacks and staticsky dont need this
+#       if ("$DB:$SURVEY_ADDSTAR_DB" == "isp")
+           # this is the only way I can think of how to handle this (but it is messy). If it is a database that we KNOW doesn use magicked (ie, isp), then do not queue destreaked
            # now with no magic, all are uncensored
            $run = $run -uncensored
 #	else
-	   #if not isp, then run destreaked version only
+	   # if not isp, then run destreaked version only
 #	   $run = $run -destreaked
 #	end
@@ -1018,5 +1019,5 @@
     end
     if ("$stage" == "skycal")
-        #skycal doesn't have magic, however, we still need to tell addtool 
+        #skycal doesnt have magic, however, we still need to tell addtool 
 	$run = $run -uncensored
     end
@@ -1028,5 +1029,4 @@
     end
     # we need to handle isp/gpc1: gpc1 wants destreaked, isp wants uncensored.  Perhaps the best way is by default do destreaked (the most paranoid), and if db = isp (is this the best way?) then do uncensored
-    
 
     echo $run