Changeset 23184

Timestamp:

Mar 4, 2009, 2:03:08 PM (17 years ago)

Author:

Paul Price

Message:

Adding mask/flag values to header of CMF files.

Location:

trunk/psModules/src

Files:

• objects/Makefile.am (modified) (2 diffs)
• objects/pmSource.h (modified) (3 diffs)
• objects/pmSourceIO_CMF_PS1_V1.c (modified) (1 diff)
• objects/pmSourceMasks.c (added)
• objects/pmSourceMasks.h (added)
• psmodules.h (modified) (1 diff)

trunk/psModules/src/objects/Makefile.am

@@ -19 +19 @@
         pmModelUtils.c \
         pmSource.c \
+        pmSourceMasks.c \
         pmSourceMoments.c \
         pmSourceExtendedPars.c \
@@ -69 +70 @@
         pmModelUtils.h \
         pmSource.h \
+        pmSourceMasks.h \
         pmSourceExtendedPars.h \
         pmSourceUtils.h \

trunk/psModules/src/objects/pmSource.h

@@ -19 +19 @@
 /// @addtogroup Objects Object Detection / Analysis Functions
 /// @{
+
+#include <pmSourceMasks.h>
 
 /** pmSourceType enumeration
@@ -34 +36 @@
     PM_SOURCE_TYPE_EXTENDED,            ///< an extended object (eg, galaxy) (subtracted model is EXT)
 } pmSourceType;
-
-// bit flags to distinguish analysis results
-typedef enum {
-    PM_SOURCE_MODE_DEFAULT          = 0x00000000, ///< Initial value: resets all bits
-    PM_SOURCE_MODE_PSFMODEL         = 0x00000001, ///< Source fitted with a psf model (linear or non-linear)
-    PM_SOURCE_MODE_EXTMODEL         = 0x00000002, ///< Source fitted with an extended-source model
-    PM_SOURCE_MODE_FITTED           = 0x00000004, ///< Source fitted with non-linear model (PSF or EXT; good or bad)
-    PM_SOURCE_MODE_FAIL             = 0x00000008, ///< Fit (non-linear) failed (non-converge, off-edge, run to zero)
-    PM_SOURCE_MODE_POOR             = 0x00000010, ///< Fit succeeds, but low-SN, high-Chisq, or large (for PSF -- drop?)
-    PM_SOURCE_MODE_PAIR             = 0x00000020, ///< Source fitted with a double psf
-    PM_SOURCE_MODE_PSFSTAR          = 0x00000040, ///< Source used to define PSF model
-    PM_SOURCE_MODE_SATSTAR          = 0x00000080, ///< Source model peak is above saturation
-    PM_SOURCE_MODE_BLEND            = 0x00000100, ///< Source is a blend with other sourcers
-    PM_SOURCE_MODE_EXTERNAL         = 0x00000200, ///< Source based on supplied input position
-    PM_SOURCE_MODE_BADPSF           = 0x00000400, ///< Failed to get good estimate of object's PSF
-    PM_SOURCE_MODE_DEFECT           = 0x00000800, ///< Source is thought to be a defect
-    PM_SOURCE_MODE_SATURATED        = 0x00001000, ///< Source is thought to be saturated pixels (bleed trail)
-    PM_SOURCE_MODE_CR_LIMIT         = 0x00002000, ///< Source has crNsigma above limit
-    PM_SOURCE_MODE_EXT_LIMIT        = 0x00004000, ///< Source has extNsigma above limit
-    PM_SOURCE_MODE_MOMENTS_FAILURE  = 0x00008000, ///< could not measure the moments
-    PM_SOURCE_MODE_SKY_FAILURE      = 0x00010000, ///< could not measure the local sky
-    PM_SOURCE_MODE_SKYVAR_FAILURE   = 0x00020000, ///< could not measure the local sky variance
-    PM_SOURCE_MODE_BELOW_MOMENTS_SN = 0x00040000, ///< moments not measured due to low S/N
-    PM_SOURCE_MODE_BIG_RADIUS       = 0x00100000, ///< poor moments for small radius, try large radius
-    PM_SOURCE_MODE_AP_MAGS          = 0x00200000, ///< source has an aperture magnitude
-    PM_SOURCE_MODE_BLEND_FIT        = 0x00400000, ///< source was fitted as a blend
-    PM_SOURCE_MODE_EXTENDED_FIT     = 0x00800000, ///< full extended fit was used
-    PM_SOURCE_MODE_EXTENDED_STATS   = 0x01000000, ///< extended aperture stats calculated
-    PM_SOURCE_MODE_LINEAR_FIT       = 0x02000000, ///< source fitted with the linear fit
-    PM_SOURCE_MODE_NONLINEAR_FIT    = 0x04000000, ///< source fitted with the non-linear fit
-    PM_SOURCE_MODE_RADIAL_FLUX      = 0x08000000, ///< radial flux measurements calculated
-    PM_SOURCE_MODE_SIZE_SKIPPED     = 0x10000000, ///< size could not be determined
-} pmSourceMode;
 
 typedef enum {
@@ -101 +70 @@
     pmSourceType type;                  ///< Best identification of object.
     pmSourceMode mode;                  ///< analysis flags set for object.
-    pmSourceTmpF tmpFlags;              ///< internal-only flags
+    pmSourceTmpF tmpFlags;              ///< internal-only flags
     psArray *blends;                    ///< collection of sources thought to be confused with object
     float psfMag;                       ///< calculated from flux in modelPSF

trunk/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c

@@ -209 +209 @@
     }
 
+    psMetadata *header = psMetadataCopy(NULL, tableHeader);
+    pmSourceMasksHeader(header);
+
     if (table->n == 0) {
-        psFitsWriteBlank (fits, tableHeader, extname);
-        psFree (table);
+        psFitsWriteBlank(fits, header, extname);
+        psFree(table);
+        psFree(header);
         return true;
     }
 
     psTrace ("pmFPAfile", 5, "writing ext data %s\n", extname);
-    if (!psFitsWriteTable (fits, tableHeader, table, extname)) {
+    if (!psFitsWriteTable(fits, header, table, extname)) {
         psError(PS_ERR_IO, false, "writing ext data %s\n", extname);
         psFree(table);
+        psFree(header);
         return false;
     }
-    psFree (table);
+    psFree(table);
+    psFree(header);
 
     return true;

trunk/psModules/src/psmodules.h

@@ -113 +113 @@
 #include <pmPSF.h>
 #include <pmModel.h>
+#include <pmSourceMasks.h>
 #include <pmSource.h>
 #include <pmSourceUtils.h>