Changeset 32676 for trunk/ppSub/src/ppSubMakePSF.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/ppSubMakePSF.c (modified) (1 diff)

trunk/ppSub/src/ppSubMakePSF.c

@@ -46 +46 @@
     bool noConvolve = psMetadataLookupBool(&mdok, recipe, "NOCONVOLVE"); // Do not use convolved images.
 
-    if (!noConvolve) {
-      printf("Using Convolved images because NOCONVOLVE is FALSE\n");
-      if (reverse) {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF.CONV");
-      } else {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT.CONV");
-      }
-    }
-    else {
-      psWarning("Not using Convolved images because NOCONVOLVE  is TRUE\n");
-      if (reverse) {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF");
-      } else {
-        minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT");
-        minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT");
-      }
+    if (noConvolve) {
+        // if we do not convolve, we need to copy the detections to the image for analysis
+        pmReadout *psfSourcesRO = NULL; // readout containing loaded sources for psf model
+        psWarning("Not using Convolved images because NOCONVOLVE  is TRUE\n");
+        if (reverse) {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF");
+            psfSourcesRO = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.SOURCES");
+        } else {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT");
+            psfSourcesRO = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.SOURCES");
+        }
+        psAssert (psfSourcesRO, "missing readout with sources");
+        pmDetections *psfDetections = psMetadataLookupPtr(&mdok, psfSourcesRO->analysis,  "PSPHOT.DETECTIONS");
+        psMetadataAddPtr(minuend->analysis,  PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "Merged source list", psfDetections);
+    } else {
+        printf("Using Convolved images because NOCONVOLVE is FALSE\n");
+        if (reverse) {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.REF.CONV");
+        } else {
+            minuend = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
+            minuendFile = psMetadataLookupPtr(&mdok, config->files, "PPSUB.INPUT.CONV");
+        }
     }