Changeset 711d8e2 in sasmodels

Timestamp:

Feb 20, 2015 12:45:49 PM (10 years ago)

Author:

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:

f734e7d

Parents:

5ca9762 (diff), 6ea6902 (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 github.com:sasview/sasmodels

Location:

sasmodels

Files:

• bumps_model.py (modified) (1 diff)
• generate.py (modified) (3 diffs)
• kernelcl.py (modified) (1 diff)
• models/gaussian_peak.py (modified) (1 diff)
• model_test.py (modified) (4 diffs)

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]

sasmodels/models/gaussian_peak.py

@@ -42 +42 @@
 # This should perhaps be volume normalized?
 form_volume = """
-    return 1;
+    return 1.0;
     """
 
 Iq = """
-    return exp(-0.5*pow((q - q0])/sigma,2.0));
+    return exp(-0.5*pow((q - q0)/sigma,2.0));
     """
 

sasmodels/model_test.py

@@ -66 +66 @@
     args = exc.args
     if not args:
-        arg0 = msg
+        exc.args = (msg,)
     else:
-        arg0 = " ".join((args[0],msg))
-    exc.args = tuple([arg0] + list(args[1:]))
+        try:
+            arg0 = " ".join((args[0],msg))
+            exc.args = tuple([arg0] + list(args[1:]))
+        except:
+            exc.args = (" ".join((str(exc),msg)),)
     
 def suite():
@@ -83 +86 @@
 
         model = getattr(module, model_name, None)
-        tests = getattr(model, 'tests', [])
+        smoke_tests = [[{},0.1,None],[{},(0.1,0.1),None]]
+        tests = smoke_tests + getattr(model, 'tests', [])
         
         if tests:
@@ -120 +124 @@
                     
                 if isinstance(Q[0], tuple):
-                    npQ = [np.array([Qi[d] for Qi in Q]) for d in xrange(len(Q[0]))]
+                    Qx,Qy = zip(*Q)
+                    Q_vectors = [np.array(Qx), np.array(Qy)]
                 else:
-                    npQ = [np.array(Q)]
+                    Q_vectors = [np.array(Q)]
 
-                self.assertTrue(Q)
-                self.assertEqual(len(I), len(Q))    
+                self.assertEqual(len(I), len(Q))
             
-                Iq = eval_kernel(self.kernel, npQ, params)
+                Iq = eval_kernel(self.kernel, Q_vectors, params)
             
                 self.assertGreater(len(Iq), 0)    
@@ -133 +137 @@
                 
                 for q, i, iq in zip(Q, I, Iq):
+                    if i is None: continue # smoke test --- make sure it runs
                     err = np.abs(i - iq)
                     nrm = np.abs(i)