Changeset 25027 for branches/pap/ippScripts/scripts/warp_skycell.pl

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ippScripts/scripts/warp_skycell.pl (modified) (10 diffs)

branches/pap/ippScripts/scripts/warp_skycell.pl

@@ -36 +36 @@
 }
 
-my ($warp_id, $skycell_id, $warp_skyfile_id, $tess_dir, $camera, $dbname, $outroot, $threads, $run_state, $magicked, $verbose, $no_update, $no_op, $redirect, $save_temps);
+my ($warp_id, $skycell_id, $warp_skyfile_id, $tess_dir, $reduction, $camera, $dbname, $outroot, $threads, $run_state, $magicked, $verbose, $no_update, $no_op, $redirect, $save_temps);
 GetOptions(
     'warp_id|i=s'         => \$warp_id, # Warp identifier
@@ -44 +44 @@
     'camera|c=s'          => \$camera, # Camera name
     'dbname|d=s'          => \$dbname, # Database name
+    'reduction=s'         => \$reduction, # Reduction class
     'outroot=s'           => \$outroot, # Output root name
     'threads=s'           => \$threads,   # Number of threads to use for pswarp
@@ -57 +58 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --warp_id --skycell_id --tess_dir --camera --outroot --run-state",
+    -msg => "Required options: --warp_id --warp_skyfile_id --skycell_id --tess_dir --camera --outroot --run-state",
     -exitval => 3,
 ) unless defined $warp_id
@@ -74 +75 @@
 $ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR ) if $redirect;
 
+# Recipes to use based on reduction class
+$reduction = 'DEFAULT' unless defined $reduction;
+my $recipe_pswarp = $ipprc->reduction($reduction, 'WARP_PSWARP'); # Recipe to use for ppImage
+unless ($recipe_pswarp) {
+    &my_die("Couldn't find selected reduction for WARP_PSWARP: $reduction\n", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_CONFIG_ERROR);
+}
+
 my $source_id = $ipprc->source_id($dbname, $PS_TABLE_ID_WARP);
 
@@ -81 +89 @@
 {
     # XXX change -tess_id to -tess_dir when db schema is updated
-    my $command = "$warptool -scmap -warp_id $warp_id -skycell_id $skycell_id -tess_id $tess_dir";
+    my $command = "$warptool -scmap";
+    $command .= " -warp_id $warp_id";
+    $command .= " -skycell_id $skycell_id";
+    # $command .= " -tess_id $tess_dir";  XXX I don't think this is necessary or useful
     $command .= " -dbname $dbname" if defined $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -99 +110 @@
 my $astromSource;               # The astrometry source
 {
-    my $command = "$ppConfigDump -camera $camera -dump-recipe PSWARP -";
+    my $command = "$ppConfigDump -camera $camera -recipe PSWARP $recipe_pswarp -dump-recipe PSWARP -";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
@@ -189 +200 @@
     $command .= " -F SOURCE.PLOT.PSFMODEL SOURCE.PLOT.SKY.PSFMODEL";
     $command .= " -F SOURCE.PLOT.APRESID SOURCE.PLOT.SKY.APRESID";
+    $command .= " -recipe PSWARP $recipe_pswarp";
     $command .= " -psf";        # Turn on PSF determination
     $command .= " -tracedest $traceDest -log $logDest";
@@ -199 +211 @@
         $do_stats = 1;
     } else {
-        $command .= " -ipprc $configuration";
+        #$command .= " -ipprc $configuration";
+        my $resolved = $ipprc->file_resolve($configuration);
+        $command .= " -ipprc $resolved";
     }
     if ($do_stats) {
@@ -303 +317 @@
             $command .= " -path_base $outroot";
             $command .= " -hostname $host" if defined $host;
+            $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
         } else {
             $command .= " -updateskyfile";
@@ -308 +323 @@
         $command .= " -warp_id $warp_id";
         $command .= " -skycell_id $skycell_id";
-        $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
         $command .= " -fault $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;