Changeset 1726b21 in sasmodels for Models/code_ellipse.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_ellipse.py (modified) (2 diffs)

Models/code_ellipse.py

@@ -53 +53 @@
             for j in xrange(len(radius_b.weight)):
                 #Average over theta distribution
+                vol += radius_a.weight[i]*radius_b.weight[j]*pow(radius_b.value[j], 2)*radius_a.value[i]
+                norm_vol += radius_a.weight[i]*radius_b.weight[j]
+
                 for k in xrange(len(axis_theta.weight)):
                     #Average over phi distribution
@@ -64 +67 @@
                                         np.uint32(self.qx.size), np.uint32(len(axis_theta.weight)))
 
-                        vol += radius_a.weight[i]*radius_b.weight[j]*pow(radius_b.value[j], 2)*radius_a.value[i]
-                        norm_vol += radius_a.weight[i]*radius_b.weight[j]
                         norm += radius_a.weight[i]*radius_b.weight[j]*axis_theta.weight[k]*axis_phi.weight[l]
+
         # Averaging in theta needs an extra normalization
         # factor to account for the sin(theta) term in the