Changeset 02098e3 in sasview

Timestamp:

Dec 8, 2015 11:09:13 AM (8 years ago)

Author:

ajj

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

50a77df

Parents:

12e5cc8 (diff), 1c2bf90 (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:

merging master to integration branch. hopefully successfully this time and with no weird line ending issues

Files:

• .gitignore (modified) (3 diffs)
• build.txt (deleted)
• install.txt (deleted)
• sasview/README.txt (modified) (1 diff)
• sasview/sasview.py (modified) (1 diff)
• sasview/setup_mac.py (modified) (1 diff)
• setup.cfg (deleted)
• src/sas/guiframe/gui_toolbar.py (modified) (2 diffs)
• src/sas/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (13 diffs)
• src/sas/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (5 diffs)
• src/sas/guiframe/utils.py (modified) (1 diff)
• src/sas/models/PeakGaussModel.py (modified) (1 diff)
• src/sas/models/resolution.py (modified) (24 diffs)
• src/sas/perspectives/fitting/basepage.py (modified) (210 diffs)
• src/sas/perspectives/fitting/batchfitpage.py (modified) (9 diffs)
• src/sas/perspectives/fitting/fitpage.py (modified) (181 diffs)
• src/sas/perspectives/fitting/fitpanel.py (modified) (2 diffs)
• src/sas/perspectives/fitting/fitting.py (modified) (2 diffs)
• src/sas/perspectives/fitting/fitting_widgets.py (modified) (7 diffs)
• src/sas/perspectives/fitting/hint_fitpage.py (modified) (2 diffs)
• src/sas/perspectives/fitting/pagestate.py (modified) (2 diffs)
• src/sas/perspectives/fitting/resultpanel.py (modified) (1 diff)
• src/sas/perspectives/fitting/simfitpage.py (modified) (33 diffs)
• src/sas/plottools/toolbar.py (modified) (3 diffs)
• test/pr_inversion/test/test_output.txt (deleted)
• test/sasdataloader/test/plugins.zip (deleted)
• test/sasdataloader/test/test_log.txt (deleted)
• test/sasfit/test/utest_fit_line.py (modified) (2 diffs)
• test/sasfit/test/utest_fit_smeared.py (modified) (2 diffs)
• run.py (modified) (1 diff)
• setup.py (modified) (5 diffs)
• src/sas/models/dispersion_models.py (modified) (1 diff)
• src/sas/perspectives/fitting/models.py (modified) (4 diffs)

.gitignore

@@ -24 +24 @@
 build
 
+/setup.cfg
+
 /dist
 **/build
@@ -30 +32 @@
 **/test/logs
 *.pyc
+*.so
 default_categories.json
 
@@ -43 +46 @@
 /docs/sphinx-docs/source/user/perspectives
 
-default_categories.json
+# test outputs
+/test/pr_inversion/test/test_output.txt
+/test/sasdataloader/test/plugins.zip
+/test/sasdataloader/test/test_log.txt
+

sasview/README.txt

@@ -255 +255 @@
 
    2.2- Installing from source
-        - Get the code from GitHub at https://github.com/SasView/sasview.git
-          for this release version use: https://github.com/SasView/sasview/releases
-          - run 'python setup.py install' under the 'sasview-x.x.x' folder
+        - Get the source code
+          - to follow the current development version from source control use
+              git clone https://github.com/SasView/sasview.git
+              git clone https://github.com/bumps/bumps.git
+          - to install a specific version
+
+        - Build, install and run a specific release
+          - make sure the requirements below are already installed
+          - retrieve the source from https://github.com/SasView/sasview/releases
+          - open a command line window in the 'sasview-x.x.x' directory
+          - run 'python setup.py install'
           - run 'python sasview.py' under the 'sasview' folder.
-          
+
+        - Build, install and run the current development version
+          - clone the source from git; also clone bumps, which is developed in parallel
+              git clone https://github.com/SasView/sasview.git
+              git clone https://github.com/bumps/bumps.git
+          - open a command line window in the 'sasview' directory
+          - run 'python setup.py build'
+          - run 'python run.py'; this runs from the source directories, so you
+            don't have to rebuild every time you make a change, unless you are
+            changing the C++ model files
+
         - The following modules are required (version numbers are what are used
           in the windows release build):

sasview/sasview.py

@@ -69 +69 @@
 
 import wx
+
 try:
     logging.info("Wx version: %s" % wx.__version__)
 except:
     logging.error("Wx version: error reading version")
+
+import wxcruft
+wxcruft.call_later_fix()
+#wxcruft.trace_new_id()
 
 # The below will make sure that sasview application uses the matplotlib font

sasview/setup_mac.py

@@ -121 +121 @@
 VERSION = sasviewver.__version__
 APPNAME = "SasView "+VERSION
-DMGNAME = "SasView-"+VERSION
+DMGNAME = "SasView-"+VERSION+"-MacOSX"
 
 APP = ['sasview.py']

src/sas/guiframe/gui_toolbar.py

@@ -36 +36 @@
     Implement toolbar for guiframe
     """
+    ID_BOOKMARK = wx.NewId()
     def __init__(self, parent,  *args, **kwds):
         Tbar.__init__(self, parent,  *args, **kwds)
@@ -133 +134 @@
         Add default items in bookmark menu
         """
-        id = wx.NewId()
-        self._bookmark_menu.Append(id, 'Bookmark This Page State')
+        self._bookmark_menu.Append(self.ID_BOOKMARK, 'Bookmark This Page State')
         self._bookmark_menu.AppendSeparator()
-        wx.EVT_MENU(self, id, self.on_bookmark)
+        wx.EVT_MENU(self, self.ID_BOOKMARK, self.on_bookmark)
    
     def on_bind_button(self):

src/sas/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -19 +19 @@
 from sas.guiframe.events import StatusEvent
 from sas.guiframe.events import PanelOnFocusEvent
-from sas.guiframe.utils import PanelMenu
+from sas.guiframe.utils import PanelMenu, IdList
 from sas.guiframe.panel_base import PanelBase
 from sas.guiframe.gui_style import GUIFRAME_ICON
@@ -35 +35 @@
     """return the key of dictionary dic given the value"""
     return [k for k, v in dic.iteritems() if v == val][0]
-
-
 
 class ModelPanel1D(PlotPanel, PanelBase):
@@ -52 +50 @@
     ## Group ID
     group_id = None
+    _menu_ids = IdList()
 
     def __init__(self, parent, id=-1, color=None,
@@ -68 +67 @@
 
         self._available_data = []
-        self._menu_add_ids = []
         self._symbol_labels = self.get_symbol_label()
         self._color_labels = self.get_color_label()
@@ -556 +554 @@
         self._slicerpop.set_plots(self.plots)
         self._slicerpop.set_graph(self.graph)
+        ids = iter(self._menu_ids)
         if not self.graph.selected_plottable in self.plots:
             # Various plot options
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Save Image', 'Save image as PNG')
             wx.EVT_MENU(self, wx_id, self.onSaveImage)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Print Image', 'Print image ')
             wx.EVT_MENU(self, wx_id, self.onPrint)
 
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Copy to Clipboard',
                                    'Copy to the clipboard')
@@ -582 +581 @@
                     continue
 
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             plot_menu.Append(wx_id, "&DataInfo", name)
             wx.EVT_MENU(self, wx_id, self. _onDataShow)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             plot_menu.Append(wx_id, "&Save Points as a File", name)
             wx.EVT_MENU(self, wx_id, self._onSave)
@@ -592 +591 @@
             # add menu of other plugins
             item_list = self.parent.get_current_context_menu(self)
-
             if (not item_list == None) and (not len(item_list) == 0):
-                for item in item_list:
+                # Note: reusing menu ids in submenu.  This code works because
+                # IdItems is set up as a lazy iterator returning each id in
+                # sequence, creating new ids as needed so it never runs out.
+                # zip() is set up to stop when any iterator is empty, so it
+                # only asks for the number of ids in item_list.
+                for item, wx_id in zip(item_list, self._menu_ids):
 
                     try:
-                        wx_id = wx.NewId()
                         plot_menu.Append(wx_id, item[0], name)
                         wx.EVT_MENU(self, wx_id, item[2])
@@ -607 +609 @@
 
             if self.parent.ClassName.count('wxDialog') == 0:
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 plot_menu.Append(wx_id, '&Linear Fit', name)
                 wx.EVT_MENU(self, wx_id, self.onFitting)
                 plot_menu.AppendSeparator()
 
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 plot_menu.Append(wx_id, "Remove", name)
                 wx.EVT_MENU(self, wx_id, self._onRemove)
                 if not plot.is_data:
-                    wx_id = wx.NewId()
+                    wx_id = ids.next()
                     plot_menu.Append(wx_id, '&Freeze', name)
                     wx.EVT_MENU(self, wx_id, self.onFreeze)
@@ -622 +624 @@
 
                 if plot.is_data:
-                    wx_id = wx.NewId()
+                    wx_id = ids.next()
                     self.hide_menu = plot_menu.Append(wx_id, "Hide Error Bar", name)
 
@@ -636 +638 @@
                     plot_menu.AppendSeparator()
 
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 plot_menu.Append(wx_id, '&Modify Plot Property', name)
                 wx.EVT_MENU(self, wx_id, self.createAppDialog)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             # plot_menu.SetTitle(name)
             self._slicerpop.AppendMenu(wx_id, '&%s' % name, plot_menu)
@@ -648 +650 @@
             loc_menu = wx.Menu()
             for label in self._loc_labels:
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 loc_menu.Append(wx_id, str(label), str(label))
                 wx.EVT_MENU(self, wx_id, self.onChangeLegendLoc)
 
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Modify Graph Appearance',
                                    'Modify graph appearance')
@@ -660 +662 @@
 
             if self.position != None:
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 self._slicerpop.Append(wx_id, '&Add Text')
                 wx.EVT_MENU(self, wx_id, self._on_addtext)
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 self._slicerpop.Append(wx_id, '&Remove Text')
                 wx.EVT_MENU(self, wx_id, self._on_removetext)
                 self._slicerpop.AppendSeparator()
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Change Scale')
             wx.EVT_MENU(self, wx_id, self._onProperties)
             self._slicerpop.AppendSeparator()
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             self._slicerpop.Append(wx_id, '&Reset Graph Range')
             wx.EVT_MENU(self, wx_id, self.onResetGraph)
@@ -677 +679 @@
             if self.parent.ClassName.count('wxDialog') == 0:
                 self._slicerpop.AppendSeparator()
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 self._slicerpop.Append(wx_id, '&Window Title')
                 wx.EVT_MENU(self, wx_id, self.onChangeCaption)

src/sas/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -287 +287 @@
 
         """
+        ids = iter(self._menu_ids)
         slicerpop = PanelMenu()
         slicerpop.set_plots(self.plots)
         slicerpop.set_graph(self.graph)
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&Save Image')
         wx.EVT_MENU(self, wx_id, self.onSaveImage)
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&Print Image', 'Print image')
         wx.EVT_MENU(self, wx_id, self.onPrint)
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&Copy to Clipboard', 'Copy to the clipboard')
         wx.EVT_MENU(self, wx_id, self.OnCopyFigureMenu)
@@ -305 +306 @@
         # saving data
         plot = self.data2D
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, "&Data Info")
         wx.EVT_MENU(self, wx_id, self._onDataShow)
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, "&Save as a File (DAT)")
         self.action_ids[str(wx_id)] = plot
@@ -320 +321 @@
                 self.data2D.name.split(" ")[0] != 'Residuals':
                 # The line above; Not for trunk
-                for item in item_list:
+                # Note: reusing menu ids for the sub-menus.  See Plotter1D.
+                for item, wx_id in zip(item_list, self._menu_ids):
                     try:
-                        wx_id = wx.NewId()
                         slicerpop.Append(wx_id, item[0], item[1])
                         wx.EVT_MENU(self, wx_id, item[2])
@@ -331 +332 @@
                 slicerpop.AppendSeparator()
 
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             slicerpop.Append(wx_id, '&Perform Circular Average')
             wx.EVT_MENU(self, wx_id, self.onCircular) \
             # For Masked Data
             if not plot.mask.all():
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 slicerpop.Append(wx_id, '&Masked Circular Average')
                 wx.EVT_MENU(self, wx_id, self.onMaskedCircular)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             slicerpop.Append(wx_id, '&Sector [Q View]')
             wx.EVT_MENU(self, wx_id, self.onSectorQ)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             slicerpop.Append(wx_id, '&Annulus [Phi View ]')
             wx.EVT_MENU(self, wx_id, self.onSectorPhi)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             slicerpop.Append(wx_id, '&Box Sum')
             wx.EVT_MENU(self, wx_id, self.onBoxSum)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             slicerpop.Append(wx_id, '&Box Averaging in Qx')
             wx.EVT_MENU(self, wx_id, self.onBoxavgX)
-            wx_id = wx.NewId()
+            wx_id = ids.next()
             slicerpop.Append(wx_id, '&Box Averaging in Qy')
             wx.EVT_MENU(self, wx_id, self.onBoxavgY)
             if self.slicer != None:
-                wx_id = wx.NewId()
+                wx_id = ids.next()
                 slicerpop.Append(wx_id, '&Clear Slicer')
                 wx.EVT_MENU(self, wx_id, self.onClearSlicer)
                 if self.slicer.__class__.__name__ != "BoxSum":
-                    wx_id = wx.NewId()
+                    wx_id = ids.next()
                     slicerpop.Append(wx_id, '&Edit Slicer Parameters')
                     wx.EVT_MENU(self, wx_id, self._onEditSlicer)
             slicerpop.AppendSeparator()
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&Edit Graph Label', 'Edit Graph Label')
         wx.EVT_MENU(self, wx_id, self.onEditLabels)
@@ -371 +372 @@
         # ILL mod here
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&Modify graph appearance', 'Modify graph appearance')
         wx.EVT_MENU(self, wx_id, self.modifyGraphAppearance)
         slicerpop.AppendSeparator()
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&2D Color Map')
         wx.EVT_MENU(self, wx_id, self._onEditDetector)
         slicerpop.AppendSeparator()
 
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&Toggle Linear/Log Scale')
         wx.EVT_MENU(self, wx_id, self._onToggleScale)
 
         slicerpop.AppendSeparator()
-        wx_id = wx.NewId()
+        wx_id = ids.next()
         slicerpop.Append(wx_id, '&Window Title')
         wx.EVT_MENU(self, wx_id, self.onChangeCaption)

src/sas/guiframe/utils.py

@@ -123 +123 @@
     return begin_flag, end_flag
 
+class IdList:
+    """
+    Create a list of wx ids that can be reused.
+
+    Ids for items need to be unique within their context.  In a dynamic
+    application where the number of ids needed different each time the
+    form is created, depending for example, on the number of items that
+    need to be shown in the context menu, you cannot preallocate the
+    ids that you are going to use for the form.  Instead, you can use
+    an IdList, which will reuse ids from context to context, adding new
+    ones if the new context requires more than a previous context.
+
+    IdList is set up as an iterator, which returns new ids forever
+    or until it runs out.  This makes it pretty useful for defining
+    menus::
+
+        class Form(wx.Dialog):
+            _form_id_pool = IdList()
+            def __init__(self):
+                ...
+                menu = wx.Menu()
+                for item, wx_id in zip(menu_items, self._form_id_pool):
+                    name, description, callback = item
+                    menu.Append(wx_id, name, description)
+                    wx.EVT_MENU(self, wx_id, callback)
+                ...
+
+    It is a little unusual to use an iterator outside of a loop, but it is
+    supported. For example, when defining a form, your class definition
+    might look something like::
+
+        class Form(wx.Dialog):
+            _form_id_pool = IdList()
+            def __init__(self, pairs, ...):
+                ids = iter(_form_id_pool)
+                ...
+                wx.StaticText(self, ids.next(), "Some key-value pairs")
+                for name, value in pairs:
+                    label = wx.StaticText(self, ids.next(), name)
+                    input = wx.TextCtrl(self, ids.next(), value=str(value))
+                    ...
+                ...
+
+    If the dialog is really dynamic, and not defined all in one place, then
+    save the id list iterator as *self._ids = iter(_form_id_pool)* in the
+    constructor.
+
+    The wx documentation is not clear on whether ids need to be unique.
+    Clearly different dialogs can use the same ids, as this is done for the
+    standard button ids such as wx.ID_HELP.  Presumably each widget on the
+    form needs its own id, but whether these ids can match the ids of menu
+    items is not indicated, or whether different submenus need their own
+    ids.  Using different id lists for menu items and widgets is safest,
+    but probably not necessary.  And what about notebook tabs.  Do the
+    ids need to be unique across all tabs?
+    """
+    def __init__(self):
+        self._ids = []
+    def __iter__(self):
+        return _IdListIterator(self)
+    def __getitem__(self, index):
+        while index >= len(self._ids):
+            self._ids.append(wx.NewId())
+        return self._ids[index]
+
+class _IdListIterator:
+    def __init__(self, id_list):
+        self.id_list = id_list
+        self.index = -1
+    def next(self):
+        self.index += 1
+        return self.id_list[self.index]
+

src/sas/models/PeakGaussModel.py

@@ -3 +3 @@
 PeakGaussModel function as a BaseComponent model
 """
+from __future__ import division
 
 from sas.models.BaseComponent import BaseComponent

src/sas/models/resolution.py

@@ -11 +11 @@
 MINIMUM_RESOLUTION = 1e-8
 
-class Resolution1D(object):
+
+# When extrapolating to -q, what is the minimum positive q relative to q_min
+# that we wish to calculate?
+MIN_Q_SCALE_FOR_NEGATIVE_Q_EXTRAPOLATION = 0.01
+
+class Resolution(object):
     """
     Abstract base class defining a 1D resolution function.
@@ -32 +37 @@
 
 
-class Perfect1D(Resolution1D):
+class Perfect1D(Resolution):
     """
     Resolution function to use when there is no actual resolution smearing
@@ -45 +50 @@
 
 
-class Pinhole1D(Resolution1D):
+class Pinhole1D(Resolution):
     r"""
     Pinhole aperture with q-dependent gaussian resolution.
@@ -77 +82 @@
 
 
-class Slit1D(Resolution1D):
+class Slit1D(Resolution):
     """
     Slit aperture with a complicated resolution function.
