Changeset 32694 for branches/eam_branches/ipp-20111110/ppSub/src/ppSubMakePSF.c

Timestamp:

Nov 17, 2011, 2:02:08 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111110

Files:

• . (modified) (1 prop)
• ppSub/src/ppSubMakePSF.c (modified) (1 diff)

branches/eam_branches/ipp-20111110/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");
+        }
     }