Changeset 3c56da87 in sasmodels for sasmodels/models/broad_peak.py

Timestamp:

Mar 5, 2015 12:55:38 AM (9 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:

3a45c2c

Parents:

b89f519

Message:

lint cleanup

File:

• sasmodels/models/broad_peak.py (modified) (4 diffs)

sasmodels/models/broad_peak.py

@@ -6 +6 @@
 layered structures, etc.
 
-The d-spacing corresponding to the broad peak is a characteristic distance 
-between the scattering inhomogeneities (such as in lamellar, cylindrical, or 
+The d-spacing corresponding to the broad peak is a characteristic distance
+between the scattering inhomogeneities (such as in lamellar, cylindrical, or
 spherical morphologies, or for bicontinuous structures).
 
@@ -44 +44 @@
 """
 
-import numpy as np
-from numpy import pi, inf, sin, cos, sqrt, exp, log, fabs
+from numpy import inf, sqrt
 
 name = "broad_peak"
@@ -82 +81 @@
 
 
-#def form_volume():
-#    return 1
-
 def Iq(q, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp):
-    inten = porod_scale/pow(q,porod_exp) + lorentz_scale/(1.0 \
-        + pow((fabs(q-peak_pos)*lorentz_length),lorentz_exp))
-    return inten  
-
-# FOR VECTORIZED VERSION, UNCOMMENT THE NEXT LINE
-Iq.vectorized = True
+    inten = (porod_scale/q**porod_exp + lorentz_scale
+        / (1.0 + (abs(q-peak_pos)*lorentz_length)**lorentz_exp))
+    return inten
+Iq.vectorized = True  # Iq accepts an array of Q values
 
 def Iqxy(qx, qy, *args):
     return Iq(sqrt(qx**2 + qy**2), *args)
-
-# FOR VECTORIZED VERSION, UNCOMMENT THE NEXT LINE
-Iqxy.vectorized = True
+Iqxy.vectorized = True # Iqxy accepts an array of Qx, Qy values
 
 
@@ -105 +97 @@
     lorentz_scale=10,lorentz_length=50, peak_pos=0.1, lorentz_exp=2,
     )
+
 oldname = "BroadPeakModel"
-oldpars = dict(porod_scale='scale_p', porod_exp='exponent_p', 
-        lorentz_scale='scale_l', lorentz_length='length_l', peak_pos='q_peak', 
+oldpars = dict(porod_scale='scale_p', porod_exp='exponent_p',
+        lorentz_scale='scale_l', lorentz_length='length_l', peak_pos='q_peak',
         lorentz_exp='exponent_l', scale=None)