Changeset ae7d639 in sasmodels for fit.py

Timestamp:

Aug 8, 2014 2:55:23 PM (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:

a953943

Parents:

1726b21

Message:

Ellipse now MUCH faster!

File:

• fit.py (modified) (4 diffs)

fit.py

@@ -8 +8 @@
 from Models.code_cylinder_f import GpuCylinder
 #from Models.code_cylinder import GpuCylinder, OneDGpuCylinder
-from Models.code_ellipse import GpuEllipse
+from Models.code_ellipse_f import GpuEllipse
 from Models.code_lamellar import GpuLamellar
 from Models.code_triaxialellipse import GpuTriEllipse
@@ -31 +31 @@
 
 
-if 0:
+if 1:
     model = SasModel(data, GpuEllipse,
     scale=0.08,
@@ -41 +41 @@
     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,
-    axis_phi_pd=2.63698e-05, axis_phi_pd_n=20, axis_phi_pd_nsigma=0,
+    axis_phi_pd=2.63698e-05, axis_phi_pd_n=20, axis_phi_pd_nsigma=3,
     dtype='float32')
 
 
     # SET THE FITTING PARAMETERS
-    model.radius_a.range(15, 1000)
-    model.radius_b.range(15, 1000)
+    #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)
 
 
@@ -70 +70 @@
 
 
-if 1:
+if 0:
     """
     pars = dict(scale=0.0023, radius=92.5, length=798.3,