Changeset 13900 for trunk/psphot/src/psphotGrowthCurve.c

Timestamp:

Jun 19, 2007, 4:40:44 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to APIs to allow use of a nominated value to mask
against (the maskVal). Previously, the mask values were either
hard-coded (e.g., PM_MASK_SAT) or taken as anything non-zero. The
code is tested with psModules (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels. For
this reason, I have left the "gutter" pixels (cell gaps) set to 0
instead of NAN in pmFPAMosaic.

File:

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

trunk/psphot/src/psphotGrowthCurve.c

@@ -7 +7 @@
 // XXX add a option to turn off the curve-of-growth (ie, make the apMag = fitMag everywhere);
 
-bool psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore) {
+bool psphotGrowthCurve (pmReadout *readout, pmPSF *psf, bool ignore, psMaskType maskVal) {
 
     // bool status;
@@ -45 +45 @@
 
     // loop over a range of source fluxes
-    // no need to interpolate since we have force the object center 
+    // no need to interpolate since we have force the object center
     // to 0.5, 0.5 above
     for (int i = 0; i < psf->growth->radius->n; i++) {
@@ -53 +53 @@
         radius = psf->growth->radius->data.F32[i];
 
-        // NOTE: we use pmModelAdd not pmSourceAdd because we are not working with a normal source
+        // NOTE: we use pmModelAdd not pmSourceAdd because we are not working with a normal source
         psImageKeepCircle (mask, xc, yc, radius, "OR", PM_MASK_MARK);
-        pmModelAdd (image, mask, model, PM_MODEL_OP_FULL);
-        pmSourcePhotometryAper (&apMag, model, image, mask);
+        pmModelAdd (image, mask, model, PM_MODEL_OP_FULL, maskVal);
+        pmSourcePhotometryAper (&apMag, model, image, mask, maskVal);
         psImageKeepCircle (mask, xc, yc, radius, "AND", PS_NOT_U8(PM_MASK_MARK));
 
-        // the 'ignore' mode is for testing
-        if (ignore) {
-            psf->growth->apMag->data.F32[i] = fitMag;
-        } else {
-            psf->growth->apMag->data.F32[i] = apMag;
-        }
+        // the 'ignore' mode is for testing
+        if (ignore) {
+            psf->growth->apMag->data.F32[i] = fitMag;
+        } else {
+            psf->growth->apMag->data.F32[i] = apMag;
+        }
     }