Changeset ea7ffce in sasmodels

Timestamp:

Feb 18, 2015 12:49:30 PM (9 years ago)

Author:

David Mannicke <davidm@…>

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

Parents:

5428233 (diff), 9474dda (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

sasmodels

Files:

• generate.py (modified) (1 diff)
• models/cylinder.py (modified) (3 diffs)
• models/fcc.c (added)
• models/fcc.py (added)
• models/parallelepiped.c (added)
• models/parallelepiped.py (added)
• sasview_model.py (modified) (3 diffs)
• model_test.py (added)

sasmodels/generate.py

@@ -722 +722 @@
         parameters = COMMON_PARAMETERS + kernel_module.parameters,
         source = getattr(kernel_module, 'source', []),
+        oldname = kernel_module.oldname,
+        oldpars = kernel_module.oldpars,
         )
     # Fill in attributes which default to None

sasmodels/models/cylinder.py

@@ -43 +43 @@
 .. figure:: img/orientation2.jpg
 
-    Examples of the angles for oriented pp against the detector plane.
+    Examples of the angles for oriented cylinders against the detector plane.
 
 NB: The 2nd virial coefficient of the cylinder is calculated based on the
@@ -113 +113 @@
 title = "Right circular cylinder with uniform scattering length density."
 description = """
-     P(q)= 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2))
-            /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)]
+     f(q,alpha) = 2*(sld - solvent_sld)*V*sin(qLcos(alpha/2))
+                /[qLcos(alpha/2)]*J1(qRsin(alpha/2))/[qRsin(alpha)]
 
-            P(q,alpha)= scale/V*f(q)^(2)+background
+            P(q,alpha)= scale/V*f(q,alpha)^(2)+background
             V: Volume of the cylinder
             R: Radius of the cylinder
@@ -125 +125 @@
             :the ouput is P(q)=scale/V*integral
             from pi/2 to zero of...
-            f(q)^(2)*sin(alpha)*dalpha + background
+            f(q,alpha)^(2)*sin(alpha)*dalpha + background
 """
 

sasmodels/sasview_model.py

@@ -32 +32 @@
 
 
-def make_class(kernel_module, dtype='single'):
+def make_class(kernel_module, dtype='single', namestyle='name'):
     """
     Load the sasview model defined in *kernel_module*.
 
     Returns a class that can be used directly as a sasview model.
+
+    Defaults to using the new name for a model. Setting namestyle='name'
+    will produce a class with a name compatible with SasView
     """
     model =  load_model(kernel_module, dtype=dtype)
@@ -42 +45 @@
         SasviewModel.__init__(self, model)
     attrs = dict(__init__=__init__)
-    ConstructedModel = type(model.info['name'],  (SasviewModel,), attrs)
+    ConstructedModel = type(model.info[namestyle],  (SasviewModel,), attrs)
     return ConstructedModel
 
@@ -54 +57 @@
 
         self.name = model.info['name']
+        self.oldname = model.info['oldname']
         self.description = model.info['description']
         self.category = None