Changeset f734e7d in sasmodels for sasmodels/models/broad_peak.py

Timestamp:

Feb 22, 2015 1:44:54 AM (9 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:

6137124

Parents:

711d8e2

Message:

restructure c code generation for maintainability; extend test harness to allow opencl and ctypes tests

File:

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

sasmodels/models/broad_peak.py

@@ -91 +91 @@
 
 
-def form_volume():
-    return 1
+#def form_volume():
+#    return 1
 
 def Iq(q, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp):
@@ -102 +102 @@
 Iq.vectorized = True
 
-def Iqxy(qx, qy, porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp):
-    return Iq(sqrt(qx**2 + qy**2), porod_scale, porod_exp, lorentz_scale, lorentz_length, peak_pos, lorentz_exp)
+def Iqxy(qx, qy, *args):
+    return Iq(sqrt(qx**2 + qy**2), *args)
 
 # FOR VECTORIZED VERSION, UNCOMMENT THE NEXT LINE