Changeset 36021 for branches/eam_branches/ipp-20130711/psModules/src/objects/models/pmModel_EXP.c

Timestamp:

Aug 25, 2013, 12:08:56 PM (13 years ago)

Author:

eugene

Message:

convert SERSIC to use pmModelCP_SersicSubpix; clean up DEV and EXP versions; add pmPCMMakeModel, pmSersicKappa, pmSersicNorm functions

File:

• branches/eam_branches/ipp-20130711/psModules/src/objects/models/pmModel_EXP.c (modified) (4 diffs)

branches/eam_branches/ipp-20130711/psModules/src/objects/models/pmModel_EXP.c

@@ -79 +79 @@
 static float *paramsMinUse = paramsMinLax;
 static float *paramsMaxUse = paramsMaxLax;
-static float betaUse[] = { 1000, 3e6, 5, 5, 1.0, 1.0, 0.5};
+static float betaUse[] = { 2, 3e6, 5, 5, 10.0, 10.0, 0.5};
 
 static bool limitsApply = true;         // Apply limits?
@@ -115 +115 @@
     psF32 f0 = exp(-q);
 
-    psF32 f1 = PAR[PM_PAR_I0]*f0;
-    psF32 f = PAR[PM_PAR_SKY] + f1;
-
     assert (isfinite(q));
-    assert (isfinite(f0));
-    assert (isfinite(f1));
-    assert (isfinite(f));
 
     // only worry about the central 4 pixels at most
@@ -127 +121 @@
     if (radius <= 1.5) {
         f0 = pmModelCP_SersicSubpix (X, Y, PAR[PM_PAR_SXX], PAR[PM_PAR_SXY], PAR[PM_PAR_SYY], 1.0, 51);
-        f1 = PAR[PM_PAR_I0]*f0;
-        f = PAR[PM_PAR_SKY] + f1;
-    }
+    }
+    assert (isfinite(f0));
+
+    psF32 f1 = PAR[PM_PAR_I0]*f0;
+    psF32 f = PAR[PM_PAR_SKY] + f1;
+
+    assert (isfinite(f1));
+    assert (isfinite(f));
 
     if (deriv != NULL) {
@@ -298 +297 @@
     // f = Io exp(-kappa*sqrt(z)) -> sqrt(z) = ln(Io/f) / kappa
     psF64 zn = log(PAR[PM_PAR_I0] / flux) / kappa;
-    psF64 radius = axes.major * sqrt (2.0) * zn;
+    psF64 radius = axes.major * zn;
 
     psAssert (isfinite(radius), "fix this code: radius should not be nan for Io = %f, flux = %f, major = %f (%f, %f, %f)",