Changeset a42fec0 in sasmodels for multi-fit.py

Timestamp:

Aug 4, 2014 3: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:

• multi-fit.py (modified) (3 diffs)

multi-fit.py

@@ -3 +3 @@
 
 from bumps.names import *
-from code_lamellar import GpuLamellar
-from code_ellipse import GpuEllipse
+from Models.code_lamellar import GpuLamellar
+from Models.code_ellipse import GpuEllipse
+from Models.code_cylinder import GpuCylinder
 from multisasmodels import SasModel, load_data, set_beam_stop, set_half
 import numpy as np
 
-data = load_data('DEC07282.DAT')
+data = load_data('December/DEC07238.DAT')
 set_beam_stop(data, 0.0052)#, outer=0.025)
 #set_half(data, 'left')
 
-truth = SasModel(data, GpuEllipse,
-                scale=.0011, radius_a=45.265, radius_b=600.8, sldEll=.291e-6, sldSolv=7.105e-6,
-                 background=8.30161, axis_theta=0, axis_phi=0,
-                 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_theta_pd=20, axis_theta_pd_n=40, axis_theta_pd_nsigma=3,
-                 axis_phi_pd=2.63698e-05, axis_phi_pd_n=20, axis_phi_pd_nsigma=0,
-                 dtype='float')
+truth = SasModel(data, GpuCylinder,
+scale=0.08, radius=46, length=719,
+sldCyl=.291e-6, sldSolv=5.77e-6, background=0,
+cyl_theta=90, cyl_phi=0,
+cyl_theta_pd=23, cyl_theta_pd_n=40, cyl_theta_pd_nsigma=3,
+radius_pd=0.1, radius_pd_n=10, radius_pd_nsigma=3,
+length_pd=0.1, length_pd_n=10, length_pd_nsigma=3,
+cyl_phi_pd=0.1, cyl_phi_pd_n=10, cyl_phi_pd_nsigma=3,
+dtype='float')
+
 
 #model.radius_a.range(15, 1000)
@@ -30 +33 @@
 
 
-lies = SasModel(data, GpuLamellar, scale=0, bi_thick=5, sld_bi=.291e-6, sld_sol=5.77e-6, background=85.23,
-                 bi_thick_pd= 0.0013, bi_thick_pd_n=5, bi_thick_pd_nsigma=3, dtype='float')
+lies = SasModel(data, GpuCylinder,
+scale=0.08, radius=46, length=719,
+sldCyl=.291e-6, sldSolv=5.77e-6, background=0,
+cyl_theta=90, cyl_phi=0,
+cyl_theta_pd=23, cyl_theta_pd_n=40, cyl_theta_pd_nsigma=3,
+radius_pd=0.1, radius_pd_n=10, radius_pd_nsigma=3,
+length_pd=0.1, length_pd_n=10, length_pd_nsigma=3,
+cyl_phi_pd=0.1, cyl_phi_pd_n=10, cyl_phi_pd_nsigma=3,
+dtype='float')
+
 
 
@@ -43 +54 @@
 
 
-a = np.add(np.multiply(arrayone, .5), np.multiply(arraytwo, 0))
+a = np.add(np.multiply(arrayone, .08), np.multiply(arraytwo, .08))
 truth.set_result(a)