Changeset 31439 for branches/eam_branches/ipp-20110404/ippScripts/scripts/diff_skycell.pl

Timestamp:

May 5, 2011, 10:05:10 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/ippScripts/scripts/diff_skycell.pl (modified) (3 diffs)

branches/eam_branches/ipp-20110404/ippScripts/scripts/diff_skycell.pl

@@ -31 +31 @@
 my $ppSub = can_run('ppSub') or (warn "Can't find ppSub" and $missing_tools = 1);
 my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
+my $nebInsert = can_run('neb-insert') or (warn "Can't find neb-insert" and $missing_tools = 1);
 if ($missing_tools) {
     warn("Can't find required tools.");
@@ -265 +266 @@
 my $do_photom = 1;
 my $dump_config = 1; 
+if ($reduction eq 'NOCONVDIFF') {
+    $do_photom = 0;
+}
 if ($run_state eq 'new') {
     $configuration = prepare_output("PPSUB.CONFIG", $outroot, 1);
@@ -380 +384 @@
                 }
             }
+            if ($reduction eq 'NOCONVDIFF') {
+                my $refConv = prepare_output("PPSUB.REF.CONV", $outroot, 0);
+                my $templateFile = $ipprc->file_resolve($template,0);
+                $command = "$nebInsert $refConv $templateFile";
+                ( $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 neb-insert: $error_code", $diff_id, $skycell_id, $error_code);
+                }
+            }
+
+
         } elsif ($run_state eq 'update') {
             &my_die("Update resulted in poor quality image: $quality", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR);