Changeset 32676 for trunk/ppSub/src/ppSubMatchPSFs.c

Timestamp:

Nov 16, 2011, 10:48:28 AM (14 years ago)

Author:

eugene

Message:

ppSubMakePSF needs to copy the detections from the input cmf file source to the detection image (minuend) if no convolution is selected (if convolution is selected, this operation takes place in ppSubMatchPSFs before the psf match is done)

File:

• trunk/ppSub/src/ppSubMatchPSFs.c (modified) (3 diffs)

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -201 +201 @@
 bool ppSubMatchPSFs(ppSubData *data)
 {
+    bool mdok = false;
+
     psAssert(data, "Require processing data");
     pmConfig *config = data->config;    // Configuration
@@ -208 +210 @@
     psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSUB_RECIPE); // Recipe for ppSim
     psAssert(recipe, "We checked this earlier, so it should be here.");
+
+    bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
+    if (noConvolve) {
+        psWarning("not matching PSFs because NOCONVOLVE is TRUE\n");
+        return true;
+    }
 
     pmFPAview *view = ppSubViewReadout(); // View to readout
@@ -228 +236 @@
         psFree(refConv);
     }
-
-    bool mdok;                          // Status of MD lookup
 
     // Load pre-calculated kernel, if available