Changeset 28029 for branches/czw_branch/20100427/psphot/src/psphotSkyReplace.c

Timestamp:

May 19, 2010, 2:08:46 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/czw_branch/20100427/psphot

Files:

• . (modified) (1 prop)
• src/psphotSkyReplace.c (modified) (3 diffs)

branches/czw_branch/20100427/psphot/src/psphotSkyReplace.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotSkyReplace (pmConfig *config, const pmFPAview *view)
+bool psphotSkyReplace (pmConfig *config, const pmFPAview *view, const char *filerule)
 {
     bool status = true;
@@ -15 +15 @@
     for (int i = 0; i < num; i++) {
         if (i == chisqNum) continue; // skip chisq image
-        if (!psphotSkyReplaceReadout (config, view, "PSPHOT.INPUT", i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to replace sky for PSPHOT.INPUT entry %d", i);
+        if (!psphotSkyReplaceReadout (config, view, filerule, i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to replace sky for %s entry %d", filerule, i);
             return false;
         }
@@ -25 +25 @@
 // XXX make this an option?
 // in order to  successfully replace the sky, we must define a corresponding file...
-bool psphotSkyReplaceReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index) {
+bool psphotSkyReplaceReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index) {
 
     psTimerStart ("psphot.skyreplace");
 
     // 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?");