Changeset 28442

Timestamp:

Jun 23, 2010, 3:14:44 PM (16 years ago)

Author:

Paul Price

Message:

Make output of source list for warp optional.

Location:

trunk

Files:

• ippconfig/recipes/pswarp.config (modified) (2 diffs)
• pswarp/src/pswarpParseCamera.c (modified) (4 diffs)
• pswarp/src/pswarpTransformReadout.c (modified) (1 diff)

trunk/ippconfig/recipes/pswarp.config

@@ -11 +11 @@
 INTERPOLATION.NUM       S32     1000            # Number of interpolation kernels to pre-calculate
 PSF                     BOOL    TRUE            # Measure PSF for warped image?
+SOURCES                 BOOL    TRUE            # Write source list for warped image?
 
 MASK.STATS         BOOL    TRUE            # calculate mask statistics.
@@ -27 +28 @@
         PSF     BOOL    FALSE
 END
+
+# Background restoration
+BACKGROUND      METADATA
+        SOURCES         BOOL    FALSE           # Write source list for warped image?
+        PSF             BOOL    FALSE           # Measure PSF for warped image?
+END

trunk/pswarp/src/pswarpParseCamera.c

@@ -61 +61 @@
 {
     psAssert(config, "Require configuration");
+    bool mdok;                          // Status of MD lookup
 
     // The input image(s) is required: it defines the camera
@@ -94 +95 @@
     psFree(skyConfig);
 
+    psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, PSWARP_RECIPE);
+    if (!recipe) {
+        psError(PSWARP_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
+        return false;
+    }
+
     // The output skycell
     pmFPAfile *output = pmFPAfileDefineSkycell(config, NULL, "PSWARP.OUTPUT");
@@ -118 +125 @@
     }
 
-    if (astrom) {
+    if (astrom && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
         pmFPAfile *outSources = pmFPAfileDefineSkycell(config, output->fpa, "PSWARP.OUTPUT.SOURCES");
         if (!outSources) {
@@ -127 +134 @@
     }
 
-    psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, PSWARP_RECIPE);
-    if (!recipe) {
-        psError(PSWARP_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
-        return false;
-    }
-
-    bool mdok;                          // Status of MD lookup
     if (psMetadataLookupBool(&mdok, recipe, "PSF")) {
         // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by

trunk/pswarp/src/pswarpTransformReadout.c

@@ -195 +195 @@
     psFree(interp);
 
-    if (goodPixels > 0) {
+    if (goodPixels > 0 && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
         if (!pswarpTransformSources(output, input, config)) {
             psError(psErrorCodeLast(), false, "Unable to interpolate image.");