Changeset 24951 for branches/czw_branch/cleanup/ippScripts/scripts/magic_destreak_revert.pl

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

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

branches/czw_branch/cleanup/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
@@ -70 +70 @@
     defined $outroot;
 
-# XXX: for testing
-$no_update = 1;
-
 &my_die("bytes and md5sum are is required for raw stage stage", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR) if ($stage eq 'raw' and (!$bytes or !$md5sum));
 
@@ -87 +84 @@
 if ($@ or not defined $nebulous) {
     &my_die ("Unable to create a Nebulous::Client object with proxy $nebulousServer", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
-    return undef;
 }
 
@@ -99 +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);
 }
@@ -108 +104 @@
 my $basename = basename($path_base);
 my $nebulousInput = inNebulous($dirname);
-
-# parse replace arguments check for errors and set up
-# the appropriate paths
-# this program doesn't make sense if $replace is false
-&my_die("Invalid value for replace: $replace", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR) if $replace ne "T";
 
 if (defined($replace) and ($replace eq "T")) {
@@ -120 +111 @@
 }
 
-# default value is "NULL" do not use
+&my_die("replace not allowed for non-nebulous files", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR) 
+    if ($replace eq "T") and !$nebulousInput;
+
+
+# default value is "NULL" do not use it
 if (defined($recoveryroot) and ($recoveryroot eq "NULL")) {
     $recoveryroot = undef;
@@ -135 +130 @@
     $backup_path_base = $tmproot . "$basename";
 } else {
-    # note: trailing / is necessary
+    # note: the trailing / here is necessary
     $tmproot = "$outroot/";
     $backup_path_base = $tmproot . $basename;
@@ -147 +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") {
@@ -172 +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
@@ -184 +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);
-}
-
-do_swap($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);
+}
+
 if ($mask) {
-    my $swap_result = do_swap($mask, $bmask);
-    if (! $swap_result) {
-        # delete next 5 lines
-        if ($stage eq "chip") {
-            # XXX: this is a kludge to get around my test environment
-            # Don't commit
-            print STDERR "failed to resotre camera mask file, proceeding\n";
+    if (!revert_file($mask, $bmask)) {
+        if ($stage eq 'chip') {
+            # 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 {
-        &my_die("failed to restore mask file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
-        }  # delete this line
-    }
-}
+            &my_die("failed to restore mask file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
+        }
+    }
+}
+
 if ($ch_mask) {
-    do_swap($ch_mask, $bch_mask) or
-        &my_die("failed to restore chip mask", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
+    if (!revert_file($ch_mask, $bch_mask)) {
+        &my_die("failed to restore chip mask file", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
+    }
 } 
+
+
 if ($weight) {
-    do_swap($weight, $bweight) or
+    revert_file($weight, $bweight) or
         &my_die("failed to restore variance image", $magic_ds_id, $component, $PS_EXIT_CONFIG_ERROR);
 }
 
-# now reverse the desreaked file
-# Change magicdstool to set the magicked value to zero
-# Actually we should probably do this first to insure that no data gets deleted
-# Input result into database
-if (0) {
-    # XXX: this is the wrong mode
-    my $command = "$magicdstool -adddestreakedfile";
+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);
+}
+
+# now revert the row in the database
+{
+    my $command = "$magicdstool -revertdestreakedfile";
     $command   .= " -magic_ds_id $magic_ds_id";
     $command   .= " -component $component";
-    $command   .= " -setmagicked" if $replace;
-    $command   .= " -backup_path_base $backup_path_base" if $backup_path_base;
-    $command   .= " -recovery_path_base $recovery_path_base" if $recovery_path_base;
     $command   .= " -dbname $dbname" if defined $dbname;
 
@@ -242 +253 @@
 
 
-
 ### Pau.
 
@@ -256 +266 @@
 }
 
-sub do_swap
+sub revert_file
 {
     my $original = shift;
@@ -297 +307 @@
         if ($b_path and -e $b_path) {
             print "ready to delete backup\n" if $verbose;
-            if (! $nebulous->delete($backup)) {
+            if (! $ipprc->file_delete($backup)) {
                 print "failed to delete $backup\n";
                 return 0;
@@ -307 +317 @@
         # delete the 'backup' (destreaked target) file if it exists
         if ($b_path and -e $b_path) {
-            if (! $nebulous->delete($backup)) {
+            if (! $ipprc->file_delete($backup)) {
                 print "failed to delete $backup\n";
                 return 0;
@@ -348 +358 @@
     $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
 
-    my $command = "$magicdstool -adddestreakedfile";
-    $command   .= " -magic_ds_id $magic_ds_id";
-    $command   .= " -component $component";
-    $command   .= " -fault $exit_code";
-    $command   .= " -dbname $dbname" if defined $dbname;
-
-    # Add the processed file to the database
-    unless ($no_update) {
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        unless ($success) {
-            carp("failed to update database for $magic_ds_id $component");
-        }
-    } else {
-        print "Skipping command: $command\n";
-    }
+    # we wouldn't be here unless an entry already exists in the database
+#    my $command = "$magicdstool -adddestreakedfile";
+#    $command   .= " -magic_ds_id $magic_ds_id";
+#    $command   .= " -component $component";
+#    $command   .= " -fault $exit_code";
+#    $command   .= " -dbname $dbname" if defined $dbname;
+
+#    # Add the processed file to the database
+#    unless ($no_update) {
+#        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+#            run(command => $command, verbose => $verbose);
+#        unless ($success) {
+#            carp("failed to update database for $magic_ds_id $component");
+#        }
+#    } else {
+#        print "Skipping command: $command\n";
+#    }
 
     carp($msg);