Changeset 34403 for trunk/psModules/src/objects/pmSource.c

Timestamp:

Sep 5, 2012, 4:16:36 PM (14 years ago)

Author:

eugene

Message:

adding SATSTAR profile code (but keeping it disabled for now); adding PS1_SV2 and PS1_DV3, finalizing PS1_V4; PLTSCALE now includes a sign for the image sky parity

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmSource.c (modified) (5 diffs)

trunk/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;
@@ -650 +652 @@
         if (source->peak->y >= region->y1) continue;
 
+# define DEBUG 0
+# define TEST_X 2792
+# define TEST_Y 1741
+# if (DEBUG) 
+        if ((fabs(source->peak->x - TEST_X) < 5) && (fabs(source->peak->y - TEST_Y) < 5)) {
+          fprintf (stderr, "test peak\n");
+        }
+# endif 
+
         // should be set by pmSourceAlloc
         psAssert (source->type == PM_SOURCE_TYPE_UNKNOWN, "source type was not init-ed?");
@@ -665 +676 @@
 
         // XXX EAM : can we use the value of SATURATE if mask is NULL?
+        // XXX a 5x5 box centered on the peak is a rather small region to check for
         inner = psRegionForSquare (source->peak->x, source->peak->y, 2);
         inner = psRegionForImage (source->maskView, inner);