Changeset 9c461c7 in sasmodels for sasmodels/models/mass_fractal.py

Timestamp:

Jan 21, 2016 2:47:17 AM (8 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:

790bcc4c

Parents:

9eaadb3

Message:

1. Code review from PK: renamed J1c to sph_j1c
2. Fixed mass_fractal

File:

• sasmodels/models/mass_fractal.py (modified) (3 diffs)

sasmodels/models/mass_fractal.py

@@ -80 +80 @@
 
 #             ["name", "units", default, [lower, upper], "type","description"],
-parameters = [["radius",        "Ang",  10.0, [0.0, inf], "",
-               "Particle radius"],
-              ["mass_dim",      "",      1.9, [1.0, 6.0],   "",
-               "Mass fractal dimension"],
-              ["cutoff_length", "Ang", 100.0, [0.0, inf], "",
-               "Cut-off length"],
+parameters = [["radius",        "Ang",  10.0, [0.0, inf], "", "Particle radius"],
+              ["mass_dim",      "",      1.9, [1.0, 6.0], "", "Mass fractal dimension"],
+              ["cutoff_length", "Ang", 100.0, [0.0, inf], "", "Cut-off length"],
               ]
 
 
-source = ["lib/J1c.c", "lib/lanczos_gamma.c", "mass_fractal.c"]
+source = ["lib/sph_j1c.c", "lib/lanczos_gamma.c", "mass_fractal.c"]
 
 demo = dict(scale=1, background=0,
@@ -104 +101 @@
            'mass_dim':      3.3,
            'cutoff_length': 1.0,
-           }, 0.001, 2.68342996226],
+           }, 0.5, 1.29016774904],
 
          [{'radius':        1.0,
@@ -116 +113 @@
            'cutoff_length': 1.0,
            'scale':        10.0,
-           }, 0.051, 11.6258202095],
+           }, 0.051, 11.6227966145],
          ]