Changeset 31530

Timestamp:

May 11, 2011, 3:15:14 PM (15 years ago)

Author:

watersc1

Message:

Fix to use new -warp_id option to stacktool to ensure that we only stack the warps that we have not previously dropped. This should prevent some of the junk from getting into the final stack.

File:

• trunk/ippScripts/scripts/lap_science.pl (modified) (4 diffs)

trunk/ippScripts/scripts/lap_science.pl

@@ -621 +621 @@
     }
 
+    my $warps = '';
+    foreach $exposure (@$exposures) {
+        if (($exposure->{data_state} != 'drop')&&
+            (S64_IS_NOT_NULL($exposure->{warp_id}))) {
+            $warps .= " -warp_id $exposure->{warp_id} ";
+        }
+    }
+
     my @utctime = gmtime();
     $utctime[5] += 1900;
@@ -636 +644 @@
     $command .= "  -set_workdir $workdir  -set_dist_group NODIST ";
     $command .= " -min_num 2 -set_reduction QUICKSTACK ";
+    $command .= " $warps ";
 
     my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -689 +698 @@
     unless (defined($label) && defined($filter) && defined($proj_cell)) {
         &my_die("Unable to perform stacktool. Insufficient information.", $lap_id);
+    }
+
+    my $warps = '';
+    foreach $exposure (@$exposures) {
+        if (($exposure->{data_state} != 'drop')&&
+            (S64_IS_NOT_NULL($exposure->{magicked}))&&
+            (S64_IS_NOT_NULL($exposure->{warp_id}))) {
+            $warps .= " -warp_id $exposure->{warp_id} ";
+        }
     }
 
@@ -704 +722 @@
     $command .= " -definebyquery -select_label $label -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     $command .= " -set_label ${label} -set_workdir $workdir -set_data_group $data_group ";
-    $command .= " -min_num 2 -set_reduction THREEPI_STACK -set_dist_group ${label}";
+    $command .= " -min_num 2 -set_reduction THREEPI_STACK -set_dist_group ${label} ";
+    $command .= " $warps ";
 
     my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =