Changeset 25022 for branches/eam_branches/20090715/ippScripts/scripts/magic_destreak_revert.pl

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• ippScripts/scripts/magic_destreak_revert.pl (modified) (6 diffs, 1 prop)

branches/eam_branches/20090715/ippScripts/scripts/magic_destreak_revert.pl

@@ -60 +60 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --magic_ds_id --camera --streaks --stage --stage_id --component --uri --path_base --outroot",
+pod2usage( -msg => "Required options: --magic_ds_id --camera --stage --stage_id --component --path_base --outroot",
            -exitval => 3) unless
     defined $magic_ds_id and
@@ -95 +95 @@
 } elsif ($stage eq "diff") {
     $skycell_id = $component;
-} else {
+} elsif ($stage ne "camera") {
     &my_die("Invalid value for stage: $stage", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
 }
@@ -142 +142 @@
 
 
-my ($image, $mask, $ch_mask, $weight);
-my ($bimage, $bmask, $bch_mask, $bweight);
+my ($image, $mask, $ch_mask, $weight, $sources, $astrom);
+my ($bimage, $bmask, $bch_mask, $bweight, $bsources, $bastrom);
 
 if ($stage eq "raw") {
@@ -167 +167 @@
     $bch_mask= $ipprc->filename("PPIMAGE.CHIP.MASK", $backup_path_base, $class_id);
     $bweight = $ipprc->filename("PPIMAGE.CHIP.VARIANCE", $backup_path_base, $class_id);
+} elsif ($stage eq "camera") {
+    $astrom =  $ipprc->filename("PSASTRO.OUTPUT", $path_base);
+    $bastrom = $ipprc->filename("PSASTRO.OUTPUT", $backup_path_base);
 } elsif ($stage eq "warp") {
     $image  = $ipprc->filename("PSWARP.OUTPUT", $path_base);
     $mask   = $ipprc->filename("PSWARP.OUTPUT.MASK", $path_base);
     $weight = $ipprc->filename("PSWARP.OUTPUT.VARIANCE", $path_base);
+    $sources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $path_base);
     $bimage  = $ipprc->filename("PSWARP.OUTPUT", $backup_path_base);
     $bmask   = $ipprc->filename("PSWARP.OUTPUT.MASK", $backup_path_base);
     $bweight = $ipprc->filename("PSWARP.OUTPUT.VARIANCE", $backup_path_base);
+    $bsources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $backup_path_base);
 } elsif ($stage eq "diff") {
     my $name = $inverse ? "PPSUB.INVERSE" : "PPSUB.OUTPUT"; # Base name for images
@@ -179 +184 @@
     $mask   = $ipprc->filename("$name.MASK", $path_base);
     $weight = $ipprc->filename("$name.VARIANCE", $path_base);
+    $sources = $ipprc->filename("PPSUB.OUTPUT.SOURCES", $path_base);
     $bimage  = $ipprc->filename($name, $backup_path_base);
     $bmask   = $ipprc->filename("$name.MASK", $backup_path_base);
     $bweight = $ipprc->filename("$name.VARIANCE", $backup_path_base);
-}
-
-revert_file($image, $bimage) or
+    $bsources = $ipprc->filename("PPSUB.OUTPUT.SOURCES", $backup_path_base);
+}
+
+if ($image) {
+    revert_file($image, $bimage) or
         &my_die("failed to restore image file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
-
-# don't commit next the next couple of lines and see xxx below
-# change to if 0 to revert chip runs without masks
-if (0) {
+}
 
 if ($mask) {
     if (!revert_file($mask, $bmask)) {
         if ($stage eq 'chip') {
-            # XXX: don't fail if the mask file fails to revert. It probably doesn't exist
-            # Handle this properly
+            # don't fail if the mask file (from the camera stage) fails to revert.
+            # It probably doesn't exist
+            # XXX: Handle this properly
             print STDERR "failure to revert mask file, ignored\n";
         } else {
@@ -204 +210 @@
 
 if ($ch_mask) {
-    # Handle this properly
     if (!revert_file($ch_mask, $bch_mask)) {
-        # print STDERR "failure to revert chip mask file, ignored\n";
         &my_die("failed to restore chip mask file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
     }
 } 
 
-# xxx don't commmit next line
-}
 
 if ($weight) {
     revert_file($weight, $bweight) or
         &my_die("failed to restore variance image", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
+}
+
+if ($sources) {
+    revert_file($sources, $bsources) or
+        &my_die("failed to restore sources file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
+}
+
+if ($astrom) {
+    revert_file($astrom, $bastrom) or
+        &my_die("failed to restore astrometry file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
 }