Changeset 29098

Timestamp:

Sep 1, 2010, 2:05:56 PM (16 years ago)

Author:

bills

Message:

from trunk. Fix destreak cleanup for diff stage. We were missing the inverse images

Location:

tags/ipp-20100823

Files:

• ippScripts/scripts/magic_destreak_cleanup.pl (modified) (7 diffs, 1 prop)
• ippTasks/destreak.pro (modified) (2 diffs, 1 prop)
• ippTools/share/magicdstool_tocleanup.sql (modified) (2 diffs, 1 prop)

tags/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) {

tags/ipp-20100823/ippTasks/destreak.pro

@@ -600 +600 @@
     book getword magicDSToCleanup $pageName magic_ds_id -var MAGIC_DS_ID
     book getword magicDSToCleanup $pageName camera -var CAMERA
-    book getword magicDSToCleanup $pageName outroot -var OUTROOT
+    book getword magicDSToCleanup $pageName stage -var STAGE
     book getword magicDSToCleanup $pageName dbname -var DBNAME
 
@@ -607 +607 @@
     host anyhost
 
-    $run = magic_destreak_cleanup.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --logfile $logfile
+    $run = magic_destreak_cleanup.pl --magic_ds_id $MAGIC_DS_ID --stage $STAGE --camera $CAMERA --logfile $logfile
 
     add_standard_args run

tags/ipp-20100823/ippTools/share/magicdstool_tocleanup.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    stage,
     magicDSRun.state,
     magicDSRun.outroot,
@@ -9 +10 @@
 WHERE magicDSRun.state = 'goto_cleaned'
 -- XXX: need to add fault to magicDSRun
+-- XXX: the database has been updated, but fault isn't yet used
 --    AND magicDSRun.fault = 0