Changeset 35b4c47 in sasmodels

Timestamp:

Mar 15, 2016 3:25:08 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:

667a6f2

Parents:

754e27b

Message:

improve product model, but still not right

Location:

sasmodels

Files:

• compare.py (modified) (1 diff)
• product.py (modified) (6 diffs)

sasmodels/compare.py

@@ -366 +366 @@
         composition_type, parts = model_info['composition']
         if composition_type == 'product':
-            from sas.models import MultiplicationModel
+            from sas.models.MultiplicationModel import MultiplicationModel
             P, S = [get_model(p) for p in model_info['oldname']]
             model = MultiplicationModel(P, S)

sasmodels/product.py

@@ -100 +100 @@
             num_p_pd = len(p_info['pd-2d'])
             num_s_fixed = len(s_info['fixed-2d'])
-            num_s_pd = len(s_info['pd-2d'])
+            num_s_pd = len(s_info['pd-2d']) - 1 # exclude effect_radius
             # volume parameters are amongst the pd pars for P, not S
             vol_par_idx = [k for k,v in enumerate(p_info['pd-2d'])
@@ -108 +108 @@
             num_p_pd = len(p_info['pd-1d'])
             num_s_fixed = len(s_info['fixed-1d'])
-            num_s_pd = len(s_info['pd-1d'])
+            num_s_pd = len(s_info['pd-1d']) - 1  # exclude effect_radius
             # volume parameters are amongst the pd pars for P, not S
             vol_par_idx = [k for k,v in enumerate(p_info['pd-1d'])
@@ -118 +118 @@
         # so borrow values from end of p_fixed.  This makes volfraction the
         # first S parameter.
-        start += num_p_fixed - 3
+        start += num_p_fixed - 2
         par_map['s_fixed'] = np.arange(start, start+num_s_fixed)
         par_map['volfraction'] = num_p_fixed
@@ -126 +126 @@
         par_map['p_pd'] = np.arange(start, start+num_p_pd)
         start += num_p_pd
-        par_map['s_pd'] = np.arange(start, start+num_s_pd)  # should be empty...
-
+        par_map['s_pd'] = np.arange(start-1, start+num_s_pd)  # should be empty...
 
         self.fixed_pars = model_info['partype']['fixed-' + dim]
@@ -146 +145 @@
         s_pd = [pars[k] for k in self.par_map['s_pd']]
         vol_pars = [pars[k] for k in self.par_map['vol_pars']]
-        p_pars = dict(list(zip(self.fixed_pars, p_fixed))
-                      +list(zip(self.pd_pars, p_pd)))
 
         effect_radius, vol_ratio = call_ER_VR(self.p_kernel.info, vol_pars)
@@ -155 +152 @@
         s_fixed[SCALE] = scale
         s_fixed[BACKGROUND] = 0.0
-        s_fixed[EFFECT_RADIUS] = effect_radius
-        s_fixed[VOLFRACTION] = s_volfraction/vol_ratio
+        s_fixed[2] = s_volfraction/vol_ratio
+        s_pd[0] = [effect_radius], [1.0]
 
         p_res = self.p_kernel(p_fixed, p_pd)
         s_res = self.s_kernel(s_fixed, s_pd)
+        #print s_fixed, s_pd, p_fixed, p_pd
 
         return p_res*s_res + background