Changeset 099e053 in sasmodels

Timestamp:

Jul 24, 2014 3:48:06 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:

a42fec0

Parents:

ca6c007

Message:

further organizing

Files:

• Kernel/Capcyl_Kfun.cpp (added)
• Kernel/Kernel-CapCyl.cpp (added)
• Kernel/Kernel-CoreShellCylinder.cpp (added)
• Kernel/Kernel-Cylinder.cpp (added)
• Kernel/Kernel-Ellipse.cpp (added)
• Kernel/Kernel-Lamellar.cpp (added)
• Kernel/Kernel-OneDCylinder.cpp (added)
• Kernel/Kernel-TriaxialEllipse.cpp (added)
• Kernel/NR_BessJ1.cpp (added)
• Kernel/OneDCyl_Kfun.cpp (added)
• Testers/TEST-Kernel-Ellipse.cpp (added)
• Testers/test.py (added)
• Testers/test_code_ellipse.py (added)
• fit.py (modified) (3 diffs)
• sasmodel.py (modified) (1 diff)

fit.py

@@ -32 +32 @@
 uplim=90) #bottom limit, upper limit of angle integral
 """
+"""
+model = SasModel(data, GpuEllipse,
+scale=0.08,
+radius_a=15, radius_b=200,
+sldEll=.291e-6, sldSolv=7.105e-6,
+background=0,
+axis_theta=0, axis_phi=0,
+axis_theta_pd=20, axis_theta_pd_n=10, axis_theta_pd_nsigma=3,
 
-
-model = SasModel(data, GpuEllipse,
-scale=0.0011,
-radius_a=100, radius_b=800.8,
-sldEll=.291e-6, sldSolv=7.105e-6,
-background=8.30161,
-axis_theta=0, axis_phi=0,
-axis_theta_pd=20, axis_theta_pd_n=40, axis_theta_pd_nsigma=3,
 radius_a_pd=0.222296, radius_a_pd_n=1, radius_a_pd_nsigma=0,
 radius_b_pd=.000128, radius_b_pd_n=1, radius_b_pd_nsigma=0,
@@ -48 +48 @@
 
 # SET THE FITTING PARAMETERS
-model.radius_a.range(15, 1000)
-model.radius_b.range(15, 1000)
-#model.axis_theta_pd.range(0, 360)
+#model.radius_a.range(15, 1000)
+#model.radius_b.range(15, 1000)
+model.axis_theta_pd.range(0, 360)
 #model.background.range(0,1000)
-model.scale.range(0, 1)
-
+#model.scale.range(0, 1)
+"""
 """
 
@@ -71 +71 @@
 """
 
+model = SasModel(data, GpuCylinder,
+scale=0.08, radius=46, length=719,
+sldCyl=.291e-6, sldSolv=5.77e-6, background=0,
+cyl_theta=0, cyl_phi=0,
+cyl_theta_pd=23, cyl_theta_pd_n=10, cyl_theta_pd_nsigma=3,
 
 
-"""
-model = SasModel(data, GpuCylinder,
-scale=0.0013, radius=105, length=1000,
-sldCyl=.291e-6, sldSolv=5.77e-6, background=21,
-cyl_theta=90, cyl_phi=0,
-cyl_theta_pd=534, cyl_theta_pd_n=40, cyl_theta_pd_nsigma=3,
+radius_pd=0.1, radius_pd_n=20, radius_pd_nsigma=0,
+length_pd=0.1, length_pd_n=20, length_pd_nsigma=0,
+cyl_phi_pd=0.1, cyl_phi_pd_n=20, cyl_phi_pd_nsigma=0,
+dtype='float')
 
 # SET THE FITTING PARAMETERS
-radius_pd=0.1, radius_pd_n=10, radius_pd_nsigma=0,
-length_pd=0.1, length_pd_n=5, length_pd_nsigma=0,
-cyl_phi_pd=0.1, cyl_phi_pd_n=4, cyl_phi_pd_nsigma=0,
-dtype='float')
-#model.radius.range(0, 1000)
+model.radius.range(0, 25)
 #model.length.range(0, 1000)
 #model.cyl_theta_pd.range(0,90)
-model.scale.range(0, 1)
-model.background.range(0, 1000)
-"""
+#model.scale.range(0, 1)
+#model.background.range(0, 1000)
+
 
 """

sasmodel.py

@@ -2 +2 @@
 # -*- coding: utf-8 -*-
 
-import sys
 import numpy as np
 import pyopencl as cl