Changeset 29546 for trunk/psModules/src/objects/pmSourcePhotometry.h

Timestamp:

Oct 25, 2010, 2:54:22 PM (16 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20100823

File:

• trunk/psModules/src/objects/pmSourcePhotometry.h (modified) (2 diffs)

trunk/psModules/src/objects/pmSourcePhotometry.h

@@ -35 +35 @@
     PM_SOURCE_PHOT_INTERP    = 0x0008,
     PM_SOURCE_PHOT_DIFFSTATS = 0x0010,
+    PM_SOURCE_PHOT_PSFONLY   = 0x0020,
 } pmSourcePhotometryMode;
 
@@ -44 +45 @@
 
 bool pmSourcePhotometryAper(
-    float   *apMag,                     ///< aperture flux magnitude
+    float *apMag,
+    float *apFluxOut,
+    float *apFluxErr,
     pmModel *model,                     ///< model used for photometry
     psImage *image,                     ///< image pixels to be used
+    psImage *variance,                  ///< variance pixels to be used
+    psImage *mask,                      ///< mask of pixels to ignore
+    psImageMaskType maskVal             ///< Value to mask
+);
+
+bool pmSourcePhotometryAperSource(
+    pmSource *source,                   ///< aperture flux magnitude
+    pmModel *model,                     ///< model used for photometry
+    psImage *image,                     ///< image pixels to be used
+    psImage *variance,                  ///< variance pixels to be used
     psImage *mask,                      ///< mask of pixels to ignore
     psImageMaskType maskVal             ///< Value to mask