Changeset 28029 for branches/czw_branch/20100427/psphot/src/psphotApResid.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/psphotApResid.c (modified) (4 diffs)

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

@@ -5 +5 @@
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotApResid (pmConfig *config, const pmFPAview *view)
+bool psphotApResid (pmConfig *config, const pmFPAview *view, const char *filerule)
 {
     bool status = true;
@@ -23 +23 @@
     for (int i = 0; i < num; i++) {
         if (i == chisqNum) continue; // skip chisq image
-        if (!psphotApResidReadout (config, view, "PSPHOT.INPUT", i, recipe)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed to measure aperture residual for PSPHOT.INPUT entry %d", i);
+        if (!psphotApResidReadout (config, view, filerule, i, recipe)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed to measure aperture residual for %s entry %d", filerule, i);
             return false;
         }
@@ -31 +31 @@
 }
 
-bool psphotApResidReadout (pmConfig *config, const pmFPAview *view, const char *filename, int index, psMetadata *recipe)
+bool psphotApResidReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index, psMetadata *recipe)
 {
     int Nfail = 0;
@@ -43 +43 @@
 
     // 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?");