Changeset 25518

Timestamp:

Sep 23, 2009, 3:49:17 PM (17 years ago)

Author:

Paul Price

Message:

Don't require PSF generation in pswarp. It's not required for PR images, where we don't need the PSF for the stack (because we're not going to convolve).

Location:

trunk

Files:

• ippScripts/scripts/warp_skycell.pl (modified) (3 diffs)
• ippconfig/recipes/pswarp.config (modified) (1 diff)
• pswarp/src/pswarpArguments.c (modified) (1 diff)
• pswarp/src/pswarpLoop.c (modified) (2 diffs)

trunk/ippScripts/scripts/warp_skycell.pl

@@ -183 +183 @@
 close $astromFile;
 
+# We need the recipe to determine if we care whether the PSF is generated or not
+my $recipe;
+{
+    my $command = "$ppConfigDump -camera $camera -dump-recipe PSWARP -recipe PSWARP $recipe_pswarp -";
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => $verbose);
+    unless ($success) {
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform ppConfigDump: $error_code", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR);
+    }
+    $recipe = $mdcParser->parse(join "", @$stdout_buf) or
+        &my_die("Unable to parse metadata config doc", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR);
+}
+
 
 # Run pswarp
@@ -201 +215 @@
     $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";
     $command .= " -threads $threads" if defined $threads;
@@ -253 +266 @@
             &my_die("Couldn't find expected output file: $outputWeight", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
             &my_die("Couldn't find expected output file: $outputSources", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
-            &my_die("Couldn't find expected output file: $outputPSF", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputPSF);
+            &my_die("Couldn't find expected output file: $outputPSF", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) if metadataLookupBool($recipe, 'PSF') and not $ipprc->file_exists($outputPSF);
         }
 

trunk/ippconfig/recipes/pswarp.config

@@ -10 +10 @@
 ACCEPT.FRAC             F32     0.1             # Minimum fraction of good pixels to accept result
 INTERPOLATION.NUM       S32     1000            # Number of interpolation kernels to pre-calculate
+PSF                     BOOL    TRUE            # Measure PSF for warped image?
 
 # Default recipe for warping

trunk/pswarp/src/pswarpArguments.c

@@ -74 +74 @@
     pswarpSetThreads ();
 
-    // PSF determination?
-    if ((N = psArgumentGet(argc, argv, "-psf"))) {
-        psArgumentRemove(N, &argc, argv);
-        psMetadataAddBool(config->arguments, PS_LIST_TAIL, "PSF", 0, "Do PSF determination?", true);
-    }
     if ((N = psArgumentGet(argc, argv, "-dumpconfig"))) {
         psArgumentRemove(N, &argc, argv);

trunk/pswarp/src/pswarpLoop.c

@@ -16 +16 @@
 
 #define WCS_NONLIN_TOL 0.001            // Non-linear tolerance for header WCS
-#define PSPHOT_FIND_PSF 1               // Use psphot's findPSF function?
 #define TESTING 0                       // Testing output?
 
@@ -380 +379 @@
     // that's going to be tricky.  We have a list of sources, so we use those to redetermine the PSF model.
 
-    if (psMetadataLookupBool(&mdok, config->arguments, "PSF")) {
+    if (psMetadataLookupBool(&mdok, recipe, "PSF")) {
         fileActivation(config, photFiles, true);
         ioChecksBefore(config);