Changeset 14612 for branches/eam_branch_20070817/psModules/src/objects/pmPSF.h

Timestamp:

Aug 22, 2007, 2:55:49 PM (19 years ago)

Author:

magnier

Message:

adjusted pmModel.h to allow pmModel to use functions which use pmModel
as an argument.

adjusted the order of the pmPSF.h entries to allow that as an argument
as well

changed pmPSF I/O functions to load/save the psf on the
chip->analysis, not the readout->analysis

fixed the modelRadius function for PGAUSS

File:

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

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

@@ -6 +6 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-06-20 02:22:26 $
+ * @version $Revision: 1.14.6.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-08-23 00:55:49 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -16 +16 @@
 /// @addtogroup Objects Object Detection / Analysis Functions
 /// @{
+
+// type of model carried by the pmModel structure
+typedef int pmModelType;
 
 typedef enum {
@@ -44 +47 @@
 typedef struct
 {
-    pmModelType type;   ///< PSF Model in use
-    psArray *params_NEW;   ///< Model parameters (psPolynomial2D)
-    // XXXXX I am changing params: we will allocate elements for the
-    // unfitted elements (So, Io, Xo, Yo) and leave them as NULL
-    // I am using a new name to catch all refs to params with gcc
+    pmModelType type;                   ///< PSF Model in use
+    psArray *params;                    ///< Model parameters (psPolynomial2D)
     psPolynomial1D *ChiTrend;         ///< Chisq vs flux fit (correction for systematic errors)
     psPolynomial4D *ApTrend;            ///< ApResid vs (x,y,rflux) (rflux = ten(0.4*mInst))
@@ -79 +79 @@
 );
 
-/**
- *
- * This function constructs a pmModel instance based on the pmPSF description
- * of the PSF. The input is a pmModel with at least the values of the centroid
- * coordinates (possibly normalization if this is needed) defined. The values of
- * the PSF-dependent parameters are specified for the specific realization based
- * on the coordinates of the object.
- *
- */
-pmModel *pmModelFromPSF(
-    pmModel *model,                     ///< Add comment
-    pmPSF *psf                          ///< Add comment
-);
-
 bool pmPSFMaskApTrend (psPolynomial4D *trend, pmPSFApTrendOptions option);