Changes in / [d0876c9d:fb5914f] in sasmodels

Location:

sasmodels

Files:

• compare.py (modified) (2 diffs)
• convert.py (modified) (1 diff)
• models/_spherepy.py (modified) (1 diff)
• models/fuzzy_sphere.py (modified) (1 diff)
• models/multilayer_vesicle.py (modified) (1 diff)
• models/sphere.py (modified) (1 diff)
• models/stacked_disks.py (modified) (3 diffs)

sasmodels/compare.py

@@ -784 +784 @@
     n1 = int(args[1]) if len(args) > 1 else 1
     n2 = int(args[2]) if len(args) > 2 else 1
-    use_sasview = any(engine=='sasview' and count>0
-                      for engine, count in zip(engines, [n1, n2]))
 
     # Get demo parameters from model definition, or use default parameters
@@ -813 +811 @@
     #import pprint; pprint.pprint(model_info)
     constrain_pars(model_info, pars)
-    if use_sasview:
-        constrain_new_to_old(model_info, pars)
+    constrain_new_to_old(model_info, pars)
     if opts['show_pars']:
         print(str(parlist(model_info, pars, opts['is2d'])))

sasmodels/convert.py

@@ -138 +138 @@
     namelist = name.split('*') if '*' in name else [name]
     for name in namelist:
-        if name == 'stacked_disks':
-            _remove_pd(oldpars, 'n_stacking', name)
-        elif name == 'pearl_necklace':
+        if name == 'pearl_necklace':
             _remove_pd(oldpars, 'num_pearls', name)
             _remove_pd(oldpars, 'thick_string', name)

sasmodels/models/_spherepy.py

@@ -1 +1 @@
 r"""
-For information about polarised and magnetic scattering, see 
-the :doc:`magnetic help <../sasgui/perspectives/fitting/mag_help>` documentation.
+For information about polarised and magnetic scattering, click here_.
+
+.. _here: polar_mag_help.html
 
 Definition

sasmodels/models/fuzzy_sphere.py

@@ -1 +1 @@
 r"""
-For information about polarised and magnetic scattering, see 
-the :doc:`magnetic help <../sasgui/perspectives/fitting/mag_help>` documentation.
+For information about polarised and magnetic scattering, click here_.
+
+.. _here: polar_mag_help.html
 
 Definition

sasmodels/models/multilayer_vesicle.py

@@ -29 +29 @@
     is used as the effective radius for *S(Q)* when $P(Q) * S(Q)$ is applied.
 
-For information about polarised and magnetic scattering, see 
-the :doc:`magnetic help <../sasgui/perspectives/fitting/mag_help>` documentation.
+
+
+For information about polarised and magnetic scattering, click here_.
+
+.. _here: polar_mag_help.html
 
 This code is based on the form factor calculations implemented in the NIST

sasmodels/models/sphere.py

@@ -1 +1 @@
 r"""
-For information about polarised and magnetic scattering, see 
-the :doc:`magnetic help <../sasgui/perspectives/fitting/mag_help>` documentation.
+For information about polarised and magnetic scattering, click here_.
+
+.. _here: polar_mag_help.html
 
 Definition

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
 """
 
@@ -162 +157 @@
 
 tests = [
-    # Accuracy tests based on content in test/utest_extra_models.py.
-    # Added 2 tests with n_stacked = 5 using SasView 3.1.2 - PDB
+    # Accuracy tests based on content in test/utest_extra_models.py
     [{'core_thick': 10.0,
       'layer_thick': 15.0,
@@ -177 +171 @@
       '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,