Changeset 0656250 in sasmodels for example

Timestamp:

Mar 24, 2015 4:24:43 AM (10 years ago)

Author:

jhbakker

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:

c210c94

Parents:

33d38d5 (diff), 0a33675 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Add SESANS example data

Location:

example

Files:

• sesansfit.py (modified) (4 diffs)
• testsasview1.ses (added)

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()
+<<<<<<< HEAD
     data=loader.load('se008724_01.ses')
 #    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)
+>>>>>>> 0a33675f5dfe63dcfc7345913a0bb44858641acc
     data.x /=10
 #    print data
@@ -43 +51 @@
 
 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.5)
@@ -54 +62 @@
 
 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: