Changeset 51ec7e8 in sasmodels for sasmodels/convert.py

Timestamp:

Jul 18, 2016 4:54:39 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:

263daec

Parents:

ce176ca

Message:

working rpa implementation

File:

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

sasmodels/convert.py

@@ -176 +176 @@
             newid = p.id
             oldid = translation.get(p.id, p.id)
-            del translation[newid]
+            translation.pop(newid, None)
             for k in range(1, p.length+1):
-                translation[newid+str(k)] = oldid+str(k)
+                if newid+str(k) not in translation:
+                    translation[newid+str(k)] = oldid+str(k)
     # Remove control parameter from the result
     if model_info.control:
@@ -211 +212 @@
     else:
         translation = _get_translation_table(model_info)
-    oldpars = _revert_pars(_unscale_sld(pars), translation)
-    oldpars = _trim_vectors(model_info, pars, oldpars)
+        oldpars = _revert_pars(_unscale_sld(pars), translation)
+        oldpars = _trim_vectors(model_info, pars, oldpars)
 
 
@@ -246 +247 @@
             for p in "L1", "L2", "L3", "L4":
                 if p in oldpars: oldpars[p] *= 1e-13
+            if pars['case_num'] < 2:
+                for k in ("a", "b"):
+                    for p in ("L", "N", "Phi", "b", "v"):
+                        oldpars.pop(p+k, None)
+                for k in "Kab,Kac,Kad,Kbc,Kbd".split(','):
+                    oldpars.pop(k, None)
+            elif pars['case_num'] < 5:
+                for k in ("a",):
+                    for p in ("L", "N", "Phi", "b", "v"):
+                        oldpars.pop(p+k, None)
+                for k in "Kab,Kac,Kad".split(','):
+                    oldpars.pop(k, None)
         elif name == 'core_shell_parallelepiped':
             _remove_pd(oldpars, 'rimA', name)