Changeset 486fcf6 in sasmodels

Timestamp:

Mar 30, 2016 1:49:38 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:

b812972

Parents:

1d4d409

Message:

update resolution tests to new naming conventions for variables and new default background

File:

• sasmodels/resolution.py (modified) (5 diffs)

sasmodels/resolution.py

@@ -804 +804 @@
         pars = {
             'scale':0.05,
-            'rpolar':500, 'requatorial':15000,
-            'sld':6, 'solvent_sld': 1,
+            'r_polar':500, 'r_equatorial':15000,
+            'sld':6, 'sld_solvent': 1,
             }
         form = load_model('ellipsoid', dtype='double')
@@ -836 +836 @@
 TEST_PARS_PINHOLE_SPHERE = {
     'scale': 1.0, 'background': 0.01,
-    'radius': 60.0, 'sld': 1, 'solvent_sld': 6.3,
+    'radius': 60.0, 'sld': 1, 'sld_solvent': 6.3,
     }
 # Q, dQ, I(Q) calculated by NIST Igor SANS package
@@ -945 +945 @@
 TEST_PARS_SLIT_SPHERE = {
     'scale': 0.01, 'background': 0.01,
-    'radius': 60000, 'sld': 1, 'solvent_sld': 4,
+    'radius': 60000, 'sld': 1, 'sld_solvent': 4,
     }
 # Q dQ I(Q) I_smeared(Q)
@@ -1046 +1046 @@
 
     if name == 'cylinder':
-        pars = {'length':210, 'radius':500}
+        pars = {'length':210, 'radius':500, 'background': 0}
     elif name == 'teubner_strey':
         pars = {'a2':0.003, 'c1':-1e4, 'c2':1e10, 'background':0.312643}
@@ -1053 +1053 @@
     elif name == 'ellipsoid':
         pars = {
-            'scale':0.05,
-            'rpolar':500, 'requatorial':15000,
-            'sld':6, 'solvent_sld': 1,
+            'scale':0.05, 'background': 0,
+            'r_polar':500, 'r_equatorial':15000,
+            'sld':6, 'sld_solvent': 1,
             }
     else: