Changeset 28643 for branches/eam_branches/ipp-20100621/psModules/src/objects/pmPSF.h

Timestamp:

Jul 9, 2010, 10:56:32 AM (16 years ago)

Author:

eugene

Message:

changed pmSourceFitModel and related APIs to pass a structure of fit options; this lets us change the options between soruces within the multithreaded context; also re-organized the include orders to avoid conflicts

File:

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

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

@@ -14 +14 @@
 # define PM_PSF_H
 
-#include <pslib.h>
-#include "pmTrend2D.h"
-#include "pmGrowthCurve.h"
-#include "pmResiduals.h"
-#include "pmFPA.h"
-
 /// @addtogroup Objects Object Detection / Analysis Functions
 /// @{
-
-// type of model carried by the pmModel structure
-typedef int pmModelType;
 
 /** pmPSF data structure
@@ -38 +29 @@
  *
  */
-typedef struct {
+struct pmPSF {
     pmModelType type;                   ///< PSF Model in use
     psArray *params;                    ///< Model parameters (psPolynomial2D)
@@ -64 +55 @@
     pmGrowthCurve *growth;              ///< apMag vs Radius
     pmResiduals *residuals;             ///< normalized residual image (no spatial variation)
-} pmPSF;
+};
 
 typedef struct {
@@ -82 +73 @@
     float         apRadius;
     bool          chiFluxTrend;         // Fit a trend in Chi2 as a function of flux?
+    pmSourceFitOptions *fitOptions;
 } pmPSFOptions;