Changeset 27015

Timestamp:

Feb 19, 2010, 2:29:48 PM (16 years ago)

Author:

bills

Message:

output the bothways status of a run from magicdstool -torevert and
pass the value to magic_destreak_revert.pl

Location:

trunk

Files:

• ippScripts/scripts/magic_destreak_revert.pl (modified) (3 diffs)
• ippTasks/destreak.pro (modified) (2 diffs)
• ippTools/share/magicdstool_torevert_camera.sql (modified) (1 diff)
• ippTools/share/magicdstool_torevert_chip.sql (modified) (1 diff)
• ippTools/share/magicdstool_torevert_diff.sql (modified) (2 diffs)
• ippTools/share/magicdstool_torevert_raw.sql (modified) (1 diff)
• ippTools/share/magicdstool_torevert_warp.sql (modified) (1 diff)

trunk/ippScripts/scripts/magic_destreak_revert.pl

@@ -36 +36 @@
 
 # Parse the command-line arguments
-my ($magic_ds_id, $camera, $streaks, $stage, $stage_id, $component, $uri, $path_base, $inverse, $cam_path_base);
+my ($magic_ds_id, $camera, $streaks, $stage, $stage_id, $component, $uri, $path_base, $bothways, $cam_path_base);
 my ($outroot, $recoveryroot, $replace, $release, $bytes, $md5sum);
 my ($dbname, $save_temps, $verbose, $no_update, $no_op, $logfile);
@@ -51 +51 @@
            'recoveryroot=s' => \$recoveryroot,# "directory" for saving the images of excised pixels
            'replace=s'      => \$replace,    # replace the input images with the results.
+           'bothways=s'     => \$bothways,   # run has inverse files (bothways diff)
            'save-temps'     => \$save_temps, # Save temporary files?
            'dbname=s'       => \$dbname,     # Database name
@@ -193 +194 @@
 revert_files($replace, $image, $mask, $weight, $sources, $astrom, $bimage, $bmask, $bweight, $bsources, $bastrom);
 
-if ($stage eq "diff" and $inverse) {
+if ($stage eq "diff" and $bothways) {
     my $name = "PPSUB.INVERSE";
     $image  = $ipprc->filename($name, $path_base);

trunk/ippTasks/destreak.pro

@@ -411 +411 @@
 #    book getword magicDSToRevert $pageName recoveryroot -var RECROOT
     book getword magicDSToRevert $pageName re_place -var REPLACE
+    book getword magicDSToRevert $pageName bothways -var BOTHWAYS
     book getword magicDSToRevert $pageName dbname -var DBNAME
 
@@ -423 +424 @@
     end
 
-    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --outroot $OUTROOT --logfile $logfile --replace $REPLACE
+    $run = magic_destreak_revert.pl --magic_ds_id $MAGIC_DS_ID --camera $CAMERA --stage $STAGE --stage_id $STAGE_ID --component $COMPONENT --path_base $PATH_BASE --cam_path_base $CAM_PATH_BASE --outroot $OUTROOT --logfile $logfile --replace $REPLACE --bothways $BOTHWAYS
 
     add_standard_args run

trunk/ippTools/share/magicdstool_torevert_camera.sql

@@ -11 +11 @@
     camProcessedExp.path_base,
     camProcessedExp.path_base AS cam_path_base,
+    0 AS bothways,
     0 AS bytes,
     0 AS md5sum

trunk/ippTools/share/magicdstool_torevert_chip.sql

@@ -11 +11 @@
     chipProcessedImfile.path_base,
     camProcessedExp.path_base AS cam_path_base,
+    0 AS bothways,
     0 AS bytes,
     0 AS md5sum

trunk/ippTools/share/magicdstool_torevert_diff.sql

@@ -11 +11 @@
     diffSkyfile.path_base,
     "NULL" AS cam_path_base,
+    CAST(diffRun.bothways AS SIGNED) AS bothways,
     0 AS bytes,
     0 AS md5sum
@@ -17 +18 @@
     JOIN magicDSFile USING(magic_ds_id)
     JOIN diffSkyfile ON (stage_id = diffSkyfile.diff_id AND component = skycell_id)
+    JOIN diffRun ON diffSkyfile.diff_id = diffRun.diff_id
     JOIN rawExp USING(exp_id)
 WHERE magicDSRun.stage = 'diff'

trunk/ippTools/share/magicdstool_torevert_raw.sql

@@ -11 +11 @@
     rawImfile.uri AS path_base,
     NULL AS cam_path_base,
+    0 AS bothways,
     bytes,
     md5sum

trunk/ippTools/share/magicdstool_torevert_warp.sql

@@ -11 +11 @@
     warpSkyfile.path_base,
     "NULL" AS cam_path_base,
+    0 AS bothways,
     0 AS bytes,
     0 AS md5sum