Changeset 1726b21 in sasmodels for Models/code_cylinder.py

Timestamp:

Aug 8, 2014 11:45:51 AM (10 years ago)

Author:

HMP1 <helen.park@…>

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:

ae7d639

Parents:

8cdb9f1

Message:

cylinder now MUCH faster!

File:

• Models/code_cylinder.py (modified) (5 diffs)

Models/code_cylinder.py

@@ -6 +6 @@
 
 from weights import GaussianDispersion
-from sasmodel import card, set_precision, set_precision_1d
+from sasmodel import card, set_precision, set_precision_1d, tic, toc
 
 
@@ -33 +33 @@
     def eval(self, pars):
 
+        tic()
         _ctx,queue = card()
         self.res[:] = 0
@@ -55 +56 @@
         for i in xrange(len(radius.weight)):
             for j in xrange(len(length.weight)):
+
+                vol += radius.weight[i]*length.weight[j]*pow(radius.value[i], 2)*length.value[j]
+                norm_vol += radius.weight[i]*length.weight[j]
+
                 for k in xrange(len(cyl_theta.weight)):
                     for l in xrange(len(cyl_phi.weight)):
@@ -63 +68 @@
                                            np.uint32(self.qx.size), np.uint32(size))
 
-                        vol += radius.weight[i]*length.weight[j]*pow(radius.value[i], 2)*length.value[j]
-                        norm_vol += radius.weight[i]*length.weight[j]
                         norm += radius.weight[i]*length.weight[j]*cyl_theta.weight[k]*cyl_phi.weight[l]
+
 
        # if size > 1:
@@ -74 +78 @@
             sum *= norm_vol/vol
 
+        print toc()*1000, self.qx.shape[0]
         return sum/norm+pars['background']