Changeset 16819 for trunk/psModules/src/objects/pmSource.h

Timestamp:

Mar 4, 2008, 3:08:08 PM (18 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20080225 (better flag definitions)

File:

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

trunk/psModules/src/objects/pmSource.h

@@ -3 +3 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-01-15 02:48:28 $
+ * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-05 01:08:08 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -36 +36 @@
 typedef enum {
     PM_SOURCE_MODE_DEFAULT    = 0x0000, ///<
-    PM_SOURCE_MODE_PSFMODEL   = 0x0001, ///<
-    PM_SOURCE_MODE_EXTMODEL   = 0x0002, ///<
-    PM_SOURCE_MODE_SUBTRACTED = 0x0004, ///<
-    PM_SOURCE_MODE_FITTED     = 0x0008, ///<
-    PM_SOURCE_MODE_FAIL       = 0x0010, ///<
-    PM_SOURCE_MODE_POOR       = 0x0020, ///<
-    PM_SOURCE_MODE_PAIR       = 0x0040, ///<
-    PM_SOURCE_MODE_PSFSTAR    = 0x0080, ///<
-    PM_SOURCE_MODE_SATSTAR    = 0x0100, ///<
-    PM_SOURCE_MODE_BLEND      = 0x0200, ///<
-    PM_SOURCE_MODE_LINEAR     = 0x0400, ///<
-    PM_SOURCE_MODE_TEMPSUB    = 0x0800, ///< XXX get me a better name!
-    PM_SOURCE_MODE_EXTERNAL   = 0x1000, ///< XXX get me a better name!
-    PM_SOURCE_MODE_BADPSF     = 0x2000, ///< Failed to get good estimate of object's PSF
+    PM_SOURCE_MODE_PSFMODEL   = 0x0001, ///< Source fitted with a psf model (linear or non-linear)
+    PM_SOURCE_MODE_EXTMODEL   = 0x0002, ///< Source fitted with an extended-source model
+    PM_SOURCE_MODE_FITTED     = 0x0004, ///< Source fitted with non-linear model (PSF or EXT; good or bad)
+    PM_SOURCE_MODE_FAIL       = 0x0008, ///< Fit (non-linear) failed (non-converge, off-edge, run to zero)
+    PM_SOURCE_MODE_POOR       = 0x0010, ///< Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
+    PM_SOURCE_MODE_PAIR       = 0x0020, ///< Source fitted with a double psf
+    PM_SOURCE_MODE_PSFSTAR    = 0x0040, ///< Source used to define PSF model
+    PM_SOURCE_MODE_SATSTAR    = 0x0080, ///< Source model peak is above saturation
+    PM_SOURCE_MODE_BLEND      = 0x0100, ///< Source is a blend with other sourcers
+    PM_SOURCE_MODE_EXTERNAL   = 0x0200, ///< Source based on supplied input position
+    PM_SOURCE_MODE_BADPSF     = 0x0400, ///< Failed to get good estimate of object's PSF
+    PM_SOURCE_MODE_DEFECT     = 0x0800, ///< Source is thought to be a defect
+    PM_SOURCE_MODE_SATURATED  = 0x1000, ///< Source is thought to be saturation
+    PM_SOURCE_MODE_CRLIMIT    = 0x2000, ///< Source has crNsigma above limit
+    PM_SOURCE_MODE_SUBTRACTED = 0x4000, ///< XXX this flag is actually only used internally (move)
 } pmSourceMode;
 
@@ -57 +58 @@
  *  simplest measurement of a source is the location and flux of the peak pixel
  *  associated with the source:
+ *
+ *  XXX do I have to re-organize this (again!) to allow an arbitrary set of extended model fits??
  *
  */