Changeset 5720

Timestamp:

Dec 7, 2005, 8:51:59 AM (21 years ago)

Author:

magnier

Message:

added pmModelStatus enum

added pmModel.status element

aded pmMomentsWriteText prototype

added 'sky' argument to pmSourceSubModel, pmSourceAddModel

File:

• branches/eam_rel8_b2/psModules/src/objects/pmObjects.h (modified) (6 diffs)

branches/eam_rel8_b2/psModules/src/objects/pmObjects.h

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2.6.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-11-26 02:48:42 $
+ *  @version $Revision: 1.2.6.1.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-07 18:51:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -125 +125 @@
 // #define PS_MODEL_SGAUSS 3
 
+typedef enum {
+    PM_MODEL_UNTRIED,               ///< model fit not yet attempted
+    PM_MODEL_SUCCESS,               ///< model fit succeeded
+    PM_MODEL_NONCONVERGE,           ///< model fit did not converge
+    PM_MODEL_OFFIMAGE,              ///< model fit drove out of range
+    PM_MODEL_BADARGS                ///< model fit called with invalid args
+} pmModelStatus;
 
 /** pmModel data structure
@@ -139 +146 @@
     pmModelType type;   ///< Model to be used.
     psVector *params;   ///< Paramater values.
-    psVector *dparams;   ///< Parameter errors.
-    float chisq;   ///< Fit chi-squared.
-    int nDOF;    ///< number of degrees of freedom
-    int nIter;    ///< number of iterations to reach min
-    float radius;   ///< fit radius actually used
+    psVector *dparams;  ///< Parameter errors.
+    float chisq;        ///< Fit chi-squared.
+    int nDOF;           ///< number of degrees of freedom
+    int nIter;          ///< number of iterations to reach min
+    int status;         ///< fit status (
+    float radius;       ///< fit radius actually used
 }
 pmModel;
@@ -365 +373 @@
 );
 
+bool pmMomentsWriteText (psArray *sources, char *filename);
 
 /** pmSourcePSFClump()
@@ -508 +517 @@
 bool pmSourceAddModel(
     psImage *image,   ///< The output image (float)
-    psImage *mask,   ///< The image pixel mask (valid == 0)
+    psImage *mask,    ///< The image pixel mask (valid == 0)
     pmModel *model,   ///< The input pmModel
-    bool center    ///< A boolean flag that determines whether pixels are centered
+    bool center,      ///< A boolean flag that determines whether pixels are centered
+    bool sky          ///< A boolean flag that determines if the sky is subtracted as well
 );
 
@@ -526 +536 @@
 bool pmSourceSubModel(
     psImage *image,   ///< The output image (float)
-    psImage *mask,   ///< The image pixel mask (valid == 0)
+    psImage *mask,    ///< The image pixel mask (valid == 0)
     pmModel *model,   ///< The input pmModel
-    bool center    ///< A boolean flag that determines whether pixels are centered
+    bool center,      ///< A boolean flag that determines whether pixels are centered
+    bool sky          ///< A boolean flag that determines if the sky is subtracted as well
 );