Changeset 0880966 in sasmodels for sasmodels/generate.py

Timestamp:

Mar 21, 2016 12:34:51 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:

839283a

Parents:

9f4409a

Message:

Mono and poly reading fixes

File:

• sasmodels/generate.py (modified) (1 diff)

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')