Changeset 78afdec in sasmodels for sasmodels/convert.py

Timestamp:

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

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

File:

• sasmodels/convert.py (modified) (2 diffs)

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