Changeset 5993 for trunk/psphot/src/psphotBasicDeblend.c

Timestamp:

Jan 15, 2006, 8:30:16 AM (21 years ago)

Author:

eugene

Message:

API cleanup, removed old test files, some re-organization, changed FLT/GAL to EXT

File:

• trunk/psphot/src/psphotBasicDeblend.c (modified) (3 diffs)

trunk/psphot/src/psphotBasicDeblend.c

@@ -36 +36 @@
     psArray *overlap = psArrayAlloc (100);
 
-    // XXX make sure this results in decreasing, not increasing, SN
+    // examine sources in decreasing SN order
     for (int i = sources->n - 1; i >= 0; i--) {
         N = index->data.U32[i];
@@ -73 +73 @@
         // generate source contour (1/4 peak counts)
         if (overlap->n > 0) {
-            // XXX EAM : make the 1/4 user-defined.
-            // XXX keep threshold from dropping too low (N*sky.sigma)
+            // set the threshold based on user inputs
             threshold = FRACTION * (source->peak->counts - source->moments->Sky) + source->moments->Sky; 
             threshold = PS_MAX (threshold, minThreshold);
 
-            // XXX EAM : should the contour input coordinate be in parent or subimage coords? parent, for now
+            // generate a basic contour (set of x,y coordinates at-or-below flux level)
             psArray *contour = pmSourceContour_EAM (source->pixels, source->peak->x, source->peak->y, threshold);
             if (contour == NULL) continue;
@@ -97 +96 @@
                     if (xv->data.F32[j+1] < testSource->peak->x) break;
 
-                    # if (0)
-                    int xp0 = source->moments->x - source->pixels->col0;
-                    int xp1 = source->peak->x - source->pixels->col0;
-                    int xp2 = testSource->moments->x - source->pixels->col0;
-                    int xp3 = testSource->peak->x - source->pixels->col0;
-
-                    int yp0 = source->moments->y - source->pixels->row0;
-                    int yp1 = source->peak->y - source->pixels->row0;
-                    int yp2 = testSource->moments->y - testSource->pixels->row0;
-                    int yp3 = testSource->peak->y - testSource->pixels->row0;
-                    
-                    fprintf (f, "%d %d (%f, %f) :  %d %d (%f, %f)  vs %f\n",
-                             source->peak->x, source->peak->y,
-                             source->pixels->data.F32[yp0][xp0], source->pixels->data.F32[yp1][xp1],
-                             testSource->peak->x, testSource->peak->y,
-                             testSource->pixels->data.F32[yp2][xp2], testSource->pixels->data.F32[yp3][xp3], threshold
-                       );
-                    # endif
-                    
                     testSource->mode |= PM_SOURCE_BLEND;