Changeset 36154 for branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

Timestamp:

Sep 27, 2013, 3:47:04 PM (13 years ago)

Author:

eugene

Message:

updates for psphotFullForce I/O

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

@@ -105 +105 @@
     {
         pmReadout *readoutCMF = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CMF");
-        if (!readoutCMF) goto loadTXT;
+        if (!readoutCMF) goto loadCFF;
 
         extCMF = psMetadataLookupPtr (NULL, readoutCMF->analysis, "PSPHOT.DETECTIONS");
@@ -111 +111 @@
             for (int i = 0; i < extCMF->allSources->n; i++) {
                 pmSource *source = extCMF->allSources->data[i];
+                source->mode |= PM_SOURCE_MODE_EXTERNAL;
+
+                // the supplied peak flux needs to be re-normalized
+                source->peak->rawFlux = 1.0;
+                source->peak->smoothFlux = 1.0;
+                source->peak->detValue = 1.0;
+
+                // drop the loaded source modelPSF
+                psFree (source->modelPSF);
+                source->modelPSF = NULL;
+                source->imageID = index;
+
+                psArrayAdd (detections->newSources, 100, source);
+            }
+        }
+    }
+
+loadCFF:
+    // load data from input CFF file:
+    {
+        pmReadout *readoutCFF = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CFF");
+        if (!readoutCFF) goto loadTXT;
+
+        extCFF = psMetadataLookupPtr (NULL, readoutCFF->analysis, "PSPHOT.DETECTIONS");
+        if (extCFF) {
+            for (int i = 0; i < extCFF->allSources->n; i++) {
+                pmSource *source = extCFF->allSources->data[i];
                 source->mode |= PM_SOURCE_MODE_EXTERNAL;