Changeset 6899 for branches/rel10_ifa/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Apr 18, 2006, 8:31:55 PM (20 years ago)

Author:

magnier

Message:

fixed handling of masks, fixed negative-radius errors in models

File:

• branches/rel10_ifa/psModules/src/objects/pmSourcePhotometry.c (modified) (4 diffs)

branches/rel10_ifa/psModules/src/objects/pmSourcePhotometry.c

@@ -3 +3 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.1.2.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 17:10:08 $
+ *  @version $Revision: 1.1.2.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-19 06:31:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 #include "pmHDU.h"
 #include "pmFPA.h"
+#include "pmMaskBadPixels.h"
 #include "pmPeaks.h"
 #include "pmMoments.h"
@@ -117 +118 @@
 
     // set aperture mask circle to model radius
-    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "OR", PM_MASK_MARK);
 
     // measure the weight of included pixels
@@ -139 +140 @@
 
     // unmask aperture
-    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", ~PM_SOURCE_MASK_MARKED);
+    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", NOT_U8(PM_MASK_MARK));
 
     // subtract object, leave local sky