Changeset a42fec0 in sasmodels for fit2.py

Timestamp:

Aug 4, 2014 5:20:07 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:

8cdb9f1

Parents:

099e053

Message:

Speed-up of 3X, compare.py working

File:

• fit2.py (modified) (2 diffs)

fit2.py

@@ -3 +3 @@
 
 from bumps.names import *
-from cylcode import GpuCylinder
-from Models.sasmodel import SasModel, load_data, set_beam_stop
+from Models.code_coreshellcyl import GpuCoreShellCylinder
+from sasmodel import SasModel, load_data, set_beam_stop, set_top
 
 
-radial_data = load_data('JUN03289.DAT')
-set_beam_stop(radial_data, 0.004)
-trans_data = load_data('JUN03305.DAT')
-set_beam_stop(trans_data, 0.004)
+radial_data = load_data('December/DEC07267.DAT')
+set_beam_stop(radial_data, 0.00669, outer=0.025)
+set_top(radial_data, -.0185)
+
+tan_data = load_data('December/DEC07266.DAT')
+set_beam_stop(tan_data, 0.00669, outer=0.025)
+set_top(tan_data, -.0185)
 
 
@@ -17 +20 @@
 dtype='float32'
 radial = SasModel(radial_data,
-                  GpuCylinder, dtype=dtype,
-                  scale=1, radius=64.1, length=266.96, sldCyl=.291e-6, sldSolv=5.77e-6, background=0,
-                  cyl_theta=0, cyl_phi=0, radius_pd=0.1, radius_pd_n=10, radius_pd_nsigma=3,length_pd=0.1,
-                  length_pd_n=5, length_pd_nsigma=3, cyl_theta_pd=0.1, cyl_theta_pd_n=5, cyl_theta_pd_nsigma=3,
-                  cyl_phi_pd=0.1, cyl_phi_pd_n=10, cyl_phi_pd_nsigma=3)
-trans = SasModel(trans_data,
-                  GpuCylinder, dtype=dtype,
+                 GpuCoreShellCylinder,
+                 scale= 3.75e-7, radius=378, thickness=30, length=1806,
+                 core_sld=7.105e-6, shell_sld=.291e-6, solvent_sld=7.105e-6,
+                 background=0.2, axis_theta=0, axis_phi=90,
+
+                 radius_pd=0.26, radius_pd_n=20, radius_pd_nsigma=3,
+                 length_pd=0.26, length_pd_n=20, length_pd_nsigma=3,
+                 thickness_pd=1, thickness_pd_n=1, thickness_pd_nsigma=0,
+                 axis_theta_pd=1, axis_theta_pd_n=10, axis_theta_pd_nsigma=3,
+                 axis_phi_pd=0.1, axis_phi_pd_n=1, axis_phi_pd_nsigma=0,
+                 dtype='float')
+tan = SasModel(tan_data,
+                  GpuCoreShellCylinder, dtype=dtype,
                   **radial.parameters())
 
-radial.radius.range(0,100)
-radial.length.range(0, 1000)
-radial.cyl_theta.range(0,90)
-radial.cyl_phi.range(0,90)
-radial.scale.range(0,10)
-trans.cyl_theta = radial.cyl_theta + 90.
+radial.radius.range(15, 1000)
+radial.length.range(0, 2500)
+#radial.thickness.range(18, 38)
+#radial.thickness_pd.range(0, 1)
+#radial.axis_phi.range(0, 90)
+#radial.radius_pd.range(0, 1)
+#radial.length_pd.range(0, 1)
+#radial.axis_theta_pd.range(0, 360)
+#radial.background.range(0,5)
+#radial.scale.range(0, 1)
+radial.axis_phi = tan.axis_phi + 90
 
 
-problem = FitProblem([radial,trans])
+problem = FitProblem([radial,tan])