Changeset ca6c007 in sasmodels for Models

Timestamp:

Jul 24, 2014 10:10:18 AM (11 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:

099e053

Parents:

473183c

Message:

further organizing

Location:

Models

Files:

• code_capcyl.py (modified) (2 diffs)
• code_coreshellcyl.py (modified) (2 diffs)
• code_cylinder.py (modified) (3 diffs)
• code_ellipse.py (modified) (2 diffs)
• code_lamellar.py (modified) (2 diffs)
• code_triaxialellipse.py (modified) (2 diffs)

Models/code_capcyl.py

@@ -7 +7 @@
 
 from weights import GaussianDispersion
-from Models.sasmodel import card
+from sasmodel import card
 
 
@@ -34 +34 @@
         #create context, queue, and build program
         ctx,_queue = card()
-        trala = open('NR_BessJ1.cpp').read()+"\n"+open('Capcyl_Kfun.cpp').read()+"\n"+open('Kernel-CapCyl.cpp').read()
+        trala = open('Kernel/NR_BessJ1.cpp').read()+"\n"+open('Kernel/Capcyl_Kfun.cpp').read()+"\n"+open('Kernel/Kernel-CapCyl.cpp').read()
         src, qx, qy = set_precision(trala, qx, qy, dtype=dtype)
         self.prg = cl.Program(ctx, src).build()

Models/code_coreshellcyl.py

@@ -6 +6 @@
 
 from weights import GaussianDispersion
-from Models.sasmodel import card
+from sasmodel import card
 
 
@@ -31 +31 @@
         #create context, queue, and build program
         ctx,_queue = card()
-        src, qx, qy = set_precision(open('NR_BessJ1.cpp').read()+"\n"+open('Kernel-CoreShellCylinder.cpp').read(), qx, qy, dtype=dtype)
+        src, qx, qy = set_precision(open('Kernel/NR_BessJ1.cpp').read()+"\n"+open('Kernel/Kernel-CoreShellCylinder.cpp').read(), qx, qy, dtype=dtype)
         self.prg = cl.Program(ctx, src).build()
         self.qx, self.qy = qx, qy

Models/code_cylinder.py

@@ -6 +6 @@
 
 from weights import GaussianDispersion
-from Models.sasmodel import card
+from sasmodel import card
 
 
@@ -47 +47 @@
         #create context, queue, and build program
         ctx,_queue = card()
-        src, qx, qy = set_precision(open('NR_BessJ1.cpp').read()+"\n"+open('Kernel-Cylinder.cpp').read(), qx, qy, dtype=dtype)
+        src, qx, qy = set_precision(open('Kernel/NR_BessJ1.cpp').read()+"\n"+open('Kernel/Kernel-Cylinder.cpp').read(), qx, qy, dtype=dtype)
         self.prg = cl.Program(ctx, src).build()
         self.qx, self.qy = qx, qy
@@ -111 +111 @@
         #create context, queue, and build program
         ctx,_queue = card()
-        trala = open('NR_BessJ1.cpp').read()+"\n"+open('OneDCyl_Kfun.cpp').read()+"\n"+open('Kernel-OneDCylinder.cpp').read()
+        trala = open('Kernel/NR_BessJ1.cpp').read()+"\n"+open('Kernel/OneDCyl_Kfun.cpp').read()+"\n"+open('Kernel/Kernel-OneDCylinder.cpp').read()
         src, self.q = set_precision_1d(trala, q, dtype=dtype)
         self.prg = cl.Program(ctx, src).build()

Models/code_ellipse.py

@@ -6 +6 @@
 
 from weights import GaussianDispersion
-from Models.sasmodel import card
+from sasmodel import card
 
 
@@ -32 +32 @@
 
         ctx,_queue = card()
-        src, qx, qy = set_precision(open('Kernel-Ellipse.cpp').read(), qx, qy, dtype=dtype)
+        src, qx, qy = set_precision(open('Kernel/Kernel-Ellipse.cpp').read(), qx, qy, dtype=dtype)
         self.prg = cl.Program(ctx, src).build()
         self.qx, self.qy = qx, qy

Models/code_lamellar.py

@@ -4 +4 @@
 import numpy as np
 import pyopencl as cl
-from weights import GaussianDispersion
+from Models.weights import GaussianDispersion
 
 def set_precision(src, qx, qy, dtype):
@@ -31 +31 @@
         self.ctx = cl.create_some_context()
         self.queue = cl.CommandQueue(self.ctx)
-        src,qx,qy = set_precision(open('Kernel-Lamellar.cpp').read(), qx, qy, dtype=dtype)
+        src,qx,qy = set_precision(open('Kernel/Kernel-Lamellar.cpp').read(), qx, qy, dtype=dtype)
         self.prg = cl.Program(self.ctx, src).build()
         self.qx, self.qy = qx, qy

Models/code_triaxialellipse.py

@@ -6 +6 @@
 
 from weights import GaussianDispersion
-from Models.sasmodel import card
+from sasmodel import card
 
 
@@ -31 +31 @@
     def __init__(self, qx, qy, dtype='float32'):
         ctx,_queue = card()
-        src, qx, qy = set_precision(open('Kernel-TriaxialEllipse.cpp').read(), qx, qy, dtype=dtype)
+        src, qx, qy = set_precision(open('Kernel/Kernel-TriaxialEllipse.cpp').read(), qx, qy, dtype=dtype)
         self.prg = cl.Program(ctx, src).build()
         self.qx, self.qy = qx, qy