@@ -92 +97 @@
     The *weight_matrix* is computed by :func:`slit1d_resolution`
     """
-    def __init__(self, q, width, height, q_calc=None):
-        # TODO: maybe issue warnings rather than raising errors
-        if not np.isscalar(width):
-            if np.any(np.diff(width) > 0.0):
-                raise ValueError("Slit resolution requires fixed width slits")
-            width = width[0]
-        if not np.isscalar(height):
-            if np.any(np.diff(height) > 0.0):
-                raise ValueError("Slit resolution requires fixed height slits")
-            height = height[0]
-
+    def __init__(self, q, width, height=0., q_calc=None):
         # Remember what width/height was used even though we won't need them
         # after the weight matrix is constructed
         self.width, self.height = width, height
+
+        # Allow independent resolution on each point even though it is not
+        # needed in practice.
+        if np.isscalar(width):
+            width = np.ones(len(q))*width
+        else:
+            width = np.asarray(width)
+        if np.isscalar(height):
+            height = np.ones(len(q))*height
+        else:
+            height = np.asarray(height)
 
         self.q = q.flatten()
@@ -147 +153 @@
 
 
-def slit_resolution(q_calc, q, width, height):
+def slit_resolution(q_calc, q, width, height, n_height=30):
     r"""
     Build a weight matrix to compute *I_s(q)* from *I(q_calc)*, given
-    $q_v$ = *width* and $q_h$ = *height*.
-
-    *width* and *height* are scalars since current instruments use the
-    same slit settings for all measurement points.
+    $q_\perp$ = *width* and $q_\parallel$ = *height*.  *n_height* is
+    is the number of steps to use in the integration over $q_\parallel$
+    when both $q_\perp$ and $q_\parallel$ are non-zero.
+
+    Each $q$ can have an independent width and height value even though
+    current instruments use the same slit setting for all measured points.
 
     If slit height is large relative to width, use:
@@ -159 +167 @@
     .. math::
 
-        I_s(q_o) = \frac{1}{\Delta q_v}
-            \int_0^{\Delta q_v} I(\sqrt{q_o^2 + u^2} du
+        I_s(q_i) = \frac{1}{\Delta q_\perp}
+            \int_0^{\Delta q_\perp} I(\sqrt{q_i^2 + q_\perp^2} dq_\perp
 
     If slit width is large relative to height, use:
@@ -166 +174 @@
     .. math::
 
-        I_s(q_o) = \frac{1}{2 \Delta q_v}
-            \int_{-\Delta q_v}^{\Delta q_v} I(u) du
-    """
-    if width == 0.0 and height == 0.0:
-        #print "condition zero"
-        return 1
-
+        I_s(q_i) = \frac{1}{2 \Delta q_\parallel}
+            \int_{-\Delta q_\parallel}^{\Delta q_\parallel}
+                I(|q_i + q_\parallel|) dq_\parallel
+
+    For a mixture of slit width and height use:
+
+    .. math::
+
+        I_s(q_i) = \frac{1}{2 \Delta q_\parallel \Delta q_\perp}
+            \int_{-\Delta q_\parallel)^{\Delta q_parallel}
+            \int_0^[\Delta q_\perp}
+                I(\sqrt{(q_i + q_\parallel)^2 + q_\perp^2})
+                dq_\perp dq_\parallel
+
+
+    Algorithm
+    ---------
+
+    We are using the mid-point integration rule to assign weights to each
+    element of a weight matrix $W$ so that
+
+    .. math::
+
+        I_s(q) = W I(q_\text{calc})
+
+    If *q_calc* is at the mid-point, we can infer the bin edges from the
+    pairwise averages of *q_calc*, adding the missing edges before
+    *q_calc[0]* and after *q_calc[-1]*.
+
+    For $q_\parallel = 0$, the smeared value can be computed numerically
+    using the $u$ substitution
+
+    .. math::
+
+        u_j = \sqrt{q_j^2 - q^2}
+
+    This gives
+
+    .. math::
+
+        I_s(q) \approx \sum_j I(u_j) \Delta u_j
+
+    where $I(u_j)$ is the value at the mid-point, and $\Delta u_j$ is the
+    difference between consecutive edges which have been first converted
+    to $u$.  Only $u_j \in [0, \Delta q_\perp]$ are used, which corresponds
+    to $q_j \in [q, \sqrt{q^2 + \Delta q_\perp}]$, so
+
+    .. math::
+
+        W_{ij} = \frac{1}{\Delta q_\perp} \Delta u_j
+               = \frac{1}{\Delta q_\perp}
+                    \sqrt{q_{j+1}^2 - q_i^2} - \sqrt{q_j^2 - q_i^2}
+            \text{if} q_j \in [q_i, \sqrt{q_i^2 + q_\perp^2}]
+
+    where $I_s(q_i)$ is the theory function being computed and $q_j$ are the
+    mid-points between the calculated values in *q_calc*.  We tweak the
+    edges of the initial and final intervals so that they lie on integration
+    limits.
+
+    (To be precise, the transformed midpoint $u(q_j)$ is not necessarily the
+    midpoint of the edges $u((q_{j-1}+q_j)/2)$ and $u((q_j + q_{j+1})/2)$,
+    but it is at least in the interval, so the approximation is going to be
+    a little better than the left or right Riemann sum, and should be
+    good enough for our purposes.)
+
+    For $q_\perp = 0$, the $u$ substitution is simpler:
+
+    .. math::
+
+        u_j = |q_j - q|
+
+    so
+
+    .. math::
+
+        W_ij = \frac{1}{2 \Delta q_\parallel} \Delta u_j
+            = \frac{1}{2 \Delta q_\parallel} (q_{j+1} - q_j)
+            \text{if} q_j \in [q-\Delta q_\parallel, q+\Delta q_\parallel]
+
+    However, we need to support cases were $u_j < 0$, which means using
+    $2 (q_{j+1} - q_j)$ when $q_j \in [0, q_\parallel-q_i]$.  This is not
+    an issue for $q_i > q_\parallel$.
+
+    For bot $q_\perp > 0$ and $q_\parallel > 0$ we perform a 2 dimensional
+    integration with
+
+    .. math::
+
+        u_jk = \sqrt{q_j^2 - (q + (k\Delta q_\parallel/L))^2}
+            \text{for} k = -L \ldots L
+
+    for $L$ = *n_height*.  This gives
+
+    .. math::
+
+        W_{ij} = \frac{1}{2 \Delta q_\perp q_\parallel}
+            \sum_{k=-L}^L \Delta u_jk (\frac{\Delta q_\parallel}{2 L + 1}
+
+
+    """
+    #np.set_printoptions(precision=6, linewidth=10000)
+
+    # The current algorithm is a midpoint rectangle rule.
     q_edges = bin_edges(q_calc) # Note: requires q > 0
     q_edges[q_edges<0.0] = 0.0 # clip edges below zero
-
-    #np.set_printoptions(linewidth=10000)
-    if width <= 100.0 * height or height == 0:
-        # The current algorithm is a midpoint rectangle rule.  In the test case,
-        # neither trapezoid nor Simpson's rule improved the accuracy.
-        #print "condition h", q_edges.shape, q.shape, q_calc.shape
-        weights = np.zeros((len(q), len(q_calc)), 'd')
-        for i, qi in enumerate(q):
-            weights[i, :] = np.diff(q_to_u(q_edges, qi))
-        weights /= width
-        weights = weights.T
-    else:
-        #print "condition w"
-        # Make q_calc into a row vector, and q into a column vector
-        q, q_calc = q[None,:], q_calc[:,None]
-        in_x = (q_calc >= q-width) * (q_calc <= q+width)
-        weights = np.diff(q_edges)[:,None] * in_x
-
+    weights = np.zeros((len(q), len(q_calc)), 'd')
+
+    #print q_calc
+    for i, (qi, w, h) in enumerate(zip(q, width, height)):
+        if w == 0. and h == 0.:
+            # Perfect resolution, so return the theory value directly.
+            # Note: assumes that q is a subset of q_calc.  If qi need not be
+            # in q_calc, then we can do a weighted interpolation by looking
+            # up qi in q_calc, then weighting the result by the relative
+            # distance to the neighbouring points.
+            weights[i, :] = (q_calc == qi)
+        elif h == 0:
+            weights[i, :] = _q_perp_weights(q_edges, qi, w)
+        elif w == 0:
+            in_x = 1.0 * ((q_calc >= qi-h) & (q_calc <= qi+h))
+            abs_x = 1.0*(q_calc < abs(qi - h)) if qi < h else 0.
+            #print qi - h, qi + h
+            #print in_x + abs_x
+            weights[i,:] = (in_x + abs_x) * np.diff(q_edges) / (2*h)
+        else:
+            L = n_height
+            for k in range(-L, L+1):
+                weights[i,:] += _q_perp_weights(q_edges, qi+k*h/L, w)
+            weights[i,:] /= 2*L + 1
+
+    return weights.T
+
+
+def _q_perp_weights(q_edges, qi, w):
+    # Convert bin edges from q to u
+    u_limit = np.sqrt(qi**2 + w**2)
+    u_edges = q_edges**2 - qi**2
+    u_edges[q_edges < abs(qi)] = 0.
+    u_edges[q_edges > u_limit] = u_limit**2 - qi**2
+    weights = np.diff(np.sqrt(u_edges))/w
+    #print "i, qi",i,qi,qi+width
+    #print q_calc
+    #print weights
     return weights
 
@@ -212 +336 @@
     function.
     """
-    height # keep lint happy
-    q_min, q_max = np.min(q), np.max(np.sqrt(q**2 + width**2))
+    q_min, q_max = np.min(q-height), np.max(np.sqrt((q+height)**2 + width**2))
+
     return geometric_extrapolation(q, q_min, q_max)
 
@@ -233 +357 @@
         ])
     return edges
-
-
-def q_to_u(q, q0):
-    """
-    Convert *q* values to *u* values for the integral computed at *q0*.
-    """
-    # array([value])**2 - value**2 is not always zero
-    qpsq = q**2 - q0**2
-    qpsq[qpsq<0] = 0
-    return sqrt(qpsq)
 
 
@@ -275 +389 @@
     q = np.sort(q)
     if q_min < q[0]:
-        if q_min <= 0: q_min = q[0]/10
+        if q_min <= 0: q_min = q_min*MIN_Q_SCALE_FOR_NEGATIVE_Q_EXTRAPOLATION
         n_low = np.ceil((q[0]-q_min) / (q[1]-q[0])) if q[1]>q[0] else 15
         q_low = np.linspace(q_min, q[0], n_low+1)[:-1]
@@ -297 +411 @@
     *points_per_decade* sets the ratio between consecutive steps such
     that there will be $n$ points used for every factor of 10 increase
-    in $q$.
+    in *q*.
 
     If *points_per_decade* is not given, it will be estimated as follows.
@@ -316 +430 @@
     Substituting:
 
-    .. math::
-
         n_\text{extend} = (n-1) (\log q_\text{max} - \log q_n)
-            / (\log q_n - \log q_1)
+            / (\log q_n - log q_1)
     """
     q = np.sort(q)
@@ -327 +439 @@
         log_delta_q = log(10.) / points_per_decade
     if q_min < q[0]:
-        if q_min < 0: q_min = q[0]/10
+        if q_min < 0: q_min = q[0]*MIN_Q_SCALE_FOR_NEGATIVE_Q_EXTRAPOLATION
         n_low = log_delta_q * (log(q[0])-log(q_min))
         q_low  = np.logspace(log10(q_min), log10(q[0]), np.ceil(n_low)+1)[:-1]
@@ -359 +471 @@
 
 
-def romberg_slit_1d(q, delta_qv, form, pars):
+def romberg_slit_1d(q, width, height, form, pars):
     """
     Romberg integration for slit resolution.
@@ -366 +478 @@
     that make it slow to evaluate but give it good accuracy.
     """
-    from scipy.integrate import romberg
+    from scipy.integrate import romberg, dblquad
 
     if any(k not in form.info['defaults'] for k in pars.keys()):
@@ -374 +486 @@
                          (", ".join(sorted(extra)), ", ".join(sorted(keys))))
 
-    _fn = lambda u, q0: eval_form(sqrt(q0**2 + u**2), form, pars)
-    r = [romberg(_fn, 0, delta_qv[0], args=(qi,),
-                 divmax=100, vec_func=True, tol=0, rtol=1e-8)
-         for qi in q]
+    if np.isscalar(width):
+        width = [width]*len(q)
+    if np.isscalar(height):
+        height = [height]*len(q)
+    _int_w = lambda w, qi: eval_form(sqrt(qi**2 + w**2), form, pars)
+    _int_h = lambda h, qi: eval_form(abs(qi+h), form, pars)
+    # If both width and height are defined, then it is too slow to use dblquad.
+    # Instead use trapz on a fixed grid, interpolated into the I(Q) for
+    # the extended Q range.
+    #_int_wh = lambda w, h, qi: eval_form(sqrt((qi+h)**2 + w**2), form, pars)
+    q_calc = slit_extend_q(q, np.asarray(width), np.asarray(height))
+    Iq = eval_form(q_calc, form, pars)
+    result = np.empty(len(q))
+    for i, (qi, w, h) in enumerate(zip(q, width, height)):
+        if h == 0.:
+            r = romberg(_int_w, 0, w, args=(qi,),
+                        divmax=100, vec_func=True, tol=0, rtol=1e-8)
+            result[i] = r/w
+        elif w == 0.:
+            r = romberg(_int_h, -h, h, args=(qi,),
+                        divmax=100, vec_func=True, tol=0, rtol=1e-8)
+            result[i] = r/(2*h)
+        else:
+            w_grid = np.linspace(0, w, 21)[None,:]
+            h_grid = np.linspace(-h, h, 23)[:,None]
+            u = sqrt((qi+h_grid)**2 + w_grid**2)
+            Iu = np.interp(u, q_calc, Iq)
+            #print np.trapz(Iu, w_grid, axis=1)
+            Is = np.trapz(np.trapz(Iu, w_grid, axis=1), h_grid[:,0])
+            result[i] = Is / (2*h*w)
+            """
+            r, err = dblquad(_int_wh, -h, h, lambda h: 0., lambda h: w,
+                             args=(qi,))
+            result[i] = r/(w*2*h)
+            """
+
     # r should be [float, ...], but it is [array([float]), array([float]),...]
-    return np.asarray(r).flatten()/delta_qv[0]
+    return result
 
 
@@ -520 +664 @@
 
     def compare(self, q, output, answer, tolerance):
-        err = (output - answer)/answer
-        idx = abs(err) >= tolerance
-        problem = zip(q[idx], output[idx], answer[idx], err[idx])
-        print "\n".join(str(v) for v in problem)
+        #err = (output - answer)/answer
+        #idx = abs(err) >= tolerance
+        #problem = zip(q[idx], output[idx], answer[idx], err[idx])
+        #print "\n".join(str(v) for v in problem)
         np.testing.assert_allclose(output, answer, rtol=tolerance)
 
@@ -609 +753 @@
         data = np.loadtxt(data_string.split('\n')).T
         q, delta_qv, _, answer = data
-        answer = romberg_slit_1d(q, delta_qv, self.model, pars)
+        answer = romberg_slit_1d(q, delta_qv, 0., self.model, pars)
         q_calc = slit_extend_q(interpolate(q, 2*np.pi/radius/20),
-                               delta_qv[0], delta_qv[0])
+                               delta_qv[0], 0.)
         resolution = Slit1D(q, width=delta_qv, height=0, q_calc=q_calc)
         output = self.Iq_sphere(pars, resolution)
@@ -629 +773 @@
         form = load_model('ellipsoid', dtype='double')
         q = np.logspace(log10(4e-5),log10(2.5e-2), 68)
-        delta_qv = [0.117]
-        resolution = Slit1D(q, width=delta_qv, height=0)
-        answer = romberg_slit_1d(q, delta_qv, form, pars)
+        width, height = 0.117, 0.
+        resolution = Slit1D(q, width=width, height=height)
+        answer = romberg_slit_1d(q, width, height, form, pars)
         output = resolution.apply(eval_form(resolution.q_calc, form, pars))
         # TODO: 10% is too much error; use better algorithm
+        #print np.max(abs(answer-output)/answer)
         self.compare(q, output, answer, 0.1)
 
@@ -860 +1005 @@
 
 def _eval_demo_1d(resolution, title):
+    import sys
     from sasmodels import core
-    from sasmodels.models import cylinder
-    ## or alternatively:
-    # cylinder = core.load_model_definition('cylinder')
-    model = core.load_model(cylinder)
+    name = sys.argv[1] if len(sys.argv) > 1 else 'cylinder'
+
+    if name == 'cylinder':
+        pars = {'length':210, 'radius':500}
+    elif name == 'teubner_strey':
+        pars = {'a2':0.003, 'c1':-1e4, 'c2':1e10, 'background':0.312643}
+    elif name == 'sphere' or name == 'spherepy':
+        pars = TEST_PARS_SLIT_SPHERE
+    elif name == 'ellipsoid':
+        pars = {
+            'scale':0.05,
+            'rpolar':500, 'requatorial':15000,
+            'sld':6, 'solvent_sld': 1,
+            }
+    else:
+        pars = {}
+    defn = core.load_model_definition(name)
+    model = core.load_model(defn)
 
     kernel = core.make_kernel(model, [resolution.q_calc])
-    theory = core.call_kernel(kernel, {'length':210, 'radius':500})
+    theory = core.call_kernel(kernel, pars)
     Iq = resolution.apply(theory)
+
+    if isinstance(resolution, Slit1D):
+        width, height = resolution.width, resolution.height
+        Iq_romb = romberg_slit_1d(resolution.q, width, height, model, pars)
+    else:
+        dq = resolution.q_width
+        Iq_romb = romberg_pinhole_1d(resolution.q, dq, model, pars)
 
     import matplotlib.pyplot as plt
     plt.loglog(resolution.q_calc, theory, label='unsmeared')
     plt.loglog(resolution.q, Iq, label='smeared', hold=True)
+    plt.loglog(resolution.q, Iq_romb, label='romberg smeared', hold=True)
     plt.legend()
     plt.title(title)
@@ -879 +1047 @@
 
 def demo_pinhole_1d():
-    q = np.logspace(-3, -1, 400)
+    q = np.logspace(-4, np.log10(0.2), 400)
     q_width = 0.1*q
     resolution = Pinhole1D(q, q_width)
@@ -885 +1053 @@
 
 def demo_slit_1d():
-    q = np.logspace(-3, -1, 400)
-    qx_width = 0.005
-    qy_width = 0.0
-    resolution = Slit1D(q, qx_width, qy_width)
-    _eval_demo_1d(resolution, title="0.005 Qx Slit Resolution")
+    q = np.logspace(-4, np.log10(0.2), 100)
+    w = h = 0.
+    #w = 0.000000277790
+    w = 0.0277790
+    #h = 0.00277790
+    #h = 0.0277790
+    resolution = Slit1D(q, w, h)
+    _eval_demo_1d(resolution, title="(%g,%g) Slit Resolution"%(w,h))
 
 def demo():
@@ -895 +1066 @@
     plt.subplot(121)
     demo_pinhole_1d()
+    #plt.yscale('linear')
     plt.subplot(122)
     demo_slit_1d()
+    #plt.yscale('linear')
     plt.show()
 
 
 if __name__ == "__main__":
-    #demo()
-    main()
+    demo()
+    #main()

src/sas/perspectives/fitting/basepage.py

@@ -15 +15 @@
 from wx.lib.scrolledpanel import ScrolledPanel
 from sas.guiframe.panel_base import PanelBase
-from sas.guiframe.utils import format_number, check_float
+from sas.guiframe.utils import format_number, check_float, IdList
 from sas.guiframe.events import PanelOnFocusEvent
 from sas.guiframe.events import StatusEvent
@@ -57 +57 @@
     ## Title to appear on top of the window
     window_caption = "Fit Page "
-    
+
+    # These two buttons have specific IDs since they seem to be created more
+    # frequently than they need to.  In particular, set_dispers_sizer() is
+    # called by _on_select_model
+    ID_BOOKMARK = wx.NewId()
+    ID_DISPERSER_HELP = wx.NewId()
+    _id_pool = IdList()
+
     def __init__(self, parent, color='blue', **kwargs):
         """
@@ -66 +73 @@
         #Set window's font size
         self.SetWindowVariant(variant=FONT_VARIANT)
-      
         self.SetBackgroundColour(color)
+
+        self._ids = iter(self._id_pool)
         ## parent of the page
         self.parent = parent
@@ -126 +134 @@
         self.Npts_fit = None
         self.Npts_total = None
-        self.theory_qmin = None 
+        self.theory_qmin = None
         self.theory_qmax = None
         self.theory_qmin_x = None
@@ -135 +143 @@
         self.sld_axes = None
         self.multi_factor = None
-       
+
         self.disp_cb_dict = {}
-   
+
         #self.state = PageState(parent=parent)
         ## dictionary containing list of models
         self.model_list_box = {}
-       
+
         ## Data member to store the dispersion object created
         self._disp_obj_dict = {}
@@ -169 +177 @@
         self.disp_list = []
         self.disp_name = ""
-        
+
         ## list of orientation parameters
         self.orientation_params = []
         self.orientation_params_disp = []
-#       Self.model should ALWAYS be None here.  It was set to none above in 
+#       Self.model should ALWAYS be None here.  It was set to none above in
 #       this long init setting.  no obvious function call in between setting
-#       and this - commenting out on 4/8/2014 by PDB.  Remove once clear 
+#       and this - commenting out on 4/8/2014 by PDB.  Remove once clear
 #       it is pointless.
 #        if self.model != None:
@@ -198 +206 @@
         ## Create context menu for page
         self.popUpMenu = wx.Menu()
-    
-        id = wx.NewId()
-        self._keep = wx.MenuItem(self.popUpMenu, id, "Add bookmark",
+
+        wx_id = self._ids.next()
+        self._keep = wx.MenuItem(self.popUpMenu, wx_id, "Add bookmark",
                                  " Keep the panel status to recall it later")
         self.popUpMenu.AppendItem(self._keep)
@@ -206 +214 @@
         self._set_bookmark_flag(False)
         self._set_save_flag(False)
-        wx.EVT_MENU(self, id, self.on_bookmark)
+        wx.EVT_MENU(self, wx_id, self.on_bookmark)
         self.popUpMenu.AppendSeparator()
-    
+
         ## Default locations
         self._default_save_location = os.getcwd()
@@ -214 +222 @@
         #self.onSave(event=None)
         self.Bind(wx.EVT_CONTEXT_MENU, self.onContextMenu)
-        
+
         # bind key event
         self.Bind(wx.EVT_LEFT_DOWN, self.on_left_down)
-        
+
         ## create the basic structure of the panel with empty sizer
         self.define_page_structure()
         ## drawing Initial dispersion parameters sizer
         self.set_dispers_sizer()
-        
+
         ## layout
         self.set_layout()
-    
+
     def set_index_model(self, index):
         """
@@ -231 +239 @@
         """
         self.index_model = index
-        
+
     def create_default_data(self):
         """
@@ -248 +256 @@
                 else:
                     self._create_default_1d_data()
-                        
+
             if self.model != None:
                 if not self.data.is_data:
@@ -258 +266 @@
             self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
             self.state.slit_smearer = self.slit_smearer.GetValue()
-        
+
     def _create_default_1d_data(self):
         """
@@ -264 +272 @@
         Only when the page is on theory mode.
         :warning: This data is never plotted.
-        
+
         """
         x = numpy.linspace(start=self.qmin_x, stop=self.qmax_x,
@@ -274 +282 @@
         self.data.id = str(self.uid) + " data"
         self.data.group_id = str(self.uid) + " Model1D"
-         
+
     def _create_log_1d_data(self):
         """
@@ -280 +288 @@
         Only when the page is on theory mode.
         :warning: This data is never plotted.
-        
+
         """
         if self.qmin_x >= 1.e-10:
             qmin = numpy.log10(self.qmin_x)
         else:
-            qmin = -10.    
-            
+            qmin = -10.
+
         if self.qmax_x <= 1.e10:
             qmax = numpy.log10(self.qmax_x)
         else:
-            qmax = 10. 
-               
+            qmax = 10.
+
         x = numpy.logspace(start=qmin, stop=qmax,
                            num=self.npts_x, endpoint=True, base=10.0)
@@ -300 +308 @@
         self.data.id = str(self.uid) + " data"
         self.data.group_id = str(self.uid) + " Model1D"
-      
+
     def _create_default_2d_data(self):
         """
@@ -358 +366 @@
         #xstep = x_size / len(x_bins - 1)
         #ystep = y_size / len(y_bins - 1)
-  
+
         self.data.source = Source()
         self.data.data = numpy.ones(len(mask))
@@ -381 +389 @@
             wx.PostEvent(self._manager.parent, PanelOnFocusEvent(panel=self))
             self.on_tap_focus()
-               
+
     def on_tap_focus(self):
         """
@@ -397 +405 @@
                     self._manager.menu1.FindItemById(self._manager.id_batchfit)
             batch_menu.Enable(self.batch_on and flag)
-    
+
     def set_page_info(self, page_info):
         """
         set some page important information at once
         """
-#       THIS METHOD/FUNCTION NO LONGE APPEARS TO BE CALLED.  Started up program 
+#       THIS METHOD/FUNCTION NO LONGE APPEARS TO BE CALLED.  Started up program
 #       and started new fit window and PR and Invariant and a fit in fitting
 #       but never entered this routine which should be an initialization
-#       routine.  Leave for a while but probably something to clean up at 
+#       routine.  Leave for a while but probably something to clean up at
 #       some point?
 #
@@ -426 +434 @@
         ## Data member to store the dispersion object created
         self.populate_box(model_dict=self.model_list_box)
-        
+
     def onContextMenu(self, event):
         """
@@ -433 +441 @@
         # Skipping the save state functionality for release 0.9.0
         #return
-    
+
         pos = event.GetPosition()
         pos = self.ScreenToClient(pos)
-       
+
         self.PopupMenu(self.popUpMenu, pos)
-      
+
     def onUndo(self, event):
         """
@@ -445 +453 @@
         event = PreviousStateEvent(page=self)
         wx.PostEvent(self.parent, event)
-        
+
     def onRedo(self, event):
         """
@@ -452 +460 @@
         event = NextStateEvent(page=self)
         wx.PostEvent(self.parent, event)
-    
+
     def define_page_structure(self):
         """
@@ -465 +473 @@
         self.sizer5 = wx.BoxSizer(wx.VERTICAL)
         self.sizer6 = wx.BoxSizer(wx.VERTICAL)
-        
+
         self.sizer0.SetMinSize((PANEL_WIDTH, -1))
         self.sizer1.SetMinSize((PANEL_WIDTH, -1))
@@ -473 +481 @@
         self.sizer5.SetMinSize((PANEL_WIDTH, -1))
         self.sizer6.SetMinSize((PANEL_WIDTH, -1))
-        
+
         self.vbox.Add(self.sizer0)
         self.vbox.Add(self.sizer1)
@@ -481 +489 @@
         self.vbox.Add(self.sizer5)
         self.vbox.Add(self.sizer6)
-        
+
     def set_layout(self):
         """
@@ -490 +498 @@
         self.SetSizer(self.vbox)
         self.Centre()
- 
+
     def set_owner(self, owner):
         """
         set owner of fitpage
-        
+
         :param owner: the class responsible of plotting
-        
+
         """
         self.event_owner = owner
         self.state.event_owner = owner
-        
+
     def get_state(self):
         """
@@ -506 +514 @@
         """
         return self.state
-    
+
     def get_data(self):
         """
@@ -512 +520 @@
         """
         return self.data
-    
+
     def get_data_list(self):
         """
@@ -518 +526 @@
         """
         return self.data_list
-    
+
     def set_manager(self, manager):
         """
         set panel manager
-        
+
         :param manager: instance of plugin fitting
-        
+
         """
         self._manager = manager
         self.state.manager = manager
-        
+
     def populate_box(self, model_dict):
         """
         Store list of model
-        
+
         :param model_dict: dictionary containing list of models
-        
+
         """
         self.model_list_box = model_dict
         self.state.model_list_box = self.model_list_box
         self.initialize_combox()
-        
+
     def set_model_dictionary(self, model_dict):
         """
@@ -551 +559 @@
         """
         put default value in the combobox
-        """  
+        """
         ## fill combox box
         if self.model_list_box is None:
@@ -560 +568 @@
         ## These are called for first time by formfactor_combo_init
         ## itself called from fitpanel only.  If we find that I'm wrong and
-        ## we DO need to initialize somehow here - do it by a call to 
-        ## formfactor_combo_init 
+        ## we DO need to initialize somehow here - do it by a call to
+        ## formfactor_combo_init
         ## self.formfator_combo_init()
-        ## BUT NOT HERE -- make it last line of this 
+        ## BUT NOT HERE -- make it last line of this
         ## method so that structure box is populated before _show_comboox_helper
         ## is called.  Otherwise wx will complain mightily:-)
@@ -575 +583 @@
 #                               self.model_list_box["Shapes"])
             self._populate_box(self.structurebox,
-                                self.model_list_box["Structure Factors"])
+                               self.model_list_box["Structure Factors"])
             self.structurebox.Insert("None", 0, None)
             self.structurebox.SetSelection(0)
@@ -582 +590 @@
             self.structurebox.Disable()
             self.text2.Disable()
-             
+
             if self.model.__class__ in self.model_list_box["P(Q)*S(Q)"]:
                 self.structurebox.Show()
@@ -589 +597 @@
                 self.text2.Enable()
 
-                
+
     def set_dispers_sizer(self):
         """
         fill sizer containing dispersity info
         """
+        #print "==== entering set_dispers_sizer ==="
         self.sizer4.Clear(True)
         name = "Polydispersity and Orientational Distribution"
-        box_description = wx.StaticBox(self, -1, name)
+        box_description = wx.StaticBox(self, wx.ID_ANY, name)
         box_description.SetForegroundColour(wx.BLUE)
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         #----------------------------------------------------
-        self.disable_disp = wx.RadioButton(self, -1, 'Off', (10, 10),
-                                            style=wx.RB_GROUP)
-        self.enable_disp = wx.RadioButton(self, -1, 'On', (10, 30))
+        self.disable_disp = wx.RadioButton(self, wx.ID_ANY, 'Off', (10, 10),
+                                           style=wx.RB_GROUP)
+        self.enable_disp = wx.RadioButton(self, wx.ID_ANY, 'On', (10, 30))
         # best size for MAC and PC
         if ON_MAC:
@@ -608 +617 @@
         else:
             size_q = (20, 15)
-        self.disp_help_bt = wx.Button(self, wx.NewId(), '?',
+        self.disp_help_bt = wx.Button(self, self.ID_DISPERSER_HELP, '?',
                                       style=wx.BU_EXACTFIT,
                                       size=size_q)
@@ -614 +623 @@
                                id=self.disp_help_bt.GetId())
         self.disp_help_bt.SetToolTipString("Helps for Polydispersion.")
-        
+
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param,
-                     id=self.disable_disp.GetId())
+                  id=self.disable_disp.GetId())
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param,
-                   id=self.enable_disp.GetId())
+                  id=self.enable_disp.GetId())
         #MAC needs SetValue
         self.disable_disp.SetValue(True)
@@ -624 +633 @@
         sizer_dispersion.Add((20, 20))
         name = ""  # Polydispersity and \nOrientational Distribution "
-        sizer_dispersion.Add(wx.StaticText(self, -1, name))
+        sizer_dispersion.Add(wx.StaticText(self, wx.ID_ANY, name))
         sizer_dispersion.Add(self.enable_disp)
         sizer_dispersion.Add((20, 20))
@@ -630 +639 @@
         sizer_dispersion.Add((25, 20))
         sizer_dispersion.Add(self.disp_help_bt)
-        
+
         ## fill a sizer for dispersion
         boxsizer1.Add(sizer_dispersion, 0,
-                wx.TOP | wx.BOTTOM | wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE,
-                border=5)
+                      wx.TOP|wx.BOTTOM|wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE,
+                      border=5)
         self.sizer4_4 = wx.GridBagSizer(6, 5)
 
@@ -643 +652 @@
         self.sizer4.Layout()
         self.Layout()
-     
+
         self.Refresh()
         ## saving the state of enable dispersity button
@@ -649 +658 @@
         self.state.disable_disp = self.disable_disp.GetValue()
         self.SetupScrolling()
-    
+
     def onResetModel(self, event):
         """
@@ -667 +676 @@
             previous_state = self.saved_states[name]
             ## reset state of checkbox,textcrtl  and  regular parameters value
-            
+
             self.reset_page(previous_state)
         self.state.m_name = self.m_name
         self.Show(True)
-               
+
     def on_preview(self, event):
         """
@@ -680 +689 @@
         # get the report dialog
         self.state.report(images, canvases)
-        
+
     def on_save(self, event):
         """
@@ -693 +702 @@
                         self._manager.parent._default_save_location
         dlg = wx.FileDialog(self, "Choose a file", self._default_save_location,
-                                        self.window_caption, "*.fitv", wx.SAVE)
+                            self.window_caption, "*.fitv", wx.SAVE)
 
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
             self._default_save_location = os.path.dirname(path)
-            self._manager.parent._default_save_location =\
-                                 self._default_save_location
+            self._manager.parent._default_save_location = \
+                                self._default_save_location
         else:
             return None
@@ -709 +718 @@
         self._manager.save_fit_state(filepath=fName, fitstate=new_state)
         return new_state
-    
+
     def on_copy(self, event):
         """
@@ -726 +735 @@
             wx.CallAfter(self.get_copy)
 
-        
+
     def on_paste(self, event):
         """
@@ -738 +747 @@
         # messages depending on the flag
         #self._copy_info(True)
-        
+
     def _copy_info(self, flag):
         """
         Send event dpemding on flag
-        
+
         : Param flag: flag that distinguish event
         """
@@ -758 +767 @@
         # inform msg to wx
         wx.PostEvent(self._manager.parent,
-                    StatusEvent(status=msg, info=infor))
-        
+                     StatusEvent(status=msg, info=infor))
+
     def _get_time_stamp(self):
         """
@@ -769 +778 @@
         current_date = str(month) + "/" + str(day) + "/" + str(year)
         return current_time, current_date
-      
+
     def on_bookmark(self, event):
         """
@@ -788 +797 @@
         name += "bookmarked at %s on %s" % (current_time, current_date)
         self.saved_states[name] = new_state
-        
+
         ## Add item in the context menu
         msg = "Model saved at %s on %s" % (current_time, current_date)
@@ -794 +803 @@
         msg += " Saved! right click on this page to retrieve this model"
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-        
-        id = wx.NewId()
-        self.popUpMenu.Append(id, name, str(msg))
-        wx.EVT_MENU(self, id, self.onResetModel)
+
+        self.popUpMenu.Append(self.ID_BOOKMARK, name, str(msg))
+        wx.EVT_MENU(self, self.ID_BOOKMARK, self.onResetModel)
         wx.PostEvent(self._manager.parent,
                      AppendBookmarkEvent(title=name,
                                          hint=str(msg),
                                          handler=self._back_to_bookmark))
-    
+
     def _back_to_bookmark(self, event):
         """
@@ -810 +818 @@
         self.onResetModel(event)
         self._draw_model()
-                
+
     def onSetFocus(self, evt):
         """
@@ -817 +825 @@
         """
         return
-    
+
     def read_file(self, path):
         """
         Read two columns file
-        
+
         :param path: the path to the file to read
-        
+
         """
         try:
@@ -856 +864 @@
         """
         return self.state.clone()
-    
+
     def save_current_state(self):
         """
@@ -866 +874 @@
             self.state.disp_list = copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
-            
+
             #model combobox: complex code because of mac's silent error
             if self.structurebox != None:
@@ -885 +893 @@
                 self.state.categorycombobox = self.categorybox.\
                 GetString(cb_select)
-        
+
         self.state.enable2D = copy.deepcopy(self.enable2D)
         self.state.values = copy.deepcopy(self.values)
@@ -902 +910 @@
             self.state.enable_disp = self.enable_disp.GetValue()
             self.state.disable_disp = self.disable_disp.GetValue()
-            
+
         self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self, "enable_smearer"):
@@ -917 +925 @@
         self.state.dxw = copy.deepcopy(self.dxw)
         self.state.slit_smearer = copy.deepcopy(self.slit_smearer.GetValue())
-                  
+
         if len(self._disp_obj_dict) > 0:
             for k, v in self._disp_obj_dict.iteritems():
@@ -926 +934 @@
         ## save plotting range
         self._save_plotting_range()
-        
+
         self.state.orientation_params = []
         self.state.orientation_params_disp = []
@@ -941 +949 @@
         self._copy_parameters_state(self.orientation_params_disp,
                                      self.state.orientation_params_disp)
-        
+
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.fittable_param,
@@ -948 +956 @@
         #save chisqr
         self.state.tcChi = self.tcChi.GetValue()
-        
+
     def save_current_state_fit(self):
         """
@@ -958 +966 @@
             self.state.disp_list = copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
-            
+
         self.state.enable2D = copy.deepcopy(self.enable2D)
         self.state.values = copy.deepcopy(self.values)
@@ -964 +972 @@
         ## save data
         self.state.data = copy.deepcopy(self.data)
-        
+
         if hasattr(self, "enable_disp"):
             self.state.enable_disp = self.enable_disp.GetValue()
             self.state.disable_disp = self.disable_disp.GetValue()
-            
+
         self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self, "enable_smearer"):
@@ -975 +983 @@
             self.state.disable_smearer = \
                                 copy.deepcopy(self.disable_smearer.GetValue())
-            
+
         self.state.pinhole_smearer = \
                                 copy.deepcopy(self.pinhole_smearer.GetValue())
@@ -998 +1006 @@
                 for k, v in self._disp_obj_dict.iteritems():
                     self.state._disp_obj_dict[k] = v
-                        
+
             self.state.values = copy.deepcopy(self.values)
             self.state.weights = copy.deepcopy(self.weights)
-           
+
         ## save plotting range
         self._save_plotting_range()
