Changeset 32694 for branches/eam_branches/ipp-20111110/ippScripts

Timestamp:

Nov 17, 2011, 2:02:08 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111110

Files:

• . (modified) (1 prop)
• ippScripts/scripts/diff_skycell.pl (modified) (1 diff)
• ippScripts/scripts/dist_defineruns.pl (modified) (1 diff)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 diff)
• ippScripts/scripts/magic_destreak_revert.pl (modified) (1 diff)

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

@@ -289 +289 @@
     }
 
-    if (!$ipprc->file_exists($configuration)) {
-       print STDERR "WARNING: Config dump file $configuration is missing. Using current recipes and file rules.\n";
-       $configuration = undef;
-    }
     # use WARPSTATS if we're updating, as we don't care about the new stuff from the STACK and DIFF STATS recipes
     $recipe_ppstats = 'WARPSTATS';

branches/eam_branches/ipp-20111110/ippScripts/scripts/dist_defineruns.pl

@@ -88 +88 @@
     push @stages, $stage;
 } else {
-    @stages = qw( raw chip chip_bg camera fake warp warp_bg diff stack SSdiff sky);
+    @stages = qw(chip chip_bg camera fake warp warp_bg diff stack SSdiff sky);
 }
 

branches/eam_branches/ipp-20111110/ippScripts/scripts/magic_destreak.pl

@@ -221 +221 @@
         my $command = "$magicdstool -magic_ds_id $magic_ds_id -getskycells";
         $command .= " $skycell_args";
+        $command .= " -dbname $dbname" if $dbname;
         my @diff_components;
         if ($mismatched_tess) {

branches/eam_branches/ipp-20111110/ippScripts/scripts/magic_destreak_revert.pl

@@ -511 +511 @@
     my $command = "$magicdstool -updaterun";
     $command   .= " -magic_ds_id $magic_ds_id";
-    $command   .= " -set_state failed_revert";
+    if ($run_state ne 'update') {
+        $command .= " -set_state failed_revert";
+    } else {
+        $command .= " -set_state failed_revert_ud";
+    }
     $command   .= " -dbname $dbname" if defined $dbname;