Changeset 21251

Timestamp:

Feb 1, 2009, 11:49:16 AM (17 years ago)

Author:

eugene

Message:

split psphotDetectionsFromSources from psphotLoadPSFSources

File:

• trunk/psphot/src/psphotMergeSources.c (modified) (2 diffs)

trunk/psphot/src/psphotMergeSources.c

@@ -56 +56 @@
 }
 
-pmDetections *psphotLoadPSFSources (pmConfig *config, const pmFPAview *view) {
+// extract the input sources corresponding to this readout
+psArray *psphotLoadPSFSources (pmConfig *config, const pmFPAview *view) {
 
     // find the currently selected readout
@@ -65 +66 @@
     }
 
-    pmDetections *detections = pmDetectionsAlloc();
-
     psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
     if (!sources) {
         psLogMsg ("psphot", 3, "no psf sources for this readout");
-        return detections;
     }
+
+    return sources;
+}
+
+// generate the detection structure for the supplied array of sources
+pmDetections *psphotDetectionsFromSources (pmConfig *config, psArray *sources) {
+
+    pmDetections *detections = pmDetectionsAlloc();
 
     detections->peaks = psArrayAllocEmpty(100);