Changeset d772f5d in sasmodels for code_capcyl.py

Timestamp:

Jul 23, 2014 1:25:44 PM (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:

dbb0048

Parents:

9a9f5b5

Message:

Added 1D Fit, fixed fitting error

File:

• code_capcyl.py (modified) (2 diffs)

code_capcyl.py

@@ -7 +7 @@
 from weights import GaussianDispersion
 from sasmodel import card
-from Capcyl_Gauss import Gauss76Wt, Gauss76Z
+from Gauss import Gauss76Wt, Gauss76Z
 
 def set_precision(src, qx, qy, dtype):
@@ -43 +43 @@
         self.qx_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=self.qx)
         self.qy_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=self.qy)
-        G, Z = Gauss76Wt, Gauss76Z
+        G = np.ascontiguousarray(Gauss76Wt, dtype=dtype)
+        Z = np.ascontiguousarray(Gauss76Z, dtype=dtype)
         self.Gauss76W_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=G)
         self.Gauss76Z_b = cl.Buffer(ctx, mf.READ_ONLY | mf.COPY_HOST_PTR, hostbuf=Z)