Changeset 445d1c0 in sasmodels

Timestamp:

Mar 21, 2016 4:08:33 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:

88aa3ee

Parents:

a4e2ae5

Message:

restrict polydispersity checks in bumps to 1d parameters for 1d data

Location:

sasmodels

Files:

• core.py (modified) (1 diff)
• kernelcl.py (modified) (2 diffs)
• kerneldll.py (modified) (1 diff)

sasmodels/core.py

@@ -222 +222 @@
     """
     if mono:
-        values = [pars.get(p.name, p.default) for p in kernel.info['parameters']]
-        weights = [1.0]*len(values)
+        active = set()
+    elif kernel.dim == '1d':
+        active = set(kernel.info['par_type']['1d'])
+    elif kernel.dim == '2d':
+        active = set(kernel.info['par_type']['2d'])
     else:
         vw_pairs = [get_weights(p, pars) for p in kernel.info['parameters']]
-        values, weights = zip(*vw_pairs)
-
-    #TODO: This is what we thought to do if max([len(w) for w in weights]) > 1:
-    print("from")
-    import pprint; pprint.pprint(weights)
-    print("to")
+
+    vw_pairs = [(get_weights(p, pars) if p.name in active else ([p.default], [1]))
+                for p in kernel.info['parameters']]
+    values, weights = zip(*vw_pairs)
+
     if max([len(w) for w in weights]) > 1:
         details = generate.poly_details(kernel.info, weights)

sasmodels/kernelcl.py

@@ -446 +446 @@
         q_input = GpuInput(q_vectors, dtype)
         self.dtype = dtype
+        self.dim = '2d' if q_input.is_2d else '1d'
         self.kernel = kernel
         self.info = model_info
@@ -452 +453 @@
         # plus three for the normalization values
         self.result = np.empty(q_input.nq+3, q_input.dtype)
-        #self.dim = '2d' if q_input.is_2d else '1d'
 
         # Inputs and outputs for each kernel call

sasmodels/kerneldll.py

@@ -256 +256 @@
         self.kernel = kernel
         self.res = np.empty(q_input.nq+3, q_input.dtype)
-        dim = '2d' if q_input.is_2d else '1d'
-        self.parameters = model_info['par_type'][dim]
+        self.dim = '2d' if q_input.is_2d else '1d'
 
         # In dll kernel, but not in opencl kernel