Changeset 31451 for trunk/psModules/src/objects/pmPSF.h

Timestamp:

May 5, 2011, 11:02:53 AM (15 years ago)

Author:

eugene

Message:

merge updates from eam branch 20110404

File:

• trunk/psModules/src/objects/pmPSF.h (modified) (5 diffs)

trunk/psModules/src/objects/pmPSF.h

@@ -31 +31 @@
 struct pmPSF {
     pmModelType type;                   ///< PSF Model in use
-    psArray *params;                    ///< Model parameters (psPolynomial2D)
-    psStats *psfTrendStats;             ///< psf parameter trend clipping stats
-    pmTrend2DMode psfTrendMode;
-    psPolynomial1D *ChiTrend;           ///< Chisq vs flux fit (correction for systematic errors)
-    pmTrend2D *ApTrend;                 ///< ApResid vs (x,y)
-    pmTrend2D *FluxScale;               ///< Flux for PSF at (x,y) for normalization = 1.0
+
+    float chisq;                        ///< PSF goodness statistic (unused??)
     float ApResid;                      ///< apMag - psfMag (for PSF stars)
     float dApResid;                     ///< scatter of ApResid
     float skyBias;                      ///< implied residual sky offset from ApResid fit
     float skySat;                       ///< roll-over of ApResid fit
-    float chisq;                        ///< PSF goodness statistic (unused??)
     int nPSFstars;                      ///< number of stars used to measure PSF
     int nApResid;                       ///< number of stars used to measure ApResid
+
+    bool poissonErrorsPhotLMM;          ///< use poission errors for non-linear model fitting
+    bool poissonErrorsPhotLin;          ///< use poission errors for linear model fitting
+    bool poissonErrorsParams;           ///< use poission errors for model parameter fitting
+
+    pmTrend2D *ApTrend;                 ///< ApResid vs (x,y)
+    pmTrend2D *FluxScale;               ///< Flux for PSF at (x,y) for normalization = 1.0
+    psPolynomial1D *ChiTrend;           ///< Chisq vs flux fit (correction for systematic errors)
+
+    pmGrowthCurve *growth;              ///< apMag vs Radius
+    pmResiduals *residuals;             ///< normalized residual image (no spatial variation)
+
+    psArray *params;                    ///< Model parameters (psPolynomial2D)
+    psStats *psfTrendStats;             ///< psf parameter trend clipping stats
+
+    pmTrend2DMode psfTrendMode;
     int trendNx;
     int trendNy;
@@ -50 +61 @@
     int fieldXo;
     int fieldYo;
-    bool poissonErrorsPhotLMM;          ///< use poission errors for non-linear model fitting
-    bool poissonErrorsPhotLin;          ///< use poission errors for linear model fitting
-    bool poissonErrorsParams;           ///< use poission errors for model parameter fitting
-    pmGrowthCurve *growth;              ///< apMag vs Radius
-    pmResiduals *residuals;             ///< normalized residual image (no spatial variation)
 };
 
@@ -60 +66 @@
     pmModelType   type;
     psStats      *stats;                // psfTrend clipping stats
+
     pmTrend2DMode psfTrendMode;
     int           psfTrendNx;
@@ -67 +74 @@
     int           psfFieldXo;
     int           psfFieldYo;
+
     bool          poissonErrorsPhotLMM; ///< use poission errors for non-linear model fitting
     bool          poissonErrorsPhotLin; ///< use poission errors for linear model fitting
     bool          poissonErrorsParams; ///< use poission errors for model parameter fitting
+
+    bool          chiFluxTrend;         // Fit a trend in Chi2 as a function of flux?
+    pmSourceFitOptions *fitOptions;
+
     float         fitRadius;
     float         apRadius;
-    bool          chiFluxTrend;         // Fit a trend in Chi2 as a function of flux?
-    pmSourceFitOptions *fitOptions;
 } pmPSFOptions;
 
@@ -94 +104 @@
 double pmPSF_SXYtoModel (psF32 *fittedPar);
 
-bool pmGrowthCurveGenerate (pmReadout *readout, pmPSF *psf, bool ignore, psImageMaskType maskVal, psImageMaskType mark);
 pmPSF *pmPSFBuildSimple (char *typeName, float sxx, float syy, float sxy, ...);