Changeset 14612 for branches/eam_branch_20070817/psModules/src/objects/pmModel.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/pmModel.h (modified) (7 diffs)

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

@@ -5 +5 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.11.6.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-20 01:58:16 $
+ * @version $Revision: 1.11.6.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-08-23 00:55:49 $
  *
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -14 +14 @@
 # define PM_MODEL_H
 
-# define TMP_PSF_TYPE void
-# define TMP_MODEL_TYPE void
-# define TMP_SOURCE_TYPE void
-
 /// @addtogroup Objects Object Detection / Analysis Functions
 /// @{
@@ -23 +19 @@
 /* pointers for the functions types below are supplied to each pmModel, and can be used by
    the programmer without needing to know the model class */
-
-// type of model carried by the pmModel structure
-typedef int pmModelType;
 
 typedef enum {
@@ -48 +41 @@
 } pmModelOpMode;
 
+typedef struct pmModel pmModel;
+typedef struct pmSource pmSource;
+
 //  This function is the model chi-square minimization function for this model.
 typedef psMinimizeLMChi2Func pmModelFunc;
@@ -63 +59 @@
 //  This function provides the model guess parameters based on the details of
 //  the given source.
-typedef bool (*pmModelGuessFunc)(TMP_MODEL_TYPE *model, TMP_SOURCE_TYPE *source);
+typedef bool (*pmModelGuessFunc)(pmModel *model, pmSource *source);
 
 //  This function constructs the PSF model for the given source based on the
 //  supplied psf and the EXT model for the object.
-typedef bool (*pmModelFromPSFFunc)(TMP_MODEL_TYPE *modelPSF, TMP_MODEL_TYPE *modelEXT, TMP_PSF_TYPE *psf);
+typedef bool (*pmModelFromPSFFunc)(pmModel *modelPSF, pmModel *modelEXT, pmPSF *psf);
 
 //  This function sets the model parameters based on the PSF for a given coordinate and central
 //  intensity
-typedef bool (*pmModelParamsFromPSF)(TMP_MODEL_TYPE *model, TMP_PSF_TYPE *psf, float Xo, float Yo, float Io);
+typedef bool (*pmModelParamsFromPSF)(pmModel *model, pmPSF *psf, float Xo, float Yo, float Io);
 
 //  This function returns the success / failure status of the given model fit
-typedef bool (*pmModelFitStatusFunc)(TMP_MODEL_TYPE *model);
+typedef bool (*pmModelFitStatusFunc)(pmModel *model);
 
 /** pmModel data structure
@@ -85 +81 @@
  *
  */
-typedef struct
-{
+struct pmModel {
     pmModelType type;                   ///< Model to be used.
     psVector *params;                   ///< Paramater values.
@@ -107 +102 @@
     pmModelParamsFromPSF modelParamsFromPSF;
     pmModelFitStatusFunc modelFitStatus;
-} pmModel;
+};
 
 /** Symbolic names for the elements of [d]params