Changeset 15936

Timestamp:

Dec 27, 2007, 1:18:30 PM (18 years ago)

Author:

eugene

Message:

split psphotImageMedian into psphotModelBackground and psphotSubtractBackground

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (1 diff)
• psphotModelBackground.c (added)
• psphotReadout.c (modified) (1 diff)
• psphotSubtractBackground.c (added)

trunk/psphot/src/Makefile.am

@@ -25 +25 @@
         psphotDefineFiles.c      \
         psphotReadout.c          \
-        psphotImageMedian.c      \
+        psphotModelBackground.c  \
+        psphotSubtractBackground.c \
         psphotFindPeaks.c        \
         psphotSourceStats.c      \

trunk/psphot/src/psphot.h

@@ -26 +26 @@
 
 // psphotReadout functions
-bool            psphotImageMedian (pmConfig *config, const pmFPAview *view, psMaskType maskVal);
+bool            psphotModelBackground (pmConfig *config, const pmFPAview *view, const char *filename, psMaskType maskVal);
+bool            psphotSubtractBackground (pmConfig *config, const pmFPAview *view, const char *filename, psMaskType maskVal) ;
 psArray        *psphotFindPeaks (pmReadout *readout, psMetadata *recipe,
                                  const bool returnFootprints, const int pass, psMaskType maskVal);

trunk/psphot/src/psphotReadout.c

@@ -68 +68 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotImageMedian (config, view, maskVal)) {
+    if (!psphotModelBackground (config, view, "PSPHOT.INPUT", maskVal)) {
+        return psphotReadoutCleanup (config, readout, recipe, NULL, NULL);
+    }
+    if (!psphotSubtractBackground (config, view, "PSPHOT.INPUT", maskVal)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL);
     }