Changeset 21252

Timestamp:

Feb 1, 2009, 11:49:46 AM (17 years ago)

Author:

eugene

Message:

allow background model to be undefined (sky & skyErr go to NAN)

File:

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

trunk/psphot/src/psphotMagnitudes.c

@@ -19 +19 @@
     // nThreads = 0; // XXX until testing is complete, do not thread this function
 
+    // if backModel or backStdev are missing, the values of sky and/or skyErr will be set to NAN
     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
@@ -42 +38 @@
     // the binning details are saved on the analysis metadata
     psImageBinning *binning = psMetadataLookupPtr(&status, recipe, "PSPHOT.BACKGROUND.BINNING");
-    PS_ASSERT (status, false);
 
     bool IGNORE_GROWTH = psMetadataLookupBool (&status, recipe, "IGNORE_GROWTH");
@@ -128 +123 @@
         if (status && isfinite(source->apMag)) Nap ++;
 
-        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, backModel->image, binning);
-        if (isnan(source->sky) && false) {
-            psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "error setting pmSource.sky");
-        }
+        if (backModel) {
+            psAssert (binning, "if backModel is defined, so should binning be");
+            source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, backModel->image, binning);
+            if (isnan(source->sky) && false) {
+                psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "error setting pmSource.sky");
+            }
+        } else {
+            source->sky = NAN;
+        }
 
-        source->skyErr = psImageUnbinPixel(source->peak->x, source->peak->y, backStdev->image, binning);
-        if (isnan(source->skyErr) && false) {
-            psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "error setting pmSource.skyErr");
-        }
+        if (backStdev) {
+            psAssert (binning, "if backStdev is defined, so should binning be");
+            source->skyErr = psImageUnbinPixel(source->peak->x, source->peak->y, backStdev->image, binning);
+            if (isnan(source->skyErr) && false) {
+                psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "error setting pmSource.skyErr");
+            }
+        } else {
+            source->skyErr = NAN;
+        }
     }