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

Timestamp:

Jun 19, 2007, 4:22:26 PM (19 years ago)

Author:

Paul Price

Message:

Extensive changes to APIs to allow use of a nominated value to mask
against (the maskVal). Previously, the mask values were either
hard-coded (e.g., PM_MASK_SAT) or taken as anything non-zero. The
code is tested under psphot (which has similar changes) and does not
crash, but neither is it successful in marking all bad pixels (EAM
will investigate). For this reason, I have left the "gutter" pixels
(cell gaps) set to 0 instead of NAN in pmFPAMosaic.

File:

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

trunk/psModules/src/objects/pmSource.h

@@ -3 +3 @@
  * @author EAM, IfA; GLG, MHPCC
  *
- * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-05-31 12:30:19 $
+ * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-20 02:22:26 $
  * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
@@ -59 +59 @@
 typedef struct
 {
-    const int id;                       ///< Unique ID for object
-    pmPeak *peak;                       ///< Description of peak pixel.
-    psImage *pixels;                    ///< Rectangular region including object pixels.
-    psImage *weight;                    ///< Image variance.
-    psImage *modelFlux;                 ///< cached copy of the model for this source
-    psImage *maskObj;                   ///< unique mask for this object which marks included pixels associated with objects.
-    psImage *maskView;                  ///< view into global image mask for this object region
-    pmMoments *moments;                 ///< Basic moments measure for the object.
-    pmModel *modelPSF;                  ///< PSF Model fit (parameters and type)
-    pmModel *modelEXT;                  ///< EXT (floating) Model fit (parameters and type).
-    pmSourceType type;                  ///< Best identification of object.
-    pmSourceMode mode;                  ///< Best identification of object.
+    const int id;                       ///< Unique ID for object
+    pmPeak *peak;                       ///< Description of peak pixel.
+    psImage *pixels;                    ///< Rectangular region including object pixels.
+    psImage *weight;                    ///< Image variance.
+    psImage *modelFlux;                 ///< cached copy of the model for this source
+    psImage *maskObj;                   ///< unique mask for this object which marks included pixels associated with objects.
+    psImage *maskView;                  ///< view into global image mask for this object region
+    pmMoments *moments;                 ///< Basic moments measure for the object.
+    pmModel *modelPSF;                  ///< PSF Model fit (parameters and type)
+    pmModel *modelEXT;                  ///< EXT (floating) Model fit (parameters and type).
+    pmSourceType type;                  ///< Best identification of object.
+    pmSourceMode mode;                  ///< Best identification of object.
     psArray *blends;
-    float psfMag;                       ///< calculated from flux in modelPsf
-    float extMag;                       ///< calculated from flux in modelEXT
-    float errMag;                       ///< error in psfMag OR extMag (depending on type)
-    float apMag;               ///< apMag corresponding to psfMag or extMag (depending on type)
-    float pixWeight;                    // model-weighted coverage of valid pixels
-    psRegion region;                    // area on image covered by selected pixels
-    float sky, skyErr;                  //?< The sky and its error at the center of the object
+    float psfMag;                       ///< calculated from flux in modelPsf
+    float extMag;                       ///< calculated from flux in modelEXT
+    float errMag;                       ///< error in psfMag OR extMag (depending on type)
+    float apMag;               ///< apMag corresponding to psfMag or extMag (depending on type)
+    float pixWeight;                    // model-weighted coverage of valid pixels
+    psRegion region;                    // area on image covered by selected pixels
+    float sky, skyErr;                  //?< The sky and its error at the center of the object
 }
 pmSource;
@@ -192 +192 @@
     psArray *source,   ///< The input pmSource
     psMetadata *metadata,  ///< Contains classification parameters
-    pmPSFClump clump   ///< Statistics about the PSF clump
+    pmPSFClump clump,   ///< Statistics about the PSF clump
+    psMaskType maskSat                  ///< Mask value for saturated pixels
 );
 
@@ -213 +214 @@
 pmModel *pmSourceGetModel (bool *isPSF, const pmSource *source);
 
-bool pmSourceAdd (pmSource *source, pmModelOpMode mode);
-bool pmSourceSub (pmSource *source, pmModelOpMode mode);
-
-bool pmSourceOp (pmSource *source, pmModelOpMode mode, bool add);
-bool pmSourceCacheModel (pmSource *source);
+bool pmSourceAdd (pmSource *source, pmModelOpMode mode, psMaskType maskVal);
+bool pmSourceSub (pmSource *source, pmModelOpMode mode, psMaskType maskVal);
+
+bool pmSourceOp (pmSource *source, pmModelOpMode mode, bool add, psMaskType maskVal);
+bool pmSourceCacheModel (pmSource *source, psMaskType maskVal);
 
 /// @}