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

trunk/psphot/src/psphotFitSourcesLinear.c

@@ -13 +13 @@
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, bool final)
+bool psphotFitSourcesLinear (pmConfig *config, const pmFPAview *view, const char *filerule, bool final)
 {
     bool status = true;
@@ -28 +28 @@
 
         // find the currently selected readout
-        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", i); // File of interest
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, i); // File of interest
         psAssert (file, "missing file?");
 
@@ -44 +44 @@
 
         if (!psphotFitSourcesLinearReadout (recipe, readout, sources, psf, final)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (linear) for PSPHOT.INPUT entry %d", i);
+            psError (PSPHOT_ERR_CONFIG, false, "failed to fit sources (linear) for %s entry %d", filerule, i);
             return false;
         }