Changeset 9a9f5b5 in sasmodels for compare.py

Timestamp:

Jul 22, 2014 11:16:56 AM (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:

d772f5d

Parents:

79fcc40

Message:

Added new fit program that fits two different mode

File:

• compare.py (modified) (4 diffs)

compare.py

@@ -15 +15 @@
 
 def sasview_model(modelname, **pars):
-    modelname = modelname.capitalize()+"Model"
+    modelname = modelname+"Model"
     sans = __import__('sans.models.'+modelname)
     ModelClass = getattr(getattr(sans.models,modelname,None),modelname,None)
@@ -54 +54 @@
         )
 
-    model = sasview_model('cylinder', **pars)
+    model = sasview_model('Cylinder', **pars)
     tic()
     for i in range(N):
@@ -91 +91 @@
                 axis_phi_pd_n=6, axis_phi_pd_nsigma=3,)
 
-    model = sasview_model('ellipsoid', **pars)
+    model = sasview_model('Ellipsoid', **pars)
     tic()
     for i in range(N):
@@ -130 +130 @@
                  length_pd=0.1, length_pd_n=1, length_pd_nsigma=0,
                  thickness_pd=0.1, thickness_pd_n=1, thickness_pd_nsigma=0,
-                 axis_theta_pd_n=10, axis_theta_pd_nsigma=3,
-                 axis_phi_pd=0.0008748, axis_phi_pd_n=10, axis_phi_pd_nsigma=3,)
+                 axis_theta_pd_n=20, axis_theta_pd_nsigma=3,
+                 axis_phi_pd=0.0008748, axis_phi_pd_n=60, axis_phi_pd_nsigma=3,)
 
     model = sasview_model('CoreShellCylinder', **pars)