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

Timestamp:

Sep 30, 2013, 5:41:48 AM (13 years ago)

Author:

eugene

Message:

getting psphotFullForce to run (not quite there)

File:

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

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

@@ -188 +188 @@
     psFree (detections);
 
-    if (!extCMF && !extSourcesTXT) {
+    if (!(extCMF || extCFF || extSourcesTXT)) {
         psLogMsg ("psphot", 3, "no external sources for this readout");
         return true;
@@ -194 +194 @@
 
     int nCMF = extCMF        ? extCMF->allSources->n        : 0;
-    int nTXT = extSourcesTXT ? extSourcesTXT->n : 0;
-
-    psLogMsg ("psphot", 3, "%d external sources (%d cmf, %d text) merged to yield %ld total sources",
-              nCMF + nTXT, nCMF, nTXT, sources->n);
+    int nCFF = extCFF        ? extCFF->allSources->n        : 0;
+    int nTXT = extSourcesTXT ? extSourcesTXT->n             : 0;
+
+    psLogMsg ("psphot", 3, "%d external sources (%d cmf, %d cff, %d text) merged to yield %ld total sources",
+              nCMF + nCFF + nTXT, nCMF, nCFF, nTXT, sources->n);
     return true;
 }