Changeset 31545 for branches/eam_branches/ipp-20110505/psModules/src/objects/models

Timestamp:

May 12, 2011, 4:49:08 PM (15 years ago)

Author:

eugene

Message:

merge fix from trunk: radius was wrong for PS1_V1 and QGAUSS for PAR_7 = 0.0

Location:

branches/eam_branches/ipp-20110505/psModules/src/objects/models

Files:

• . (modified) (1 prop)
• pmModel_PS1_V1.c (modified) (2 diffs)
• pmModel_QGAUSS.c (modified) (2 diffs)

branches/eam_branches/ipp-20110505/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;
+
+    // we can solve directly if PAR_7 goes to 0.0
+    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];

branches/eam_branches/ipp-20110505/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -289 +289 @@
     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);
+
+    // 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;
@@ -297 +298 @@
     psEllipseAxes axes = psEllipseShapeToAxes (shape, 20.0);
     psF64 sigma = axes.major;
+
+    // we can solve directly if PAR_7 goes to 0.0
+    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];