Changeset 25983

Timestamp:

Nov 1, 2009, 3:58:41 PM (17 years ago)

Author:

eugene

Message:

add functions to read text source list

Location:

trunk/psphot/src

Files:

• psphotDefineFiles.c (modified) (1 diff)
• psphotLoadSRCTEXT.c (added)
• psphotMergeSources.c (modified) (2 diffs)

trunk/psphot/src/psphotDefineFiles.c

@@ -126 +126 @@
     }
 
+    if (psMetadataLookupPtr(NULL, config->arguments, "SRCTEXT")) {
+        // XXX cannot use pmFPAfileDefineFromArgs: this is explicitly a FITS-based I/O function
+        // supply the attach the 
+        if (!psphotLoadSRCTEXT(input->fpa, config)) {
+            psError(PSPHOT_ERR_CONFIG, false, "Failed to load PSPHOT.INPUT.TEXT");
+            return status;
+        }
+    }
+
     if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
         pmFPAfileBindFromArgs(&status, input, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");

trunk/psphot/src/psphotMergeSources.c

@@ -4 +4 @@
                          PM_SOURCE_MODE_BADPSF | PM_SOURCE_MODE_DEFECT | PM_SOURCE_MODE_SATURATED | \
                          PM_SOURCE_MODE_CR_LIMIT | PM_SOURCE_MODE_EXT_LIMIT) // Mask to apply for PSF sources
+
+// merge the externally supplied sources with the existing sources.  mark them as having
+// mode PM_SOURCE_MODE_EXTERNAL
+bool psphotLoadExtSources (pmConfig *config, const pmFPAview *view, psArray *sources) {
+
+    psArray *extSourcesCMF = NULL;
+    psArray *extSourcesTXT = NULL;
+
+    // load data from input CMF file:
+    { 
+        pmReadout *readoutCMF = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CMF");
+        if (!readoutCMF) goto loadTXT;
+
+        extSourcesCMF = psMetadataLookupPtr (NULL, readoutCMF->analysis, "PSPHOT.SOURCES");
+        if (extSourcesCMF) {
+            for (int i = 0; i < extSourcesCMF->n; i++) {
+                pmSource *source = extSourcesCMF->data[i];
+                source->mode |= PM_SOURCE_MODE_EXTERNAL;
+
+                // the supplied peak flux needs to be re-normalized
+                source->peak->flux = 1.0;
+                source->peak->value = 1.0;
+
+                // drop the loaded source modelPSF
+                psFree (source->modelPSF);
+                source->modelPSF = NULL;
+            }
+            psphotMergeSources (sources, extSourcesCMF);
+        }
+    }
+
+loadTXT:
+
+    // load data from input TXT file:
+    { 
+        pmChip *chipTXT = pmFPAfileThisChip (config->files, view, "PSPHOT.INPUT");
+        if (!chipTXT) goto finish;
+
+        extSourcesTXT = psMetadataLookupPtr (NULL, chipTXT->analysis, "PSPHOT.SOURCES.TEXT");
+        if (extSourcesTXT) {
+            for (int i = 0; i < extSourcesTXT->n; i++) {
+                pmSource *source = extSourcesTXT->data[i];
+                source->mode |= PM_SOURCE_MODE_EXTERNAL;
+
+                // drop the loaded source modelPSF
+                psFree (source->modelPSF);
+                source->modelPSF = NULL;
+            }
+            psphotMergeSources (sources, extSourcesTXT);
+        }
+    }
+
+finish:
+
+    if (!extSourcesTXT && !extSourcesTXT) {
+        psLogMsg ("psphot", 3, "no external sources for this readout");
+        return true;
+    }
+
+    int nCMF = extSourcesCMF ? extSourcesCMF->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);
+    return true;
+}
 
 // add newly selected sources to the existing list of sources
@@ -12 +78 @@
         psArrayAdd (oldSources, 100, source);
     }
-    return true;
-}
-
-// merge the externally supplied sources with the existing sources.  mark them as having
-// mode PM_SOURCE_MODE_EXTERNAL
-bool psphotLoadExtSources (pmConfig *config, const pmFPAview *view, psArray *sources) {
-
-    // find the currently selected readout
-    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CMF");
-    if (!readout) {
-        psLogMsg ("psphot", 3, "no external sources supplied");
-        return true;
-    }
-
-    psArray *extSources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
-    if (!extSources) {
-        psLogMsg ("psphot", 3, "no external sources for this readout");
-        return true;
-    }
-
-    for (int i = 0; i < extSources->n; i++) {
-        pmSource *source = extSources->data[i];
-        source->mode |= PM_SOURCE_MODE_EXTERNAL;
-        pmModel *model = source->modelPSF;
-
-        float xpos = model->params->data.F32[PM_PAR_XPOS];
-        float ypos = model->params->data.F32[PM_PAR_YPOS];
-
-        source->peak = pmPeakAlloc(xpos, ypos, 1.0, PM_PEAK_LONE);
-        source->peak->xf = xpos;
-        source->peak->yf = ypos;
-        source->peak->flux = 1.0;
-
-        // drop the loaded source modelPSF
-        psFree (source->modelPSF);
-        source->modelPSF = NULL;
-    }
-
-    psphotMergeSources (sources, extSources);
-    psLogMsg ("psphot", 3, "%ld external sources merged to yield %ld total sources", extSources->n, sources->n);
-
     return true;
 }