Changeset 26567 for trunk/ippScripts/scripts

Timestamp:

Jan 12, 2010, 2:07:51 PM (17 years ago)

Author:

bills

Message:

Make update processing compatible with magic. Fix some bugs in update for the warp stage
Make script changes to implement update for diff stage.
Change value of 'magicked' in the various runs and files to contain the value
the magic_id of the magicRun that corresponds to the streaks file used for desreaking.

Location:

trunk/ippScripts/scripts

Files:

• chip_imfile.pl (modified) (2 diffs)
• diff_skycell.pl (modified) (11 diffs)
• warp_skycell.pl (modified) (2 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -53 +53 @@
     'reduction=s'       => \$reduction, # Reduction class
     'run-state=s'       => \$run_state, # current state of the run (new, update)
-    'magicked'          => \$magicked,  # magicked state of input file
+    'magicked=s'        => \$magicked,  # magicked state of input file
     'deburned=s'        => \$deburned,  # does deburned image exist?
     'threads=s'         => \$threads,   # Number of threads to use for ppImage
@@ -411 +411 @@
     $command .= " -uri $outputImage";
     $command .= " -path_base $outroot";
-    $command .= " -magicked" if $magicked;
+    $command .= " -magicked $magicked" if $magicked;
     $command .= " -hostname $host" if defined $host;
     $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/diff_skycell.pl

@@ -35 +35 @@
 }
 
-my ($diff_id, $dbname, $threads, $outroot, $reduction, $inverse, $verbose, $no_update, $no_op, $redirect);
+my ($diff_id, $dbname, $threads, $outroot, $reduction, $inverse, $run_state, $verbose, $no_update, $no_op, $redirect);
 my ($skycell_id, $diff_skyfile_id);
 GetOptions(
@@ -43 +43 @@
     'dbname|d=s'        => \$dbname, # Database name
     'threads=s'         => \$threads,   # Number of threads to use
+    'run-state=s'       => \$run_state,   # state for run: 'new' or 'update'
     'outroot=s'         => \$outroot, # Output root name
     'inverse'           => \$inverse, # Make inverse subtraction?
@@ -54 +55 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --diff_id --skycell_id --outroot",
+    -msg => "Required options: --diff_id --skycell_id --outroot --run-state",
     -exitval => 3,
           ) unless defined $diff_id
     and defined $skycell_id
     and defined $diff_skyfile_id
+    and defined $run_state
     and defined $outroot;
 
@@ -66 +68 @@
 # my $logDest = $ipprc->filename("LOG.EXP", $outroot);
 my $logDest = "$outroot.log";
+$logDest .= ".update" if $run_state eq "update";
 $ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR ) if $redirect;
 
@@ -155 +158 @@
 # The output file will be considered magicked if the input has been magicked and the
 # template is either a stack or a warp that has been magicked.
-# note that difftool -inputskyfile outputs the magicked boolean as an int not T or F
-# because the output is constructed from a union of two selects
-my $magicked = $inputMagic && $templateMagic;
+my $magicked = $inputMagic && $templateMagic ? $inputMagic : 0;
 
 # Recipes to use based on reduction class
@@ -212 +213 @@
 my $outputStats = $ipprc->filename("SKYCELL.STATS", $outroot);
 my $traceDest = $ipprc->filename("TRACE.EXP", $outroot);
+
+if ($run_state eq 'update') {
+    $traceDest .= '.update';
+    $outputStats .= '.update';
+}
 
 my ($inverseName, $inverseMask, $inverseVariance, $inverseSources);
@@ -236 +242 @@
     $command .= " -stats $outputStats";
     $command .= " -threads $threads" if defined $threads;
+    my $configurationReal = $ipprc->file_resolve($configuration);
+    if ($run_state eq "new") {
+        $command .= " -dumpconfig $configurationReal";
+    } else {
+        $command .= " -ipprc $configurationReal";
+    }
     $command .= " -recipe PPSUB $recipe_ppSub";
     $command .= " -recipe PSPHOT $recipe_psphot";
@@ -245 +257 @@
     $command .= " -inverse" if $inverse;
     $command .= " -tracedest $traceDest -log $logDest";
-    $command .= " -dumpconfig $configuration";
     $command .= " -dbname $dbname" if defined $dbname;
     $command .= " -image_id $diff_skyfile_id" if defined $diff_skyfile_id;
@@ -295 +306 @@
     # Add the subtraction result
     {
-        my $command = "$difftool -adddiffskyfile -diff_id $diff_id -skycell_id $skycell_id -path_base $outroot";
-        $command .= " $cmdflags";
-        $command .= " -magicked" if $magicked;
-        $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
-        $command .= " -hostname $host" if defined $host;
+        my $command = "$difftool -diff_id $diff_id -skycell_id $skycell_id";
+        $command .= " -magicked $magicked" if $magicked;
+        if ($run_state eq 'new') {
+            $command .= " -adddiffskyfile -path_base $outroot";
+            $command .= " $cmdflags";
+            $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
+            $command .= " -hostname $host" if defined $host;
+        } else {
+            $command .= " -tofullskyfile";
+        }
         $command .= " -dbname $dbname" if defined $dbname;
 
@@ -306 +322 @@
         unless ($success) {
             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform difftool -adddiffskyfile: $error_code", $diff_id, $skycell_id, $error_code);
+            my $err_message = $run_state eq "update" ? 
+                "Unable to perform difftool -adddiffskyfile" :
+                "Unable to perform difftool -tofullskyfile";
+            &my_die("$err_message: $error_code", $diff_id, $skycell_id, $error_code);
         }
     }
@@ -323 +342 @@
     warn($msg);
     if (defined $diff_id and defined $skycell_id and not $no_update) {
-        my $command = "$difftool -adddiffskyfile -diff_id $diff_id -skycell_id $skycell_id -fault $exit_code";
-        $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
-        $command .= " -hostname $host" if defined $host;
-        $command .= " -path_base $outroot" if defined $outroot;
-        $command .= " -dbname $dbname" if defined $dbname;
+        my $command = "$difftool -diff_id $diff_id -skycell_id $skycell_id -fault $exit_code";
+        if ($run_state eq 'new') {
+            $command .= " -adddiffskyfile";
+            $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
+            $command .= " -hostname $host" if defined $host;
+            $command .= " -path_base $outroot" if defined $outroot;
+            $command .= " -dbname $dbname" if defined $dbname;
+        } else {
+            $command .= " -updatediffskyfile";
+        }
         run(command => $command, verbose => $verbose);
     }

trunk/ippScripts/scripts/warp_skycell.pl

@@ -48 +48 @@
     'threads=s'           => \$threads,   # Number of threads to use for pswarp
     'run-state=s'         => \$run_state,  # 'new' or 'update'
-    'magicked'            => \$magicked,  # input run has been magicked already?
+    'magicked=s'          => \$magicked,  # input run has been magicked already?
     'verbose'             => \$verbose,   # Print to stdout
     'no-update'           => \$no_update, # Don't update the database?
@@ -276 +276 @@
             $command .= " -tess_id $tess_dir";
             $command .= " -path_base $outroot"; # needed for logfile lookups
-            $command .= " -magicked" if $magicked;
+            $command .= " -magicked $magicked" if $magicked;
 
             $command .= " -uri $outputImage" if !$quality;