Changeset 19913

Timestamp:

Oct 6, 2008, 3:14:23 AM (18 years ago)

Author:

eugene

Message:

get the local sky stdev from the background model image

File:

• trunk/psphot/src/psphotMagnitudes.c (modified) (4 diffs)

trunk/psphot/src/psphotMagnitudes.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotMagnitudes(psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background) {
+bool psphotMagnitudes(pmConfig *config, const pmFPAview *view, psArray *sources, psMetadata *recipe, pmPSF *psf) {
 
     bool status = false;
@@ -7 +7 @@
 
     psTimerStart ("psphot");
+
+    pmReadout *backModel = psphotSelectBackground (config, view);
+    pmReadout *backStdev = psphotSelectBackgroundStdev (config, view);
+
+    // XXX require that we have a background model, or
+    // allow it to be missing, setting local sky to 0.0?
+    PS_ASSERT (backModel, false);
+    PS_ASSERT (backStdev, false);
 
     // bit-masks to test for good/bad pixels
@@ -20 +28 @@
 
     pmSourceMagnitudesInit (recipe);
-
-    // XXX require that we have a background model, or
-    // allow it to be missing, setting local sky to 0.0?
-    PS_ASSERT (background, false);
 
     // the binning details are saved on the analysis metadata
@@ -41 +45 @@
         if (status) Nap ++;
 
-        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, background->image, binning);
+        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, backModel->image, binning);
         if (isnan(source->sky) && false) {
+          psError(PSPHOT_ERR_SKY, false, "Setting pmSource.sky");
+          psErrorStackPrint(NULL, " ");
+          psErrorClear();
+        }
+
+        source->skyErr = psImageUnbinPixel(source->peak->x, source->peak->y, backStdev->image, binning);
+        if (isnan(source->skyErr) && false) {
           psError(PSPHOT_ERR_SKY, false, "Setting pmSource.sky");
           psErrorStackPrint(NULL, " ");