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

Timestamp:

Jul 26, 2011, 3:27:44 PM (15 years ago)

Author:

watersc1

Message:

typo fix to remove warning in log output. Wildcard label to allow SAS2.12 and SAS2.123 to play together. I'll need to come up with a better solution than this. Perhaps we don't need to select the label anyway, since we're directly supplying a warp list?

File:

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

trunk/ippScripts/scripts/lap_science.pl

@@ -581 +581 @@
         if ($needs_qstack < $total_exposures * $qstack_threshold) { # Drop any exposures that are requiring the qstack
             print "STATUS: Insufficient unpaired exposures to justify quickstack.  Dropping unpaired exposures\n";
-            foreach $exposure (@lonely_exposures) {
+            foreach my $exposure (@lonely_exposures) {
                 $exposure->{data_state} = 'drop';
                 &update_this_exposure($exposure);
@@ -640 +640 @@
     my $warps = '';
     foreach $exposure (@$exposures) {
-        if (($exposure->{data_state} != 'drop')&&
+        if (($exposure->{data_state} ne 'drop')&&
             (S64_IS_NOT_NULL($exposure->{warp_id}))) {
             $warps .= " -warp_id $exposure->{warp_id} ";
@@ -657 +657 @@
     $command .= " -pretend " if defined $debug;
     $command .= " -dbname $dbname " if defined $dbname;
-    $command .= " -definebyquery -select_label $label -select_skycell_id ${proj_cell}.% -select_filter $filter ";
+    $command .= " -definebyquery -select_label ${label}% -select_skycell_id ${proj_cell}.% -select_filter $filter ";
     $command .= " -set_label ${label} -set_data_group $data_group ";
     $command .= "  -set_workdir $workdir  -set_dist_group NODIST ";
@@ -719 +719 @@
     my $warps = '';
     foreach $exposure (@$exposures) {
-        if (($exposure->{data_state} != 'drop')&&
+        if (($exposure->{data_state} ne 'drop')&&
             (S64_IS_NOT_NULL($exposure->{magicked}))&&
             (S64_IS_NOT_NULL($exposure->{warp_id}))) {
@@ -737 +737 @@
     $command .= " -pretend " if defined $debug;
     $command .= " -dbname $dbname " if defined $dbname;
-    $command .= " -definebyquery -select_label $label -select_skycell_id ${proj_cell}.% -select_filter $filter ";
+    $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 $exposure->{dist_group} ";