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

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

@@ -2 +2 @@
 
 // for now, let's store the detections on the readout->analysis for each readout
-bool psphotDeblendSatstars (pmConfig *config, const pmFPAview *view)
+bool psphotDeblendSatstars (pmConfig *config, const pmFPAview *view, const char *filerule)
 {
     bool status = true;
@@ -11 +11 @@
     // loop over the available readouts
     for (int i = 0; i < num; i++) {
-        if (!psphotDeblendSatstarsReadout (config, view, "PSPHOT.INPUT", i)) {
-            psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for PSPHOT.INPUT entry %d", i);
+        if (!psphotDeblendSatstarsReadout (config, view, filerule, i)) {
+            psError (PSPHOT_ERR_CONFIG, false, "failed on saturated star deblend analysis for %s entry %d", filerule, i);
             return false;
         }
@@ -19 +19 @@
 }
 
-bool psphotDeblendSatstarsReadout (pmConfig *config, const pmFPAview *view, const char *filename, int fileIndex) {
+bool psphotDeblendSatstarsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int fileIndex) {
 
     int N;
@@ -31 +31 @@
 
     // find the currently selected readout
-    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filename, fileIndex); // File of interest
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, fileIndex); // File of interest
     psAssert (file, "missing file?");