Changeset 0a33675 in sasmodels

Timestamp:

Mar 23, 2015 3:49:13 PM (10 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:

3a45c2c

Parents:

bcd3aa3

Message:

update sesans example for refactored sasmodels.core

File:

• example/sesansfit.py (modified) (4 diffs)

example/sesansfit.py

@@ -2 +2 @@
 from bumps.names import *
 
-from sasmodels import bumps_model as sas
-kernel = sas.load_model('sphere', dtype='single')
-#kernel = sas.load_model('triaxial_ellipsoid', dtype='single')
+from sasmodels import core, bumps_model
+
+kernel = core.load_model("sphere", dtype='single')
+
 
 
@@ -11 +12 @@
     from sas.dataloader.loader import Loader
     loader=Loader()
-    data=loader.load('testsasview1.ses')
+    filename = 'testsasview1.ses'
+    data=loader.load(filename)
+    if data is None: raise IOError("Could not load file %r"%(filename,))
+    print dir(data), type(data)
     data.x /=10
     
@@ -41 +45 @@
 
 phi = Parameter(0.1, name="phi")
-model = sas.BumpsModel(data, kernel,
+model = bumps_model.BumpsModel(data, kernel,
     scale=phi*(1-phi), sld=7.0, solvent_sld=1.0, radius=radius)
 phi.range(0.001,0.90)
@@ -52 +56 @@
 
 if False: # have sans data
-    sansmodel = sas.BumpsModel(sans_data, kernel, **model.parameters())
+    sansmodel = bumps_model.BumpsModel(sans_data, kernel, **model.parameters())
     problem = FitProblem([model, sansmodel])
 else: