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

trunk/psphot/src/psphotMagnitudes.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotMagnitudes (pmConfig *config, const pmFPAview *view)
+bool psphotMagnitudes (pmConfig *config, const pmFPAview *view, const char *filerule)
 {
     bool status = true;
@@ -21 +21 @@
 
         // 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?");
 
@@ -37 +37 @@
 
         if (!psphotMagnitudesReadout (config, recipe, view, readout, sources, psf)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to measure magnitudes for PSPHOT.INPUT entry %d", i);
+            psError (PSPHOT_ERR_CONFIG, false, "failed to measure magnitudes for %s entry %d", filerule, i);
             return false;
         }