Changeset 37833 for trunk/ippScripts/scripts/lap_science.pl

Timestamp:

Jan 12, 2015, 12:53:36 PM (12 years ago)

Author:

eugene

Message:

merging changes from ipp-pv3-20140717 (via branches/eam_branches/ipp-pv3-20140717-merge)

Location:

trunk/ippScripts/scripts

Files:

• . (modified) (1 prop)
• lap_science.pl (modified) (5 diffs, 1 prop)

trunk/ippScripts/scripts/lap_science.pl

@@ -34 +34 @@
 my $qstack_threshold     = 0.05; # Only make a quickstack if more than 5% of the exposures require it.
 my $minimum_stack_inputs = 2;    # We can avoid magicking stack inputs if we have more than this number.
-my $maximum_stack_inputs = 25;   # This is the place-holder guess on how big a stack we should process locally
+my $maximum_stack_inputs = 25;   # This is the place-holder guess on how big a stack we should process locally.  25 is the best guess.
 my $do_updates_pv2       = 0;    # Do updates using the calls needed for PV2.  
 
@@ -1058 +1058 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform stacktool -definebyquery: $error_code", $lap_id);
+        &my_die("Unable to perform stacktool -definebyquery: $error_code :: $command", $lap_id);
     }
     my $stacks_made = $mdcParser->parse_list(join "", @$stdout_buf) or
@@ -1066 +1066 @@
     ## Queue the "deep" stacks that will run locally.
     my $deep_minimum = $maximum_stack_inputs + 1;
+    if ($deep_minimum < 2) { $deep_minimum = 2; }
     $command = "$stacktool ";
     $command .= " -pretend " if defined $debug;
@@ -1079 +1080 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform stacktool -definebyquery: $error_code", $lap_id);
-    }
-    my $stacks_made_deep .= $mdcParser->parse_list(join "", @$stdout_buf) or
+        &my_die("Unable to perform stacktool -definebyquery: $error_code :: $command", $lap_id);
+    }
+    my $stacks_made_deep = $mdcParser->parse_list(join "", @$stdout_buf) or
         &my_die("unable to parse metadata from stacktool -definebyquery", $lap_id, "");    
 
     # Append deep stacks to stacks so we can get a complete count later.
-    push @{ $stacks_made}, @{ $stacks_made_deep };
+    push @{ $stacks_made }, @{ $stacks_made_deep };
     
     ## Determine the sass_id so we can record it in the database.
@@ -1449 +1450 @@
 
     my @clean_modes = (
-#       'chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -chip_id @CHIP_ID@',
+        'chiptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -chip_id @CHIP_ID@',
 #       'warptool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -warp_id @WARP_ID@',
         'difftool -dbname @DBNAME@ -updaterun -set_state goto_cleaned -set_label goto_cleaned -label @LABEL@ -diff_id @DIFF_ID@',