Changeset 12958 for branches/eam_02_branch/psModules/src/objects/pmPSFtry.c

Timestamp:

Apr 23, 2007, 8:04:18 AM (19 years ago)

Author:

magnier

Message:

converting to source->maskObj and source->maskView

File:

• branches/eam_02_branch/psModules/src/objects/pmPSFtry.c (modified) (4 diffs)

branches/eam_02_branch/psModules/src/objects/pmPSFtry.c

@@ -5 +5 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.34.6.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-21 00:03:31 $
+ *  @version $Revision: 1.34.6.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-23 18:04:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -99 +99 @@
 {
     bool status;
-    float x;
-    float y;
     int Next = 0;
     int Npsf = 0;
@@ -120 +118 @@
             return NULL;
         }
-        x = source->peak->x;
-        y = source->peak->y;
-
-        // set temporary object mask and fit object
+
+        // set object mask to define valid pixels
+        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, RADIUS, "OR", PM_MASK_MARK);
+
         // fit model as EXT, not PSF
-
-        psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
         status = pmSourceFitModel (source, source->modelEXT, PM_SOURCE_FIT_EXT);
-        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
 
         // exclude the poor fits
@@ -158 +153 @@
         source->modelPSF = pmModelFromPSF (source->modelEXT, psfTry->psf);
         source->modelPSF->radiusFit = RADIUS;
-        x = source->peak->x;
-        y = source->peak->y;
-
-        // set the mask and fit the PSF model
-        psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
+
+        // set object mask to define valid pixels
+        psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, RADIUS, "OR", PM_MASK_MARK);
+
+        // fit the PSF model to the source
         status = pmSourceFitModel (source, source->modelPSF, PM_SOURCE_FIT_PSF);
-        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", PS_NOT_U8(PM_MASK_MARK));
 
         // skip poor fits