Changeset 16820 for trunk/psphot/src/psphotMagnitudes.c

Timestamp:

Mar 4, 2008, 3:10:25 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080229: better flag definitions, cleanup footprint code (move into psphotFindDetections), push mask selection into called functions

File:

• trunk/psphot/src/psphotMagnitudes.c (modified) (1 diff)

trunk/psphot/src/psphotMagnitudes.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotMagnitudes(psArray *sources,
-                      psMetadata *recipe,
-                      pmPSF *psf,
-                      pmReadout *background,
-                      psMaskType maskVal,
-                      psMaskType mark)
-{
+bool psphotMagnitudes(psArray *sources, psMetadata *recipe, pmPSF *psf, pmReadout *background) {
+
     bool status = false;
     int Nap = 0;
 
     psTimerStart ("psphot");
+
+    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
+    psMaskType maskVal = psMetadataLookupU8(&status, recipe, "MASK.PSPHOT"); // Mask value for bad pixels
+    assert (maskVal);
+
+    // user-defined masks to test for good/bad pixels (build from recipe list if not yet set)
+    psMaskType mark = psMetadataLookupU8(&status, recipe, "MASK.MARK"); // Mask value for bad pixels
+    assert (mark);
 
     pmSourceMagnitudesInit (recipe);