Changeset 28013 for trunk/psphot/src/psphotBlendFit.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/psphotBlendFit.c (modified) (4 diffs)

trunk/psphot/src/psphotBlendFit.c

@@ -2 +2 @@
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotBlendFit (pmConfig *config, const pmFPAview *view)
+bool psphotBlendFit (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 (!psphotBlendFitReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (non-linear) for PSPHOT.INPUT entry %d", i);
+        if (!psphotBlendFitReadout (config, view, filerule, i, recipe)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (non-linear) for %s entry %d", filerule, i);
             return false;
         }
@@ -24 +24 @@
 
 // XXX I don't like this name
-bool psphotBlendFitReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe) {
+bool psphotBlendFitReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe) {
 
     int Nfit = 0;
@@ -35 +35 @@
 
     // 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?");