Changeset 25679

Timestamp:

Sep 29, 2009, 9:58:47 PM (17 years ago)

Author:

eugene

Message:

add asserts to catch bad radius tests

Location:

branches/eam_branches/20090715/psModules/src/objects/models

Files:

• pmModel_GAUSS.c (modified) (1 diff)
• pmModel_PGAUSS.c (modified) (1 diff)
• pmModel_PS1_V1.c (modified) (1 diff)
• pmModel_QGAUSS.c (modified) (1 diff)
• pmModel_RGAUSS.c (modified) (1 diff)
• pmModel_SERSIC.c (modified) (1 diff)

branches/eam_branches/20090715/psModules/src/objects/models/pmModel_GAUSS.c

@@ -260 +260 @@
     psEllipseAxes axes = psEllipseShapeToAxes (shape, 20.0);
     psF64 radius = axes.major * sqrt (2.0 * log(PAR[PM_PAR_I0] / flux));
+    psAssert (isfinite(radius, "fix this code: radius should not be nan for %f", PAR[PM_PAR_I0]));
+
     return (radius);
 }

branches/eam_branches/20090715/psModules/src/objects/models/pmModel_PGAUSS.c

@@ -287 +287 @@
     // choose a z value guaranteed to be beyond our limit
     float z0 = pow((1.0 / limit), (1.0 / 3.0));
+    psAssert (isfinite(z0, "fix this code: z0 should not be nan for %f", PAR[PM_PAR_I0]));
     float z1 = (1.0 / limit);
+    psAssert (isfinite(z1, "fix this code: z1 should not be nan for %f", PAR[PM_PAR_I0]));
     z1 = PS_MAX (z0, z1);
     z0 = 0.0;

branches/eam_branches/20090715/psModules/src/objects/models/pmModel_PS1_V1.c

@@ -325 +325 @@
     float z0 = 0.0;
     float z1 = pow((1.0 / limit), (1.0 / ALPHA));
+    psAssert (isfinite(z1, "fix this code: z1 should not be nan for %f", PAR[PM_PAR_7]));
     if (PAR[PM_PAR_7] < 0.0) z1 *= 2.0;
 

branches/eam_branches/20090715/psModules/src/objects/models/pmModel_QGAUSS.c

@@ -321 +321 @@
     // choose a z value guaranteed to be beyond our limit
     float z0 = pow((1.0 / limit), (1.0 / 2.25));
+    psAssert (isfinite(z0, "fix this code: z0 should not be nan for %f", PAR[PM_PAR_7]));
     float z1 = (1.0 / limit) / PAR[PM_PAR_7];
+    psAssert (isfinite(z1, "fix this code: z1 should not be nan for %f", PAR[PM_PAR_7]));
     z1 = PS_MAX (z0, z1);
     z0 = 0.0;

branches/eam_branches/20090715/psModules/src/objects/models/pmModel_RGAUSS.c

@@ -314 +314 @@
     // choose a z value guaranteed to be beyond our limit
     float z0 = pow((1.0 / limit), (1.0 / PAR[PM_PAR_7]));
+    psAssert (isfinite(z0, "fix this code: z0 should not be nan for %f", PAR[PM_PAR_7]));
     float z1 = (1.0 / limit);
+    psAssert (isfinite(z1, "fix this code: z1 should not be nan for %f", PAR[PM_PAR_7]));
     z1 = PS_MAX (z0, z1);
     z0 = 0.0;

branches/eam_branches/20090715/psModules/src/objects/models/pmModel_SERSIC.c

@@ -324 +324 @@
 
     psF64 z = pow (-log(limit), (1.0 / PAR[PM_PAR_7]));
+    psAssert (isfinite(z, "fix this code: z should not be nan for %f", PAR[PM_PAR_7]));
 
     psF64 radius = sigma * sqrt (2.0 * z);
+    psAssert (isfinite(radius, "fix this code: radius should not be nan for %f, %f", PAR[PM_PAR_7], sigma));
 
     if (isnan(radius))