Index: /branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceMoments.c
===================================================================
--- /branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceMoments.c	(revision 32244)
+++ /branches/eam_branches/ipp-20110710/psModules/src/objects/pmSourceMoments.c	(revision 32245)
@@ -115,11 +115,4 @@
     // Now calculate higher-order moments, using the above-calculated first moments to adjust coordinates
     // Xn  = SUM (x - xc)^n * (z - sky)
-
-    float RFa = 0.0;
-    float RSa = 0.0;
-
-    float RF = 0.0;
-    float RH = 0.0;
-    float RS = 0.0;
     float XX = 0.0;
     float XY = 0.0;
@@ -269,14 +262,5 @@
     source->moments->Myyyy = YYYY/Sum;
 
-# define TEST_X1 167
-# define TEST_Y1 299
-# define TEST_X2 180
-# define TEST_Y2 300
-    if ((fabs(Xo - TEST_X1) < 3) && (fabs(Yo - TEST_Y1) < 3)) {
-	fprintf (stderr, "test obj 1\n");
-    }
-    if ((fabs(Xo - TEST_X2) < 3) && (fabs(Yo - TEST_Y2) < 3)) {
-	fprintf (stderr, "test obj 2\n");
-    }
+    // *** now calculate the 1st radial moment (for kron flux) -- symmetrical averaging
 
     float **vPix = source->pixels->data.F32;
@@ -284,5 +268,8 @@
     psImageMaskType  **vMsk = (source->maskObj == NULL) ? NULL : source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA;
 
-    // calculate the 1st radial moment (for kron flux) -- symmetrical averaging
+    float RF = 0.0;
+    float RH = 0.0;
+    float RS = 0.0;
+
     for (psS32 row = 0; row < source->pixels->numRows ; row++) {
 
@@ -326,13 +313,7 @@
 	    float rs = 0.5 * (fDiff1 + fDiff2);
 
-	    float rfa = r * fDiff1;
-	    float rsa = fDiff1;
-
 	    RF  += rf;
 	    RH  += rh;
 	    RS  += rs;
-
-	    RFa  += rfa;
-	    RSa  += rsa;
 	}
     }
@@ -340,14 +321,4 @@
     source->moments->Mrf = RF/RS;
     source->moments->Mrh = RH/RS;
-
-    float R1 = RFa / RSa;
-    if ((fabs(Xo - TEST_X1) < 3) && (fabs(Yo - TEST_Y1) < 3)) {
-	fprintf (stderr, "R1: %f vs %f\n", R1, source->moments->Mrf);
-    }
-    if ((fabs(Xo - TEST_X2) < 3) && (fabs(Yo - TEST_Y2) < 3)) {
-	fprintf (stderr, "R2: %f vs %f\n", R1, source->moments->Mrf);
-    }
-
-    // fprintf (stderr, "Rad: %f vs %f\n", R1, source->moments->Mrf);
 
     // if Mrf (first radial moment) is very small, we are getting into low-significance
@@ -358,4 +329,6 @@
 	kronRefRadius = MIN(radius, kronRefRadius);
     }
+
+    // *** now calculate the kron flux values using the 1st radial moment
 
     float radKinner = 1.0*kronRefRadius;
@@ -371,14 +344,9 @@
     float SumOuter = 0.0;
 
-    // calculate the Kron flux, and related fluxes (symmetrical averaging)
+    // calculate the Kron flux, and related fluxes (NO symmetrical averaging)
     for (psS32 row = 0; row < source->pixels->numRows ; row++) {
 	
 	float yDiff = row - yCM;
 	if (fabs(yDiff) > radKouter) continue;
-	
-	// coordinate of mirror pixel
-	int yFlip = yCM - yDiff;
-	if (yFlip < 0) continue;
-	if (yFlip >= source->pixels->numRows) continue;
 	
 	for (psS32 col = 0; col < source->pixels->numCols ; col++) {
@@ -390,20 +358,9 @@
 	    if (fabs(xDiff) > radKouter) continue;
 	    
-	    // coordinate of mirror pixel
-	    int xFlip = xCM - xDiff;
-	    if (xFlip < 0) continue;
-	    if (xFlip >= source->pixels->numCols) continue;
-	    
-	    // check mask and value for mirror pixel
-	    if (vMsk && (vMsk[yFlip][xFlip] & maskVal)) continue;
-	    if (isnan(vPix[yFlip][xFlip])) continue;
-	    
 	    // radKron is just a function of (xDiff, yDiff)
 	    float r2  = PS_SQR(xDiff) + PS_SQR(yDiff);
 
 	    float fDiff1 = vPix[row][col] - sky;
-	    float fDiff2 = vPix[yFlip][xFlip] - sky;
-	    float pDiff = (fDiff1 > 0.0) ? sqrt(fabs(fDiff1*fDiff2)) : -sqrt(fabs(fDiff1*fDiff2));
-	    // float pDiff = vPix[row][col] - sky;
+	    float pDiff = fDiff1;
 	    float wDiff = vWgt[row][col];
 				    
@@ -413,17 +370,8 @@
 	    if (PS_SQR(pDiff) < minSN2*wDiff) continue;
 	    
-# define WEIGHTED 0
-# if (WEIGHTED)
-	    float z = r2 * rsigma2 / 4.0;
-	    assert (z >= 0.0);
-	    float weight  = exp(-z);
-# else
-	    float weight  = 1.0;
-# endif
-
 	    float r  = sqrt(r2);
 	    if (r < radKron) {
-		Sum += pDiff*weight;
-		Var += wDiff*weight;
+		Sum += pDiff;
+		Var += wDiff;
 		nKronPix ++;
 		// if (beVerbose) fprintf (stderr, "mome: %d %d  %f  %f  %f\n", col, row, sky, *vPix, Sum);