Changeset 0880966 in sasmodels

Timestamp:

Mar 21, 2016 12:34:51 PM (9 years ago)

Author:

wojciech

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:

839283a

Parents:

9f4409a

Message:

Mono and poly reading fixes

Location:

sasmodels

Files:

• core.py (modified) (3 diffs)
• generate.py (modified) (1 diff)
• kerneldll.py (modified) (1 diff)

sasmodels/core.py

@@ -183 +183 @@
     value = values.get(parameter.name, parameter.default)
     if parameter.type not in ('volume', 'orientation'):
-        return [value], []
+        return np.array([value]), np.array([1.0])
     relative = parameter.type == 'volume'
     limits = parameter.limits
@@ -208 +208 @@
     return value, weight
 
-def call_kernel(kernel, values, cutoff=0, mono=False):
+def call_kernel(kernel, pars, cutoff=0, mono=False):
     """
     Call *kernel* returned from :func:`make_kernel` with parameters *pars*.
@@ -221 +221 @@
     *mono* is True if polydispersity should be set to none on all parameters.
     """
-    if mono or True:
-        pars = np.array([values.get(p.name, p.default)
-                         for p in kernel.info['parameters']],
-                        dtype=kernel.dtype)
-        weights = np.array([1.0], dtype=kernel.dtype)
+    if mono:
+        values = [pars.get(p.name, p.default) for p in kernel.info['parameters']]
+        weights = [1.0]*len(values)
+    else:
+        wv_pairs = [get_weights(p, pars) for p in kernel.info['parameters']]
+        weights, values = [v for v in zip(*wv_pairs)]
+
+    #TODO: This is what we thought to do if max([len(w) for w in weights]) > 1:
+    if max([w for w in weights]) > 1:
+        details = generate.poly_details(kernel.info, weights)
+    else:
         details = kernel.info['mono_details']
-        return kernel(details,  weights, pars, cutoff)
-    else:
-        pairs = [get_weights(p, values) for p in kernel.info['parameters']]
-        weights, pars = [v for v in zip(*pairs)]
-        details = generate.poly_details(kernel.info, weights, pars)
-        weights, pars = [np.hstack(v) for v in (weights, pars)]
-        return kernel(details, weights, pars, cutoff)
+
+    weights, values = [np.hstack(v) for v in (weights, values)]
+
+    weights = weights.astype(dtype=kernel.dtype)
+    values = values.astype(dtype=kernel.dtype)
+
+    return kernel(details, weights, values, cutoff)
 
 def call_ER_VR(model_info, vol_pars):

sasmodels/generate.py

@@ -693 +693 @@
     # Note: the reversing view, x[::-1], does not require a copy
     pd_length = np.array([len(w) for w in weights])
+    print (pd_length)
     pd_offset = np.cumsum(np.hstack((0, pd_length)))
     pd_isvol = np.array([p.type=='volume' for p in pars])
     idx = np.argsort(pd_length)[::-1][:max_pd]
-    pd_stride = np.cumprod(np.hstack((1, np.maximum(pd_length[idx][:-1],1))))
-    par_offsets = np.cumsum(np.hstack((2, np.maximum(pd_length, 1))))[:-1]
-    theta_par = model_info['theta_par']
-    if theta_par >= 0 and pd_length[theta_par] <= 1:
-        theta_par = -1
+    print (idx)
+    pd_stride = np.cumprod(np.hstack((1, pd_length[idx][:-1])))
+    par_offsets = np.cumsum(np.hstack((2, pd_length)))[:-1]
+
+    theta_par = -1
+    if 'theta_par' in model_info:
+        theta_par = model_info['theta_par']
+        if theta_par >= 0 and pd_length[theta_par] <= 1:
+            theta_par = -1
 
     details = np.empty(constants_offset + 3, 'int32')

sasmodels/kerneldll.py

@@ -271 +271 @@
         #weights = np.asarray(weights, dtype=real)
         #values = np.asarray(values, dtype=real)
+        #TODO: How can I access max_pd and is this the way to do it?
+        #max_pd = model_info['max_pd']
+        max_pd = 1
         args = [
             self.q_input.nq, # nq
+            #TODO: pd_start will need to be changed
             0, # pd_start
-            1, # pd_stop
+            details[3*max_pd:4*max_pd], # pd_stop pd_stride[MAX_PD]
             details.ctypes.data, # problem
             weights.ctypes.data,  # weights