Changeset 53215cf in sasmodels

Timestamp:

Mar 27, 2016 5:14:16 PM (8 years ago)

Author:

butler

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:

381b1f0, fa1582e

Parents:

3034fc5

Message:

fixed n_stacked value in convert so that compare works, added two unit
tests to the model (stacked_disks) with n_stacked = 5 (to have more than
just n_stacked=1) and added attribution line in docs of modle. closes
#551

Location:

sasmodels

Files:

• convert.py (modified) (1 diff)
• models/stacked_disks.py (modified) (3 diffs)

sasmodels/convert.py

@@ -184 +184 @@
     for name in namelist:
         if name == 'stacked_disks':
-            pars['n_stacking'] = 0
+            pars['n_stacking'] = 1
         elif name == 'pearl_necklace':
             pars['string_thickness_pd_n'] = 0

sasmodels/models/stacked_disks.py

@@ -100 +100 @@
 J S Higgins and H C Benoit, *Polymers and Neutron Scattering*, Clarendon, Oxford, 1994
 
+**Author:** NIST IGOR/DANSE **on:** pre 2010
+
+**Last Modified by:** Piotr Rozyczko **on:** February 18, 2016
+
+**Last Reviewed by:** Richard Heenan **on:** March 22, 2016
 """
 
@@ -157 +162 @@
 
 tests = [
-    # Accuracy tests based on content in test/utest_extra_models.py
+    # Accuracy tests based on content in test/utest_extra_models.py.
+    # Added 2 tests with n_stacked = 5 using SasView 3.1.2 - PDB
     [{'core_thick': 10.0,
       'layer_thick': 15.0,
@@ -171 +177 @@
       'background': 0.001,
      }, 0.001, 5075.12],
+
+    [{'core_thick': 10.0,
+      'layer_thick': 15.0,
+      'radius': 3000.0,
+      'n_stacking': 5.0,
+      'sigma_d': 0.0,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
+      'solvent_sd': 5.0,
+      'theta': 0.0,
+      'phi': 0.0,
+      'scale': 0.01,
+      'background': 0.001,
+     }, 0.001, 5065.12793824],
+
+    [{'core_thick': 10.0,
+      'layer_thick': 15.0,
+      'radius': 3000.0,
+      'n_stacking': 5.0,
+      'sigma_d': 0.0,
+      'sld_core': 4.0,
+      'sld_layer': -0.4,
+      'solvent_sd': 5.0,
+      'theta': 0.0,
+      'phi': 0.0,
+      'scale': 0.01,
+      'background': 0.001,
+     }, 0.164, 0.0127673597265],
 
     [{'core_thick': 10.0,