Changeset 42093 for trunk/psModules/src/objects/pmModelUtils.c

Timestamp:

Feb 28, 2022, 2:52:56 PM (4 years ago)

Author:

eugene

Message:

plug a memory leak in FITS table I/O; fix error in PSF fit map scale calculation; add options to use reweighted errors in non-linear source fitting; change concept for source size parameter guess from using the KRON radius to a size based on the second moments

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmModelUtils.c (modified) (2 diffs)

trunk/psModules/src/objects/pmModelUtils.c

@@ -179 +179 @@
 // Reff says if this is a model which uses R_eff (like exp or dev) instead of Sigma
 // set the parameter values SXX, SXY, SYY
-bool pmModelSetShape (float *Sxx, float *Sxy, float *Syy, pmMoments *moments, bool useReff) {
+// Scale allows some models to increase the guess size relative to Mxx,Myy
+bool pmModelSetShape (float *Sxx, float *Sxy, float *Syy, pmMoments *moments, bool useReff, float Scale) {
 
     psEllipseMoments emoments;
@@ -190 +191 @@
 
     if (!isfinite(axes.major)) return false;
-    if (axes.major == 0) return false;
     if (!isfinite(axes.minor)) return false;
     if (!isfinite(axes.theta)) return false;
-    if (axes.major == 0) return false;
-
+
+    // set a lower limit to avoid absurd solutions..
+    // NOTE: I should set the lower limit based on the PSF size, if known
+    float Rmajor = PS_MAX(1.0, Scale * axes.major);
+    float Rminor = Rmajor * (axes.minor / axes.major);
+    axes.major = Rmajor;
+    axes.minor = Rminor;
+
+    // EAM 2022.02.05 : Mrf is often much too large, disable this for now
     // Mxx, Mxy, Myy define the elliptical shape, but Mrf defines the width 
-    float scale = (isfinite(moments->Mrf) && (moments->Mrf > 0.0)) ? moments->Mrf / axes.major : 1.0;
-    axes.major *= scale;
-    axes.minor *= scale;
+    // float scale = (isfinite(moments->Mrf) && (moments->Mrf > 0.0)) ? moments->Mrf / axes.major : 1.0;
+    // axes.major *= scale;
+    // axes.minor *= scale;
 
     pmModelAxesToParams (Sxx, Sxy, Syy, axes, useReff);