Changeset 36072 for branches/eam_branches/ipp-20130711/ippScripts/scripts/lap_science.pl

Timestamp:

Aug 30, 2013, 4:52:14 PM (13 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20130711/ippScripts/scripts/lap_science.pl (modified) (9 diffs, 1 prop)

branches/eam_branches/ipp-20130711/ippScripts/scripts/lap_science.pl

@@ -33 +33 @@
 # Global configuration constants that probably should be read from elsewhere.  
 my $qstack_threshold     = 0.05; # Only make a quickstack if more than 5% of the exposures require it.
-my $minimum_stack_inputs = 4;    # We can avoid magicking stack inputs if we have more than this number.
+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.  
 
@@ -309 +309 @@
     my $magicDS_update_cmd  = "magicdstool -setfiletoupdate -magic_ds_id $chip_magicDS_id -set_label $label";
     $magicDS_update_cmd    .= " -dbname $dbname " if defined $dbname;
+    my $warptool_preupdate_cmd = "warptool -revertwarped -warp_id $warp_id -fault 26";
+    $warptool_preupdate_cmd .= " -dbname $dbname " if defined $dbname;
     my $warptool_update_cmd = "warptool -setskyfiletoupdate -warp_id $warp_id -set_label $label";
     $warptool_update_cmd   .= " -dbname $dbname " if defined $dbname;
@@ -314 +316 @@
     # only need to update the data if the warps are not full
     if ($warp->{state} ne 'full') { 
-        if ($chip->{state} eq 'cleaned') {
+        if (($chip->{state} eq 'cleaned')||  # Exposure is cleaned
+            (($chip->{state} eq 'update')&&($chip->{label} ne $label))) {  # Exposure is owned by an interloper.
             ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
                 run(command => $chiptool_update_cmd, verbose => $verbose);
@@ -341 +344 @@
         }
 
+
+        ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $warptool_preupdate_cmd, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform warptool --revertwarped: $error_code", $exposure->{exp_id}, $data_group);
+        }
+
         ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $warptool_update_cmd, verbose => $verbose);
@@ -364 +375 @@
     if (S64_IS_NOT_NULL($exposure->{chip_id})) {
         if (($exposure->{chip_state} eq 'cleaned')||
+            ($exposure->{chip_state} eq 'update')||
             ($exposure->{chip_state} eq 'goto_cleaned')||
             ($exposure->{chip_state} eq 'error_cleaned')) {
@@ -777 +789 @@
 #           $can_qstack ++;
             $can_diff ++;
-            $exposure->{data_state} = 'to_diff';
+            ## BEGIN These two disable LAP stacks
+            $are_magicked = $total_exposures;
+            $have_diff ++;
+            ## END
+#           $exposure->{data_state} = 'to_diff';
+            $exposure->{data_state} = 'full';
         }
         if (($exposure->{diff_id})&&
@@ -858 +875 @@
                     }
                 }
-                elsif ($are_magicked == $total_exposures) { # We have made all of the diffs, and propagated through magic
+                elsif ($are_magicked >= $total_exposures) { # We have made all of the diffs, and propagated through magic
                     print "STATUS: We would create all remaining stacks possible, but no longer require magic.\n";
 #                   my $Nstacks_made = -1;
@@ -1025 +1042 @@
 #    $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 -set_dist_group $exposure->{dist_group} ";
+    $command .= " -min_num ${minimum_stack_inputs} -set_reduction THREEPI_STACK_1DG -set_dist_group $exposure->{dist_group} ";
     $command .= " $warps ";
 
@@ -1106 +1123 @@
 #    $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 2 -min_new 2 -set_reduction THREEPI_STACK -set_dist_group $exposure->{dist_group} ";
+    $command .= " -min_num 2 -min_new 2 -set_reduction THREEPI_STACK_1DG -set_dist_group $exposure->{dist_group} ";
     $command .= " $warps ";