Changeset 13898 for trunk/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Jun 19, 2007, 4:22:26 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 under psphot (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels (EAM
will investigate). For this reason, I have left the "gutter" pixels
(cell gaps) set to 0 instead of NAN in pmFPAMosaic.

File:

• trunk/psModules/src/objects/pmSourcePhotometry.c (modified) (23 diffs)

trunk/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-05-22 21:45:00 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-20 02:22:26 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -58 +58 @@
         - the source is a STAR (PSF)
         - the option is selected (mode & PM_SOURCE_PHOT_APCORR)
- 
+
     - extMag : all sources with non-NULL modelEXT
 **/
 
 // XXX masked region should be (optionally) elliptical
-bool pmSourceMagnitudes (pmSource *source, pmPSF *psf, pmSourcePhotometryMode mode)
+bool pmSourceMagnitudes (pmSource *source, pmPSF *psf, pmSourcePhotometryMode mode, psMaskType maskVal, psMaskType mark)
 {
 
@@ -110 +110 @@
     // XXX use pmSourceAdd instead?
     if (source->mode & PM_SOURCE_MODE_SUBTRACTED) {
-        pmModelAdd (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL);
+        pmModelAdd (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL, maskVal);
     }
 
@@ -185 +185 @@
     // XXX can I remove this?  the source should have the mask defined when it is constructed or
     // when the fit / aperture radius is changed...
-    psImageKeepCircle (source->maskObj, x, y, model->radiusFit, "OR", PM_MASK_MARK);
+    psImageKeepCircle (source->maskObj, x, y, model->radiusFit, "OR", mark);
 
     // measure the weight of included pixels
     // XXX is this supposed to use the weight or the flux?
     if (mode & PM_SOURCE_PHOT_WEIGHT) {
-        pmSourcePixelWeight (&source->pixWeight, model, source->pixels, source->maskObj);
+        pmSourcePixelWeight (&source->pixWeight, model, source->pixels, source->maskObj, maskVal);
     }
 
     // measure object aperture photometry
-    status = pmSourcePhotometryAper  (&source->apMag, model, flux, source->maskObj);
+    status = pmSourcePhotometryAper  (&source->apMag, model, flux, source->maskObj, maskVal);
     if (!status) {
-        psErrorCode last = psErrorCodeLast();
-        if (last == PM_ERR_PHOTOM) {
-            // the aper mag was undefined (flux < 0).  bad object, but
-            // don't keep the error on the stack
-            psErrorClear();
-        }
+        psErrorCode last = psErrorCodeLast();
+        if (last == PM_ERR_PHOTOM) {
+            // the aper mag was undefined (flux < 0).  bad object, but
+            // don't keep the error on the stack
+            psErrorClear();
+        }
     }
 
@@ -220 +220 @@
     // unmask aperture
     // XXX can I remove this?  this will probably break things downstream...
-    psImageKeepCircle (source->maskObj, x, y, model->radiusFit, "AND", PS_NOT_U8(PM_MASK_MARK));
+    psImageKeepCircle (source->maskObj, x, y, model->radiusFit, "AND", PS_NOT_U8(mark));
 
     // if source was originally subtracted, re-subtract object, leave local sky
     // XXX replace with pmSourceSub...
     if (source->mode & PM_SOURCE_MODE_SUBTRACTED) {
-        pmModelSub (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL);
+        pmModelSub (source->pixels, source->maskObj, model, PM_MODEL_OP_FULL, maskVal);
     }
 
@@ -235 +235 @@
 (aprMag - flux*skySat - r^2*rflux*skyBias) - fitMAg = ApTrend(x,y)
 (aprMag - flux*skySat - r^2*rflux*skyBias) = fitMAg + ApTrend(x,y)
- 
+
 */
 
@@ -262 +262 @@
 
 // return source aperture magnitude
-bool pmSourcePhotometryAper (float *apMag, pmModel *model, psImage *image, psImage *mask)
+bool pmSourcePhotometryAper (float *apMag, pmModel *model, psImage *image, psImage *mask, psMaskType maskVal)
 {
     float apSum = 0;
@@ -269 +269 @@
 
     if (model == NULL) {
-        psError(PM_ERR_OBJECTS, true, "Model is NULL");
+        psError(PM_ERR_OBJECTS, true, "Model is NULL");
         return false;
     }
@@ -285 +285 @@
     for (int ix = 0; ix < image->numCols; ix++) {
         for (int iy = 0; iy < image->numRows; iy++) {
-            if (mkData[iy][ix])
+            if (mkData[iy][ix] & maskVal)
                 continue;
             apSum += imData[iy][ix] - sky;
@@ -291 +291 @@
     }
     if (apSum <= 0) {
-        psError(PM_ERR_PHOTOM, true, "apSum is negative");
+        psError(PM_ERR_PHOTOM, true, "apSum is negative");
         return false;
     }
@@ -300 +300 @@
 
 // return source aperture magnitude
-bool pmSourcePixelWeight (float *pixWeight, pmModel *model, psImage *image, psImage *mask)
+bool pmSourcePixelWeight (float *pixWeight, pmModel *model, psImage *image, psImage *mask, psMaskType maskVal)
 {
     float modelSum = 0;
@@ -366 +366 @@
             if (my >= NY)
                 continue;
-            if (mask->data.U8[my][mx])
+            if (mask->data.U8[my][mx] & maskVal)
                 continue;
 
@@ -400 +400 @@
     const psImage *Wi = Mi->weight;
     if (!unweighted_sum) {
-        assert (Wi != NULL);
+        assert (Wi != NULL);
     }
 
@@ -463 +463 @@
     const psImage *Wi = Mi->weight;
     if (!unweighted_sum) {
-        assert (Wi != NULL);
+        assert (Wi != NULL);
     }
 
@@ -518 +518 @@
     const psImage *Wi = Mi->weight;
     if (!unweighted_sum) {
-        assert (Wi != NULL);
+        assert (Wi != NULL);
     }
     const psImage *Ti = Mi->maskObj;
@@ -561 +561 @@
 # endif
 
-bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *weight)
+bool pmSourceChisq (pmModel *model, psImage *image, psImage *mask, psImage *weight, psMaskType maskVal)
 {
 
@@ -568 +568 @@
     for (int j = 0; j < image->numRows; j++) {
         for (int i = 0; i < image->numCols; i++) {
-            if (mask->data.U8[j][i])
+            if (mask->data.U8[j][i] & maskVal)
                 continue;
             if (weight->data.F32[j][i] <= 0)
@@ -593 +593 @@
     const psImage *Wi = Mi->weight;
     if (!unweighted_sum) {
-        assert (Wi != NULL);
+        assert (Wi != NULL);
     }
     const psImage *Ti = Mi->maskObj;
@@ -633 +633 @@
 
 double pmSourceModelDotModel (const pmSource *Mi,
-                              const pmSource *Mj,
-                              const bool unweighted_sum) // should the cross product be weighted?
+                              const pmSource *Mj,
+                              const bool unweighted_sum) // should the cross product be weighted?
 {
     int Xs, Xe, Ys, Ye;
@@ -649 +649 @@
     const psImage *Wi = Mi->weight;
     if (!unweighted_sum) {
-        assert (Wi != NULL);
+        assert (Wi != NULL);
     }
 
@@ -680 +680 @@
                 continue;
 
-            // XXX skip the nonsense weight pixels?
+            // XXX skip the nonsense weight pixels?
             if (unweighted_sum) {
                 flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);
@@ -712 +712 @@
     const psImage *Wi = Mi->weight;
     if (!unweighted_sum) {
-        assert (Wi != NULL);
+        assert (Wi != NULL);
     }
 
@@ -743 +743 @@
                 continue;
 
-            // XXX skip the nonsense weight pixels?
+            // XXX skip the nonsense weight pixels?
             if (unweighted_sum) {
                 flux += (Pi->data.F32[yi][xi] * Pj->data.F32[yj][xj]);