Changeset 6d8c359 in sasmodels

Timestamp:

Feb 3, 2016 6:23:49 AM (9 years ago)

Author:

piotr

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, 81dd619

Parents:

8007311 (diff), 7f47777 (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 remote-tracking branch 'origin/master'

Location:

sasmodels/models

Files:

• HayterMSAsq.py (modified) (1 diff)
• hardsphere.py (modified) (1 diff)
• lamellarCaille.py (modified) (1 diff)
• lamellarCailleHG.py (modified) (1 diff)
• lamellarFFHG.py (modified) (1 diff)
• lamellarPC.py (modified) (1 diff)
• stickyhardsphere.py (modified) (1 diff)
• core_shell_bicelle.c (added)
• core_shell_bicelle.py (added)
• img/core_shell_bicelle_1d.jpg (added)
• img/core_shell_bicelle_fig1.jpg (added)
• img/core_shell_bicelle_fig2.jpg (added)
• img/core_shell_bicelle_geometry.png (added)

sasmodels/models/HayterMSAsq.py

@@ -90 +90 @@
 # odd that the default st has saltconc zero
 demo = dict(effect_radius = 20.75,charge=19.0,volfraction = 0.0192,temperature=318.16,saltconc=0.05,dielectconst=71.08,effect_radius_pd = 0.1,effect_radius_pd_n = 40)
+#
+# attempt to use same values as old sasview unit test
+tests = [
+        [ {'scale': 1.0, 'background' : 0.0, 'effect_radius' : 20.75, 'charge' : 19.0, 'volfraction' : 0.0192, 'temperature' : 298.0,
+          'saltconc' : 0,'dielectconst' : 78.0, 'effect_radius_pd' : 0}, [0.0010], [0.0712928]]
+        ]
 

sasmodels/models/hardsphere.py

@@ -106 +106 @@
 oldpars = dict()
 
+tests = [
+        [ {'scale': 1.0, 'background' : 0.0, 'effect_radius' : 50.0, 'volfraction' : 0.2,
+           'effect_radius_pd' : 0}, [0.001], [0.209128]]
+        ]
+

sasmodels/models/lamellarCaille.py

@@ -122 +122 @@
 oldpars = dict(thickness='delta', Nlayers='N_plates', Caille_parameter='caille',
                sld='sld_bi',solvent_sld='sld_sol')
+#
+tests = [
+        [ {'scale': 1.0, 'background' : 0.0, 'thickness' : 30.,'Nlayers' : 20.0, 'spacing' : 400.,
+            'Caille_parameter' : 0.1, 'sld' : 6.3, 'solvent_sld' : 1.0,
+            'thickness_pd' : 0.0, 'spacing_pd' : 0.0 }, [0.001], [28895.13397]]
+        ]

sasmodels/models/lamellarCailleHG.py

@@ -139 +139 @@
 
 oldname = 'LamellarPSHGModel'
+
 oldpars = dict(
     tail_length='deltaT', head_length='deltaH', Nlayers='n_plates',
     Caille_parameter='caille', sld='sld_tail', head_sld='sld_head',
     solvent_sld='sld_solvent')
+#
+tests = [
+        [ {'scale': 1.0, 'background' : 0.0, 'tail_length' : 10.0, 'head_length' : 2.0,'Nlayers' : 30.0, 'spacing' : 40.,
+            'Caille_parameter' : 0.001, 'sld' : 0.4, 'head_sld' : 2.0, 'solvent_sld' : 6.0,
+            'tail_length_pd' : 0.0, 'head_length_pd' : 0.0, 'spacing_pd' : 0.0 }, [0.001], [6838238.571488]]
+        ]

sasmodels/models/lamellarFFHG.py

@@ -121 +121 @@
 oldpars = dict(head_length='h_thickness', tail_length='t_length',
                sld='sld_tail', head_sld='sld_head', solvent_sld='sld_solvent')
+#
+tests = [
+        [ {'scale': 1.0, 'background' : 0.0, 'tail_length' : 15.0, 'head_length' : 10.0,'sld' : 0.4,
+         'head_sld' : 3.0, 'solvent_sld' : 6.0, }, [0.001], [653143.9209]]
+        ]
 
+

sasmodels/models/lamellarPC.py

@@ -148 +148 @@
 oldpars = dict(spacing_polydisp='pd_spacing', sld='sld_layer',
                solvent_sld='sld_solvent')
+#
+tests = [
+        [ {'scale': 1.0, 'background' : 0.0, 'thickness' : 33.,'Nlayers' : 20.0, 'spacing' : 250., 'spacing_polydisp' : 0.2,
+            'sld' : 1.0, 'solvent_sld' : 6.34,
+            'thickness_pd' : 0.0, 'thickness_pd_n' : 40 }, [0.001, 0.215268], [21829.3, 0.00487686]]
+        ]

sasmodels/models/stickyhardsphere.py

@@ -182 +182 @@
 demo = dict(effect_radius=200, volfraction=0.2, perturb=0.05,
             stickiness=0.2, effect_radius_pd=0.1, effect_radius_pd_n=40)
+#
+tests = [
+        [ {'scale': 1.0, 'background' : 0.0, 'effect_radius' : 50.0, 'perturb' : 0.05, 'stickiness' : 0.2, 'volfraction' : 0.1,
+           'effect_radius_pd' : 0}, [0.001], [1.09718]]
+        ]
 
+