Changeset 40a87fa in sasmodels for sasmodels/details.py

Timestamp:

Aug 8, 2016 11:24:11 AM (8 years ago)

Author:

Paul Kienzle <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:

2472141

Parents:

2d65d51

Message:

lint and latex cleanup

File:

• sasmodels/details.py (modified) (7 diffs)

sasmodels/details.py

@@ -113 +113 @@
     @pd_prod.setter
     def pd_prod(self, v):
+        """Total size of the pd mesh"""
         self.buffer[-4] = v
 
@@ -122 +123 @@
     @pd_sum.setter
     def pd_sum(self, v):
+        """Total length of all the weight vectors"""
         self.buffer[-3] = v
 
@@ -131 +133 @@
     @num_active.setter
     def num_active(self, v):
+        """Number of active polydispersity loops"""
         self.buffer[-2] = v
 
@@ -140 +143 @@
     @theta_par.setter
     def theta_par(self, v):
+        """Location of the theta parameter in the parameter vector"""
         self.buffer[-1] = v
 
@@ -185 +189 @@
     pd_length = np.array([len(w)
                           for w in weights[2:2+model_info.parameters.npars]])
-    num_active = np.sum(pd_length>1)
+    num_active = np.sum(pd_length > 1)
     max_pd = model_info.parameters.max_pd
     if num_active > max_pd:
@@ -250 +254 @@
     values, weights = zip(*pairs)
     scalars = [v[0] for v in values]
-    if all(len(w)==1 for w in weights):
+    if all(len(w) == 1 for w in weights):
         call_details = mono_details(kernel.info)
         # Pad value array to a 32 value boundary
@@ -276 +280 @@
     mag = values[parameters.nvalues-3*parameters.nmagnetic:parameters.nvalues]
     mag = mag.reshape(-1, 3)
-    M0 = mag[:,0]
-    if np.any(M0):
-        theta, phi = mag[:,1]*pi/180., mag[:,2]*pi/180.
+    scale = mag[:,0]
+    if np.any(scale):
+        theta, phi = mag[:, 1]*pi/180., mag[:, 2]*pi/180.
         cos_theta = cos(theta)
-        mx = M0*cos_theta*cos(phi)
-        my = M0*sin(theta)
-        mz = -M0*cos_theta*sin(phi)
-        mag[:,0], mag[:,1], mag[:,2] = mx, my, mz
+        mag[:, 0] = scale*cos_theta*cos(phi)  # mx
+        mag[:, 1] = scale*sin(theta)  # my
+        mag[:, 2] = -scale*cos_theta*sin(phi)  # mz
         return True
     else: