Changeset 27657 for trunk/psModules/src/objects

Timestamp:

Apr 11, 2010, 5:08:29 PM (16 years ago)

Author:

eugene

Message:

updates to support psphotStack

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/Makefile.am (modified) (2 diffs)
• src/objects/pmPeaks.h (modified) (1 diff)
• src/objects/pmPhotObj.c (modified) (2 diffs)
• src/objects/pmPhotObj.h (modified) (1 diff)
• src/objects/pmSource.c (modified) (2 diffs)
• src/objects/pmSource.h (modified) (3 diffs)

trunk/psModules/src/objects/Makefile.am

@@ -20 +20 @@
         pmModelUtils.c \
         pmSource.c \
+        pmPhotObj.c \
         pmSourceMasks.c \
         pmSourceMoments.c \
@@ -80 +81 @@
         pmModelUtils.h \
         pmSource.h \
+        pmPhotObj.h \
         pmSourceMasks.h \
         pmSourceDiffStats.h \

trunk/psModules/src/objects/pmPeaks.h

@@ -63 +63 @@
     bool assigned;                      ///< is peak assigned to a source?
     pmPeakType type;                    ///< Description of peak.
-    pmFootprint *footprint;     ///< reference to containing footprint
+    pmFootprint *footprint;             ///< reference to containing footprint
 }
 pmPeak;

trunk/psModules/src/objects/pmPhotObj.c

@@ -17 +17 @@
 #include <pslib.h>
 #include "pmPhotObj.h"
+#include "pmSource.h"
 
 static void pmPhotObjFree (pmPhotObj *tmp)
@@ -38 +39 @@
 }
 
+bool pmPhotObjAddSource(pmPhotObj *object, pmSource *source) {
+
+    psAssert (source, "programming error: NULL source");
+    if (!source->peak) {
+        psError(PS_ERR_UNKNOWN, true, "source missing peak");
+        return false; 
+    }
+    if (!finite(source->peak->xf)) {
+        psError(PS_ERR_UNKNOWN, true, "NAN peak coordinate");
+        return false; 
+    }
+    if (!finite(source->peak->yf)) {
+        psError(PS_ERR_UNKNOWN, true, "NAN peak coordinate");
+        return false; 
+    }
+
+    // XXX we should probably use the fitted position if it exists
+    if (!object->sources) {
+        object->sources = psArrayAllocEmpty(1);
+        object->x = source->peak->xf;
+        object->y = source->peak->yf;
+    }
+    psArrayAdd (object->sources, 1, source);
+    return true;
+}

trunk/psModules/src/objects/pmPhotObj.h

@@ -34 +34 @@
  */
 typedef struct {
-  int seq;                            ///< ID for output (generated on write OR set on read)
-  psArray *sources;
+    int id;                            ///< ID for output (generated on write OR set on read)
+    psArray *sources;
+    int flags;
+    float x;
+    float y;
 } pmPhotObj;
+
+bool pmPhotObjAddSource(pmPhotObj *object, pmSource *source);
+pmPhotObj *pmPhotObjAlloc(void);
 
 /// @}
 # endif /* PM_PHOT_OBJ_H */
+

trunk/psModules/src/objects/pmSource.c

@@ -180 +180 @@
     source->type = in->type;
     source->mode = in->mode;
+    source->imageID = in->imageID;
 
     return(source);
@@ -1058 +1059 @@
     psF32 fA = (A->peak == NULL) ? 0 : A->peak->y;
     psF32 fB = (B->peak == NULL) ? 0 : B->peak->y;
+
+    psF32 diff = fA - fB;
+    if (diff > FLT_EPSILON) return (+1);
+    if (diff < FLT_EPSILON) return (-1);
+    return (0);
+}
+
+// sort by X (ascending)
+int pmSourceSortByX (const void **a, const void **b)
+{
+    pmSource *A = *(pmSource **)a;
+    pmSource *B = *(pmSource **)b;
+
+    psF32 fA = (A->peak == NULL) ? 0 : A->peak->x;
+    psF32 fB = (B->peak == NULL) ? 0 : B->peak->x;
 
     psF32 diff = fA - fB;

trunk/psModules/src/objects/pmSource.h

@@ -43 +43 @@
     PM_SOURCE_TMPF_SIZE_MEASURED     = 0x0004,
     PM_SOURCE_TMPF_SIZE_CR_CANDIDATE = 0x0008,
+    PM_SOURCE_TMPF_MOMENTS_MEASURED  = 0x0010,
 } pmSourceTmpF;
 
@@ -90 +91 @@
     pmSourceExtendedPars *extpars;      ///< extended source parameters
     pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections
+    int imageID;
 };
 
@@ -245 +247 @@
 int  pmSourceSortBySN (const void **a, const void **b);
 int  pmSourceSortByY (const void **a, const void **b);
+int  pmSourceSortByX (const void **a, const void **b);
 int  pmSourceSortBySeq (const void **a, const void **b);