Changeset 31538

Timestamp:

May 12, 2011, 10:29:57 AM (15 years ago)

Author:

bills

Message:

Fix incorrect FWHM calculation when PM_PAR_7 is 0

File:

• trunk/psModules/src/objects/models/pmModel_PS1_V1.c (modified) (2 diffs)

trunk/psModules/src/objects/models/pmModel_PS1_V1.c

@@ -288 +288 @@
     if (PAR[PM_PAR_I0] <= 0) return 1.0;
     if (flux >= PAR[PM_PAR_I0]) return 1.0;
-    if (PAR[PM_PAR_7] == 0.0) return powf(PAR[PM_PAR_I0] / flux - 1.0, 1.0 / ALPHA);
 
     shape.sx  = PAR[PM_PAR_SXX] / M_SQRT2;
@@ -296 +295 @@
     psEllipseAxes axes = psEllipseShapeToAxes (shape, 20.0);
     psF64 sigma = axes.major;
+
+    if (PAR[PM_PAR_7] == 0.0) { 
+        psF32 z =  powf(PAR[PM_PAR_I0] / flux - 1.0, 1.0 / ALPHA);
+        return ( sigma * sqrt (2.0 * z) );
+    }
 
     psF64 limit = flux / PAR[PM_PAR_I0];