Changeset 0dd4199 in sasmodels

Timestamp:

Aug 3, 2016 12:40:55 PM (8 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:

4fd2c63

Parents:

d119f34

Message:

spherical sld: works for dll, not for opencl

Location:

sasmodels

Files:

• convert.py (modified) (1 diff)
• models/spherical_sld.py (modified) (1 diff)

sasmodels/convert.py

@@ -319 +319 @@
             pars['n_shells'] = math.ceil(pars['n_shells'])
         elif name == 'spherical_sld':
+            pars['n_shells'] = math.ceil(pars['n_shells'])
+            pars['npts_inter'] = math.ceil(pars['npts_inter'])
+            pars['func_inter0'] = math.trunc(pars['func_inter0']+0.5)
             for k in range(1, 11):
+                pars['func_inter%d'%k] = math.trunc(pars['func_inter%d'%k]+0.5)
                 pars['thick_flat%d_pd_n'%k] = 0
                 pars['thick_inter%d_pd_n'%k] = 0

sasmodels/models/spherical_sld.py

@@ -207 +207 @@
               ["sld_core",          "1e-6/Ang^2",     2.07,   [-inf, inf],    "sld", "sld function flat"],
               ["sld_solvent",       "1e-6/Ang^2",     1.0,    [-inf, inf],    "sld", "sld function solvent"],
-              ["func_inter0",       "",               0,      [0, 4],         "", "Erf:0, RPower:1, LPower:2, RExp:3, LExp:4"],
+              ["func_inter0",       "",               0,      [0, 5],         "", "Erf:0, RPower:1, LPower:2, RExp:3, LExp:4, Linear:5"],
               ["thick_inter0",      "Ang",            50.0,   [0, inf],       "volume", "intern layer thickness for core layer"],
               ["nu_inter0",         "",               2.5,    [-inf, inf],    "", "steepness parameter for core layer"],
               ["sld_flat[n_shells]",      "1e-6/Ang^2",     4.06,   [-inf, inf],    "sld", "sld function flat"],
               ["thick_flat[n_shells]",    "Ang",            100.0,  [0, inf],       "volume", "flat layer_thickness"],
-              ["func_inter[n_shells]",    "",               0,      [0, 4],         "", "Erf:0, RPower:1, LPower:2, RExp:3, LExp:4"],
+              ["func_inter[n_shells]",    "",               0,      [0, 5],         "", "Erf:0, RPower:1, LPower:2, RExp:3, LExp:4, Linear:5"],
               ["thick_inter[n_shells]",   "Ang",            50.0,   [0, inf],       "volume", "intern layer thickness"],
               ["nu_inter[n_shells]",      "",               2.5,    [-inf, inf],    "", "steepness parameter"],