Changeset d5ba841 in sasmodels

Timestamp:

Mar 18, 2016 7:00:13 AM (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:

5852c86

Parents:

7c391dd

Message:

product model now works with sphere

Location:

sasmodels

Files:

• core.py (modified) (1 diff)
• product.py (modified) (1 diff)

sasmodels/core.py

@@ -170 +170 @@
     """
     value, weight = zip(*pars)
-    if len(value) > 1:
-        value = [v.flatten() for v in np.meshgrid(*value)]
-        weight = np.vstack([v.flatten() for v in np.meshgrid(*weight)])
-        weight = np.prod(weight, axis=0)
+    value = [v.flatten() for v in np.meshgrid(*value)]
+    weight = np.vstack([v.flatten() for v in np.meshgrid(*weight)])
+    weight = np.prod(weight, axis=0)
     return value, weight
 

sasmodels/product.py

@@ -124 +124 @@
         # so borrow values from end of p_fixed.  This makes volfraction the
         # first S parameter.
-        start += num_p_fixed - 2
-        par_map['s_fixed'] = np.arange(start, start+num_s_fixed)
+        start += num_p_fixed
+        par_map['s_fixed'] = np.hstack(([start,start],
+                                        np.arange(start, start+num_s_fixed-2)))
         par_map['volfraction'] = num_p_fixed
-        start += num_s_fixed
+        start += num_s_fixed-2
         # vol pars offset from the start of pd pars
         par_map['vol_pars'] = [start+k for k in vol_par_idx]
         par_map['p_pd'] = np.arange(start, start+num_p_pd)
-        start += num_p_pd
-        par_map['s_pd'] = np.arange(start-1, start+num_s_pd)  # should be empty...
+        start += num_p_pd-1
+        par_map['s_pd'] = np.hstack((start,
+                                     np.arange(start, start+num_s_pd-1)))
 
         self.fixed_pars = model_info['partype']['fixed-' + dim]