Changeset 11230

Timestamp:

Jan 21, 2007, 3:13:53 PM (19 years ago)

Author:

eugene

Message:

adding ability to load externally-supplied sources

Location:

trunk/psphot/src

Files:

• psphot.h (modified) (1 diff)
• psphotMergeSources.c (modified) (1 diff)
• psphotParseCamera.c (modified) (1 diff)
• psphotReadout.c (modified) (2 diffs)

trunk/psphot/src/psphot.h

@@ -98 +98 @@
 bool psphotFitSummary ();
 bool psphotMergeSources (psArray *oldSources, psArray *newSources);
-
-bool psphotSaveExtSources (pmReadout *readout);
-bool psphotLoadExtSources (pmReadout *readout, psArray *sources);
+bool psphotLoadExtSources (pmConfig *config, pmFPAview *view, psArray *sources);

trunk/psphot/src/psphotMergeSources.c

@@ -11 +11 @@
 }
 
-// XXX this is something of a hack: external sources are loaded with the same functions used to
-// read and write the sources.  These use the readout->analysis entry PSPHOT.SOURCES.  at the
-// beginning of psphotReadout, we need to rename any such entry for later use by
-// psphotLoadExtSources below
-
-bool psphotSaveExtSources (pmReadout *readout) {
-
-    psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
-    if (!sources) return true;
-
-    psLogMsg ("psphot", 3, "%ld external sources loaded, saved for later use", sources->n);
-    psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.EXTSRC", PS_DATA_ARRAY, "external sources", sources);
-
-    psMetadataRemoveKey (readout->analysis, "PSPHOT.SOURCES");
-
-    return true;
-}
-
 // merge the externally supplied sources with the existing sources.  mark them as having 
 // mode PM_SOURCE_MODE_EXTERNAL
-bool psphotLoadExtSources (pmReadout *readout, psArray *sources) {
+bool psphotLoadExtSources (pmConfig *config, pmFPAview *view, psArray *sources) {
 
-    psArray *extSources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.EXTSRC");
-    if (!extSources) return true;
+    // find the currently selected readout
+    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "INPUT.SRC");
+    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++) {

trunk/psphot/src/psphotParseCamera.c

@@ -23 +23 @@
     // optionally load the PSF Model and/or fixed stars
     pmFPAfileBindFromArgs (NULL, input, config, "INPUT.PSF", "PSF");
-    pmFPAfile *srcInput = pmFPAfileBindFromArgs (NULL, input, config, "INPUT.SRC", "SRC");
+    pmFPAfile *srcInput = pmFPAfileDefineFromArgs (NULL, config, "INPUT.SRC", "SRC");
     if (!srcInput) {
         fprintf (stderr, "!");

trunk/psphot/src/psphotReadout.c

@@ -8 +8 @@
     // find the currently selected readout
     pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT");
-    psphotSaveExtSources (readout);
 
     // optional break-point for processing
@@ -81 +80 @@
 
     // include externally-supplied sources
-    psphotLoadExtSources (readout, sources);
+    psphotLoadExtSources (config, view, sources);
 
     // construct an initial model for each object