Changeset 31670 for trunk/psModules/src/objects/models

Timestamp:

Jun 22, 2011, 12:48:29 AM (15 years ago)

Author:

eugene

Message:

merge from trunk : various minor issues (kron radii; I/O fixes)

Location:

trunk/psModules/src/objects/models

Files:

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

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

@@ -296 +296 @@
     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];
 

trunk/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];