Changeset fa79f5c in sasmodels for example/sesansfit.py

Timestamp:

Nov 29, 2017 8:43:12 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a839b22

Parents:

32398dc

Message:

restore working sesans example using direct model

File:

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

example/sesansfit.py

@@ +1 @@
+import logging
+
 from bumps.names import *
 from sasmodels import core, bumps_model, sesans
@@ -8 +10 @@
     return model
 
-def sesans_fit(file, model, initial_vals={}, custom_params={}, param_range=[], acceptance_angle=None):
+def sesans_fit(file, model, initial_vals={}, custom_params={}, param_range=[],
+               acceptance_angle=None):
     """
 
@@ -19 +22 @@
     @return: FitProblem for Bumps usage
     """
+    logging.basicConfig()
+
     initial_vals['background'] = 0.0
     try:
         loader = Loader()
-        data = loader.load(file)
-        if data is None: raise IOError("Could not load file %r"%(file))
+        data = loader.load(file)[0]
+        if data is None:
+            raise IOError("Could not load file %r"%(file))
 
-    except:
+    except Exception:
+        raise
         # If no loadable data file, generate random data
         SElength = np.linspace(0, 2400, 61) # [A]
@@ -50 +57 @@
     data.Rmax = 30*radius # [A]
 
-    if isinstance(model, basestring):
+    if isinstance(model, str):
         model = get_bumps_model(model)