Changeset 31610

Timestamp:

Jun 8, 2011, 11:41:35 AM (15 years ago)

Author:

eugene

Message:

use same min radius for masked kron mags as unmasked

File:

• branches/eam_branches/ipp-20110505/psphot/src/psphotKronMasked.c (modified) (6 diffs)

branches/eam_branches/ipp-20110505/psphot/src/psphotKronMasked.c

@@ -1 +1 @@
 # include "psphotInternal.h"
 
-bool psphotKronMag (pmSource *source, float radius, psImageMaskType maskVal);
+bool psphotKronMag (pmSource *source, float radius, float minKronRadius, psImageMaskType maskVal);
 
 bool psphotKronMasked (pmConfig *config, const pmFPAview *view, const char *filerule)
@@ -65 +65 @@
     if (!status) {
         RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS");
+    }
+
+    float MIN_KRON_RADIUS = psMetadataLookupF32 (&status, readout->analysis, "MOMENTS_MIN_KRON");
+    if (!status) {
+        MIN_KRON_RADIUS = 0.25*RADIUS;
     }
 
@@ -96 +101 @@
         }
 
-        psphotKronMag (source, RADIUS, maskVal);
+        psphotKronMag (source, RADIUS, MIN_KRON_RADIUS, maskVal);
 
         // re-subtract the object, leave local sky
@@ -138 +143 @@
 }
 
-bool psphotKronMag (pmSource *source, float radius, psImageMaskType maskVal) {
+bool psphotKronMag (pmSource *source, float radius, float minKronRadius, psImageMaskType maskVal) {
 
     PS_ASSERT_PTR_NON_NULL(source, false);
@@ -219 +224 @@
 
     // Saturate the 1st radial moment
-    float Mrf = MIN(radius, MAX(0.25*radius, RF/RS));
+    float Mrf = MAX(minKronRadius, RF/RS);
+    if (sqrt(source->peak->detValue) < 10.0) {
+        Mrf = MIN (radius, Mrf);
+    }
 
     // Calculate the Kron magnitude (make this block optional?)
@@ -263 +271 @@
         }
     }
+
+    source->moments->Mrh = Mrf;
+
     // XXX for a test, save the old values here:
-    source->moments->KronCore    = source->moments->KronFlux;
+    source->moments->KronFouter    = source->moments->KronFlux;
     source->moments->KronCoreErr = source->moments->KronFluxErr;