Changeset 31312 for branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceMoments.c

Timestamp:

Apr 18, 2011, 8:53:12 AM (15 years ago)

Author:

eugene

Message:

adding flag to mark PASS1 (vs PASS2) detections; moving AP_MAGS flag inot pmSourcePhotometry; bad mask was missing suspect bits (logic error in I/O writing MASK.PSPHOT - added explicitly to maskPoor in PSF_QF_PERFECT; limit Kron radius at upper and lower bounds; use non-linear position errors only for PSF sources in PSF output (extended sources not fitted with non-linear PSF model); make sure pmSourceCopy gets all the elements of the structure that it needs

File:

• branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceMoments.c (modified) (5 diffs)

branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceMoments.c

@@ -109 +109 @@
     // Xn  = SUM (x - xc)^n * (z - sky)
 
+    psF32 RFW = 0.0;
+    psF32 RHW = 0.0;
+
     psF32 RF = 0.0;
     psF32 RH = 0.0;
@@ -187 +190 @@
             psF32 rs = fDiff;
 
+            psF32 rfw = r * pDiff;
+            psF32 rhw = sqrt(r) * pDiff;
+
             psF32 x = xDiff * pDiff;
             psF32 y = yDiff * pDiff;
@@ -208 +214 @@
             RH  += rh;
             RS  += rs;
+
+            RFW  += rfw;
+            RHW  += rhw;
 
             XX  += xx;
@@ -226 +235 @@
     }
 
-    source->moments->Mrf = RF/RS;
-    source->moments->Mrh = RH/RS;
+    // if Mrf (first radial moment) is << sigma, we are getting into low-significance
+    // territory.  saturate at 0.75*sigma.  conversely, if Mrf is > radius, we are clearly
+    // making an error.  saturate at radius.
+    source->moments->Mrf = MIN(radius, MAX(0.75*sigma, RF/RS));
+    source->moments->Mrh = MIN(radius, MAX(0.75*sigma, RH/RS));
 
     source->moments->Mxx = XX/Sum;
@@ -243 +255 @@
     source->moments->Mxyyy = XYYY/Sum;
     source->moments->Myyyy = YYYY/Sum;
+
+    // XXX TEST:
+    // source->moments->KronFinner = RFW/Sum;
+    // source->moments->KronFouter = sigma;
 
     // Calculate the Kron magnitude (make this block optional?)