Index: /tags/ipp-20100701/ippScripts/scripts/automate_stacks.pl
===================================================================
--- /tags/ipp-20100701/ippScripts/scripts/automate_stacks.pl	(revision 28875)
+++ /tags/ipp-20100701/ippScripts/scripts/automate_stacks.pl	(revision 28876)
@@ -41,5 +41,5 @@
 # Grab options
 my ( $date, $camera, $dbname, $logfile, $verbose, $manual);
-my ( $help, $isburning, $force_stack_count, $test_mode, $this_target_only, $this_filter_only, $this_mode_only, $check_mode);
+my ( $help, $isburning, $force_stack_count, $test_mode, $this_target_only, $this_filter_only, $this_mode_only, $check_mode, $burntool_stats);
 my ( $check_registration, $define_burntool, $queue_burntool, $check_chips, $queue_chips);
 my ( $check_stacks, $queue_stacks, $check_diffs, $queue_diffs, $clean_old);
@@ -58,4 +58,5 @@
     'check'                => \$check_mode,
     'test_mode'            => \$test_mode,
+    'burntool_stats'       => \$burntool_stats,
     'this_target_only=s'   => \$this_target_only,
     'this_filter_only=s'   => \$this_filter_only,
@@ -89,4 +90,5 @@
            --this_filter_only     Process only a single filter.
            --this_mode_only       Process only a single clean mode.
+           --burntool_stats       Display Nexp Nimfile Nburntooled Nqueued for check_chips.
         Modes:
            --check_registration   Confirm the data downloaded correctly.
@@ -656,6 +658,11 @@
     my $pretend = shift;
     my $exposures = 0;
+
     foreach my $target (@target_list) {
         my ($Nexposures,$Nimfiles,$Nburntooled,$Nalready) = pre_chip_queue($date,$target);
+	if (defined($burntool_stats)) {
+	    print "$Nexposures $Nimfiles $Nburntooled $Nalready\n";
+	}
+
         if ($Nexposures == 0) {
 	    print STDERR "execute_chips: Target $target on $date had no exposures.\n";
@@ -1039,5 +1046,5 @@
     my $args = $command;
     if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
-	$args .= " -dbname $dbname -updaterun -set_state goto_cleaned -full -set_label goto_cleaned -time_stamp_end $cleaning_date ";
+	$args .= " -dbname $dbname -updaterun -set_state goto_cleaned -full -set_label goto_cleaned -label $label -time_stamp_end $cleaning_date ";
     }
     elsif ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'B')) {
@@ -1058,21 +1065,21 @@
 
     foreach my $mode (@mode_list) {
-	if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
-	    my ($cleaning_date,$command) = construct_cleantool_args($date,"",$mode);
-	    if ($cleaning_date eq 'no clean') {
-		next;
-	    }
-	    print STDERR "$command\n";
-	    if (!(defined($pretend) || $debug == 1)) {
-#           print STDERR "BEAR IS DRIVING!?\n";
-		my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-		    run ( command => $command, verbose => $verbose );
-		unless ($success) {
-		    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-		    &my_die("Unable to perform stacktool: $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
-		}
-	    }
-	}
-	else {
+# 	if ((exists($clean_alternate{$mode})) && ($clean_alternate{$mode} eq 'A')) {
+# 	    my ($cleaning_date,$command) = construct_cleantool_args($date,"",$mode);
+# 	    if ($cleaning_date eq 'no clean') {
+# 		next;
+# 	    }
+# 	    print STDERR "$command\n";
+# 	    if (!(defined($pretend) || $debug == 1)) {
+# #           print STDERR "BEAR IS DRIVING!?\n";
+# 		my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+# 		    run ( command => $command, verbose => $verbose );
+# 		unless ($success) {
+# 		    $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+# 		    &my_die("Unable to perform cleantool ($command): $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
+# 		}
+# 	    }
+# 	}
+# 	else {
 	    foreach my $target (@target_list) {
 		if (exists($noclean_list{$target})) {
@@ -1090,9 +1097,9 @@
 		    unless ($success) {
 			$error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-			&my_die("Unable to perform stacktool: $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
+			&my_die("Unable to perform cleantool ($command): $error_code", 0,0,$date, $PS_EXIT_SYS_ERROR);
 		    }
 		}
 	    }
-	}
+# 	}
     }
     return(0);
Index: /tags/ipp-20100701/ippconfig/recipes/nightly_science.config
===================================================================
--- /tags/ipp-20100701/ippconfig/recipes/nightly_science.config	(revision 28875)
+++ /tags/ipp-20100701/ippconfig/recipes/nightly_science.config	(revision 28876)
@@ -46,4 +46,5 @@
 #  COMMENT STR M31%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -54,4 +55,5 @@
 #  COMMENT STR %MD01%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -62,4 +64,5 @@
 #  COMMENT STR %MD02%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -70,4 +73,5 @@
 #  COMMENT STR %MD03%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -78,4 +82,5 @@
 #  COMMENT STR %MD04%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -86,4 +91,5 @@
 #  COMMENT STR %MD05%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -94,4 +100,5 @@
 #  COMMENT STR %MD06%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -102,4 +109,5 @@
 #  COMMENT STR %MD07%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -110,4 +118,5 @@
 #  COMMENT STR %MD08%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -118,4 +127,5 @@
 #  COMMENT STR %MD09%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -126,4 +136,5 @@
 #  COMMENT STR %MD10%
   STACKABLE BOOL TRUE
+  DIST S16 30
 END
 TARGETS METADATA
@@ -150,4 +161,6 @@
 # OBJECT STR 3PI
   STACKABLE BOOL FALSE
+  CHIP S16 14
+  DIFF S16 14
 END
 # This is a hack, and I freely admit it.