Changeset 49d1f8b8 in sasmodels for example

Timestamp:

Mar 5, 2018 6:33:00 PM (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:

bf94e6e

Parents:

bc248f8

Message:

move multiscat into sasmodels namespace to make it easier to run the example

File:

• example/multiscatfit.py (modified) (2 diffs)

example/multiscatfit.py

@@ -34 +34 @@
 from sasmodels.data import load_data, set_beam_stop, set_top
 
-from multiscat import MultipleScattering
+from sasmodels.multiscat import MultipleScattering
 
 ## Load the data
 #data = load_data('DEC07267.DAT')
 #set_beam_stop(data, 0.003, outer=0.025)
-data = load_data('latex_smeared.xml', index=1)
+data = load_data('latex_smeared.xml', index=0)
 
 ## Define the model
@@ -66 +66 @@
 
 # Mulitple scattering probability parameter
-# HACK: the parameter is assigned to model.theta, which is otherwise unused
-# since the dataset is 1D; this won't work for 2D data
+# HACK: the probability is stuffed in as an extra parameter to the experiment.
 probability = Parameter(name="probability", value=0.0)
 probability.range(0.0, 0.9)
-model.phi = probability
 
-M = Experiment(data=data, model=model)
+M = Experiment(data=data, model=model, extra_pars={'probability': probability})
 
 # Stack mulitple scattering on top of the existing resolution function.