-        
+
         ## save checkbutton state and txtcrtl values
         self._copy_parameters_state(self.orientation_params,
-                                     self.state.orientation_params)
+                                    self.state.orientation_params)
         self._copy_parameters_state(self.orientation_params_disp,
-                                     self.state.orientation_params_disp)
+                                    self.state.orientation_params_disp)
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.fittable_param,
-                                             self.state.fittable_param)
+                                    self.state.fittable_param)
         self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
-    
+
     def check_invalid_panel(self):
         """
@@ -1025 +1033 @@
             wx.MessageBox(msg, 'Info')
             return  True
-        
+
     def set_model_state(self, state):
         """
@@ -1032 +1040 @@
         self.disp_cb_dict = state.disp_cb_dict
         self.disp_list = state.disp_list
-      
+
         ## set the state of the radio box
         #self.shape_rbutton.SetValue(state.shape_rbutton)
@@ -1038 +1046 @@
         #self.struct_rbutton.SetValue(state.struct_rbutton)
         #self.plugin_rbutton.SetValue(state.plugin_rbutton)
-        
+
         ## fill model combobox
         self._show_combox_helper()
@@ -1052 +1060 @@
                     category_pos = int(ind_cat)
                     break
-            
+
         self.categorybox.Select(category_pos)
         try:
@@ -1064 +1072 @@
                     formfactor_pos = int(ind_form)
                     break
-            
+
         self.formfactorbox.Select(formfactor_pos)
-        
+
         try:
             # to support older version
@@ -1077 +1085 @@
                     structfactor_pos = int(ind_struct)
                     break
-                
+
         self.structurebox.SetSelection(structfactor_pos)
-        
+
         if state.multi_factor != None:
             self.multifactorbox.SetSelection(state.multi_factor)
-            
+
         ## reset state of checkbox,textcrtl  and  regular parameters value
         self._reset_parameters_state(self.orientation_params_disp,
@@ -1094 +1102 @@
         self.enable_disp.SetValue(state.enable_disp)
         self.disable_disp.SetValue(state.disable_disp)
-        
+
         if hasattr(self, "disp_box") and self.disp_box != None:
             self.disp_box.SetSelection(state.disp_box)
@@ -1102 +1110 @@
 
             self._set_dipers_Param(event=None)
-       
+
             if name == "ArrayDispersion":
-                
+
                 for item in self.disp_cb_dict.keys():
-                    
+
                     if hasattr(self.disp_cb_dict[item], "SetValue"):
                         self.disp_cb_dict[item].SetValue(\
                                                     state.disp_cb_dict[item])
                         # Create the dispersion objects
-                        #from sas.models.dispersion_models import ArrayDispersion
-                        from sasmodels.weights import ArrayDispersion
+                        from sas.models.dispersion_models import ArrayDispersion
                         disp_model = ArrayDispersion()
                         if hasattr(state, "values") and \
@@ -1123 +1130 @@
                             else:
                                 self._reset_dispersity()
-                        
+
                         self._disp_obj_dict[item] = disp_model
                         # Set the new model as the dispersion object
                         #for the selected parameter
                         self.model.set_dispersion(item, disp_model)
-                    
+
                         self.model._persistency_dict[item] = \
                                                 [state.values, state.weights]
-                    
+
             else:
                 keys = self.model.getParamList()
@@ -1149 +1156 @@
         self.pinhole_smearer.SetValue(state.pinhole_smearer)
         self.slit_smearer.SetValue(state.slit_smearer)
-        
+
         self.dI_noweight.SetValue(state.dI_noweight)
         self.dI_didata.SetValue(state.dI_didata)
         self.dI_sqrdata.SetValue(state.dI_sqrdata)
         self.dI_idata.SetValue(state.dI_idata)
-        
+
         ## we have two more options for smearing
         if self.pinhole_smearer.GetValue():
@@ -1160 +1167 @@
         elif self.slit_smearer.GetValue():
             self.onSlitSmear(event=None)
-       
+
         ## reset state of checkbox,textcrtl  and dispersity parameters value
         self._reset_parameters_state(self.fittable_param, state.fittable_param)
         self._reset_parameters_state(self.fixed_param, state.fixed_param)
-        
+
         ## draw the model with previous parameters value
         self._onparamEnter_helper()
@@ -1172 +1179 @@
         self._lay_out()
         self.Refresh()
-        
+
     def reset_page_helper(self, state):
         """
         Use page_state and change the state of existing page
-        
+
         :precondition: the page is already drawn or created
-        
+
         :postcondition: the state of the underlying data change as well as the
             state of the graphic interface
@@ -1204 +1211 @@
         else:
             self.set_data(data)
-            
+
         self.enable2D = state.enable2D
         try:
@@ -1214 +1221 @@
         self.disp_cb_dict = state.disp_cb_dict
         self.disp_list = state.disp_list
-      
+
         ## set the state of the radio box
         #self.shape_rbutton.SetValue(state.shape_rbutton)
@@ -1220 +1227 @@
         #self.struct_rbutton.SetValue(state.struct_rbutton)
         #self.plugin_rbutton.SetValue(state.plugin_rbutton)
-        
+
         ## fill model combobox
         self._show_combox_helper()
@@ -1234 +1241 @@
                     category_pos = int(ind_cat)
                     break
-            
+
         self.categorybox.Select(category_pos)
         self._show_combox(None)
@@ -1247 +1254 @@
                     formfactor_pos = int(ind_form)
                     break
-            
+
         self.formfactorbox.Select(formfactor_pos)
-        
+
         try:
             # to support older version
@@ -1260 +1267 @@
                     structfactor_pos = int(ind_struct)
                     break
-            
+
         self.structurebox.SetSelection(structfactor_pos)
 
@@ -1268 +1275 @@
         #draw the panel according to the new model parameter
         self._on_select_model(event=None)
-            
+
         # take care of 2D button
         if data == None and self.model_view.IsEnabled():
@@ -1275 +1282 @@
             else:
                 self.model_view.SetLabel("1D Mode")
-                
+        
         ## set the select all check box to the a given state
         self.cb1.SetValue(state.cb1)
-     
+
         ## reset state of checkbox,textcrtl  and  regular parameters value
         self._reset_parameters_state(self.orientation_params_disp,
@@ -1317 +1324 @@
             self.dI_sqrdata.SetValue(False)
             self.dI_idata.SetValue(False)
- 
+
         ## we have two more options for smearing
         if self.pinhole_smearer.GetValue():
@@ -1333 +1340 @@
                 self.smear_slit_height.SetValue(str(self.dxl))
             if self.dxw != None:
-                self.smear_slit_width.SetValue(str(self.dxw))  
+                self.smear_slit_width.SetValue(str(self.dxw))
             else:
-                self.smear_slit_width.SetValue('')  
+                self.smear_slit_width.SetValue('')
             self.onSlitSmear(event=None)
-        
+
         ## reset state of checkbox,textcrtl  and dispersity parameters value
         self._reset_parameters_state(self.fittable_param, state.fittable_param)
         self._reset_parameters_state(self.fixed_param, state.fixed_param)
-        
+
         ## draw the model with previous parameters value
         self._onparamEnter_helper()
@@ -1348 +1355 @@
         ## reset context menu items
         self._reset_context_menu()
-        
+
         ## set the value of the current state to the state given as parameter
         self.state = state.clone()
         self.state.m_name = self.m_name
-    
+
     def _reset_page_disp_helper(self, state):
         """
@@ -1367 +1374 @@
         self.values = copy.deepcopy(state.values)
         self.weights = copy.deepcopy(state.weights)
-        
+
         for key, disp in state._disp_obj_dict.iteritems():
             # From saved file, disp_model can not be sent in model obj.
@@ -1373 +1380 @@
             if disp.__class__.__name__ == 'str':
                 disp_model = None
-                #com_str = "from sas.models.dispersion_models "
                 com_str = "from sasmodels.weights "
                 com_str += "import %s as disp_func \ndisp_model = disp_func()"
@@ -1415 +1421 @@
                         except:
                             logging.error(sys.exc_info()[1])
-    
+
         # Make sure the check box updated when all checked
         if self.cb1.GetValue():
             self.select_all_param(None)
-      
+
     def _selectDlg(self):
         """
-        open a dialog file to selected the customized dispersity 
+        open a dialog file to selected the customized dispersity
         """
         if self.parent != None:
@@ -1428 +1434 @@
                         self._manager.parent.get_save_location()
         dlg = wx.FileDialog(self, "Choose a weight file",
-                                self._default_save_location, "",
-                                "*.*", wx.OPEN)
+                            self._default_save_location, "",
+                            "*.*", wx.OPEN)
         path = None
         if dlg.ShowModal() == wx.ID_OK:
@@ -1440 +1446 @@
         reset the context menu
         """
+        ids = iter(self._id_pool)  # Reusing ids for context menu
         for name, _ in self.state.saved_states.iteritems():
             self.number_saved_state += 1
             ## Add item in the context menu
-            id = wx.NewId()
+            wx_id = ids.next()
             msg = 'Save model and state %g' % self.number_saved_state
-            self.popUpMenu.Append(id, name, msg)
-            wx.EVT_MENU(self, id, self.onResetModel)
-    
+            self.popUpMenu.Append(wx_id, name, msg)
+            wx.EVT_MENU(self, wx_id, self.onResetModel)
+
     def _reset_plotting_range(self, state):
         """
@@ -1466 +1473 @@
         self.state.formfactorcombobox = self.formfactorbox.GetLabel()
         self.state.categorycombobox = self.categorybox.GetLabel()
-       
+
         ## post state to fit panel
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
-        
+
     def _save_plotting_range(self):
         """
@@ -1478 +1485 @@
         self.state.qmax = self.qmax_x
         self.state.npts = self.npts_x
-            
+
     def _onparamEnter_helper(self):
         """
@@ -1495 +1502 @@
             try:
                 is_modified = self._check_value_enter(self.fittable_param,
-                                                     is_modified)
+                                                      is_modified)
                 is_modified = self._check_value_enter(self.fixed_param,
                                                       is_modified)
@@ -1515 +1522 @@
                     self.qmax_x = tempmax
                     is_modified = True
-            
+
                 if is_2Ddata:
                     # set mask
                     is_modified = self._validate_Npts()
-                    
+
             else:
                 self.fitrange = False
-                
+
             if not self.data.is_data:
                 is_modified = True
@@ -1542 +1549 @@
                 self.Refresh()
         return is_modified
-    
+
     def _update_paramv_on_fit(self):
         """
@@ -1567 +1574 @@
             self._check_value_enter(self.parameters, is_modified)
 
-            # If qmin and qmax have been modified, update qmin and qmax and 
+            # If qmin and qmax have been modified, update qmin and qmax and
             # Here we should check whether the boundaries have been modified.
-            # If qmin and qmax have been modified, update qmin and qmax and 
+            # If qmin and qmax have been modified, update qmin and qmax and
             # set the is_modified flag to True
             self.fitrange = self._validate_qrange(self.qmin, self.qmax)
@@ -1596 +1603 @@
                                                   qmax=float(self.qmax_x),
                                                   enable_smearer=enable_smearer,
-                                                      draw=False)
+                                                  draw=False)
                 elif not self._is_2D():
                     enable_smearer = not self.disable_smearer.GetValue()
@@ -1605 +1612 @@
                                               qmax=float(self.qmax_x),
                                               enable_smearer=enable_smearer,
-                                                 draw=False)
+                                              draw=False)
                     if self.data != None:
                         index_data = ((self.qmin_x <= self.data.x) & \
@@ -1641 +1648 @@
             msg += " model or Fitting range is not valid!!!  "
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-        
+
         try:
             self.save_current_state()
         except:
             logging.error(sys.exc_info()[1])
-   
+
         return flag
-               
+
     def _is_modified(self, is_modified):
         """
@@ -1654 +1661 @@
         """
         return is_modified
-                       
+
     def _reset_parameters_state(self, listtorestore, statelist):
         """
@@ -1693 +1700 @@
                 item_page[5].Show(item_page_info[5][0])
                 item_page[5].SetValue(item_page_info[5][1])
-                
+
             if item_page[6] != None:
                 ## show of hide the text crtl for fitting error
                 item_page[6].Show(item_page_info[6][0])
                 item_page[6].SetValue(item_page_info[6][1])
-                    
+
     def _reset_strparam_state(self, listtorestore, statelist):
         """
@@ -1707 +1714 @@
 
         listtorestore = copy.deepcopy(statelist)
-        
+
         for j in range(len(listtorestore)):
             item_page = listtorestore[j]
             item_page_info = statelist[j]
             ##change the state of the check box for simple parameters
-            
+
             if item_page[0] != None:
                 item_page[0].SetValue(format_number(item_page_info[0], True))
@@ -1724 +1731 @@
                 item_page[2].SetValue(selection)
                 self.model.setParam(param_name, selection)
-                                      
+
     def _copy_parameters_state(self, listtocopy, statelist):
         """
         copy the state of button
-        
+
         :param listtocopy: the list of check button to copy
         :param statelist: list of state object to store the current state
-        
+
         """
         if len(listtocopy) == 0:
             return
-       
+
         for item in listtocopy:
-  
+
             checkbox_state = None
             if item[0] != None:
@@ -1753 +1760 @@
                 error_value = item[4].GetValue()
                 error_state = item[4].IsShown()
-                
+
             min_value = None
             min_state = None
@@ -1759 +1766 @@
                 min_value = item[5].GetValue()
                 min_state = item[5].IsShown()
-                
+
             max_value = None
             max_state = None
@@ -1768 +1775 @@
             if item[7] != None:
                 unit = item[7].GetLabel()
-               
+
             statelist.append([checkbox_state, parameter_name, parameter_value,
                               static_text, [error_state, error_value],
                               [min_state, min_value],
                               [max_state, max_value], unit])
-           
-                
+
+
     def _draw_model(self, update_chisqr=True, source='model'):
         """
@@ -1780 +1787 @@
         The method will use the data member from the model page
         to build a call to the fitting perspective manager.
-        
+
         :param chisqr: update chisqr value [bool]
         """
         wx.CallAfter(self._draw_model_after, update_chisqr, source)
-        
+
     def _draw_model_after(self, update_chisqr=True, source='model'):
         """
@@ -1790 +1797 @@
         The method will use the data member from the model page
         to build a call to the fitting perspective manager.
-        
+
         :param chisqr: update chisqr value [bool]
         """
@@ -1818 +1825 @@
                                     source='model',
                                     weight=weight)
-       
+
     def _on_show_sld(self, event=None):
         """
@@ -1833 +1840 @@
         sld_data.name = 'SLD'
         sld_data.axes = self.sld_axes
-        self.panel = SLDPanel(self, data=sld_data, axes=self.sld_axes, id=-1)
+        self.panel = SLDPanel(self, data=sld_data, axes=self.sld_axes,
+                              id=wx.ID_ANY)
         self.panel.ShowModal()
-        
+
     def _set_multfactor_combobox(self, multiplicity=10):
         """
@@ -1845 +1853 @@
             self.multifactorbox.Append(str(idx), int(idx))
         self._hide_multfactor_combobox()
-        
+
     def _show_multfactor_combobox(self):
         """
@@ -1855 +1863 @@
         if not self.multifactorbox.IsShown():
             self.multifactorbox.Show(True)
-             
+
     def _hide_multfactor_combobox(self):
         """
@@ -1865 +1873 @@
         if self.multifactorbox.IsShown():
             self.multifactorbox.Hide()
-    
+
     def formfactor_combo_init(self):
         """
@@ -1871 +1879 @@
         """
         self._show_combox(None)
-                
+
     def _show_combox_helper(self):
         """
@@ -1904 +1912 @@
                          StatusEvent(status=msg, info="error"))
         self._populate_box(self.formfactorbox, m_list)
-    
-    def _on_modify_cat(self, event=None):  
+
+    def _on_modify_cat(self, event=None):
         """
         Called when category manager is opened
         """
-        self._manager.parent.on_category_panel(event)  
-        
+        self._manager.parent.on_category_panel(event)
+
     def _show_combox(self, event=None):
         """
@@ -1924 +1932 @@
         self.Layout()
         self.Refresh()
-  
+
     def _populate_box(self, combobox, list):
         """
         fill combox box with dict item
-        
+
         :param list: contains item to fill the combox
             item must model class
@@ -1942 +1950 @@
                     name = model.name
                 mlist.append((name, models))
-                
+
         # Sort the models
         mlist_sorted = sorted(mlist)
@@ -1948 +1956 @@
             combobox.Append(item[0], item[1])
         return 0
-    
+
     def _onQrangeEnter(self, event):
         """
         Check validity of value enter in the Q range field
-        
+
         """
         tcrtl = event.GetEventObject()
@@ -2005 +2013 @@
             self.create_default_data()
         self._draw_model()
-                   
+
     def _theory_qrange_enter(self, event):
         """
         Check validity of value enter in the Q range field
         """
-        
+
         tcrtl = event.GetEventObject()
         #Clear msg if previously shown.
@@ -2062 +2070 @@
         self.create_default_data()
         self._draw_model()
-                   
+
     def _on_select_model_helper(self):
         """
@@ -2088 +2096 @@
             self.structurebox.Enable()
             self.text2.Enable()
-            
+
         if form_factor != None:
             # set multifactor for Mutifunctional models
@@ -2105 +2113 @@
                     # default value
                     m_id = 1
-                    
+
                 self.multi_factor = self.multifactorbox.GetClientData(m_id)
                 if self.multi_factor == None:
@@ -2133 +2141 @@
             self.show_sld_button.Hide()
             self.multi_factor = None
-              
+
         s_id = self.structurebox.GetCurrentSelection()
         struct_factor = self.structurebox.GetClientData(s_id)
-        
+
         if  struct_factor != None:
             from sas.models.MultiplicationModel import MultiplicationModel
@@ -2151 +2159 @@
         # check if model has magnetic parameters
         if len(self.model.magnetic_params) > 0:
-            self._has_magnetic = True 
+            self._has_magnetic = True
         else:
-            self._has_magnetic = False  
+            self._has_magnetic = False
         ## post state to fit panel
         self.state.parameters = []
@@ -2163 +2171 @@
         self.on_set_focus(None)
         self.Layout()
-        
+
     def _validate_qrange(self, qmin_ctrl, qmax_ctrl):
         """
         Verify that the Q range controls have valid values
         and that Qmin < Qmax.
-        
+
         :param qmin_ctrl: text control for Qmin
         :param qmax_ctrl: text control for Qmax
-        
+
         :return: True is the Q range is value, False otherwise
-        
+
         """
         qmin_validity = check_float(qmin_ctrl)
@@ -2197 +2205 @@
                 return False
         return True
-    
+
     def _validate_Npts(self):
         """
@@ -2232 +2240 @@
                 self.Npts_fit.SetValue(str(len(index_data[index_data == True])))
                 self.fitrange = True
-            
+
         return flag
 
@@ -2267 +2275 @@
                 self.Npts_fit.SetValue(str(len(index_data[index_data == True])))
                 self.fitrange = True
-            
+
         return flag
-    
+
     def _check_value_enter(self, list, modified):
         """
@@ -2291 +2299 @@
             #try:
             name = str(item[1])
-            
+
             if string.find(name, ".npts") == -1 and \
                                         string.find(name, ".nsigmas") == -1:
@@ -2297 +2305 @@
                 param_min = None
                 param_max = None
-               
+
                 ## check minimun value
                 if item[5] != None and item[5] != "":
@@ -2306 +2314 @@
                                 if numpy.isfinite(param_min):
                                     item[2].SetValue(format_number(param_min))
-                            
+
                             item[5].SetBackgroundColour(wx.WHITE)
                             item[2].SetBackgroundColour(wx.WHITE)
-                                           
+
                         except:
                             msg = "Wrong fit parameter range entered"
@@ -2324 +2332 @@
                                 if numpy.isfinite(param_max):
                                     item[2].SetValue(format_number(param_max))
-                            
+
                             item[6].SetBackgroundColour(wx.WHITE)
                             item[2].SetBackgroundColour(wx.WHITE)
@@ -2333 +2341 @@
                             raise ValueError, msg
                         is_modified = True
-                
+
                 if param_min != None and param_max != None:
                     if not self._validate_qrange(item[5], item[6]):
@@ -2340 +2348 @@
                         wx.PostEvent(self._manager.parent,
                                      StatusEvent(status=msg))
-                
+
                 if name in self.model.details.keys():
                     self.model.details[name][1:3] = param_min, param_max
@@ -2361 +2369 @@
                 msg = "Wrong Fit parameter value entered "
                 wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-                
+
         return is_modified
-        
+
     def _set_dipers_Param(self, event):
         """
@@ -2382 +2390 @@
 
         self._reset_dispersity()
-    
+
         if self.model == None:
             self.model_disp.Hide()
@@ -2390 +2398 @@
         if self.enable_disp.GetValue():
             ## layout for model containing no dispersity parameters
-            
+
             self.disp_list = self.model.getDispParamList()
-             
+
             if len(self.disp_list) == 0 and len(self.disp_cb_dict) == 0:
                 self._layout_sizer_noDipers()
@@ -2400 +2408 @@
         else:
             self.sizer4_4.Clear(True)
-            
+
         ## post state to fit panel
         self.save_current_state()
@@ -2408 +2416 @@
         #draw the model with the current dispersity
         self._draw_model()
-        self.sizer4_4.Layout()
-        self.sizer5.Layout()
-        self.Layout()
-        self.Refresh()
-          
+        ## Need to use FitInside again here to replace the next four lines.
+        ## Otherwised polydispersity off does not resize the scrollwindow. 
+        ## PDB Nov 28, 2015
+        self.FitInside()
+#        self.sizer4_4.Layout()
+#        self.sizer5.Layout()
+#        self.Layout()
+#        self.Refresh()
+
     def _layout_sizer_noDipers(self):
         """
@@ -2422 +2434 @@
         self.fixed_param = []
         self.orientation_params_disp = []
-        
+
         self.sizer4_4.Clear(True)
         text = "No polydispersity available for this model"
-        model_disp = wx.StaticText(self, -1, text)
+        model_disp = wx.StaticText(self, wx.ID_ANY, text)
         self.sizer4_4.Add(model_disp, (iy, ix), (1, 1),
                           wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 10)
         self.sizer4_4.Layout()
         self.sizer4.Layout()
-    
+
     def _reset_dispersity(self):
         """
@@ -2443 +2455 @@
                 if item in self.param_toFit:
                     self.param_toFit.remove(item)
-         
+
         self.fittable_param = []
         self.fixed_param = []
@@ -2462 +2474 @@
                 # Go back to Gaussian model (with 0 pts)
                 disp_model = GaussianDispersion()
-               
+
                 self._disp_obj_dict[p] = disp_model
                 # Set the new model as the dispersion object
@@ -2475 +2487 @@
         self.Layout()
         self.Refresh()
-                  
+
     def _on_select_Disp(self, event):
         """
@@ -2488 +2500 @@
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
-        
+
         self.sizer4_4.Layout()
         self.sizer4.Layout()
         self.SetupScrolling()
-    
+
     def _on_disp_func(self, event=None):
         """
         Select a distribution function for the polydispersion
-        
+
         :Param event: ComboBox event
         """
@@ -2512 +2524 @@
             disp_name = disp_box.GetValue()
             dispersity = disp_box.GetClientData(selection)
-    
+
             #disp_model =  GaussianDispersion()
             disp_model = dispersity()
@@ -2530 +2542 @@
                 self.model.set_dispersion(param_name, disp_model)
                 self.state._disp_obj_dict[name1] = disp_model
- 
+
                 value1 = str(format_number(self.model.getParam(name1), True))
                 value2 = str(format_number(self.model.getParam(name2)))
@@ -2558 +2570 @@
             for item in self.fixed_param:
                 if item[1] == name2:
-                    item[2].SetValue(value2) 
+                    item[2].SetValue(value2)
                     # Disable Npts for array
                     if disp_name.lower() == "array":
@@ -2571 +2583 @@
                     else:
                         item[2].Enable()
-                
+
             # Make sure the check box updated when all checked
             if self.cb1.GetValue():
@@ -2592 +2604 @@
             wx.PostEvent(self._manager.parent,
                          StatusEvent(status=msg, info="error"))
-        
+
     def _set_array_disp(self, name=None, disp=None):
         """
         Set array dispersion
-        
+
         :param name: name of the parameter for the dispersion to be set
         :param disp: the polydisperion object
@@ -2613 +2625 @@
         self._default_save_location = os.path.dirname(path)
         if self._manager != None:
-            self._manager.parent._default_save_location =\
+            self._manager.parent._default_save_location = \
                              self._default_save_location
 
         basename = os.path.basename(path)
         values, weights = self.read_file(path)
-        
+
         # If any of the two arrays is empty, notify the user that we won't
         # proceed
@@ -2631 +2643 @@
                                     values=values, weights=weights)
         return basename
-    
+
     def _set_array_disp_model(self, name=None, disp=None,
                               values=[], weights=[]):
         """
         Set array dispersion model
-        
+
         :param name: name of the parameter for the dispersion to be set
         :param disp: the polydisperion object
@@ -2665 +2677 @@
         self.state.model._persistency_dict[name.split('.')[0]] = \
                                         [values, weights]
-                                        
+
     def _del_array_values(self, name=None):
         """
         Reset array dispersion
-        
+
         :param name: name of the parameter for the dispersion to be set
         """
@@ -2683 +2695 @@
         except:
             logging.error(sys.exc_info()[1])
-                                            
+
     def _lay_out(self):
         """
         returns self.Layout
-        
+
         :Note: Mac seems to like this better when self.
             Layout is called after fitting.
@@ -2694 +2706 @@
         self.Layout()
         return
-    
+
     def _sleep4sec(self):
         """
@@ -2703 +2715 @@
         if ON_MAC == True:
             time.sleep(1)
-            
+
     def _find_polyfunc_selection(self, disp_func=None):
         """
         FInd Comboox selection from disp_func
-        
+
         :param disp_function: dispersion distr. function
         """
@@ -2721 +2733 @@
         except:
             return 3
-                            
+
     def on_reset_clicked(self, event):
         """
@@ -2733 +2745 @@
             flag = False
             return
-            
+
         elif self.data.__class__.__name__ == "Data2D":
             data_min = 0
@@ -2739 +2751 @@
             y = max(math.fabs(self.data.ymin), math.fabs(self.data.ymax))
             self.qmin_x = data_min
-            self.qmax_x = math.sqrt(x*x + y*y)
+            self.qmax_x = math.sqrt(x * x + y * y)
             #self.data.mask = numpy.ones(len(self.data.data),dtype=bool)
             # check smearing
@@ -2749 +2761 @@
                 else:
                     flag = True
-                    
+
         elif self.data == None:
             self.qmin_x = _QMIN_DEFAULT
@@ -2755 +2767 @@
             self.num_points = _NPTS_DEFAULT
             self.state.npts = self.num_points
-            
+
         elif self.data.__class__.__name__ != "Data2D":
             self.qmin_x = min(self.data.x)
@@ -2771 +2783 @@
         else:
             flag = False
-            
+
         if flag == False:
             msg = "Cannot Plot :Must enter a number!!!  "
@@ -2788 +2800 @@
         self.state.qmin = self.qmin_x
         self.state.qmax = self.qmax_x
-        
+
         #reset the q range values
         self._reset_plotting_range(self.state)
         self._draw_model()
-        
+
     def select_log(self, event):
         """
@@ -2801 +2813 @@
         """
         Get the images of the plots corresponding this panel for report
-        
+
         : return graphs: list of figures
         : Need Move to guiframe
@@ -2825 +2837 @@
                         # append to the list
                         graphs.append(item2.figure)
-                        canvases.append(item2.canvas)  
+                        canvases.append(item2.canvas)
             except:
                 # Not for control panels
@@ -2856 +2868 @@
             name = self.formfactorbox.GetValue()
             _PageAnchor = '#' + name.lower()
-            _doc_viewer = DocumentationWindow(self, -1, _TreeLocation,
+            _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation,
                                               _PageAnchor, name + " Help")
         else:
-            _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "",
-                                                "General Model Help")
+            _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation,
+                                              "", "General Model Help")
 
 
@@ -2875 +2887 @@
         :param evt: on Description Button pressed event
         """
-        
+
         if self.model == None:
             name = 'index.html'
@@ -2881 +2893 @@
             name = self.formfactorbox.GetValue()
 
-                msg = 'Model description:\n'
+        msg = 'Model description:\n'
         info = "Info"
         if self.model != None:
 #                frame.Destroy()
-                if str(self.model.description).rstrip().lstrip() == '':
-                    msg += "Sorry, no information is available for this model."
-                else:
-                    msg += self.model.description + '\n'
-                wx.MessageBox(msg, info)
+            if str(self.model.description).rstrip().lstrip() == '':
+                msg += "Sorry, no information is available for this model."
             else:
+                msg += self.model.description + '\n'
+            wx.MessageBox(msg, info)
+        else:
             msg += "You must select a model to get information on this"
             wx.MessageBox(msg, info)
@@ -2911 +2923 @@
 
         _TreeLocation = "_images/M_angles_pic.bmp"
-        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "",
+        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "",
                                           "Magnetic Angle Defintions")
 
-    def _on_mag_help(self, event):    
+    def _on_mag_help(self, event):
         """
         Bring up Magnetic Angle definition bmp image whenever the ? button
@@ -2931 +2943 @@
 
         _TreeLocation = "user/perspectives/fitting/mag_help.html"
-        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "",
+        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "",
                                           "Polarized Beam/Magnetc Help")
 
-    def _on_mag_on(self, event):    
+    def _on_mag_on(self, event):
         """
         Magnetic Parameters ON/OFF
@@ -2955 +2967 @@
                     #reset mag value to zero fo safety
                     self.model.setParam(key, 0.0)
-                    
-        self.Show(False)    
+
+        self.Show(False)
         self.set_model_param_sizer(self.model)
         #self._set_sizer_dispersion() 
@@ -2962 +2974 @@
         self.SetupScrolling()
         self.Show(True)
-            
+
     def on_pd_help_clicked(self, event):
         """
@@ -2972 +2984 @@
         webbrowser does not pass anything past the # to the browser when it is
         running "file:///...."
-        
+
         :param evt: Triggers on clicking ? in polydispersity box
         """
@@ -2978 +2990 @@
         _TreeLocation = "user/perspectives/fitting/pd_help.html"
         _PageAnchor = ""
-        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation,
+        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation,
                                           _PageAnchor, "Polydispersity Help")
-        
+
     def on_left_down(self, event):
         """
@@ -2995 +3007 @@
         # make event free
         event.Skip()
-        
+
     def get_copy(self):
         """
@@ -3004 +3016 @@
         self._copy_info(flag)
         return flag
-            
+
     def get_copy_params(self):
         """
@@ -3012 +3024 @@
         # Do it if params exist
         if  self.parameters != []:
-            
+
             # go through the parameters
             strings = self._get_copy_helper(self.parameters,
                                            self.orientation_params)
             content += strings
-            
+
             # go through the fittables
             strings = self._get_copy_helper(self.fittable_param,
@@ -3027 +3039 @@
                                            self.orientation_params_disp)
             content += strings
