Changeset a8a7f08 in sasmodels for sasmodels/kernelpy.py

Timestamp:

Apr 7, 2016 2:25:44 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:

3707eee

Parents:

3543141

Message:

fix python model polydispersity

File:

• sasmodels/kernelpy.py (modified) (4 diffs)

sasmodels/kernelpy.py

@@ -104 +104 @@
         # will use views into this vector, relying on the fact that a
         # an array of no dimensions acts like a scalar.
-        parameter_vector = np.empty(len(partable.call_parameters), 'd')
+        parameter_vector = np.empty(len(partable.call_parameters)-2, 'd')
 
         # Create views into the array to hold the arguments
-        offset = 2
+        offset = 0
         kernel_args, volume_args = [], []
         for p in partable.kernel_parameters:
@@ -120 +120 @@
                 kernel_args.append(v)
             if p in volume_parameters:
-                volume_args.append(p)
+                volume_args.append(v)
 
         # Hold on to the parameter vector so we can use it to call kernel later.
@@ -172 +172 @@
     #                                                              #
     ################################################################
-    parameters[2:] = values[details.par_offset]
+    parameters[:] = values[details.par_offset]
     scale, background = values[0], values[1]
     if details.num_active == 0:
@@ -215 +215 @@
         for k in range(details.num_coord):
             if details.pd_coord[k]&1:
-                par = details.par_coord[k]
+                #par = details.par_coord[k]
                 parameters[par] = values[offset[par]]
+                #print "par",par,offset[par],parameters[par+2]
                 offset[par] += 1
                 if par == theta: