Changeset 34375

Timestamp:

Sep 2, 2012, 12:38:50 PM (14 years ago)

Author:

eugene

Message:

adding satstar element to pmSource

Location:

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

Files:

• Makefile.am (modified) (2 diffs)
• pmSource.c (modified) (3 diffs)
• pmSource.h (modified) (1 diff)
• pmSourceSatstar.c (added)
• pmSourceSatstar.h (added)

branches/eam_branches/ipp-20120805/psModules/src/objects/Makefile.am

@@ -26 +26 @@
         pmSourceDiffStats.c \
         pmSourceExtendedPars.c \
+        pmSourceSatstar.c \
         pmSourceUtils.c \
         pmSourceSky.c \
@@ -100 +101 @@
         pmSourceDiffStats.h \
         pmSourceExtendedPars.h \
+        pmSourceSatstar.h \
         pmSourceUtils.h \
         pmSourceSky.h \

branches/eam_branches/ipp-20120805/psModules/src/objects/pmSource.c

@@ -40 +40 @@
 #include "pmSourceDiffStats.h"
 #include "pmSourcePhotometry.h"
+#include "pmSourceSatstar.h"
 #include "pmSource.h"
 
@@ -61 +62 @@
     psFree(tmp->modelFits);
     psFree(tmp->extFitPars);
+    psFree(tmp->blends);
+    psFree(tmp->satstar);
     psFree(tmp->extpars);
-    psFree(tmp->moments);
     psFree(tmp->diffStats);
     psFree(tmp->radialAper);
-    psFree(tmp->blends);
     psTrace("psModules.objects", 10, "---- end ----\n");
 }
@@ -160 +161 @@
     source->region = psRegionSet(NAN, NAN, NAN, NAN);
     source->blends = NULL;
+    source->satstar = NULL;
     source->extpars = NULL;
     source->diffStats = NULL;

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

@@ -114 +114 @@
     psRegion region;                    ///< area on image covered by selected pixels
     psArray *blends;                    ///< collection of sources thought to be confused with object
+    pmSourceSatstar *satstar;
     pmSourceExtendedPars *extpars;      ///< extended source parameters
     pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections