Changeset 28013 for trunk/psphot/src/psphotFindDetections.c

Timestamp:

May 18, 2010, 4:11:53 PM (16 years ago)

Author:

eugene

Message:

merge changes from branches/eam_branches/psphot,psModules.20100506 (finish basic psphotStack)

Location:

trunk/psphot

Files:

• . (modified) (1 prop)
• src/psphotFindDetections.c (modified) (4 diffs)

trunk/psphot/src/psphotFindDetections.c

@@ -4 +4 @@
 // peaks and new footprints.  any old peaks are saved on oldPeaks.  the resulting footprint set
 // contains all footprints (old and new)
-bool psphotFindDetections (pmConfig *config, const pmFPAview *view, bool firstPass)
+bool psphotFindDetections (pmConfig *config, const pmFPAview *view, const char *filerule, bool firstPass)
 {
     bool status = true;
@@ -17 +17 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotFindDetectionsReadout (config, view, "PSPHOT.INPUT", i, recipe, firstPass)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to find initial detections for PSPHOT.INPUT entry %d", i);
+        if (!psphotFindDetectionsReadout (config, view, filerule, i, recipe, firstPass)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to find initial detections for %s entry %d", filerule, i);
             return false;
         }
@@ -26 +26 @@
 
 // smooth the image, search for peaks, optionally define footprints based on the peaks
-bool psphotFindDetectionsReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe, bool firstPass) {
+bool psphotFindDetectionsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe, bool firstPass) {
 
     bool status;
@@ -34 +34 @@
 
     // 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?");