Changeset 49d1f8b8 in sasmodels for sasmodels/multiscat.py

Timestamp:

Mar 5, 2018 6:33:00 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

bf94e6e

Parents:

bc248f8

Message:

move multiscat into sasmodels namespace to make it easier to run the example

File:

• sasmodels/multiscat.py (moved) (moved from explore/multiscat.py) (2 diffs)

sasmodels/multiscat.py

@@ -144 +144 @@
         frame = np.fft.ifft2(F_convolved)
         result = scale * _inverse_shift(frame.real, dtype=self.dtype)
-        #print("multiscat time", time.time()-t0)
+        #print("numpy multiscat time", time.time()-t0)
         return result
 
@@ -237 +237 @@
         #result = scale * _inverse_shift(frame.real, dtype=self.dtype)
         result = scale * _inverse_shift(frame.real, dtype=self.dtype)
-        #print("multiscat time", time.time()-t0)
+        #print("OpenCL multiscat time", time.time()-t0)
         return result