Changeset 37403 for branches/eam_branches/ps2-tc3-20130727/ippScripts/scripts/lap_science.pl

Timestamp:

Sep 19, 2014, 4:05:27 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ippScripts/scripts/lap_science.pl (modified) (6 diffs)

branches/eam_branches/ps2-tc3-20130727/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 $do_updates_pv2       = 1;    # Do updates using the calls needed for PV2.  
+my $maximum_stack_inputs = 25;   # This is the place-holder guess on how big a stack we should process locally
+my $do_updates_pv2       = 0;    # Do updates using the calls needed for PV2.  
 
 GetOptions(
@@ -190 +191 @@
     $chip_cmd .= " -set_workdir $workdir -set_dist_group $exposure->{dist_group} ";
     $chip_cmd .= " -set_reduction LAP_SCIENCE ";
+#    $chip_cmd .= " -set_reduction LAP_POLE ";
 
     my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -1036 +1038 @@
     my $data_group = "${label}.${proj_cell}.final.${lap_id}";
 
+
+    ##
+    ## Queue the "shallow" stacks that will run at los alamos.
     my $command = "$stacktool ";
     $command .= " -pretend " if defined $debug;
@@ -1042 +1047 @@
 #    $command .= " -select_label $label "; # Removed to allow exposure sharing to work
     $command .= " -set_label ${label} -set_workdir $workdir -set_data_group $data_group ";
-    $command .= " -min_num ${minimum_stack_inputs} -set_reduction THREEPI_STACK_1DG -set_dist_group $exposure->{dist_group} ";
+    $command .= " -min_num ${minimum_stack_inputs} -max_num ${maximum_stack_inputs} -set_reduction THREEPI_STACK_1DG -set_dist_group $exposure->{dist_group} ";
     $command .= " $warps ";
 
@@ -1053 +1058 @@
     my $stacks_made = $mdcParser->parse_list(join "", @$stdout_buf) or
         &my_die("unable to parse metadata from stacktool -definebyquery", $lap_id, "");    
-    
+
+    ##
+    ## Queue the "deep" stacks that will run locally.
+    my $deep_minimum = $maximum_stack_inputs + 1;
+    $command = "$stacktool ";
+    $command .= " -pretend " if defined $debug;
+    $command .= " -dbname $dbname " if defined $dbname;
+    $command .= " -definebyquery -select_skycell_id ${proj_cell}.% -select_filter $filter ";
+#    $command .= " -select_label $label "; # Removed to allow exposure sharing to work
+    $command .= " -set_label ${label}.local -set_workdir $workdir -set_data_group $data_group ";
+    $command .= " -min_num ${deep_minimum} -set_reduction THREEPI_STACK_1DG -set_dist_group $exposure->{dist_group} ";
+    $command .= " $warps ";
+
+    ($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 -definebyquery: $error_code", $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 };
+    
+    ## Determine the sass_id so we can record it in the database.
     $command = "$stacktool ";
     $command .= " -dbname $dbname " if defined $dbname;
@@ -1415 +1445 @@
 
     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@',