Changeset 78d3341 in sasmodels

Timestamp:

Mar 17, 2016 12:24:09 PM (9 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:

3a45c2c

Parents:

3bcd03d

Message:

allow the sld on the start or end, or as an sld type

Location:

sasmodels

Files:

• convert.py (modified) (1 diff)
• generate.py (modified) (5 diffs)

sasmodels/convert.py

@@ -72 +72 @@
     new model definition end with sld.
     """
-    return dict((p, (v*1e-6 if p.endswith('sld')
+    return dict((p, (v*1e-6 if p.startswith('sld') or p.endswith('sld')
                      else v*1e15 if 'ndensity' in p
                      else v))

sasmodels/generate.py

@@ -91 +91 @@
     in *Iqxy* and *Imagnetic*.  "magnetic* parameters will be used in
     *Imagnetic* only.  If *type* is the empty string, the parameter will
-    be used in all of *Iq*, *Iqxy* and *Imagnetic*.
+    be used in all of *Iq*, *Iqxy* and *Imagnetic*.  "sld" parameters
+    can automatically be promoted to magnetic parameters, each of which
+    will have a magnitude and a direction, which may be different from
+    other sld parameters.
 
     *description* is a short description of the parameter.  This will
@@ -216 +219 @@
 import re
 import string
+import warnings
 from collections import namedtuple
 
@@ -604 +608 @@
     """
     partype = {
-        'volume': [], 'orientation': [], 'magnetic': [], '': [],
+        'volume': [], 'orientation': [], 'magnetic': [], 'sld': [], '': [],
         'fixed-1d': [], 'fixed-2d': [], 'pd-1d': [], 'pd-2d': [],
         'pd-rel': set(),
@@ -618 +622 @@
         elif p.type == 'orientation':
             partype['pd-2d'].append(p.name)
-        elif p.type == '':
+        elif p.type in ('', 'sld'):
             partype['fixed-1d'].append(p.name)
             partype['fixed-2d'].append(p.name)
@@ -632 +636 @@
     """
     # convert parameters into named tuples
+    for p in model_info['parameters']:
+        if p[4] == '' and (p[0].startswith('sld') or p[0].endswith('sld')):
+            p[4] = 'sld'
+            # TODO: make sure all models explicitly label their sld parameters
+            #raise ValueError("%s.%s needs to be explicitly set to type 'sld'" %(model_info['id'], p[0]))
+
     pars = [Parameter(*p) for p in model_info['parameters']]
     # Fill in the derived attributes