Changeset abc03d8 in sasmodels for sasmodels/generate.py

Timestamp:

Mar 21, 2016 4:06:45 PM (8 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:

e8d2276

Parents:

31641b2

Message:

Bug fixes

File:

• sasmodels/generate.py (modified) (3 diffs)

sasmodels/generate.py

@@ -685 +685 @@
 def poly_details(model_info, weights):
     pars = model_info['parameters'][2:]  # skip scale and background
+    weights = weights[2:]
     max_pd = model_info['max_pd']
     npars = len(pars) # scale and background already removed
@@ -694 +695 @@
     pd_length = np.array([len(w) for w in weights])
     print (pd_length)
+    print (weights)
     pd_offset = np.cumsum(np.hstack((0, pd_length)))
     pd_isvol = np.array([p.type=='volume' for p in pars])
@@ -716 +718 @@
     details[par_offset+1*npars:par_offset+2*npars] = 0  # no coordination for most
     details[par_offset+2*npars:par_offset+3*npars] = 0  # no fast coord with 0
-    coord_offset = par_offset+1*pars
+    coord_offset = par_offset+1*npars
     for k,parameter_num in enumerate(idx):
         details[coord_offset+parameter_num] = 2**k