Index: trunk/psphot/src/psphotBasicDeblend.c
===================================================================
--- trunk/psphot/src/psphotBasicDeblend.c	(revision 9270)
+++ trunk/psphot/src/psphotBasicDeblend.c	(revision 9734)
@@ -2,5 +2,5 @@
 
 // 2006.02.07 : no leaks
-bool psphotBasicDeblend (psArray *sources, psMetadata *recipe) { 
+bool psphotBasicDeblend (psArray *sources, psMetadata *recipe) {
 
     int N;
@@ -25,8 +25,7 @@
     // we use an index for this so the spatial sorting is kept
     psVector *SN = psVectorAlloc (sources->n, PS_DATA_F32);
-    SN->n = SN->nalloc;
     for (int i = 0; i < SN->n; i++) {
-	source = sources->data[i];
-	SN->data.F32[i] = source->peak->counts;
+        source = sources->data[i];
+        SN->data.F32[i] = source->peak->counts;
     }
     psVector *index = psVectorSortIndex (NULL, SN);
@@ -35,91 +34,89 @@
     // examine sources in decreasing SN order
     for (int i = sources->n - 1; i >= 0; i--) {
-	N = index->data.U32[i];
-	source = sources->data[N];
+        N = index->data.U32[i];
+        source = sources->data[N];
 
-	if (source->mode & PM_SOURCE_MODE_BLEND) continue;
+        if (source->mode & PM_SOURCE_MODE_BLEND) continue;
 
-	// temporary array for overlapping objects we find
-	psArray *overlap = psArrayAlloc (100);
-	// DROP overlap->n = 0;
+        // temporary array for overlapping objects we find
+        psArray *overlap = psArrayAllocEmpty (100);
 
-	// search backwards for overlapping sources
-	for (int j = N - 1; j >= 0; j--) {
-	    testSource = sources->data[j];
-	    if (testSource->peak->x <  source->pixels->col0) continue;
-	    if (testSource->peak->x >= source->pixels->col0 + source->pixels->numCols) continue;
-	    if (testSource->peak->y <  source->pixels->row0) break;
-	    if (testSource->peak->y >= source->pixels->row0 + source->pixels->numRows) {
-		fprintf (stderr, "warning: invalid condition\n");
-		continue;
-	    }
-	    psArrayAdd (overlap, 100, testSource);
-	}
+        // search backwards for overlapping sources
+        for (int j = N - 1; j >= 0; j--) {
+            testSource = sources->data[j];
+            if (testSource->peak->x <  source->pixels->col0) continue;
+            if (testSource->peak->x >= source->pixels->col0 + source->pixels->numCols) continue;
+            if (testSource->peak->y <  source->pixels->row0) break;
+            if (testSource->peak->y >= source->pixels->row0 + source->pixels->numRows) {
+                fprintf (stderr, "warning: invalid condition\n");
+                continue;
+            }
+            psArrayAdd (overlap, 100, testSource);
+        }
 
-	// search forwards for overlapping sources
-	for (int j = N + 1; j < sources->n; j++) {
-	    testSource = sources->data[j];
-	    if (testSource->peak->x <  source->pixels->col0) continue;
-	    if (testSource->peak->x >= source->pixels->col0 + source->pixels->numCols) continue;
-	    if (testSource->peak->y <  source->pixels->row0) {
-		fprintf (stderr, "warning: invalid condition\n");
-		continue;
-	    }
-	    if (testSource->peak->y >= source->pixels->row0 + source->pixels->numRows) break;
-	    psArrayAdd (overlap, 100, testSource);
-	}
+        // search forwards for overlapping sources
+        for (int j = N + 1; j < sources->n; j++) {
+            testSource = sources->data[j];
+            if (testSource->peak->x <  source->pixels->col0) continue;
+            if (testSource->peak->x >= source->pixels->col0 + source->pixels->numCols) continue;
+            if (testSource->peak->y <  source->pixels->row0) {
+                fprintf (stderr, "warning: invalid condition\n");
+                continue;
+            }
+            if (testSource->peak->y >= source->pixels->row0 + source->pixels->numRows) break;
+            psArrayAdd (overlap, 100, testSource);
+        }
 
-	if (overlap->n == 0) {
-	    psFree (overlap);
-	    continue;
-	}
+        if (overlap->n == 0) {
+            psFree (overlap);
+            continue;
+        }
 
-	// this source has overlapping neighbors, check for actual blends
-	// generate source contour (1/4 peak counts)
-	// set the threshold based on user inputs
-	
-	// threshold is fraction of the source peak flux
-	// image is background subtracted; source->moments->Sky should always be 0.0
-	threshold = FRACTION * source->moments->Peak;
-	// threshold is no less than NSIGMA above the local median sigma?
-	threshold = PS_MAX (threshold, NSIGMA*sqrt(source->moments->dSky));
+        // this source has overlapping neighbors, check for actual blends
+        // generate source contour (1/4 peak counts)
+        // set the threshold based on user inputs
 
-	// generate a basic contour (set of x,y coordinates at-or-below flux level)
-	psArray *contour = pmSourceContour (source->pixels, source->peak->x, source->peak->y, threshold);
-	if (contour == NULL) {
-	    psFree (overlap);
-	    continue;
-	}
+        // threshold is fraction of the source peak flux
+        // image is background subtracted; source->moments->Sky should always be 0.0
+        threshold = FRACTION * source->moments->Peak;
+        // threshold is no less than NSIGMA above the local median sigma?
+        threshold = PS_MAX (threshold, NSIGMA*sqrt(source->moments->dSky));
 
-	// the source contour consists of two vectors, xv and yv.  the contour is 
-	// a series of coordinate pairs, (xv[i],yv[i]) & (xv[i+1],yv[i+1]).  both
-	// coordinate pairs have the same yv[] value, with xv[i] corresponding to
-	// the left boundary and xv[i+1] corresponding to the right boundary
+        // generate a basic contour (set of x,y coordinates at-or-below flux level)
+        psArray *contour = pmSourceContour (source->pixels, source->peak->x, source->peak->y, threshold);
+        if (contour == NULL) {
+            psFree (overlap);
+            continue;
+        }
 
-	psVector *xv = contour->data[0];
-	psVector *yv = contour->data[1];
-	for (int k = 0; k < overlap->n; k++) {
-	    testSource = overlap->data[k];
-	    if (testSource->peak->counts > source->peak->counts) continue;
-	    for (int j = 0; j < xv->n; j+=2) {
-		if (fabs(yv->data.F32[j] - testSource->peak->y) > 0.5) continue;
-		if (xv->data.F32[j+0] > testSource->peak->x) break;
-		if (xv->data.F32[j+1] < testSource->peak->x) break;
+        // the source contour consists of two vectors, xv and yv.  the contour is
+        // a series of coordinate pairs, (xv[i],yv[i]) & (xv[i+1],yv[i+1]).  both
+        // coordinate pairs have the same yv[] value, with xv[i] corresponding to
+        // the left boundary and xv[i+1] corresponding to the right boundary
 
-		testSource->mode |= PM_SOURCE_MODE_BLEND;
+        psVector *xv = contour->data[0];
+        psVector *yv = contour->data[1];
+        for (int k = 0; k < overlap->n; k++) {
+            testSource = overlap->data[k];
+            if (testSource->peak->counts > source->peak->counts) continue;
+            for (int j = 0; j < xv->n; j+=2) {
+                if (fabs(yv->data.F32[j] - testSource->peak->y) > 0.5) continue;
+                if (xv->data.F32[j+0] > testSource->peak->x) break;
+                if (xv->data.F32[j+1] < testSource->peak->x) break;
 
-		// add this to the list of source->blends
-		if (source->blends == NULL) {
-		    source->blends = psArrayAlloc (16);
-		    // DROP source->blends->n = 0;
-		}
-		psArrayAdd (source->blends, 16, testSource);
+                testSource->mode |= PM_SOURCE_MODE_BLEND;
 
-		Nblend ++;
-		j = xv->n;
-	    }
-	}  
-	psFree (overlap);
-	psFree (contour);
+                // add this to the list of source->blends
+                if (source->blends == NULL) {
+                    source->blends = psArrayAllocEmpty (16);
+                }
+                psArrayAdd (source->blends, 16, testSource);
+
+                Nblend ++;
+                j = xv->n;
+            }
+        }
+        psFree (overlap);
+        psFree (contour);
     }
     psLogMsg ("psphot.deblend", 3, "identified %d blended objects (%f sec)\n", Nblend, psTimerMark ("psphot"));