Changeset 473183c in sasmodels for Models

Timestamp:

Jul 24, 2014 9:59:02 AM (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:

ca6c007

Parents:

dbb0048

Message:

organizing

Location:

Models

Files:

• __init__.py (added)
• code_capcyl.py (modified) (1 diff)
• code_coreshellcyl.py (modified) (1 diff)
• code_cylinder.py (modified) (1 diff)
• code_ellipse.py (modified) (1 diff)
• code_lamellar.py (modified) (2 diffs)
• code_triaxialellipse.py (modified) (1 diff)

Models/code_capcyl.py

@@ -5 +5 @@
 from math import asin, sqrt, fabs, atan
 import pyopencl as cl
+
 from weights import GaussianDispersion
-from sasmodel import card
+from Models.sasmodel import card
+
 
 def set_precision(src, qx, qy, dtype):

Models/code_coreshellcyl.py

@@ -3 +3 @@
 
 import numpy as np
-import math
 import pyopencl as cl
+
 from weights import GaussianDispersion
-from sasmodel import card
+from Models.sasmodel import card
+
 
 def set_precision(src, qx, qy, dtype):

Models/code_cylinder.py

@@ -4 +4 @@
 import numpy as np
 import pyopencl as cl
+
 from weights import GaussianDispersion
-from sasmodel import card
+from Models.sasmodel import card
+
 
 def set_precision(src, qx, qy, dtype):

Models/code_ellipse.py

@@ -3 +3 @@
 
 import numpy as np
-import math
 import pyopencl as cl
+
 from weights import GaussianDispersion
-from sasmodel import card
+from Models.sasmodel import card
+
 
 def set_precision(src, qx, qy, dtype):

Models/code_lamellar.py

@@ -61 +61 @@
         return sum/norm + pars['background']
 
-def demo():
-
-    from time import time
-    import matplotlib.pyplot as plt
-
-    #create qx and qy evenly spaces
-    qx = np.linspace(-.01, .01, 128)
-    qy = np.linspace(-.01, .01, 128)
-    qx, qy = np.meshgrid(qx, qy)
-
-    #saved shape of qx
-    r_shape = qx.shape
-
-    #reshape for calculation; resize as float32
-    qx = qx.flatten()
-    qy = qy.flatten()
-
-    pars = LamellarParameters(scale=1, bi_thick=100, sld_bi=.291e-6, sld_sol=5.77e-6, background=0)
-    t = time()
-    result = GpuLamellar(qx, qy)
-    result.x = result.lamellar_fit(pars, b_n=35, b_w=.1, sigma=3)
-    result.x = np.reshape(result.x, r_shape)
-    tt = time()
-
-    print("Time taken: %f" % (tt - t))
-
-    f = open("r.txt", "w")
-    for x in xrange(len(r_shape)):
-        f.write(str(result.x[x]))
-        f.write("\n")
-
-    plt.pcolormesh(np.log10(result.x))
-    plt.show()
-
-
-if __name__ == "__main__":
-    demo()
 
 
@@ -126 +89 @@
 
 
-
-
-
-

Models/code_triaxialellipse.py

@@ -3 +3 @@
 
 import numpy as np
-from math import asin
 import pyopencl as cl
+
 from weights import GaussianDispersion
-from sasmodel import card
+from Models.sasmodel import card
+
 
 def set_precision(src, qx, qy, dtype):