-                
+
             # go through the str params
             strings = self._get_copy_helper(self.str_parameters,
@@ -3060 +3072 @@
                 content += param[1] #parameter name
                 content += tab
-                content += param[1]+"_err"
+                content += param[1] + "_err"
                 content += tab
 
@@ -3068 +3080 @@
             for param in self.parameters:
                 content += param[2].GetValue() #value
-                content +=tab
+                content += tab
                 content += param[4].GetValue() #error
-                content +=tab
+                content += tab
 
             return content
@@ -3106 +3118 @@
 
             for index, param in enumerate(self.parameters):
-                content += param[1].replace('_','\_') #parameter name
+                content += param[1].replace('_', '\_') #parameter name
                 content += ' & '
-                content += param[1].replace('_','\_')+"\_err"
-                if index < len(self.parameters)-1:
+                content += param[1].replace('_', '\_') + "\_err"
+                if index < len(self.parameters) - 1:
                     content += ' & '
             content += '\\\\ \\hline'
@@ -3119 +3131 @@
                 content += ' & '
                 content += param[4].GetValue() #parameter error
-                if index < len(self.parameters)-1:
+                if index < len(self.parameters) - 1:
                     content += ' & '
             content += '\\\\ \\hline'
@@ -3142 +3154 @@
             return True
         return None
-    
+
     def _get_copy_helper(self, param, orient_param):
         """
         Helping get value and name of the params
-        
+
         : param param:  parameters
         : param orient_param = oritational params
@@ -3163 +3175 @@
             except:
                 logging.error(sys.exc_info()[1])
-            
+
             # 2D
             if self.data.__class__.__name__ == "Data2D":
@@ -3185 +3197 @@
             # add to the content
             if disfunc != '':
-                
+
                 disfunc = ',' + disfunc
             # Need to support array func for copy/paste
@@ -3201 +3213 @@
 
         return content
-   
+
     def get_clipboard(self):
         """
@@ -3221 +3233 @@
             wx.TheClipboard.Close()
         return text
-    
+
     def get_paste(self):
         """
@@ -3230 +3242 @@
         self._copy_info(flag)
         return flag
-        
+
     def get_paste_params(self, text=''):
         """
@@ -3259 +3271 @@
                     val = [float(a_val) for a_val in array_values[1:]]
                     weit = [float(a_weit) for a_weit in array_weights[1:]]
-                    
+
                     context[name].append(val)
                     context[name].append(weit)
@@ -3282 +3294 @@
             self._get_paste_helper(self.fixed_param,
                                    self.orientation_params_disp, context)
-            
+
             # go through the str params
             self._get_paste_helper(self.str_parameters,
                                    self.orientation_params, context)
-                
+
             return True
         return None
-    
+
     def _get_paste_helper(self, param, orient_param, content):
         """
         Helping set values of the params
-        
+
         : param param:  parameters
         : param orient_param: oritational params
@@ -3321 +3333 @@
                             fun_val = self.model.fun_list[content[name][1]]
                             self.model.setParam(name, fun_val)
-                    
+
                     value = content[name][1:]
                     self._paste_poly_help(item, value)
@@ -3367 +3379 @@
                         if is_true != None:
                             item[0].SetValue(is_true)
-                        
+
     def _paste_poly_help(self, item, value):
         """
         Helps get paste for poly function
-        
+
         :param item: Gui param items
         :param value: the values for parameter ctrols
@@ -3411 +3423 @@
                                             [self.state.values,
                                              self.state.weights]
-                         
+
             except:
                 logging.error(sys.exc_info()[1])
                 print "Error in BasePage._paste_poly_help: %s" % \
                                         sys.exc_info()[1]
-    
+
     def _set_disp_array_cb(self, item):
         """
@@ -3430 +3442 @@
         item[6].SetValue('')
         item[6].Enable(False)
-        
+
     def update_pinhole_smear(self):
         """
@@ -3452 +3464 @@
             if not os.path.isfile(categorization_file):
                 categorization_file = CategoryInstaller.get_default_file()
-            cat_file = open(categorization_file, 'rb')                           
+            cat_file = open(categorization_file, 'rb')
             self.master_category_dict = json.load(cat_file)
             self._regenerate_model_dict()
@@ -3464 +3476 @@
     def _regenerate_model_dict(self):
         """
-        regenerates self.by_model_dict which has each model name as the 
+        regenerates self.by_model_dict which has each model name as the
         key and the list of categories belonging to that model
         along with the enabled mapping
@@ -3473 +3485 @@
                 self.by_model_dict[model].append(category)
                 self.model_enabled_dict[model] = enabled
-    
+
     def _populate_listbox(self):
         """
@@ -3485 +3497 @@
         if not uncat_str in cat_list:
             cat_list.append(uncat_str)
-        
+
         for category in cat_list:
             if category != '':
@@ -3493 +3505 @@
             self.categorybox.SetSelection(0)
         else:
-            self.categorybox.SetSelection( \
+            self.categorybox.SetSelection(\
                 self.categorybox.GetSelection())
         #self._on_change_cat(None)
@@ -3513 +3525 @@
 
         else:
-            for (model,enabled) in sorted(self.master_category_dict[category],
-                                      key = lambda name: name[0]):
+            for (model, enabled) in sorted(self.master_category_dict[category],
+                                      key=lambda name: name[0]):
                 if(enabled):
                     self.model_box.Append(model)
@@ -3522 +3534 @@
         fill sizer containing model info
         """
+        # This should only be called once per fit tab
+        #print "==== Entering _fill_model_sizer"
         ##Add model function Details button in fitpanel.
         ##The following 3 lines are for Mac. Let JHC know before modifying...
@@ -3527 +3541 @@
         self.formfactorbox = None
         self.multifactorbox = None
-        self.mbox_description = wx.StaticBox(self, -1, str(title))
+        self.mbox_description = wx.StaticBox(self, wx.ID_ANY, str(title))
         boxsizer1 = wx.StaticBoxSizer(self.mbox_description, wx.VERTICAL)
         sizer_cat = wx.BoxSizer(wx.HORIZONTAL)
         self.mbox_description.SetForegroundColour(wx.RED)
-        id = wx.NewId()
-        self.model_func = wx.Button(self, id, 'Help', size=(80, 23))
-        self.model_func.Bind(wx.EVT_BUTTON, self.on_function_help_clicked, id=id)
+        wx_id = self._ids.next()
+        self.model_func = wx.Button(self, wx_id, 'Help', size=(80, 23))
+        self.model_func.Bind(wx.EVT_BUTTON, self.on_function_help_clicked,
+                             id=wx_id)
         self.model_func.SetToolTipString("Full Model Function Help")
-        id = wx.NewId()
-        self.model_help = wx.Button(self, id, 'Description', size=(80, 23))
-        self.model_help.Bind(wx.EVT_BUTTON, self.on_model_help_clicked, id=id)
+        wx_id = self._ids.next()
+        self.model_help = wx.Button(self, wx_id, 'Description', size=(80, 23))
+        self.model_help.Bind(wx.EVT_BUTTON, self.on_model_help_clicked,
+                             id=wx_id)
         self.model_help.SetToolTipString("Short Model Function Description")
-        id = wx.NewId()
-        self.model_view = wx.Button(self, id, "Show 2D", size=(80, 23))
-        self.model_view.Bind(wx.EVT_BUTTON, self._onModel2D, id=id)
+        wx_id = self._ids.next()
+        self.model_view = wx.Button(self, wx_id, "Show 2D", size=(80, 23))
+        self.model_view.Bind(wx.EVT_BUTTON, self._onModel2D, id=wx_id)
         hint = "toggle view of model from 1D to 2D  or 2D to 1D"
         self.model_view.SetToolTipString(hint)
-        
-        cat_set_box = wx.StaticBox(self, -1, 'Category')
+
+        cat_set_box = wx.StaticBox(self, wx.ID_ANY, 'Category')
         sizer_cat_box = wx.StaticBoxSizer(cat_set_box, wx.HORIZONTAL)
         sizer_cat_box.SetMinSize((200, 50))
-        self.categorybox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        self.categorybox.SetToolTip( wx.ToolTip("Select a Category/Type") )
+        self.categorybox = wx.ComboBox(self, wx.ID_ANY,
+                                       style=wx.CB_READONLY)
+        self.categorybox.SetToolTip(wx.ToolTip("Select a Category/Type"))
         self._populate_listbox()
-        wx.EVT_COMBOBOX(self.categorybox, -1, self._show_combox)
-        #self.shape_rbutton = wx.RadioButton(self, -1, 'Shapes',
+        wx.EVT_COMBOBOX(self.categorybox, wx.ID_ANY, self._show_combox)
+        #self.shape_rbutton = wx.RadioButton(self, wx.ID_ANY, 'Shapes',
         #                                     style=wx.RB_GROUP)
-        #self.shape_indep_rbutton = wx.RadioButton(self, -1,
+        #self.shape_indep_rbutton = wx.RadioButton(self, wx.ID_ANY,
         #                                          "Shape-Independent")
-        #self.struct_rbutton = wx.RadioButton(self, -1, "Structure Factor ")
-        #self.plugin_rbutton = wx.RadioButton(self, -1, "Uncategorized")
-                
+        #self.struct_rbutton = wx.RadioButton(self, wx.ID_ANY,
+        #                                     "Structure Factor ")
+        #self.plugin_rbutton = wx.RadioButton(self, wx.ID_ANY,
+        #                                     "Uncategorized")
+
         #self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
         #                   id=self.shape_rbutton.GetId())
@@ -3568 +3587 @@
         #                    id=self.plugin_rbutton.GetId())
         #MAC needs SetValue
-        
-        show_cat_button = wx.Button(self, -1, "Modify")
+
+        show_cat_button = wx.Button(self, wx.ID_ANY, "Modify")
         cat_tip = "Modify model categories \n"
         cat_tip += "(also accessible from the menu bar)."
@@ -3594 +3613 @@
         sizer_selection = wx.BoxSizer(wx.HORIZONTAL)
         mutifactor_selection = wx.BoxSizer(wx.HORIZONTAL)
-        
-        self.text1 = wx.StaticText(self, -1, "")
-        self.text2 = wx.StaticText(self, -1, "P(Q)*S(Q)")
-        self.mutifactor_text = wx.StaticText(self, -1, "No. of Shells: ")
-        self.mutifactor_text1 = wx.StaticText(self, -1, "")
-        self.show_sld_button = wx.Button(self, -1, "Show SLD Profile")
+
+        self.text1 = wx.StaticText(self, wx.ID_ANY, "")
+        self.text2 = wx.StaticText(self, wx.ID_ANY, "P(Q)*S(Q)")
+        self.mutifactor_text = wx.StaticText(self, wx.ID_ANY, "No. of Shells: ")
+        self.mutifactor_text1 = wx.StaticText(self, wx.ID_ANY, "")
+        self.show_sld_button = wx.Button(self, wx.ID_ANY, "Show SLD Profile")
         self.show_sld_button.Bind(wx.EVT_BUTTON, self._on_show_sld)
 
-        self.formfactorbox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        self.formfactorbox.SetToolTip( wx.ToolTip("Select a Model") )
+        self.formfactorbox = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
+        self.formfactorbox.SetToolTip(wx.ToolTip("Select a Model"))
         if self.model != None:
             self.formfactorbox.SetValue(self.model.name)
-        self.structurebox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        self.multifactorbox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
+        self.structurebox = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
+        self.multifactorbox = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
         self.initialize_combox()
-        wx.EVT_COMBOBOX(self.formfactorbox, -1, self._on_select_model)
-
-        wx.EVT_COMBOBOX(self.structurebox, -1, self._on_select_model)
-        wx.EVT_COMBOBOX(self.multifactorbox, -1, self._on_select_model)
+        wx.EVT_COMBOBOX(self.formfactorbox, wx.ID_ANY, self._on_select_model)
+
+        wx.EVT_COMBOBOX(self.structurebox, wx.ID_ANY, self._on_select_model)
+        wx.EVT_COMBOBOX(self.multifactorbox, wx.ID_ANY, self._on_select_model)
         ## check model type to show sizer
         if self.model != None:
             print "_set_model_sizer_selection: disabled."
             #self._set_model_sizer_selection(self.model)
-        
+
         sizer_selection.Add(self.text1)
         sizer_selection.Add((10, 5))
@@ -3625 +3644 @@
         sizer_selection.Add((5, 5))
         sizer_selection.Add(self.structurebox)
-       
+
         mutifactor_selection.Add((13, 5))
         mutifactor_selection.Add(self.mutifactor_text)
@@ -3639 +3658 @@
         boxsizer1.Add((10, 10))
         boxsizer1.Add(mutifactor_selection)
-        
+
         self._set_multfactor_combobox()
         self.multifactorbox.SetSelection(1)
@@ -3645 +3664 @@
         sizer.Add(boxsizer1, 0, wx.EXPAND | wx.ALL, 10)
         sizer.Layout()
-        
+
     def on_smear_helper(self, update=False):
         """
         Help for onSmear if implemented
-        
+
         :param update: force or not to update
         """
@@ -3658 +3677 @@
     def onSmear(self, event):
         """
-        Create a smear object if implemented 
+        Create a smear object if implemented
         """
     def onPinholeSmear(self, event):

src/sas/perspectives/fitting/batchfitpage.py

@@ -38 +38 @@
         fill sizer 0 with data info
         """
-        self.data_box_description = wx.StaticBox(self, -1, 'I(q) Data Source')
+        self.data_box_description = wx.StaticBox(self, wx.ID_ANY, 'I(q) Data Source')
         if check_data_validity(self.data):
             dname_color = wx.BLUE
@@ -47 +47 @@
         #----------------------------------------------------------
         sizer_data = wx.BoxSizer(wx.VERTICAL)
-        text1 = wx.StaticText(self, -1, ' - Choose a file to set initial fit parameters -')
+        text1 = wx.StaticText(self, wx.ID_ANY, ' - Choose a file to set initial fit parameters -')
         text1.SetForegroundColour(wx.RED)
         sizer_data.Add(text1)
-        text2 = wx.StaticText(self, -1, ' - This panel is not designed to view individual fits. - ')
+        text2 = wx.StaticText(self, wx.ID_ANY, ' - This panel is not designed to view individual fits. - ')
         text2.SetForegroundColour(wx.RED)
         sizer_data.Add(text2)
 
         combo = wx.BoxSizer(wx.HORIZONTAL)
-        self.dataSource = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        wx.EVT_COMBOBOX(self.dataSource, -1, self.on_select_data)
+        self.dataSource = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
+        wx.EVT_COMBOBOX(self.dataSource, wx.ID_ANY, self.on_select_data)
         self.dataSource.SetMinSize((_DATA_BOX_WIDTH, -1))
 
-        combo.Add(wx.StaticText(self, -1, 'Name : '))
+        combo.Add(wx.StaticText(self, wx.ID_ANY, 'Name : '))
         combo.Add((0, 5))
         combo.Add(self.dataSource)
@@ -86 +86 @@
 #         
 #         #Sizers
-#         box_description_range = wx.StaticBox(self, -1, str(title))
+#         box_description_range = wx.StaticBox(self, wx.ID_ANY, str(title))
 #         boxsizer_range = wx.StaticBoxSizer(box_description_range, wx.VERTICAL)      
 #         self.sizer_set_smearer = wx.BoxSizer(wx.VERTICAL)
@@ -96 +96 @@
 #         sizer_fit = wx.GridSizer(2, 4, 2, 6)
 #         #Fit button
-#         self.btFit = wx.Button(self, wx.NewId(), 'Fit', size=(88, 25))
+#         self.btFit = wx.Button(self, self._ids.next(), 'Fit', size=(88, 25))
 #         self.default_bt_colour =  self.btFit.GetDefaultAttributes()
 #         self.btFit.Bind(wx.EVT_BUTTON, self._onFit, id= self.btFit.GetId())
@@ -102 +102 @@
 # 
 #         # Update and Draw button
-#         self.draw_button = wx.Button(self, wx.NewId(), 'Compute', size=(88, 24))
+#         self.draw_button = wx.Button(self, self._ids.next(), 'Compute', size=(88, 24))
 #         self.draw_button.Bind(wx.EVT_BUTTON, \
 #                               self._onDraw,id=self.draw_button.GetId())
@@ -122 +122 @@
 #         self.sizer5.Clear(True)
 #      
-#         self.qmin  = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
+#         self.qmin  = ModelTextCtrl(self, wx.ID_ANY, size=(_BOX_WIDTH, 20),
 #                                           style=wx.TE_PROCESS_ENTER, 
 #                                     text_enter_callback = self._onQrangeEnter)
@@ -128 +128 @@
 #         self.qmin.SetToolTipString("Minimun value of Q in linear scale.")
 #      
-#         self.qmax  = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
+#         self.qmax  = ModelTextCtrl(self, wx.ID_ANY, size=(_BOX_WIDTH, 20),
 #                                           style=wx.TE_PROCESS_ENTER, 
 #                                         text_enter_callback=self._onQrangeEnter)
@@ -134 +134 @@
 #         self.qmax.SetToolTipString("Maximum value of Q in linear scale.")
 #         
-#         id = wx.NewId()
+#         id = self._ids.next()
 #         self.reset_qrange =wx.Button(self, id, 'Reset', size=(77, 20))
 #       
@@ -144 +144 @@
 #         sizer = wx.GridSizer(2, 4, 2, 6)
 # 
-#         self.btEditMask = wx.Button(self, wx.NewId(),'Editor', size=(88, 23))
+#         self.btEditMask = wx.Button(self, self._ids.next(),'Editor', size=(88, 23))
 #         self.btEditMask.Bind(wx.EVT_BUTTON, 
 #                              self._onMask,id=self.btEditMask.GetId())
 #         self.btEditMask.SetToolTipString("Edit Mask.")
-#         self.EditMask_title = wx.StaticText(self, -1, ' Masking(2D)')
-# 
-#         sizer.Add(wx.StaticText(self, -1, 'Q range'))     
-#         sizer.Add(wx.StaticText(self, -1, ' Min[1/A]'))
-#         sizer.Add(wx.StaticText(self, -1, ' Max[1/A]'))
+#         self.EditMask_title = wx.StaticText(self, wx.ID_ANY, ' Masking(2D)')
+# 
+#         sizer.Add(wx.StaticText(self, wx.ID_ANY, 'Q range'))
+#         sizer.Add(wx.StaticText(self, wx.ID_ANY, ' Min[1/A]'))
+#         sizer.Add(wx.StaticText(self, wx.ID_ANY, ' Max[1/A]'))
 #         sizer.Add(self.EditMask_title)
 #  

src/sas/perspectives/fitting/fitpage.py

@@ -34 +34 @@
     FitPanel class contains fields allowing to display results when
     fitting  a model and one data
-    
+
     :note: For Fit to be performed the user should check at least one parameter
         on fit Panel window.
@@ -44 +44 @@
         """
         BasicPage.__init__(self, parent, color=color)
-        
+
         ## draw sizer
         self._fill_data_sizer()
@@ -71 +71 @@
         self.create_default_data()
         self._manager.frame.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
-    
+
     def enable_fit_button(self):
         """
@@ -93 +93 @@
         fill sizer 0 with data info
         """
-        self.data_box_description = wx.StaticBox(self, -1, 'I(q) Data Source')
+        self.data_box_description = wx.StaticBox(self, wx.ID_ANY,
+                                                 'I(q) Data Source')
         if check_data_validity(self.data):
             dname_color = wx.BLUE
@@ -102 +103 @@
         #----------------------------------------------------------
         sizer_data = wx.BoxSizer(wx.HORIZONTAL)
-        self.dataSource = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        wx.EVT_COMBOBOX(self.dataSource, -1, self.on_select_data)
+        self.dataSource = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
+        wx.EVT_COMBOBOX(self.dataSource, wx.ID_ANY, self.on_select_data)
         self.dataSource.SetMinSize((_DATA_BOX_WIDTH, -1))
-        sizer_data.Add(wx.StaticText(self, -1, 'Name : '))
+        sizer_data.Add(wx.StaticText(self, wx.ID_ANY, 'Name : '))
         sizer_data.Add(self.dataSource)
         sizer_data.Add((0, 5))
@@ -111 +112 @@
         self.sizer0.Add(boxsizer1, 0, wx.EXPAND | wx.ALL, 10)
         self.sizer0.Layout()
-        
+
     def enable_datasource(self):
         """
@@ -120 +121 @@
         else:
             self.dataSource.Enable()
-            
+
     def fill_data_combobox(self, data_list):
         """
@@ -155 +156 @@
         if len(data_list) == 1:
             self.dataSource.Disable()
-                
+
     def on_select_data(self, event=None):
         """
@@ -167 +168 @@
             data = self.dataSource.GetClientData(pos)
             self.set_data(data)
-    
+
     def _on_fit_complete(self):
         """
@@ -174 +175 @@
         self.fit_started = False
         self.set_fitbutton()
-        
+
     def _is_2D(self):
         """
         Check if data_name is Data2D
-        
+
         :return: True or False
-        
+
         """
         if self.data.__class__.__name__ == "Data2D" or \
@@ -186 +187 @@
             return True
         return False
-            
+
     def _fill_range_sizer(self):
         """
@@ -195 +196 @@
         """
         is_2Ddata = False
-        
+
         # Check if data is 2D
         if self.data.__class__.__name__ == "Data2D" or \
                         self.enable2D:
             is_2Ddata = True
-            
+
         title = "Fitting"
         #smear messages & titles
@@ -217 +218 @@
         smear_message_slit_height_title = "Slit height[1/A]:"
         smear_message_slit_width_title = "Slit width[1/A]:"
-        
+
         self._get_smear_info()
-        
+
         #Sizers
-        box_description_range = wx.StaticBox(self, -1, str(title))
+        box_description_range = wx.StaticBox(self, wx.ID_ANY, str(title))
         box_description_range.SetForegroundColour(wx.BLUE)
         boxsizer_range = wx.StaticBoxSizer(box_description_range, wx.VERTICAL)
@@ -229 +230 @@
         self.sizer_set_masking = wx.BoxSizer(wx.HORIZONTAL)
         sizer_chi2 = wx.BoxSizer(wx.VERTICAL)
-        smear_set_box = wx.StaticBox(self, -1, 'Set Instrumental Smearing')
+        smear_set_box = wx.StaticBox(self, wx.ID_ANY,
+                                     'Set Instrumental Smearing')
         sizer_smearer_box = wx.StaticBoxSizer(smear_set_box, wx.HORIZONTAL)
         sizer_smearer_box.SetMinSize((_DATA_BOX_WIDTH, 60))
-        
-        weighting_set_box = wx.StaticBox(self, -1, \
+
+        weighting_set_box = wx.StaticBox(self, wx.ID_ANY,
                                 'Set Weighting by Selecting dI Source')
         weighting_box = wx.StaticBoxSizer(weighting_set_box, wx.HORIZONTAL)
@@ -239 +241 @@
         weighting_box.SetMinSize((_DATA_BOX_WIDTH, 40))
         #Filling the sizer containing weighting info.
-        self.dI_noweight = wx.RadioButton(self, -1, 'No Weighting',
-                                          style=wx.RB_GROUP)
-        self.dI_didata = wx.RadioButton(self, -1, 'Use dI Data')
-        self.dI_sqrdata = wx.RadioButton(self, -1, 'Use |sqrt(I Data)|')
-        self.dI_idata = wx.RadioButton(self, -1, 'Use |I Data|')
+        self.dI_noweight = wx.RadioButton(self, wx.ID_ANY,
+                                          'No Weighting', style=wx.RB_GROUP)
+        self.dI_didata = wx.RadioButton(self, wx.ID_ANY, 'Use dI Data')
+        self.dI_sqrdata = wx.RadioButton(self, wx.ID_ANY, 'Use |sqrt(I Data)|')
+        self.dI_idata = wx.RadioButton(self, wx.ID_ANY, 'Use |I Data|')
         self.Bind(wx.EVT_RADIOBUTTON, self.onWeighting,
                   id=self.dI_noweight.GetId())
@@ -267 +269 @@
         self.dI_idata.Enable(False)
         weighting_box.Add(sizer_weighting)
-        
+
         # combobox for smear2d accuracy selection
-        self.smear_accuracy = wx.ComboBox(self, -1, size=(50, -1),
-                                          style=wx.CB_READONLY)
+        self.smear_accuracy = wx.ComboBox(self, wx.ID_ANY,
+                                          size=(50, -1), style=wx.CB_READONLY)
         self._set_accuracy_list()
         self.smear_accuracy.SetValue(self.smear2d_accuracy)
         self.smear_accuracy.SetSelection(0)
-        self.smear_accuracy.SetToolTipString(\
+        self.smear_accuracy.SetToolTipString(
             "'Higher' uses more Gaussian points for smearing computation.")
-                   
-        wx.EVT_COMBOBOX(self.smear_accuracy, -1, self._on_select_accuracy)
+
+        wx.EVT_COMBOBOX(self.smear_accuracy, wx.ID_ANY,
+                        self._on_select_accuracy)
 
         #Fit button
-        self.btFit = wx.Button(self, wx.NewId(), 'Fit')
+        self.btFit = wx.Button(self, self._ids.next(), 'Fit')
         self.default_bt_colour = self.btFit.GetDefaultAttributes()
         self.btFit.Bind(wx.EVT_BUTTON, self._onFit, id=self.btFit.GetId())
         self.btFit.SetToolTipString("Start fitting.")
-        
+
         #General Help button
-        self.btFitHelp = wx.Button(self, -1, 'Help')
+        self.btFitHelp = wx.Button(self, wx.ID_ANY, 'Help')
         self.btFitHelp.SetToolTipString("General fitting help.")
         self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp)
@@ -299 +302 @@
         else:
             size_q = (30, 20)  #on MAC
-        self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT,\
-                                     size=size_q)
+        self.btSmearHelp = wx.Button(self, wx.ID_ANY, '?',
+                                     style=wx.BU_EXACTFIT, size=size_q)
         self.btSmearHelp.SetToolTipString("Resolution smearing help.")
         self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp)
         
         #textcntrl for custom resolution
-        self.smear_pinhole_max = ModelTextCtrl(self, -1,
+        self.smear_pinhole_max = ModelTextCtrl(self, wx.ID_ANY,
                             size=(_BOX_WIDTH - 25, 20),
                             style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self.onPinholeSmear)
-        self.smear_pinhole_min = ModelTextCtrl(self, -1,
+        self.smear_pinhole_min = ModelTextCtrl(self, wx.ID_ANY,
                             size=(_BOX_WIDTH - 25, 20),
                             style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self.onPinholeSmear)
-        self.smear_slit_height = ModelTextCtrl(self, -1,
+        self.smear_slit_height = ModelTextCtrl(self, wx.ID_ANY,
                             size=(_BOX_WIDTH - 25, 20),
                             style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self.onSlitSmear)
-        self.smear_slit_width = ModelTextCtrl(self, -1,
+        self.smear_slit_width = ModelTextCtrl(self, wx.ID_ANY,
                             size=(_BOX_WIDTH - 25, 20),
                             style=wx.TE_PROCESS_ENTER,
@@ -323 +326 @@
 
         ## smear
-        self.smear_data_left = BGTextCtrl(self, -1,
-                                         size=(_BOX_WIDTH - 25, 20), style=0)
+        self.smear_data_left = BGTextCtrl(self, wx.ID_ANY,
+                                          size=(_BOX_WIDTH - 25, 20), style=0)
         self.smear_data_left.SetValue(str(self.dq_l))
-        self.smear_data_right = BGTextCtrl(self, -1,
-                                        size=(_BOX_WIDTH - 25, 20), style=0)
+        self.smear_data_right = BGTextCtrl(self, wx.ID_ANY,
+                                           size=(_BOX_WIDTH - 25, 20), style=0)
         self.smear_data_right.SetValue(str(self.dq_r))
 
@@ -337 +340 @@
 
         #Filling the sizer containing instruments smearing info.
-        self.disable_smearer = wx.RadioButton(self, -1,
+        self.disable_smearer = wx.RadioButton(self, wx.ID_ANY,
                                               'None', style=wx.RB_GROUP)
-        self.enable_smearer = wx.RadioButton(self, -1,
-                                             'Use dQ Data')
+        self.enable_smearer = wx.RadioButton(self, wx.ID_ANY, 'Use dQ Data')
         #self.enable_smearer.SetToolTipString(
         #"Click to use the loaded dQ data for smearing.")
-        self.pinhole_smearer = wx.RadioButton(self, -1,
+        self.pinhole_smearer = wx.RadioButton(self, wx.ID_ANY,
                                               'Custom Pinhole Smear')
         #self.pinhole_smearer.SetToolTipString
         #("Click to input custom resolution for pinhole smearing.")
-        self.slit_smearer = wx.RadioButton(self, -1, 'Custom Slit Smear')
+        self.slit_smearer = wx.RadioButton(self, wx.ID_ANY, 'Custom Slit Smear')
         #self.slit_smearer.SetToolTipString
         #("Click to input custom resolution for slit smearing.")
@@ -359 +361 @@
                   id=self.slit_smearer.GetId())
         self.disable_smearer.SetValue(True)
-        
+
         sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10)
         sizer_smearer.Add(self.enable_smearer)
@@ -366 +368 @@
         sizer_smearer.Add(self.btSmearHelp)
         sizer_smearer.Add((10, 10))
-        
+
         # StaticText for chi2, N(for fitting), Npts + Log/linear spacing
-        self.tcChi = BGTextCtrl(self, -1, "-", size=(75, 20), style=0)
+        self.tcChi = BGTextCtrl(self, wx.ID_ANY, "-", size=(75, 20), style=0)
         self.tcChi.SetToolTipString("Chi2/Npts(Fit)")
-        self.Npts_fit = BGTextCtrl(self, -1, "-", size=(75, 20), style=0)
-        self.Npts_fit.SetToolTipString(\
+        self.Npts_fit = BGTextCtrl(self, wx.ID_ANY, "-", size=(75, 20), style=0)
+        self.Npts_fit.SetToolTipString(
                             " Npts : number of points selected for fitting")
-        self.Npts_total = ModelTextCtrl(self, -1,
-                        size=(_BOX_WIDTH, 20),
-                        style=wx.TE_PROCESS_ENTER,
-                        text_enter_callback=self._onQrangeEnter)
+        self.Npts_total = ModelTextCtrl(self, wx.ID_ANY, size=(_BOX_WIDTH, 20),
+                            style=wx.TE_PROCESS_ENTER,
+                            text_enter_callback=self._onQrangeEnter)
         self.Npts_total.SetValue(format_number(self.npts_x))
         self.Npts_total.SetToolTipString(\
                                 " Total Npts : total number of data points")
-                
+
         # Update and Draw button
-        self.draw_button = wx.Button(self, wx.NewId(), 'Compute')
-        self.draw_button.Bind(wx.EVT_BUTTON, \
+        self.draw_button = wx.Button(self, self._ids.next(), 'Compute')
+        self.draw_button.Bind(wx.EVT_BUTTON,
                               self._onDraw, id=self.draw_button.GetId())
         self.draw_button.SetToolTipString("Compute and Draw.")
-        
-        self.points_sizer = wx.BoxSizer(wx.HORIZONTAL) 
-        self.pointsbox = wx.CheckBox(self, -1, 'Log?', (10, 10))
+
+        self.points_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.pointsbox = wx.CheckBox(self, wx.ID_ANY, 'Log?', (10, 10))
         self.pointsbox.SetValue(False)
         self.pointsbox.SetToolTipString("Check mark to use log spaced points")
         wx.EVT_CHECKBOX(self, self.pointsbox.GetId(), self.select_log)
-        
-        self.points_sizer.Add(wx.StaticText(self, -1, 'Npts    '))
+
+        self.points_sizer.Add(wx.StaticText(self, wx.ID_ANY, 'Npts    '))
         self.points_sizer.Add(self.pointsbox)
 
-        box_description_1 = wx.StaticText(self, -1, '   Chi2/Npts')
-        box_description_2 = wx.StaticText(self, -1, 'Npts(Fit)')
+        box_description_1 = wx.StaticText(self, wx.ID_ANY, '   Chi2/Npts')
+        box_description_2 = wx.StaticText(self, wx.ID_ANY, 'Npts(Fit)')
 
         # StaticText for smear
-        self.smear_description_none = wx.StaticText(self, -1,
+        self.smear_description_none = wx.StaticText(self, wx.ID_ANY,
                                     smear_message_none, style=wx.ALIGN_LEFT)
-        self.smear_description_dqdata = wx.StaticText(self,
-                                -1, smear_message_dqdata, style=wx.ALIGN_LEFT)
-        self.smear_description_type = wx.StaticText(self,
-                                     -1, "Type:", style=wx.ALIGN_LEFT)
-        self.smear_description_accuracy_type = wx.StaticText(self, -1,
-                                        "Accuracy:", style=wx.ALIGN_LEFT)
-        self.smear_description_smear_type = BGTextCtrl(self, -1,
+        self.smear_description_dqdata = wx.StaticText(self, wx.ID_ANY,
+                                 smear_message_dqdata, style=wx.ALIGN_LEFT)
+        self.smear_description_type = wx.StaticText(self, wx.ID_ANY,
+                                    "Type:", style=wx.ALIGN_LEFT)
+        self.smear_description_accuracy_type = wx.StaticText(self, wx.ID_ANY,
+                                    "Accuracy:", style=wx.ALIGN_LEFT)
+        self.smear_description_smear_type = BGTextCtrl(self, wx.ID_ANY,
                                                        size=(57, 20), style=0)
         self.smear_description_smear_type.SetValue(str(self.dq_l))
         self.SetBackgroundColour(self.GetParent().GetBackgroundColour())
-        self.smear_description_2d = wx.StaticText(self, -1,
+        self.smear_description_2d = wx.StaticText(self, wx.ID_ANY,
                                     smear_message_2d, style=wx.ALIGN_LEFT)
-        self.smear_message_new_s = wx.StaticText(self, -1,
+        self.smear_message_new_s = wx.StaticText(self, wx.ID_ANY,
                          smear_message_new_ssmear, style=wx.ALIGN_LEFT)
-        self.smear_message_new_p = wx.StaticText(self, -1,
+        self.smear_message_new_p = wx.StaticText(self, wx.ID_ANY,
                             smear_message_new_psmear, style=wx.ALIGN_LEFT)
-        self.smear_description_2d_x = wx.StaticText(self, -1,
+        self.smear_description_2d_x = wx.StaticText(self, wx.ID_ANY,
                             smear_message_2d_x_title, style=wx.ALIGN_LEFT)
-        self.smear_description_2d_x.SetToolTipString(\
+        self.smear_description_2d_x.SetToolTipString(
                                         "  dQp(parallel) in q_r direction.")
-        self.smear_description_2d_y = wx.StaticText(self, -1,
+        self.smear_description_2d_y = wx.StaticText(self, wx.ID_ANY,
                             smear_message_2d_y_title, style=wx.ALIGN_LEFT)
         self.smear_description_2d_y.SetToolTipString(\
                                     " dQs(perpendicular) in q_phi direction.")
-        self.smear_description_pin_min = wx.StaticText(self, -1,
+        self.smear_description_pin_min = wx.StaticText(self, wx.ID_ANY,
                         smear_message_pinhole_min_title, style=wx.ALIGN_LEFT)
-        self.smear_description_pin_max = wx.StaticText(self, -1,
+        self.smear_description_pin_max = wx.StaticText(self, wx.ID_ANY,
                         smear_message_pinhole_max_title, style=wx.ALIGN_LEFT)
-        self.smear_description_slit_height = wx.StaticText(self, -1,
+        self.smear_description_slit_height = wx.StaticText(self, wx.ID_ANY,
                         smear_message_slit_height_title, style=wx.ALIGN_LEFT)
-        self.smear_description_slit_width = wx.StaticText(self, -1,
+        self.smear_description_slit_width = wx.StaticText(self, wx.ID_ANY,
                         smear_message_slit_width_title, style=wx.ALIGN_LEFT)
-        
+
         #arrange sizers
         self.sizer_set_smearer.Add(sizer_smearer)
@@ -467 +468 @@
         self.sizer_new_smear.Add((20, -1))
         self.sizer_new_smear.Add(self.smear_description_2d_y,
-                                  0, wx.CENTER, 10 )
+                                  0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_description_pin_max,
-                                  0, wx.CENTER, 10 )
+                                  0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_description_slit_width,
-                                  0, wx.CENTER, 10 )
+                                  0, wx.CENTER, 10)
 
         self.sizer_new_smear.Add(self.smear_pinhole_max, 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_slit_width, 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_data_right, 0, wx.CENTER, 10)
-           
+
         self.sizer_set_smearer.Add(self.smear_message_new_s, 0, wx.CENTER, 10)
         self.sizer_set_smearer.Add(self.smear_message_new_p, 0, wx.CENTER, 10)
         self.sizer_set_smearer.Add((5, 2))
         self.sizer_set_smearer.Add(self.sizer_new_smear, 0, wx.CENTER, 10)
-        
+
         # add all to chi2 sizer
         sizer_smearer_box.Add(self.sizer_set_smearer)
@@ -488 +489 @@
         sizer_chi2.Add(weighting_box)
         sizer_chi2.Add((-1, 5))
-        
+
         # hide all smear messages and textctrl
         self._hide_all_smear_info()
-        
+
         # get smear_selection
         self.current_smearer = smear_selection(self.data, self.model)
@@ -512 +513 @@
         #2D data? default
         is_2Ddata = False
-        
+
         #check if it is 2D data
         if self.data.__class__.__name__ == "Data2D" or self.enable2D:
             is_2Ddata = True
-            
+
         self.sizer5.Clear(True)
-     
-        self.qmin = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
-                                    style=wx.TE_PROCESS_ENTER,
-                                    set_focus_callback=self.qrang_set_focus,
-                                    text_enter_callback=self._onQrangeEnter,
-                                    name='qmin')
+
+        self.qmin = ModelTextCtrl(self, wx.ID_ANY, size=(_BOX_WIDTH, 20),
+                                  style=wx.TE_PROCESS_ENTER,
+                                  set_focus_callback=self.qrang_set_focus,
+                                  text_enter_callback=self._onQrangeEnter,
+                                  name='qmin')
         self.qmin.SetValue(str(self.qmin_x))
         q_tip = "Click outside of the axes\n to remove the lines."
@@ -529 +530 @@
         qmin_tip += q_tip
         self.qmin.SetToolTipString(qmin_tip)
-     
-        self.qmax = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
-                                       style=wx.TE_PROCESS_ENTER,
-                                       set_focus_callback=self.qrang_set_focus,
-                                       text_enter_callback=self._onQrangeEnter,
-                                       name='qmax')
+
+        self.qmax = ModelTextCtrl(self, wx.ID_ANY, size=(_BOX_WIDTH, 20),
+                                  style=wx.TE_PROCESS_ENTER,
+                                  set_focus_callback=self.qrang_set_focus,
+                                  text_enter_callback=self._onQrangeEnter,
+                                  name='qmax')
         self.qmax.SetValue(str(self.qmax_x))
         qmax_tip = "Maximum value of Q.\n"
@@ -545 +546 @@
         self.qmin.Bind(wx.EVT_TEXT, self.on_qrange_text)
         self.qmax.Bind(wx.EVT_TEXT, self.on_qrange_text)
-        wx_id = wx.NewId()
+        wx_id = self._ids.next()
         self.reset_qrange = wx.Button(self, wx_id, 'Reset')
-      
+
         self.reset_qrange.Bind(wx.EVT_BUTTON, self.on_reset_clicked, id=wx_id)
         self.reset_qrange.SetToolTipString("Reset Q range to the default")
-     
+
         sizer = wx.GridSizer(5, 5, 2, 6)
 
-        self.btEditMask = wx.Button(self, wx.NewId(), 'Editor')
+        self.btEditMask = wx.Button(self, self._ids.next(), 'Editor')
         self.btEditMask.Bind(wx.EVT_BUTTON, self._onMask,
                              id=self.btEditMask.GetId())
         self.btEditMask.SetToolTipString("Edit Mask.")
-        self.EditMask_title = wx.StaticText(self, -1, ' Masking(2D)')
-        
-        sizer.Add(wx.StaticText(self, -1, '   Q range'))
-        sizer.Add(wx.StaticText(self, -1, ' Min[1/A]'))
-        sizer.Add(wx.StaticText(self, -1, ' Max[1/A]'))
+        self.EditMask_title = wx.StaticText(self, wx.ID_ANY, ' Masking(2D)')
+
+        sizer.Add(wx.StaticText(self, wx.ID_ANY, '   Q range'))
+        sizer.Add(wx.StaticText(self, wx.ID_ANY, ' Min[1/A]'))
+        sizer.Add(wx.StaticText(self, wx.ID_ANY, ' Max[1/A]'))
         sizer.Add(self.EditMask_title)
         sizer.Add((-1,5))
@@ -598 +599 @@
         self.sizer5.Layout()
 
-        
+
     def _set_sizer_dispersion(self):
         """
@@ -614 +615 @@
             ## the user didn't select dispersity display
             return
-            
+
         self._reset_dispersity()
-        
+
         ## fill a sizer with the combobox to select dispersion type
-        model_disp = wx.StaticText(self, -1, 'Function')
+        model_disp = wx.StaticText(self, wx.ID_ANY, 'Function')
         CHECK_STATE = self.cb1.GetValue()
-        #import sas.models.dispersion_models
-        #self.polydisp = sas.models.dispersion_models.models
-        import sasmodels.weights
-        self.polydisp = sasmodels.weights.models
+        import sas.models.dispersion_models
+        self.polydisp = sas.models.dispersion_models.models
 
         ix = 0
         iy = 0
-        disp = wx.StaticText(self, -1, ' ')
+        disp = wx.StaticText(self, wx.ID_ANY, ' ')
         self.sizer4_4.Add(disp, (iy, ix), (1, 1),
                           wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
         ix += 1
-        values = wx.StaticText(self, -1, 'PD[ratio]')
+        values = wx.StaticText(self, wx.ID_ANY, 'PD[ratio]')
         polytext = "Polydispersity (= STD/mean); "
         polytext += "the standard deviation over the mean value."
@@ -643 +642 @@
         else:
             err_text = ''
-        self.text_disp_1 = wx.StaticText(self, -1, err_text)
+        self.text_disp_1 = wx.StaticText(self, wx.ID_ANY, err_text)
         self.sizer4_4.Add(self.text_disp_1, (iy, ix), (1, 1), \
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-        
+
         ix += 1
-        self.text_disp_min = wx.StaticText(self, -1, 'Min')
+        self.text_disp_min = wx.StaticText(self, wx.ID_ANY, 'Min')
         self.sizer4_4.Add(self.text_disp_min, (iy, ix), (1, 1), \
                             wx.EXPAND | wx.ADJUST_MINSIZE, 0)
 
         ix += 1
-        self.text_disp_max = wx.StaticText(self, -1, 'Max')
+        self.text_disp_max = wx.StaticText(self, wx.ID_ANY, 'Max')
         self.sizer4_4.Add(self.text_disp_max, (iy, ix), (1, 1),
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-       
+
         ix += 1
-        npts = wx.StaticText(self, -1, 'Npts')
+        npts = wx.StaticText(self, wx.ID_ANY, 'Npts')
         npts.SetToolTipString("Number of sampling points for the numerical\n\
         integration over the distribution function.")
@@ -664 +663 @@
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         ix += 1
-        nsigmas = wx.StaticText(self, -1, 'Nsigs')
+        nsigmas = wx.StaticText(self, wx.ID_ANY, 'Nsigs')
         nsigmas.SetToolTipString("Number of sigmas between which the range\n\
          of the distribution function will be used for weighting. \n\
@@ -674 +673 @@
         self.sizer4_4.Add(model_disp, (iy, ix), (1, 1),
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-        
+
         self.text_disp_max.Show(True)
         self.text_disp_min.Show(True)
@@ -694 +693 @@
                 iy += 1
                 for p in self.model.dispersion[item].keys():
-        
+
                     if p == "width":
                         ix = 0
-                        cb = wx.CheckBox(self, -1, name0, (10, 10))
+                        cb = wx.CheckBox(self, wx.ID_ANY, name0, (10, 10))
                         cb.SetValue(CHECK_STATE)
                         cb.SetToolTipString("Check mark to fit")
@@ -705 +704 @@
                         ix = 1
                         value = self.model.getParam(name1)
-                        ctl1 = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 1.3, 20),
-                                                  style=wx.TE_PROCESS_ENTER)
+                        ctl1 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 1.3, 20),
+                                             style=wx.TE_PROCESS_ENTER)
                         ctl1.SetLabel('PD[ratio]')
                         poly_text = "Polydispersity (STD/mean) of %s\n" % item
@@ -717 +716 @@
                         ## text to show error sign
                         ix = 2
-                        text2 = wx.StaticText(self, -1, '+/-')
+                        text2 = wx.StaticText(self, wx.ID_ANY, '+/-')
                         self.sizer4_4.Add(text2, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -724 +723 @@
 
                         ix = 3
-                        ctl2 = wx.TextCtrl(self, -1,
+                        ctl2 = wx.TextCtrl(self, wx.ID_ANY,
                                            size=(_BOX_WIDTH / 1.3, 20),
                                            style=0)
-                  
+
                         self.sizer4_4.Add(ctl2, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -734 +733 @@
 
                         ix = 4
-                        ctl3 = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 2, 20),
-                                                  style=wx.TE_PROCESS_ENTER,
-                                text_enter_callback=self._onparamRangeEnter)
-                        
+                        ctl3 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2, 20),
+                                             style=wx.TE_PROCESS_ENTER,
+                            text_enter_callback=self._onparamRangeEnter)
+
                         self.sizer4_4.Add(ctl3, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-                       
+
                         ix = 5
-                        ctl4 = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 2, 20),
-                                                  style=wx.TE_PROCESS_ENTER,
+                        ctl4 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2, 20),
+                                             style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self._onparamRangeEnter)
-                        
+
                         self.sizer4_4.Add(ctl4, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -753 +752 @@
                         ctl3.Show(True)
                         ctl4.Show(True)
-                                                              
+
                     elif p == "npts":
                         ix = 6
                         value = self.model.getParam(name2)
-                        Tctl = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 2.2, 20),
-                                                  style=wx.TE_PROCESS_ENTER)
-                        
+                        Tctl = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2.2, 20),
+                                             style=wx.TE_PROCESS_ENTER)
+
                         Tctl.SetValue(str(format_number(value)))
                         self.sizer4_4.Add(Tctl, (iy, ix), (1, 1),
@@ -769 +768 @@
                         ix = 7
                         value = self.model.getParam(name3)
-                        Tct2 = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 2.2, 20),
-                                                  style=wx.TE_PROCESS_ENTER)
-                        
+                        Tct2 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2.2, 20),
+                                             style=wx.TE_PROCESS_ENTER)
+
                         Tct2.SetValue(str(format_number(value)))
                         self.sizer4_4.Add(Tct2, (iy, ix), (1, 1),
@@ -781 +780 @@
 
                 ix = 8
-                disp_box = wx.ComboBox(self, -1, size=(65, -1),
+                disp_box = wx.ComboBox(self, wx.ID_ANY, size=(65, -1),
                                        style=wx.CB_READONLY, name='%s' % name1)
                 for key, value in self.polydisp.iteritems():
@@ -787 +786 @@
                     disp_box.Append(name_disp, value)
                     disp_box.SetStringSelection("gaussian")
-                wx.EVT_COMBOBOX(disp_box, -1, self._on_disp_func)
+                wx.EVT_COMBOBOX(disp_box, wx.ID_ANY, self._on_disp_func)
                 self.sizer4_4.Add(disp_box, (iy, ix), (1, 1), wx.EXPAND)
                 self.fittable_param.append([cb, name1, ctl1, text2,
                                             ctl2, ctl3, ctl4, disp_box])
-                           
+
         ix = 0
         iy += 1
@@ -808 +807 @@
                 name2 = item + ".npts"
                 name3 = item + ".nsigmas"
-                
+
                 if not name1 in self.model.details:
                     self.model.details[name1] = ["", None, None]
- 
+
                 iy += 1
                 for p in self.model.dispersion[item].keys():
-        
+
                     if p == "width":
                         ix = 0
-                        cb = wx.CheckBox(self, -1, name0, (10, 10))
+                        cb = wx.CheckBox(self, wx.ID_ANY, name0, (10, 10))
                         cb.SetValue(CHECK_STATE)
                         cb.SetToolTipString("Check mark to fit")
@@ -830 +829 @@
                         ix = 1
                         value = self.model.getParam(name1)
-                        ctl1 = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 1.3, 20),
-                                                  style=wx.TE_PROCESS_ENTER)
+                        ctl1 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 1.3, 20),
+                                             style=wx.TE_PROCESS_ENTER)
                         poly_tip = "Absolute Sigma for %s." % item
                         ctl1.SetToolTipString(poly_tip)
