Index: trunk/ippTasks/nightly_science.pro
===================================================================
--- trunk/ippTasks/nightly_science.pro	(revision 30073)
+++ trunk/ippTasks/nightly_science.pro	(revision 30111)
@@ -7,8 +7,4 @@
     ns.detrends.off
     ns.dqstats.on
-#    ns.sweetspot.on
-#    ns.registration.on
-#    ns.burntool.on
-#    ns.chips.on
     ns.stacks.on
     ns.diffs.on
@@ -19,8 +15,4 @@
     ns.detrends.off
     ns.dqstats.off
-#    ns.sweetspot.off
-#    ns.registration.off
-#    ns.burntool.off
-#    ns.chips.off
     ns.stacks.off
     ns.diffs.off
@@ -53,34 +45,4 @@
 end
 
-# macro ns.sweetspot.on
-#   task ns.sweetspot.load
-#     active true
-#   end
-# end
-
-# macro ns.registration.on
-#   task ns.registration.load
-#     active true
-#   end
-# end
-
-# macro ns.burntool.on
-#   task ns.burntool.load
-#     active true
-#   end
-#   task ns.burntool.run
-#     active true
-#   end
-# end
-
-# macro ns.chips.on
-#   task ns.chips.load
-#     active true
-#   end
-#   task ns.chips.run
-#     active true
-#   end
-# end
-
 macro ns.stacks.on
   task ns.stacks.load
@@ -122,34 +84,4 @@
 end
 
-# macro ns.sweetspot.off
-#   task ns.sweetspot.load
-#     active false
-#   end
-# end
-
-# macro ns.registration.off
-#   task ns.registration.load
-#     active false
-#   end
-# end
-
-# macro ns.burntool.off
-#   task ns.burntool.load
-#     active false
-#   end
-#   task ns.burntool.run
-#     active false
-#   end
-# end
-
-# macro ns.chips.off
-#   task ns.chips.load
-#     active false
-#   end
-#   task ns.chips.run
-#     active false
-#   end
-# end
-
 macro ns.stacks.off
   task ns.stacks.load
@@ -174,10 +106,4 @@
 end
 
-# $ns_regPAGE = 0
-# $ns_burnPAGE = 0
-# $ns_RburnPAGE = 0
-# $ns_RburnCELL = 0
-# $ns_chipPAGE = 0
-# $ns_RchipPAGE = 0
 $ns_stackPAGE = 0
 $ns_RstackPAGE = 0
@@ -218,5 +144,4 @@
 
 
-
 #
 # Start a new date to work on
@@ -242,5 +167,5 @@
 #    command echo $today
    $run = nightly_science.pl --clean_old --date $today --dbname $DB:0
-    add_standard_args $run
+#    add_standard_args run
     command $run
   end
@@ -279,5 +204,5 @@
 
     $run = nightly_science.pl --queue_detrends --date $today --dbname $DB:0
-     add_standard_args $run
+#     add_standard_args $run
      command $run
   end
@@ -317,5 +242,5 @@
 
     $run = nightly_science.pl --queue_dqstats --date $today --dbname $DB:0
-     add_standard_args $run
+#     add_standard_args $run
      command $run
 
@@ -367,6 +292,6 @@
      if ("$ns_STATE" != "TOWARP") break
 
-     $run = nightly_science.pl --check_stacks --date $date
-     add_standard_args $run
+     $run = nightly_science.pl --check_stacks --date $date --dbname $DBNAME
+#     add_standard_args $run
      command $run
 
@@ -435,6 +360,6 @@
 
      if (("$ns_STATE" != "QUEUESTACKS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
-     $run = nightly_science.pl --queue_stacks --date $date
-     add_standard_args $run
+     $run = nightly_science.pl --queue_stacks --date $date --dbname $DBNAME
+#     add_standard_args $run
      command $run
    end
@@ -501,6 +426,6 @@
 
      if ("$ns_STATE" != "STACKING") break
-     $run = nightly_science.pl --confirm_stacks --date $date
-     add_standard_args $run
+     $run = nightly_science.pl --confirm_stacks --date $date --dbname $DBNAME
+#     add_standard_args $run
      command $run
    end
@@ -567,6 +492,6 @@
 
      if ("$ns_STATE" != "TOWARP") break
-     $run = nightly_science.pl --check_diffs --date $date
-     add_standard_args $run
+     $run = nightly_science.pl --check_diffs --date $date --dbname $DBNAME
+#     add_standard_args $run
      command $run
    end
@@ -634,6 +559,6 @@
 
      if (("$ns_STATE" != "QUEUEDIFFS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
-     $run = nightly_science.pl --queue_diffs --date $date
-     add_standard_args $run
+     $run = nightly_science.pl --queue_diffs --date $date --dbname $DBNAME
+#     add_standard_args $run
      command $run
    end