Changeset 66ebdd6 in sasmodels for sasmodels/models/guinier.py

Timestamp:

Nov 19, 2015 2:47:50 PM (8 years ago)

Author:

krzywon

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:

5d80bbf

Parents:

8fe0b9b

Message:

Finished the hollow_cylinder model and added unit tests to guinier and
lorentz models.

File:

• sasmodels/models/guinier.py (modified) (3 diffs)

sasmodels/models/guinier.py

@@ -26 +26 @@
 description = """
  I(q) = scale exp ( - rg^2 q^2 / 3.0 )
-        
+ 
     List of default parameters:
     scale = scale
@@ -34 +34 @@
 
 #             ["name", "units", default, [lower, upper], "type","description"],
-parameters = [["rg", "Ang", 60.0, [0, inf], "", "Radius of Gyration"],]
+parameters = [
+              ["rg", "Ang", 60.0, [0, inf], "", "Radius of Gyration"],
+              ]
 
 Iq = """
-    double value = rg*rg*q*q/3.0;
-    return exp(-value);
+    double exponent = rg*rg*q*q/3.0;
+    double value = exp(-exponent);
+    return value;
 """
 
@@ -52 +55 @@
 oldname = 'GuinierModel'
 oldpars = dict(rg='rg')
+
+# parameters for unit tests
+tests = [
+         [{'rg' : 31.5}, 0.005, 0.991756]
+         ]