Changes in / [eec5fd6:ead4bd5] in sasmodels

Files:

• doc/genmodel.py (modified) (2 diffs)
• example/sesansfit.py (modified) (1 diff)
• sasmodels/sasview_model.py (modified) (2 diffs)

doc/genmodel.py

@@ -77 +77 @@
 
 
-# Generate image (comment IF for 1D/2D for the moment) and generate only 1D
+# Generate image 
 fig_height = 3.0 # in
 fig_left = 0.6 # in
@@ -109 +109 @@
     fig = plt.figure(figsize=aspect)
     ax1d = fig.add_axes([ax_left, ax_bottom, ax_width, ax_height])
-plot_1d(model, opts, ax1d)
+    plot_1d(model, opts, ax1d)
 
 # Save image in model/img

example/sesansfit.py

@@ -14 +14 @@
     return model
 
-def sesans_fit(file, model_name, initial_vals={}, custom_params={}, param_range=[], acceptance_angle=None):
+def sesans_fit(file, model, initial_vals={}, custom_params={}, param_range=[], acceptance_angle=None):
     """
 

sasmodels/sasview_model.py

@@ -17 +17 @@
 from copy import deepcopy
 import warnings
+import collections
 
 import numpy as np
@@ -57 +58 @@
         ## TODO: reorganize parameter handling
         self.details = dict()
-        self.params = dict()
+        self.params = collections.OrderedDict()
         self.dispersion = dict()
         partype = model.info['partype']
+
         for p in model.info['parameters']:
             self.params[p.name] = p.default