Changeset 14986 for branches/eam_branch_20070921/psModules/src/objects/pmPSF.h

Timestamp:

Sep 22, 2007, 3:47:28 AM (19 years ago)

Author:

eugene

Message:

fix compilation issues re pmTrend for psf parameters

File:

• branches/eam_branch_20070921/psModules/src/objects/pmPSF.h (modified) (4 diffs)

branches/eam_branch_20070921/psModules/src/objects/pmPSF.h

@@ -6 +6 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.16.2.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-09-22 02:20:11 $
+ * @version $Revision: 1.16.2.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-09-22 13:47:28 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -47 +47 @@
     int nPSFstars;                      ///< number of stars used to measure PSF
     int nApResid;                       ///< number of stars used to measure ApResid
-    bool poissonErrors;
+    int Nx, Ny;                         ///< reference image dimensions
+    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 +63 @@
     int           psfTrendNx;
     int           psfTrendNy;
-    bool          poissonErrors;
+    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
+    float         radius;
+    
 } pmPSFOptions;
 
@@ -72 +79 @@
  *
  */
-pmPSF *pmPSFAlloc(
-    pmModelType type,     // type of model for PSF
-    bool poissonErrors,
-    psPolynomial2D *psfTrendMask
-);
+pmPSF *pmPSFAlloc (pmPSFOptions *options);
+pmPSFOptions *pmPSFOptionsAlloc ();
 
 double pmPSF_SXYfromModel (psF32 *modelPar);