Changeset 38389

Timestamp:

Jun 5, 2015, 12:42:15 PM (11 years ago)

Author:

bills

Message:

change psphotLoadExtSources to loop over all readouts.
Note used in any programs that work on more than one readout (i.e. psphotStack)
but I implmented it for an early incarnation of -updatemode.

File:

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

trunk/psphot/src/psphotMergeSources.c

@@ -64 +64 @@
 // only expect a single entry for PSPHOT.INPUT.CMF and PSPHOT.SOURCES.TEXT, so we can only
 // associate input sources with a single entry for the filerule
-bool psphotLoadExtSources (pmConfig *config, const pmFPAview *view, const char *filerule) {
+bool psphotLoadExtSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index) {
 
     bool status;
@@ -70 +70 @@
     pmDetections *extCFF = NULL;
     psArray *extSourcesTXT = NULL;
-    int index = 0;
 
     // find the currently selected readout
@@ -197 +196 @@
     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;
+}
+bool psphotLoadExtSources(pmConfig *config, const pmFPAview *view, const char *filerule) {
+    int num = psphotFileruleCount(config, filerule);
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+        if (!psphotLoadExtSourcesReadout (config, view, filerule, i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to load sources for %s entry %d", filerule, i);
+            return false;
+        }
+    }
     return true;
 }