Changeset 28440 for branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourcePhotometry.h

Timestamp:

Jun 23, 2010, 2:36:55 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk (pauls fixes for loading pre-calculated psfs)

File:

• branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourcePhotometry.h (modified) (2 diffs)

branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourcePhotometry.h

@@ -48 +48 @@
     psImage *image,                     ///< image pixels to be used
     psImage *mask,                      ///< mask of pixels to ignore
-    psImageMaskType maskVal             ///< Value to mask
+    psImageMaskType maskVal             ///< Value to mask
 );
 
@@ -58 +58 @@
 bool pmSourceMeasureDiffStats (pmSource *source, psImageMaskType maskVal);
 
-double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor);
-double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor);
-double pmSourceModelWeight(const pmSource *Mi, int term, const bool unweighted_sum, const float covarFactor);
+double pmSourceDataDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal);
+double pmSourceModelDotModel (const pmSource *Mi, const pmSource *Mj, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal);
+double pmSourceModelWeight(const pmSource *Mi, int term, const bool unweighted_sum, const float covarFactor, psImageMaskType maskVal);
 
 // retire these: