Changeset 35809 for trunk/ippScripts

Timestamp:

Jul 12, 2013, 2:19:29 PM (13 years ago)

Author:

watersc1

Message:

Changes from test tag that were needed for PV2_SAS

Location:

trunk/ippScripts/scripts

Files:

• chip_imfile.pl (modified) (2 diffs, 1 prop)
• lap_science.pl (modified) (3 diffs, 1 prop)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -235 +235 @@
         if ($dump_config || rerun_photometry($outroot, $class_id)) {
             carp "Will rerun photometry\n";
+            if ($update_mode) {
+                carp "Sorry, update_mode = 1. Will NOT rerun photometry\n";
+                $do_photom = 0;
+            }
         } else {
             $do_photom = 0;
@@ -492 +496 @@
     if ($no_compress_image) {
         $command .= " -R PPIMAGE.CHIP FITS.TYPE NONE";
+    }
+    if ($run_state eq 'update') {
+        $command .= " -Db PPIMAGE:MASK.STATS FALSE ";
     }
     $command .= $burntoolArguments if $burntoolArguments;

trunk/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.  
 
@@ -1025 +1025 @@
 #    $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 +1106 @@
 #    $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 ";