Changeset 7cf2cfd in sasmodels for example

Timestamp:

Nov 22, 2015 11:37:15 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

3b4243d

Parents:

677ccf1

Message:

refactor compare.py so that bumps/sasview not required for simple tests

File:

• example/fit.py (modified) (8 diffs)

example/fit.py

@@ -5 +5 @@
 from bumps.names import *
 from sasmodels.core import load_model
-from sasmodels import bumps_model as sas
+from sasmodels.bumps_model import Model, Experiment
+from sasmodels.data import load_data, set_beam_stop, set_top
 
 """ IMPORT THE DATA USED """
-radial_data = sas.load_data('DEC07267.DAT')
-sas.set_beam_stop(radial_data, 0.00669, outer=0.025)
-sas.set_top(radial_data, -.0185)
+radial_data = load_data('DEC07267.DAT')
+set_beam_stop(radial_data, 0.00669, outer=0.025)
+set_top(radial_data, -.0185)
 
-tan_data = sas.load_data('DEC07266.DAT')
-sas.set_beam_stop(tan_data, 0.00669, outer=0.025)
-sas.set_top(tan_data, -.0185)
+tan_data = load_data('DEC07266.DAT')
+set_beam_stop(tan_data, 0.00669, outer=0.025)
+set_top(tan_data, -.0185)
 #sas.set_half(tan_data, 'right')
 
@@ -28 +29 @@
 
 if name == "ellipsoid":
-    model = sas.Model(kernel,
+    model = Model(kernel,
         scale=0.08,
         rpolar=15, requatorial=800,
@@ -51 +52 @@
 
 elif name == "lamellar":
-    model = sas.Model(kernel,
+    model = Model(kernel,
         scale=0.08,
         thickness=19.2946,
@@ -87 +88 @@
         theta_pd=10, theta_pd_n=50, theta_pd_nsigma=3,
         phi_pd=0, phi_pd_n=10, phi_pd_nsigma=3)
-    model = sas.Model(kernel, **pars)
+    model = Model(kernel, **pars)
 
     # SET THE FITTING PARAMETERS
@@ -102 +103 @@
 
 elif name == "core_shell_cylinder":
-    model = sas.Model(kernel,
+    model = Model(kernel,
         scale= .031, radius=19.5, thickness=30, length=22,
         core_sld=7.105, shell_sld=.291, solvent_sld=7.105,
@@ -129 +130 @@
 
 elif name == "capped_cylinder":
-    model = sas.Model(kernel,
+    model = Model(kernel,
         scale=.08, radius=20, cap_radius=40, length=400,
         sld_capcyl=1, sld_solv=6.3,
@@ -144 +145 @@
 
 elif name == "triaxial_ellipsoid":
-    model = sas.Model(kernel,
+    model = Model(kernel,
         scale=0.08, req_minor=15, req_major=20, rpolar=500,
         sldEll=7.105, solvent_sld=.291,
@@ -170 +171 @@
 
 model.cutoff = cutoff
-M = sas.Experiment(data=data, model=model)
+M = Experiment(data=data, model=model)
 if section == "both":
-   tan_model = sas.Model(model.kernel, **model.parameters())
+   tan_model = Model(model.kernel, **model.parameters())
    tan_model.phi = model.phi - 90
    tan_model.cutoff = cutoff
-   tan_M = sas.Experiment(data=tan_data, model=tan_model)
+   tan_M = Experiment(data=tan_data, model=tan_model)
    problem = FitProblem([M, tan_M])
 else: