Changeset e6408d0 in sasmodels

Timestamp:

Apr 6, 2016 7:44:11 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

3a45c2c, 65279d8

Parents:

0278e3f

Message:

new normalization code requires form_volume=1.0 if there is no volume normalization

Location:

sasmodels

Files:

• generate.py (modified) (1 diff)
• models/flexible_cylinder.c (modified) (1 diff)
• models/lib/sas_JN.c (modified) (2 diffs)

sasmodels/generate.py

@@ -15 +15 @@
 
     *form_volume(p1, p2, ...)* returns the volume of the form with particular
-    dimension.
+    dimension, or 1.0 if no volume normalization is required.
 
     *ER(p1, p2, ...)* returns the effective radius of the form with

sasmodels/models/flexible_cylinder.c

@@ -10 +10 @@
 double form_volume(double length, double kuhn_length, double radius)
 {
-
-      return 0.0;
+    return 1.0;
 }
 

sasmodels/models/lib/sas_JN.c

@@ -52 +52 @@
 
     const double MACHEP = 1.11022302462515654042E-16;
-    double pkm2, pkm1, pk, xk, r, ans, xinv;
+    double pkm2, pkm1, pk, xk, r, ans;
     int k, sign;
 
@@ -122 +122 @@
 
     #else
-        xinv = 1.0/x;
+        const double xinv = 1.0/x;
         pkm1 = ans * xinv;
         k = n-1;