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

Timestamp:

May 5, 2011, 11:02:53 AM (15 years ago)

Author:

eugene

Message:

merge updates from eam branch 20110404

File:

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

trunk/psModules/src/objects/pmSource.h

@@ -80 +80 @@
     pmSourceMode2 mode2;                ///< analysis flags set for object.
     pmSourceTmpF tmpFlags;              ///< internal-only flags
-    psArray *blends;                    ///< collection of sources thought to be confused with object
+
     float psfMag;                       ///< calculated from flux in modelPSF
+    float psfMagErr;                    ///< error in psfMag
     float psfFlux;                      ///< calculated from flux in modelPSF
-    float psfFluxErr;                   ///< calculated from flux in modelPSF
-    float extMag;                       ///< calculated from flux in modelEXT
-    float errMag;                       ///< error in psfMag OR extMag (depending on type)
+    float psfFluxErr;                   ///< error in psfFlux
+    float extMag;                       ///< calculated from flux in modelEXT -- NOTE this is not actually used
     float apMag;                        ///< apMag corresponding to psfMag or extMag (depending on type)
     float apMagRaw;                     ///< raw mag in given aperture
@@ -98 +98 @@
     float crNsigma;                     ///< Nsigma deviation from PSF to CR
     float extNsigma;                    ///< Nsigma deviation from PSF to EXT
-    float sky, skyErr;                  ///< The sky and its error at the center of the object
+    float sky;                          ///< The sky at the center of the object 
+    float skyErr;                       ///< The sky error at the center of the object
+
     psRegion region;                    ///< area on image covered by selected pixels
+    psArray *blends;                    ///< collection of sources thought to be confused with object
     pmSourceExtendedPars *extpars;      ///< extended source parameters
     pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections
@@ -254 +257 @@
     float sigma,      ///< size of Gaussian window function (<= 0.0 -> skip window)
     float minSN,              ///< minimum pixel significance
+    float minKronRadius,      ///< minimum pixel significance
     psImageMaskType maskVal
 );
@@ -273 +277 @@
   float xGuess, float yGuess);
 
+float pmSourceMinKronRadius(psArray *sources, float PSF_SN_LIM);
+
 pmModel *pmSourceGetModel (bool *isPSF, const pmSource *source);