Changeset 261658d in sasmodels for sasmodels

Timestamp:

Feb 19, 2015 4:43:07 PM (9 years ago)

Author:

richardh

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:

29f5536

Parents:

9cb1415 (diff), fd1c792 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

Location:

sasmodels

Files:

• bumps_model.py (modified) (1 diff)
• convert.py (modified) (1 diff)
• direct_model.py (added)
• generate.py (modified) (1 diff)
• kernelpy.py (modified) (3 diffs)
• models/broad_peak.py (modified) (3 diffs)
• models/img/stickyhardsphere_228.PNG (added)
• models/img/stickyhardsphere_229.PNG (added)
• models/img/stickyhardsphere_230.jpg (added)
• models/stickyhardsphere.py (added)

sasmodels/bumps_model.py

@@ -354 +354 @@
             #self._theory[:] = self._fn.eval(pars, pd_pars)
             if self.data_type == 'sesans':
-                P = sesans.hankel(self.data.x, self.data.lam,
+                P = sesans.hankel(self.data.x, self.data.lam*1e-9,
                                   self.data.sample.thickness/10, self._fn_inputs[0],
                                   self._theory)

sasmodels/convert.py

@@ -13 +13 @@
         for variant in ("", "_pd", "_pd_n", "_pd_nsigma", "_pd_type"):
             if old+variant in newpars:
-                newpars[new+variant] = pars[old+variant]
+                if new is not None:
+                    newpars[new+variant] = pars[old+variant]
                 del newpars[old+variant]
         # Sasview style parameter names
         for variant in (".width", ".nsigmas", ".type", ".npts"):
             if old+variant in newpars:
-                newpars[new+variant] = pars[old+variant]
+                if new is not None:
+                    newpars[new+variant] = pars[old+variant]
                 del newpars[old+variant]
     return newpars

sasmodels/generate.py

@@ -731 +731 @@
     info['limits'] = dict((p[0],p[3]) for p in info['parameters'])
     info['partype'] = categorize_parameters(info['parameters'])
+    info['defaults'] = dict((p[0],p[2]) for p in info['parameters'])
 
     source = make_model(info)

sasmodels/kernelpy.py

@@ -87 +87 @@
         self.pd_pars = pd_pars
 
-    def __call__(self, fixed, pd, cutoff):
+    def __call__(self, fixed, pd, cutoff=1e-5):
         #print "fixed",fixed
         #print "pd", pd
@@ -144 +144 @@
     ##########################################################
 
-    # weight vector, to be populated by polydispersity loops
     weight = np.empty(len(pd), 'd')
-
-    # identify which pd parameters are volume parameters
-    vol_weight_index = np.array([(index in vol_index) for index in pd_index])
-
-    # Sort parameters in decreasing order of pd length
-    Npd = np.array([len(pdi[0]) for pdi in pd], 'i')
-    order = np.argsort(Npd)[::-1]
-    stride = np.cumprod(Npd[order])
-    pd = [pd[index] for index in order]
-    pd_index = pd_index[order]
-    vol_weight_index = vol_weight_index[order]
-
-    fast_value = pd[0][0]
-    fast_weight = pd[0][1]
+    if weight.size > 0:
+        # weight vector, to be populated by polydispersity loops
+
+        # identify which pd parameters are volume parameters
+        vol_weight_index = np.array([(index in vol_index) for index in pd_index])
+
+        # Sort parameters in decreasing order of pd length
+        Npd = np.array([len(pdi[0]) for pdi in pd], 'i')
+        order = np.argsort(Npd)[::-1]
+        stride = np.cumprod(Npd[order])
+        pd = [pd[index] for index in order]
+        pd_index = pd_index[order]
+        vol_weight_index = vol_weight_index[order]
+
+        fast_value = pd[0][0]
+        fast_weight = pd[0][1]
+    else:
+        stride = np.array([1])
+        vol_weight_index = slice(None, None)
 
     ret = np.zeros_like(args[0])
@@ -169 +173 @@
         fast_index = k%stride[0]
         if fast_index == 0:  # bottom loop complete ... check all other loops
-            for i,index, in enumerate(k%stride):
-                args[pd_index[i]] = pd[i][0][index]
-                weight[i] = pd[i][1][index]
+            if weight.size > 0:
+                for i,index, in enumerate(k%stride):
+                    args[pd_index[i]] = pd[i][0][index]
+                    weight[i] = pd[i][1][index]
         else:
             args[pd_index[0]] = fast_value[fast_index]

sasmodels/models/broad_peak.py

@@ -51 +51 @@
 
 import numpy as np
-from numpy import pi, inf, sin, cos, sqrt, exp, log
+from numpy import pi, inf, sin, cos, sqrt, exp, log, fabs
 
 name = "broad_peak"
@@ -92 +92 @@
 def Iq(q, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp):
     inten = porod_scale/pow(q,porod_exp) + lorentz_scale/(1.0 \
-        + pow((math.fabs(q-peak_pos)*lorentz_length),lorentz_exp))
+        + pow((fabs(q-peak_pos)*lorentz_length),lorentz_exp))
     return inten  
 
@@ -113 +113 @@
 oldpars = dict(porod_scale='scale_p', porod_exp='exponent_p', 
         lorentz_scale='scale_l', lorentz_length='length_l', peak_pos='q_peak', 
-        lorentz_exp='exponent_l')
+        lorentz_exp='exponent_l', scale=None)