Changeset 13900 for trunk/psphot/src/psphotMagnitudes.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/psphotMagnitudes.c (modified) (3 diffs)

trunk/psphot/src/psphotMagnitudes.c

@@ -2 +2 @@
 
 bool psphotMagnitudes(psArray *sources,
-                      psMetadata *recipe,
-                      pmPSF *psf,
-                      pmReadout *background)
+                      psMetadata *recipe,
+                      pmPSF *psf,
+                      pmReadout *background,
+                      psMaskType maskVal,
+                      psMaskType mark)
 {
     bool status = false;
@@ -13 +15 @@
     pmSourceMagnitudesInit (recipe);
 
-    // XXX require that we have a background model, or 
+    // 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 
+    // the binning details are saved on the analysis metadata
     psImageBinning *binning = psMetadataLookupPtr(&status, recipe, "PSPHOT.BACKGROUND.BINNING");
     PS_ASSERT (status, false);
@@ -29 +31 @@
 
     for (int i = 0; i < sources->n; i++) {
-        pmSource *source = (pmSource *) sources->data[i];
-        status = pmSourceMagnitudes (source, psf, photMode);
-        if (status) Nap ++;
+        pmSource *source = (pmSource *) sources->data[i];
+        status = pmSourceMagnitudes (source, psf, photMode, maskVal, mark);
+        if (status) Nap ++;
 
-        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, background->image, binning);
-        if (isnan(source->sky) && false) {
-          psError(PSPHOT_ERR_SKY, false, "Setting pmSource.sky");
-          psErrorStackPrint(NULL, " ");
-          psErrorClear();
-        }
-    }   
+        source->sky = psImageUnbinPixel(source->peak->x, source->peak->y, background->image, binning);
+        if (isnan(source->sky) && false) {
+          psError(PSPHOT_ERR_SKY, false, "Setting pmSource.sky");
+          psErrorStackPrint(NULL, " ");
+          psErrorClear();
+        }
+    }
 
     psLogMsg ("psphot.magnitudes", PS_LOG_DETAIL, "measure magnitudes : %f sec for %ld objects (%d with apertures)\n", psTimerMark ("psphot"), sources->n, Nap);