Changeset d2d6100 in sasmodels

Timestamp:

Jul 28, 2016 7:51:51 AM (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:

20317b3

Parents:

7f1ee79

Message:

mark linear pearls and polymer micelle as double precision

Location:

sasmodels

Files:

• core.py (modified) (2 diffs)
• models/linear_pearls.py (modified) (1 diff)
• models/polymer_micelle.py (modified) (1 diff)

sasmodels/core.py

@@ -62 +62 @@
     Return the list of available models on the model path.
     """
-    KINDS = ("all", "py", "c", "double", "oriented", "magnetic")
+    KINDS = ("all", "py", "c", "double", "single", "1d", "2d", "nonmagnetic", "magnetic")
     if kind and kind not in KINDS:
         raise ValueError("kind not in "+", ".join(KINDS))
@@ -83 +83 @@
     elif kind == "double" and not info.single:
         return True
-    elif kind == "oriented" and any(p.type=='orientation' for p in pars):
+    elif kind == "single" and info.single:
+        return True
+    elif kind == "2d" and any(p.type=='orientation' for p in pars):
+        return True
+    elif kind == "1d" and any(p.type!='orientation' for p in pars):
         return True
     elif kind == "magnetic" and any(p.type=='sld' for p in pars):
+        return True
+    elif kind == "nonmagnetic" and any(p.type!='sld' for p in pars):
         return True
     return False

sasmodels/models/linear_pearls.py

@@ -61 +61 @@
     ]
 # pylint: enable=bad-whitespace, line-too-long
+single=False
 
 source = ["linear_pearls.c"]

sasmodels/models/polymer_micelle.py

@@ -51 +51 @@
 # pylint: enable=bad-whitespace, line-too-long
 
+single = False
+
 source = ["lib/sph_j1c.c", "polymer_micelle_kernel.c"]