Changeset f1ecfa92 in sasmodels

Timestamp:

Feb 20, 2015 7:38:00 AM (9 years ago)

Author:

ajj

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:

6ea6902

Parents:

4c8f9cd

Message:

towards fixing the 'models with no polydispersity' problem

Location:

sasmodels

Files:

• bumps_model.py (modified) (1 diff)
• generate.py (modified) (3 diffs)
• kernelcl.py (modified) (1 diff)

sasmodels/bumps_model.py

@@ -348 +348 @@
                 self._fn = self.model(input)
 
-            pars = [getattr(self,p).value for p in self._fn.fixed_pars]
+            fixed_pars = [getattr(self,p).value for p in self._fn.fixed_pars]
             pd_pars = [self._get_weights(p) for p in self._fn.pd_pars]
-            #print pars
-            self._theory[self.index] = self._fn(pars, pd_pars, self.cutoff)
+            #print fixed_pars,pd_pars
+            self._theory[self.index] = self._fn(fixed_pars, pd_pars, self.cutoff)
             #self._theory[:] = self._fn.eval(pars, pd_pars)
             if self.data_type == 'sesans':

sasmodels/generate.py

@@ -549 +549 @@
         weights = [p+"_w" for p in pd_pars]
         sasview_spherical = ""
+    weight_product = "*".join(weights) if len(weights) > 1 else "1.0"
     subst = {
-        'weight_product': "*".join(weights),
+        'weight_product': weight_product,
         'volume_norm': volume_norm,
         'fn': fn,
@@ -574 +575 @@
 
     # Finally, put the pieces together in the kernel.
+    pd_length = "+".join('N'+p for p in pd_pars) if len(pd_pars) > 0 else "0"
     subst = {
         # kernel name is, e.g., cylinder_Iq
@@ -582 +584 @@
         'par_decl': par_decl,
         # to copy global to local pd pars we need, e.g., Nradius+Nlength
-        'pd_length': "+".join('N'+p for p in pd_pars),
+        'pd_length': pd_length,
         # the q initializers, e.g., double qi = q[i];
         'qinit': q_pars['qinit'],

sasmodels/kernelcl.py

@@ -353 +353 @@
         fixed = [real(p) for p in pars]
         cutoff = real(cutoff)
-        loops = np.hstack(pd_pars)
+        loops = np.hstack(pd_pars) if pd_pars else np.empty(0,dtype=self.input.dtype)
         loops = np.ascontiguousarray(loops.T, self.input.dtype).flatten()
         Nloops = [np.uint32(len(p[0])) for p in pd_pars]