Changeset 20301

Timestamp:

Oct 21, 2008, 3:25:14 PM (18 years ago)

Author:

Paul Price

Message:

warptool now takes a '-accept' flag if it's to be accepted. This is a
bit more intuitive from the standpoint of ppStatsFromMetadata.

File:

• trunk/ippScripts/scripts/warp_skycell.pl (modified) (3 diffs)

trunk/ippScripts/scripts/warp_skycell.pl

@@ -203 +203 @@
     if ($do_stats) {
         # Check first for the stats file, and if the ACCEPT flag is set.
-        my $outputStatsReal = $ipprc->file_resolve($outputStats);
+        my $outputStatsReal = $ipprc->file_resolve($outputStats);
         &my_die("Couldn't find expected output file: $outputStats", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
 
-        # measure chip stats
-        $command = "$ppStatsFromMetadata $outputStatsReal - WARP_SKYCELL";
-        ( $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 ppStatsFromMetadata: $error_code", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR);
-        }
-        foreach my $line (@$stdout_buf) {
-            $cmdflags .= " $line";
-        }
-        chomp $cmdflags;
-
-        # the stats includes ACCEPT as a boolean: convert the T/F value to 0/1
-        my $acceptFlag = &value_for_flag ($cmdflags, "-accept");
-        $accept = ($acceptFlag eq "T") ? 1 : 0;
-        if ($accept && !$ipprc->file_exists($outputPSF)) {
-            $accept = 0;
-        }
-
-        if ($accept) {
+        # measure chip stats
+        $command = "$ppStatsFromMetadata $outputStatsReal - WARP_SKYCELL";
+        ( $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 ppStatsFromMetadata: $error_code", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR);
+        }
+        foreach my $line (@$stdout_buf) {
+            $cmdflags .= " $line";
+        }
+        chomp $cmdflags;
+
+        if ($cmdflags =~ /-accept/) {
             &my_die("Couldn't find expected output file: $outputImage", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputImage);
             &my_die("Couldn't find expected output file: $outputMask", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
@@ -240 +233 @@
             $command .= " -tess_id $tess_dir";
             $command .= " -path_base $outroot"; # needed for logfile lookups
-            $command .= " -ignore"           if not $accept; # Completed succesfully, but can't produce product
+
             $command .= " -uri $outputImage" if $accept;
             $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
@@ -272 +265 @@
         }
     }
-}
-
-sub value_for_flag
-{
-    my $cmdflags = shift;
-    my $flag = shift;
-
-    my $value = 0.0;
-    if ($cmdflags =~ m|$flag|) {
-        ($value) = $cmdflags =~ m|$flag\s+(\S+)|;
-    }
-    $value;
 }