Changeset 78afdec in sasmodels

Timestamp:

Jan 18, 2016 2:48:37 AM (9 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:

23d3b41

Parents:

421e55c (diff), e66c9f9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Files:

• sasmodels/compare.py (modified) (1 diff)
• sasmodels/convert.py (modified) (2 diffs)
• sasmodels/generate.py (modified) (2 diffs)
• sasmodels/models/rpa.c (added)
• sasmodels/models/rpa.py (added)
• test/rpa.py (added)
• sasmodels/models/img/two_lorentzian.jpg (added)
• sasmodels/models/two_lorentzian.py (added)

sasmodels/compare.py

@@ -123 +123 @@
         rg_max = np.sqrt(90*np.log(10) + 3*np.log(pars['scale']))/q_max
         pars['rg'] = min(pars['rg'],rg_max)
+
+    if name == 'rpa':
+        # Make sure phi sums to 1.0
+        if pars['case_num'] < 2:
+            pars['Phia'] = 0.
+            pars['Phib'] = 0.
+        elif pars['case_num'] < 5:
+            pars['Phia'] = 0.
+        total = sum(pars['Phi'+c] for c in 'abcd')
+        for c in 'abcd':
+            pars['Phi'+c] /= total
 
 def parlist(pars):

sasmodels/convert.py

@@ -112 +112 @@
         _remove_pd(oldpars, 'num_pearls', name)
         _remove_pd(oldpars, 'thick_string', name)
+    elif name == 'rpa':
+        # convert scattering lengths from femtometers to centimeters
+        for p in "La", "Lb", "Lc", "Ld":
+            if p in oldpars: oldpars[p] *= 1e-13
 
     return oldname, oldpars
@@ -128 +132 @@
         pars['string_thickness_pd_n'] = 0
         pars['number_of_pearls_pd_n'] = 0
+    elif name == 'rpa':
+        pars['case_num'] = int(pars['case_num'])
     elif getattr(model_definition, 'category', None) == 'structure-factor':
         pars['scale'], pars['background'] = 1, 0

sasmodels/generate.py

@@ -265 +265 @@
 """
 
-def format_units(par):
-    return RST_UNITS.get(par, par)
+def format_units(units):
+    return "string" if isinstance(units, list) else RST_UNITS.get(units, units)
 
 def make_partable(pars):
@@ -284 +284 @@
     lines = [
         sep,
-        " ".join("%-*s" % (w, h) for w, h in zip(column_widths, PARTABLE_HEADERS)),
+        " ".join("%-*s" % (w, h)
+                 for w, h in zip(column_widths, PARTABLE_HEADERS)),
         sep,
         ]