@@ -846 +845 @@
                                 poly_text += "It is the STD (ratio*mean)"
                                 poly_text += " of the distribution.\n "
-                            
+
                                 values.SetToolTipString(poly_text)
                                 first_orient = False
@@ -852 +851 @@
                         elif ctl1.IsShown():
                             ctl1.Hide()
-                        
+
                         self.sizer4_4.Add(ctl1, (iy, ix), (1, 1), wx.EXPAND)
                         ## text to show error sign
                         ix = 2
-                        text2 = wx.StaticText(self, -1, '+/-')
+                        text2 = wx.StaticText(self, wx.ID_ANY, '+/-')
                         self.sizer4_4.Add(text2, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -863 +862 @@
 
                         ix = 3
-                        ctl2 = wx.TextCtrl(self, -1,
+                        ctl2 = wx.TextCtrl(self, wx.ID_ANY,
                                            size=(_BOX_WIDTH / 1.3, 20),
                                            style=0)
-                    
+
                         self.sizer4_4.Add(ctl2, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -876 +875 @@
                                 text2.Show(True)
                                 ctl2.Show(True)
-                            
+
                         ix = 4
-                        ctl3 = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 2, 20),
-                                                  style=wx.TE_PROCESS_ENTER,
+                        ctl3 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2, 20),
+                                             style=wx.TE_PROCESS_ENTER,
                                 text_enter_callback=self._onparamRangeEnter)
 
@@ -887 +886 @@
 
                         ctl3.Hide()
-                
+
                         ix = 5
-                        ctl4 = ModelTextCtrl(self, -1,
-                            size=(_BOX_WIDTH / 2, 20),
-                            style=wx.TE_PROCESS_ENTER,
+                        ctl4 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2, 20),
+                                             style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self._onparamRangeEnter)
                         self.sizer4_4.Add(ctl4, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
                         ctl4.Hide()
-                        
+
                         if self.data.__class__.__name__ == "Data2D" or \
                                 self.enable2D:
                             ctl3.Show(True)
                             ctl4.Show(True)
-                             
+
                     elif p == "npts":
                         ix = 6
                         value = self.model.getParam(name2)
-                        Tctl = ModelTextCtrl(self, -1,
-                                                 size=(_BOX_WIDTH / 2.2, 20),
-                                                 style=wx.TE_PROCESS_ENTER)
-                        
+                        Tctl = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2.2, 20),
+                                             style=wx.TE_PROCESS_ENTER)
+
                         Tctl.SetValue(str(format_number(value)))
                         if self.data.__class__.__name__ == "Data2D" or \
@@ -925 +924 @@
                         ix = 7
                         value = self.model.getParam(name3)
-                        Tct2 = ModelTextCtrl(self, -1,
-                                                  size=(_BOX_WIDTH / 2.2, 20),
-                                                  style=wx.TE_PROCESS_ENTER)
-                        
+                        Tct2 = ModelTextCtrl(self, wx.ID_ANY,
+                                             size=(_BOX_WIDTH / 2.2, 20),
+                                             style=wx.TE_PROCESS_ENTER)
+
                         Tct2.SetValue(str(format_number(value)))
                         if self.data.__class__.__name__ == "Data2D" or \
@@ -940 +939 @@
                         self.fixed_param.append([None, name3, Tct2,
                                                  None, None, None, None, None])
-                                                   
+
                         self.orientation_params_disp.append([None, name3,
                                         Tct2, None, None, None, None, None])
 
                 ix = 8
-                disp_box = wx.ComboBox(self, -1, size=(65, -1),
+                disp_box = wx.ComboBox(self, wx.ID_ANY, size=(65, -1),
                                 style=wx.CB_READONLY, name='%s' % name1)
                 for key, value in self.polydisp.iteritems():
@@ -951 +950 @@
                     disp_box.Append(name_disp, value)
                     disp_box.SetStringSelection("gaussian")
-                wx.EVT_COMBOBOX(disp_box, -1, self._on_disp_func)
+                wx.EVT_COMBOBOX(disp_box, wx.ID_ANY, self._on_disp_func)
                 self.sizer4_4.Add(disp_box, (iy, ix), (1, 1), wx.EXPAND)
                 self.fittable_param.append([cb, name1, ctl1, text2,
@@ -957 +956 @@
                 self.orientation_params_disp.append([cb, name1, ctl1,
                                             text2, ctl2, ctl3, ctl4, disp_box])
-                       
+
                 if self.data.__class__.__name__ == "Data2D" or \
                                 self.enable2D:
@@ -963 +962 @@
                 else:
                     disp_box.Hide()
-        
+
         self.state.disp_cb_dict = copy.deepcopy(self.disp_cb_dict)
-          
+
         self.state.model = self.model.clone()
         ## save state into
@@ -998 +997 @@
         """
         flag = self._update_paramv_on_fit()
-    
+
         wx.CallAfter(self._onparamEnter_helper)
         if not flag:
@@ -1004 +1003 @@
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
             return
-        
+
     def _onFit(self, event):
         """
@@ -1029 +1028 @@
                          StatusEvent(status="Fit: %s" % msg, type="stop"))
             return
-        
+
         if len(self.param_toFit) <= 0:
             msg = "Select at least one parameter to fit"
@@ -1036 +1035 @@
                          StatusEvent(status=msg, type="stop"))
             return
-        
+
         flag = self._update_paramv_on_fit()
-        
+
         if self.batch_on and not self._is_2D():
             if not self._validate_Npts_1D():
                 return
-                
+
         if not flag:
             msg = "Fitting range or parameters are invalid"
@@ -1048 +1047 @@
                          StatusEvent(status=msg, type="stop"))
             return
-              
+
         self.select_param(event=None)
 
@@ -1064 +1063 @@
         self.fit_started = self._manager.onFit(uid=self.uid)
         wx.CallAfter(self.set_fitbutton)
-    
+
     def _onFitHelp(self, event):
         """
@@ -1081 +1080 @@
 
         _TreeLocation = "user/perspectives/fitting/fitting_help.html"
-        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "",
+        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "",
                                           "General Fitting Help")
 
@@ -1100 +1099 @@
 
         _TreeLocation = "user/perspectives/fitting/sm_help.html"
-        _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "",
+        _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation, "",
                                           "Instrumental Resolution Smearing \
                                           Help")
@@ -1112 +1111 @@
         if self.is_mac:
             return
-        
+
         if self.fit_started:
             label = "Stop"
@@ -1123 +1122 @@
         self.btFit.SetForegroundColour(color)
         self.btFit.Enable(True)
-                     
+
     def get_weight_flag(self):
         """
@@ -1145 +1144 @@
                 break
         return flag
-                
+
     def _StopFit(self, event=None):
         """
@@ -1155 +1154 @@
         self._manager._reset_schedule_problem(value=0)
         self._on_fit_complete()
-         
+
     def rename_model(self):
         """
@@ -1162 +1161 @@
         if self.model is not None:
             self.model.name = "M" + str(self.index_model)
-    
+
     def _on_select_model(self, event=None):
         """
@@ -1184 +1183 @@
             self._keep.Enable(False)
             self._set_save_flag(False)
+        # TODO: why do we have to variables for one flag??
         self.enable_disp.SetValue(False)
         self.disable_disp.SetValue(True)
+        # TODO: should not have an untrapped exception when displaying disperser
+        # TODO: do we need to create the disperser panel on every model change?
+        # Note: if we fix this, then remove ID_DISPERSER_HELP from basepage
         try:
             self.set_dispers_sizer()
@@ -1194 +1197 @@
         self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
         self.state.slit_smearer = self.slit_smearer.GetValue()
-    
+
         self.state.structurecombobox = self.structurebox.GetLabel()
         self.state.formfactorcombobox = self.formfactorbox.GetLabel()
@@ -1210 +1213 @@
                     self._keep.Enable(not self.batch_on)
                     self._set_save_flag(True)
-    
+
             # more disables for 2D
             self._set_smear_buttons()
-            
+
             try:
                 # update smearer sizer
@@ -1227 +1230 @@
             ## event to post model to fit to fitting plugins
             (ModelEventbox, EVT_MODEL_BOX) = wx.lib.newevent.NewEvent()
-         
+
             ## set smearing value whether or not
             #    the data contain the smearing info
@@ -1237 +1240 @@
                             caption=self.window_caption,
                             qmax=float(self.qmax_x))
-   
+
             self._manager._on_model_panel(evt=evt)
-            self.mbox_description.SetLabel("Model [ %s ]"% str(self.model.name))
+            self.mbox_description.SetLabel("Model [ %s ]" % str(self.model.name))
             self.mbox_description.SetForegroundColour(wx.BLUE)
             self.state.model = self.model.clone()
@@ -1272 +1275 @@
                 self.get_paste_params(copy_flag)
                 wx.CallAfter(self._onDraw, None)
-                
+
         else:
             self._draw_model()
-            
+
         if self.batch_on:
             self.slit_smearer.Enable(False)
@@ -1281 +1284 @@
             self.btEditMask.Disable()
             self.EditMask_title.Disable()
-            
+
         self.Show(True)
         self.SetupScrolling()
-         
+
     def _onparamEnter(self, event):
         """
@@ -1327 +1330 @@
                                               qmax=float(self.qmax_x),
                                               enable_smearer=enable_smearer,
-                                            draw=True)
+                                              draw=True)
                 if flag:
                     #self.compute_chisqr(smearer= temp_smearer)
-        
+
                     ## new state posted
                     if self.state_change:
@@ -1345 +1348 @@
             msg = "Cannot Plot :Must enter a number!!!  "
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-             
+
         self.save_current_state()
         return
-   
+
     def _onparamRangeEnter(self, event):
         """
@@ -1371 +1374 @@
         else:
             tcrtl.SetBackgroundColour(wx.WHITE)
-           
+
         #self._undo.Enable(True)
         self.save_current_state()
@@ -1377 +1380 @@
         wx.PostEvent(self.parent, event)
         self.state_change = False
-        
-    def qrang_set_focus(self, event=None):  
+
+    def qrang_set_focus(self, event=None):
         """
         ON Qrange focus
@@ -1386 +1389 @@
         #tcrtl = event.GetEventObject()
         self._validate_qrange(self.qmin, self.qmax)
-        
+
     def qrange_click(self, event):
         """
@@ -1400 +1403 @@
             d_group_id = self.data.group_id
             act_ctrl = event.GetEventObject()
-            wx.PostEvent(self._manager.parent, 
-                         PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id, 
+            wx.PostEvent(self._manager.parent,
+                         PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id,
                                      group_id=d_group_id, leftdown=is_click,
                                      active=act_ctrl))
-            
+
     def on_qrange_text(self, event):
         """
@@ -1416 +1419 @@
         d_id = self.data.id
         d_group_id = self.data.group_id
-        wx.PostEvent(self._manager.parent, 
-                     PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id, 
-                                     group_id=d_group_id, leftdown=False, 
+        wx.PostEvent(self._manager.parent,
+                     PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id,
+                                     group_id=d_group_id, leftdown=False,
                                      active=act_ctrl))
         self._validate_qrange(self.qmin, self.qmax)
-    
-    def on_key(self, event):   
+
+    def on_key(self, event):
         """
         On Key down
@@ -1433 +1436 @@
             x_data = float(ctrl.GetValue())
         except:
-            return 
+            return
         key = event.GetKeyCode()
         length = len(self.data.x)
@@ -1450 +1453 @@
         ctrl.SetValue(str(self.data.x[indx]))
         self._validate_qrange(self.qmin, self.qmax)
-               
+
     def _onQrangeEnter(self, event):
         """
@@ -1511 +1514 @@
                               (self.data.x <= self.qmax_x))
                 self.Npts_fit.SetValue(str(len(self.data.x[index_data])))
-            
+
             self.npts_x = self.Npts_total.GetValue()
             self.create_default_data()
@@ -1519 +1522 @@
             msg = "Model Error:wrong value entered!!!"
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-        
+
         self._draw_model()
         self.save_current_state()
@@ -1526 +1529 @@
         self.state_change = False
         return
-    
+
     def _clear_Err_on_Fit(self):
         """
@@ -1556 +1559 @@
                     if item[4] != None and item[4].IsShown():
                         item[4].Hide()
-  
+
         if len(self.fittable_param) > 0:
             for item in self.fittable_param:
@@ -1576 +1579 @@
                         item[4].Hide()
         return
-                
+
     def _get_defult_custom_smear(self):
         """
@@ -1590 +1593 @@
         if self.dx_max == None:
             self.dx_max = SMEAR_SIZE_H
-        
+
     def _get_smear_info(self):
         """
         Get the smear info from data.
-       
+
         :return: self.smear_type, self.dq_l and self.dq_r,
             respectively the type of the smear, dq_min and
@@ -1625 +1628 @@
             self.dq_l = data.dx[0]
             self.dq_r = data.dx[-1]
-            
+
         # check if it is slit smear and get min max if it is.
         elif data.dxl != None or data.dxw != None:
@@ -1634 +1637 @@
                 self.dq_r = data.dxw[0]
         #return self.smear_type,self.dq_l,self.dq_r
-    
+
     def _show_smear_sizer(self):
         """
@@ -1698 +1701 @@
         self.smear_description_2d_y.Hide()
         self.smear_description_2d.Hide()
-        
+
         self.smear_accuracy.Hide()
         self.smear_data_left.Hide()
@@ -1712 +1715 @@
         self.smear_message_new_p.Hide()
         self.smear_message_new_s.Hide()
-    
+
     def _set_accuracy_list(self):
         """
@@ -1722 +1725 @@
         for idx in range(len(list)):
             self.smear_accuracy.Append(list[idx], idx)
-            
+
     def _set_fun_box_list(self, fun_box):
         """