Changeset 30b4ddf in sasmodels

Timestamp:

Jan 19, 2016 6:39:15 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:

2f6f4c3, 513efc5

Parents:

da84551

Message:

Converted GelFit? model

Location:

sasmodels

Files:

• convert.py (modified) (2 diffs)
• models/gel_fit.c (added)
• models/gel_fit.py (added)
• models/img/gel_fit_1d.gif (added)
• models/surface_fractal.py (modified) (1 diff)

sasmodels/convert.py

@@ -98 +98 @@
     # Note: update compare.constrain_pars to match
     name = model_definition.name
-    if name in ('teubner_strey', 'broad_peak', 'two_lorentzian'):
+    if name in ('teubner_strey', 'broad_peak', 'two_lorentzian', 'gel_fit'):
         if oldpars.pop('scale', 1.0) != 1.0:
             warnings.warn("parameter scale not used in sasview %s"%name)
@@ -125 +125 @@
     # Note: update convert.revert_model to match
     name = model_definition.name
-    if name in ('teubner_strey','broad_peak', 'two_lorentzian'):
+    if name in ('teubner_strey','broad_peak', 'two_lorentzian', 'gel_fit'):
         pars['scale'] = 1
     elif name in ('guinier',):

sasmodels/models/surface_fractal.py

@@ -38 +38 @@
 
 .. note::
-
-The surface fractal dimension $D_s$ is only valid if $1<surface\_dim<3$.
-It is also only valid over a limited $q$ range (see the reference for details)
+    The surface fractal dimension $D_s$ is only valid if $1<surface\_dim<3$.
+    It is also only valid over a limited $q$ range (see the reference for details)