Changeset 13803 for trunk/psModules/src/objects/pmModel.h

Timestamp:

Jun 13, 2007, 1:41:51 PM (19 years ago)

Author:

magnier

Message:

replaced pmModel.status with pmModel.flags; using bit values instead of ints; names are now of the form PM_MODEL_STATUS_XXX; no error on limit saturation for model parameters

File:

• trunk/psModules/src/objects/pmModel.h (modified) (3 diffs)

trunk/psModules/src/objects/pmModel.h

@@ -5 +5 @@
  * @author EAM, IfA
  *
- * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-05-10 19:48:35 $
+ * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-13 23:41:51 $
  *
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 
 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
+    PM_MODEL_STATUS_NONE         = 0x00, ///< model fit not yet attempted, no other info
+    PM_MODEL_STATUS_FITTED       = 0x01, ///< model fit completed
+    PM_MODEL_STATUS_NONCONVERGE  = 0x02, ///< model fit did not converge
+    PM_MODEL_STATUS_OFFIMAGE     = 0x04, ///< model fit drove out of range
+    PM_MODEL_STATUS_BADARGS      = 0x08, ///< model fit called with invalid args
+    PM_MODEL_STATUS_LIMITS       = 0x10  ///< model parameters hit limits
 } pmModelStatus;
 
@@ -58 +59 @@
     int nDOF;                           ///< number of degrees of freedom
     int nIter;                          ///< number of iterations to reach min
-    pmModelStatus status;               ///< fit status
+    pmModelStatus flags;                ///< model status flags
     float radiusFit;                    ///< fit radius actually used
     pmResiduals *residuals;             ///< normalized PSF residuals