Changeset 27909 for branches/eam_branches/psphot.20100506/src/psphotMergeSources.c

Timestamp:

May 10, 2010, 5:24:37 PM (16 years ago)

Author:

eugene

Message:

functions called by the psphotReadoutXXX functions now take a filerule so psphotStack can select the correct targets

File:

• branches/eam_branches/psphot.20100506/src/psphotMergeSources.c (modified) (12 diffs)

branches/eam_branches/psphot.20100506/src/psphotMergeSources.c

@@ -6 +6 @@
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotMergeSources (pmConfig *config, const pmFPAview *view)
+bool psphotMergeSources (pmConfig *config, const pmFPAview *view, const char *filerule)
 {
     bool status = true;
@@ -15 +15 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotMergeSourcesReadout (config, view, "PSPHOT.INPUT", i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to merge sources for PSPHOT.INPUT entry %d", i);
+        if (!psphotMergeSourcesReadout (config, view, filerule, i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to merge sources for %s entry %d", filerule, i);
             return false;
         }
@@ -24 +24 @@
 
 // add newly selected sources to the existing list of sources
-bool psphotMergeSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index) {
+bool psphotMergeSourcesReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index) {
 
     bool status;
 
     // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, index); // File of interest
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
     psAssert (file, "missing file?");
 
@@ -71 +71 @@
 // 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 PSPHOT.INPUT
-bool psphotLoadExtSources (pmConfig *config, const pmFPAview *view) {
+bool psphotLoadExtSources (pmConfig *config, const pmFPAview *view, const char *filerule) {
 
     bool status;
@@ -79 +79 @@
 
     // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", index); // File of interest
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
     psAssert (file, "missing file?");
 
@@ -130 +130 @@
     // load data from input TXT file:
     {
-        pmChip *chipTXT = pmFPAfileThisChip (config->files, view, "PSPHOT.INPUT");
+        pmChip *chipTXT = pmFPAfileThisChip (config->files, view, filerule);
         if (!chipTXT) goto finish;
 
@@ -167 +167 @@
 
 // extract the input sources corresponding to this readout
-// XXX this function needs to be updated to work with the new context of pshot inputs
+// XXX this function needs to be updated to work with the new context of psphot inputs
 psArray *psphotLoadPSFSources (pmConfig *config, const pmFPAview *view) {
 
@@ -197 +197 @@
 // psphotDetectionsFromSources to psphotSourceStats and are now stored on
 // detections->newSources.
-bool psphotRepairLoadedSources (pmConfig *config, const pmFPAview *view) {
-
-    // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", 0); // File of interest
+bool psphotRepairLoadedSources (pmConfig *config, const pmFPAview *view, const char *filerule) {
+
+    // find the currently selected readout
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, 0); // File of interest
     psAssert (file, "missing file?");
 
@@ -227 +227 @@
 // generate the detection structure for the supplied array of sources
 // XXX this currently assumes there is a single input file
-bool psphotDetectionsFromSources (pmConfig *config, const pmFPAview *view, psArray *sources) {
-
-    // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", 0); // File of interest
+bool psphotDetectionsFromSources (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *sources) {
+
+    // find the currently selected readout
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, 0); // File of interest
     psAssert (file, "missing file?");
 
@@ -335 +335 @@
 }
 
-bool psphotCheckExtSources (pmConfig *config, const pmFPAview *view) {
+bool psphotCheckExtSources (pmConfig *config, const pmFPAview *view, const char *filerule) {
 
     bool status;
@@ -343 +343 @@
 
     // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", 0); // File of interest
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, 0); // File of interest
     psAssert (file, "missing file?");
 
@@ -373 +373 @@
 
         // find the detections (by peak and/or footprint) in the image.
-        if (!psphotFindDetections (config, view, true)) {
+        if (!psphotFindDetections (config, view, filerule, true)) {
             psError(PSPHOT_ERR_CONFIG, false, "unable to find detections in this image");
-            return psphotReadoutCleanup (config, view);
+            return psphotReadoutCleanup (config, view, filerule);
         }
 
         // construct sources and measure basic stats
-        psphotSourceStats (config, view, true);
+        psphotSourceStats (config, view, filerule, true);
 
         // find blended neighbors of very saturated stars
-        psphotDeblendSatstars (config, view);
+        psphotDeblendSatstars (config, view, filerule);
 
         // mark blended peaks PS_SOURCE_BLEND
-        if (!psphotBasicDeblend (config, view)) {
+        if (!psphotBasicDeblend (config, view, filerule)) {
             psLogMsg ("psphot", 3, "failed on deblend analysis");
-            return psphotReadoutCleanup (config, view);
+            return psphotReadoutCleanup (config, view, filerule);
         }
 
         // classify sources based on moments, brightness
-        if (!psphotRoughClass (config, view)) {
+        if (!psphotRoughClass (config, view, filerule)) {
             psLogMsg ("psphot", 3, "failed to find a valid PSF clump for image");
-            return psphotReadoutCleanup (config, view);
-        }
-    }
-
-    return true;
-}
+            return psphotReadoutCleanup (config, view, filerule);
+        }
+    }
+
+    return true;
+}