Changeset 31641b2 in sasmodels

Timestamp:

Mar 21, 2016 4:20:32 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:

abc03d8

Parents:

afda63c (diff), 88aa3ee (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'polydisp' of ​https://github.com/SasView/sasmodels into polydisp

Location:

sasmodels

Files:

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

sasmodels/compare.py

@@ -452 +452 @@
     """
     # initialize the code so time is more accurate
-    #value = calculator(**suppress_pd(pars))
+    if Nevals > 1:
+        value = calculator(**suppress_pd(pars))
     toc = tic()
     for _ in range(max(Nevals, 1)):  # make sure there is at least one eval

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)
-    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")
+        active = lambda name: False
+    elif kernel.dim == '1d':
+        active = lambda name: name in set(kernel.info['par_type']['1d'])
+    elif kernel.dim == '2d':
+        active = lambda name: name in set(kernel.info['par_type']['2d'])
+    else:
+        active = lambda name: True
+
+    vw_pairs = [(get_weights(p, pars) if active(p.name) 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

sasmodels/generate.py

@@ -684 +684 @@
 
 def poly_details(model_info, weights):
-    print("entering poly",weights)
     pars = model_info['parameters'][2:]  # skip scale and background
     max_pd = model_info['max_pd']
@@ -707 +706 @@
         if theta_par >= 0 and pd_length[theta_par] <= 1:
             theta_par = -1
-
-    print("p","max_pd","constants_offset",par_offset,max_pd,constants_offset,npars)
-    print(idx)
-    print(pd_length[idx])
-    print(pd_offset[idx])
-    print(pd_stride)
-    print(pd_isvol[idx])
 
     details = np.empty(constants_offset + 2, 'int32')
@@ -727 +719 @@
     for k,parameter_num in enumerate(idx):
         details[coord_offset+parameter_num] = 2**k
-    details[constants_offset]   = 1   # fast_coord_count: one fast index
+    details[constants_offset] = 1   # fast_coord_count: one fast index
     details[constants_offset+1] = theta_par
     print ("details",details)