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

trunk/psphot/src/psphotEfficiency.c

@@ -156 +156 @@
 }
 
-bool psphotEfficiency (pmConfig *config, const pmFPAview *view)
+bool psphotEfficiency (pmConfig *config, const pmFPAview *view, const char *filerule)
 {
     bool status = true;
@@ -173 +173 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (i == chisqNum) continue; // skip chisq image
-        if (!psphotEfficiencyReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to measure detection efficiency for PSPHOT.INPUT entry %d", i);
+        if (i == chisqNum) continue; // skip chisq image
+        if (!psphotEfficiencyReadout (config, view, filerule, i, recipe)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to measure detection efficiency for %s entry %d", filerule, i);
             return false;
         }
@@ -183 +183 @@
 
 // Determine detection efficiency
-bool psphotEfficiencyReadout(pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe)
+bool psphotEfficiencyReadout(pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe)
 {
     bool status = true;
@@ -190 +190 @@
 
     // 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?");