Changeset 29124 for branches/eam_branches/ipp-20100823/ippScripts

Timestamp:

Sep 7, 2010, 9:16:10 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100823

Files:

• . (modified) (1 prop)
• ippScripts/scripts/automate_stacks.pl (modified) (2 diffs)
• ippScripts/scripts/dist_bundle.pl (modified) (1 diff)
• ippScripts/scripts/dist_defineruns.pl (modified) (1 diff)
• ippScripts/scripts/magic_destreak_cleanup.pl (modified) (7 diffs)
• ippScripts/scripts/staticsky.pl (modified) (2 diffs)

branches/eam_branches/ipp-20100823/ippScripts/scripts/automate_stacks.pl

@@ -123 +123 @@
     defined $queue_chips or defined $queue_stacks or $queue_sweetspot or $queue_detrends or $queue_dqstats or 
     defined $check_chips or defined $check_stacks or $check_sweetspot or $check_detrends or $check_dqstats or
-    defined $test_mode or defined $clean_old or defined $check_mode;
+    defined $test_mode or defined $clean_old or defined $check_mode or
+    defined $confirm_stacks;
 
 # Configurable parameters from our config file.
@@ -1271 +1272 @@
                     print STDERR "confirm_stacks: Target $target on $date is not done stacking. $Nstacks $Nattempted\n"
                 }
+                if ($metadata_out{nsState} eq 'CONFIRM_STACKING') {
+                    $metadata_out{nsState} = 'STACKING';
+                }
+                    
                 next;
             }
-            if (defined($pretend)) {
-                add_to_macro_list('check_confirm_stacks',$stackable_list{$target},$date,$target);
-            }
-            else {
-                add_to_macro_list('confirm_stacks',$stackable_list{$target},$date,$target);
+            if ($metadata_out{nsState} eq 'CONFIRM_STACKING') {
+                if (defined($pretend)) {
+                    add_to_macro_list('check_confirm_stacks',$stackable_list{$target},$date,$target);
+                }
+                else {
+                    add_to_macro_list('confirm_stacks',$stackable_list{$target},$date,$target);
+                }
             }
         }

branches/eam_branches/ipp-20100823/ippScripts/scripts/dist_bundle.pl

@@ -154 +154 @@
 #   2. magic is not required for this distRun
 #   3. the processing for the component produced no images (warp or diff with bad quality for example)
-my $nan_masked_pixels = ! ($clean || (($stage eq "camera") || ($stage eq 'fake') || ($stage eq 'stack')) || $no_magic || $poor_quality);
+my $nan_masked_pixels = ! ($clean || (($stage eq "camera") || ($stage eq 'fake') || ($stage eq 'stack') || ($stage eq 'sky')) || $no_magic || $poor_quality);
 
 my ($image, $mask, $variance);

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

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

branches/eam_branches/ipp-20100823/ippScripts/scripts/magic_destreak_cleanup.pl

@@ -38 +38 @@
 
 # Parse the command-line arguments
-my ($magic_ds_id, $camera);
+my ($magic_ds_id, $camera, $stage);
 my ($dbname, $save_temps, $verbose, $no_update, $no_op, $logfile);
 
@@ -44 +44 @@
            'magic_ds_id=s'  => \$magic_ds_id,# Magic destreak run identifier
            'camera=s'       => \$camera,     # camera for evaluating file rules
+           'stage=s'        => \$stage,     # camera for evaluating file rules
            'save-temps'     => \$save_temps, # Save temporary files?
            'dbname=s'       => \$dbname,     # Database name
@@ -56 +57 @@
            -exitval => 3) unless
     defined $magic_ds_id and
-    defined $camera;
-#    defined $stage and
-#    defined $stage_id;
+    defined $camera and
+    defined $stage;
 
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $magic_ds_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
@@ -79 +79 @@
 my $dbh = DBI->connect($dsn, $dbuser, $dbpassword) or die "Cannot connect to mysql server\n";
 
-my $q1 = "SELECT magicDSRun.*, camera, camProcessedExp.path_base AS cam_path_base, camRun.reduction AS cam_reduction, magicRun.inverse"
-         . " FROM magicDSRun JOIN magicRun USING(magic_id) JOIN rawExp USING(exp_id) LEFT JOIN camProcessedExp USING(cam_id) LEFT JOIN camRun USING(cam_id)"
-         . " WHERE magic_ds_id = $magic_ds_id";
+my $q1;
+
+if ($stage ne 'diff') {
+    $q1 = "SELECT magicDSRun.*, camera, camProcessedExp.path_base AS cam_path_base, camRun.reduction AS cam_reduction"
+     . " FROM magicDSRun JOIN magicRun USING(magic_id) JOIN rawExp USING(exp_id) LEFT JOIN camProcessedExp USING(cam_id) LEFT JOIN camRun USING(cam_id)";
+} else {
+    $q1 = "SELECT magicDSRun.*, diffRun.diff_mode FROM magicDSRun JOIN diffRun ON stage_id = diffRun.diff_id AND stage = 'diff'";
+}
+$q1 .= " WHERE magic_ds_id = $magic_ds_id";
+
 my $q2 = "SELECT * from magicDSFile where magic_ds_id = $magic_ds_id";
 
@@ -89 +96 @@
 &my_die ("Unable to find magicDSRun $magic_ds_id", $magic_ds_id, $PS_EXIT_CONFIG_ERROR) if !$nrows;
 my $run = $stmt1->fetchrow_hashref();
+$stmt1->finish();
 
 my $state = $run->{state};
-my $stage = $run->{stage};
 my $stage_id = $run->{stage_id};
 my $cam_path_base = $run->{cam_path_base};
 my $cam_reduction = $run->{cam_reduction};
 $cam_reduction = 'DEFAULT' if !$cam_reduction or ($cam_reduction eq 'NULL');
-my $inverse = $run->{inverse};
+
+my $warp_warp = ($stage eq 'diff' and $run->{diff_mode} eq 1);
 
 
@@ -105 +113 @@
 &my_die("clean not allowed for raw stage, use goto_restore", $magic_ds_id, $PS_EXIT_CONFIG_ERROR) if $stage eq "raw";
 
-my $recipe_psastro = $ipprc->reduction($cam_reduction, 'PSASTRO'); # Recipe to use
-&my_die("Unrecognised PSASTRO recipe", $magic_ds_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_psastro;
+my $recipe_psastro;
+if ($stage eq 'chip') {
+    $recipe_psastro = $ipprc->reduction($cam_reduction, 'PSASTRO'); # Recipe to use
+    &my_die("Unrecognised PSASTRO recipe", $magic_ds_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe_psastro;
+}
 
 
@@ -217 +228 @@
         delete_files($rimage, $rmask, $rweight, $rsources, $rastrom, $bimage, $bmask, $bweight, $bsources, $bastrom, $bch_mask, $rch_mask);
 
-        if ($stage eq "diff" and $inverse) {
+        if ($stage eq "diff" and $warp_warp) {
             my $name = "PPSUB.INVERSE";
             if ($backup_path_base) {

branches/eam_branches/ipp-20100823/ippScripts/scripts/staticsky.pl

@@ -71 +71 @@
 $ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $sky_id, $PS_EXIT_SYS_ERROR ) if $redirect;
 
+my $traceDest      = $ipprc->filename("TRACE.EXP", $outroot);
 # my $source_id = $ipprc->source_id($dbname, $PS_TABLE_ID_STATICSKY);
 
@@ -164 +165 @@
     $command .= " -recipe PSPHOT $recipe_psphot";
     $command .= " -dumpconfig $configuration";
-    # $command .= " -tracedest $traceDest -log $logDest";
+    $command .= " -tracedest $traceDest -log $logDest";
     # $command .= " -dbname $dbname" if defined $dbname;
     # $command .= " -image_id $diff_skyfile_id" if defined $diff_skyfile_id;