Changeset 28822

Timestamp:

Aug 1, 2010, 4:39:31 PM (16 years ago)

Author:

eugene

Message:

add more source flags and output fields for diff/input source matches

Location:

branches/eam_branches/ipp-20100621/psModules/src/objects

Files:

• pmSource.h (modified) (1 diff)
• pmSourceDiffStats.c (modified) (1 diff)
• pmSourceDiffStats.h (modified) (1 diff)
• pmSourceMasks.h (modified) (1 diff)

branches/eam_branches/ipp-20100621/psModules/src/objects/pmSource.h

@@ -65 +65 @@
     pmSourceType type;                  ///< Best identification of object.
     pmSourceMode mode;                  ///< analysis flags set for object.
+    pmSourceMode2 mode2;                ///< analysis flags set for object.
     pmSourceTmpF tmpFlags;              ///< internal-only flags
     psArray *blends;                    ///< collection of sources thought to be confused with object

branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceDiffStats.c

@@ -29 +29 @@
     diffStats->nRatioAll = NAN;
     diffStats->nGood = 0;
+
+    diffStats->SNp = NAN;
+    diffStats->SNm = NAN;
+    diffStats->Rp = NAN;
+    diffStats->Rm = NAN;
 }
 

branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceDiffStats.h

@@ -29 +29 @@
     float nRatioAll;                    // = nGood / (nGood + nMask + nBad)
     int   nGood;                        // nGood as defined above
+    float SNp;                          // S/N of matched source in positive image
+    float SNm;                          // S/N of matched source in negative image
+    float Rp;                           // radius of matched source in positive image
+    float Rm;                           // radius of matched source in negative image
 } pmSourceDiffStats;
 

branches/eam_branches/ipp-20100621/psModules/src/objects/pmSourceMasks.h

@@ -39 +39 @@
 } pmSourceMode;
 
+// Bit flags to distinguish analysis results
+// When adding to or subtracting from this list, please also modify pmSourceMaskHeader
+typedef enum {
+    PM_SOURCE_MODE2_DEFAULT          = 0x00000000, ///< Initial value: resets all bits
+    PM_SOURCE_MODE2_DIFF_WITH_SINGLE = 0x00000001, ///< diff source matched to a single positive detection
+    PM_SOURCE_MODE2_DIFF_WITH_DOUBLE = 0x00000002, ///< diff source matched to positive detections in both images
+} pmSourceMode2;
 
 /// Populate header with mask values