Changeset a792234 in sasmodels for example

Timestamp:

Mar 18, 2016 4:58:55 AM (9 years ago)

Author:

gonzalezm

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:

5bb9c79

Parents:

2622b3f (diff), 4554131 (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:

Merge branch 'master' of ​https://github.com/SasView/sasmodels

File:

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

example/sesansfit.py

@@ -1 +1 @@
 from bumps.names import *
-from sasmodels import core, bumps_model, sesans
+from sas import core, bumps_model, sesans
 
 HAS_CONVERTER = True
@@ -8 +8 @@
     HAS_CONVERTER = False
 
+
 def get_bumps_model(model_name):
     kernel = core.load_model(model_name)
@@ -13 +14 @@
     return model
 
-def sesans_fit(file, model, initial_vals={}, custom_params={}, param_range=[]):
+def sesans_fit(file, model_name, initial_vals={}, custom_params={}, param_range=[], acceptance_angle=None):
     """
+
     @param file: SESANS file location
     @param model: Bumps model object or model name - can be model, model_1 * model_2, and/or model_1 + model_2
@@ -55 +57 @@
             dy = err_data
             sample = Sample()
+            acceptance_angle = acceptance_angle
+            needs_all_q = acceptance_angle is not None
         data = SESANSData1D()