Changeset f668101 in sasview for src/sas/sasgui/perspectives

Timestamp:

Dec 7, 2016 9:16:33 AM (7 years ago)

Author:

jhbakker

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c6728e1

Parents:

1cad8a4 (diff), 5231948 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into Jurtest

Location:

src/sas/sasgui/perspectives

Files:

• calculator/model_editor.py (modified) (10 diffs)
• fitting/basepage.py (modified) (173 diffs)
• fitting/fitpage.py (modified) (147 diffs)
• fitting/fitpanel.py (modified) (10 diffs)
• fitting/fitting.py (modified) (2 diffs)
• fitting/media/fitting_help.rst (modified) (1 diff)
• fitting/media/plugin.rst (modified) (7 diffs)
• fitting/models.py (modified) (1 diff)
• fitting/pagestate.py (modified) (45 diffs)
• invariant/media/invariant_help.rst (modified) (1 diff)
• pr/pr.py (modified) (1 diff)

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -28 +28 @@
 import math
 import re
+import logging
 from wx.py.editwindow import EditWindow
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
@@ -388 +389 @@
             wx.PostEvent(self.parent.parent, StatusEvent(status=msg,
                                                          info=info))
-        else:
-            raise
 
     def on_help(self, event):
@@ -512 +511 @@
         fill the current combobox with the operator
         """
-        operator_list = [' +', ' *']
+        operator_list = ['+', '*']
         for oper in operator_list:
             pos = self._operator_choice.Append(str(oper))
-            self._operator_choice.SetClientData(pos, str(oper.strip()))
+            self._operator_choice.SetClientData(pos, str(oper))
         self._operator_choice.SetSelection(0)
 
@@ -684 +683 @@
         #title name [string]
         name_txt = wx.StaticText(self, -1, 'Function Name : ')
-        overwrite_cb = wx.CheckBox(self, -1, "Overwrite?", (10, 10))
+        overwrite_cb = wx.CheckBox(self, -1, "Overwrite existing plugin model of this name?", (10, 10))
         overwrite_cb.SetValue(False)
         overwrite_cb.SetToolTipString("Overwrite it if already exists?")
         wx.EVT_CHECKBOX(self, overwrite_cb.GetId(), self.on_over_cb)
-        #overwrite_cb.Show(False)
         self.name_tcl = wx.TextCtrl(self, -1, size=(PANEL_WIDTH * 3 / 5, -1))
         self.name_tcl.Bind(wx.EVT_TEXT_ENTER, self.on_change_name)
-        self.name_tcl.SetValue('MyFunction')
+        self.name_tcl.SetValue('')
         self.name_tcl.SetFont(self.font)
         hint_name = "Unique Model Function Name."
@@ -947 +945 @@
         # Sort out the errors if occur
         # First check for valid python name then if the name already exists
-        if not re.match('^[A-Za-z0-9_]*$', name):
-            msg = "not a valid python name. Name must include only alpha \n"
-            msg += "numeric or underline characters and no spaces"
+        if not name or not bool(re.match('^[A-Za-z0-9_]*$', name)):
+            msg = '"%s" '%name
+            msg += "is not a valid model name. Name must not be empty and \n"
+            msg += "may include only alpha numeric or underline characters \n"
+            msg += "and no spaces"
         elif self.check_name():
             description = self.desc_tcl.GetValue()
@@ -966 +966 @@
                         result, msg = None, "error building model"
                         check_err = "\n"+traceback.format_exc(limit=2)
-
-                    # Modified compiling test, as it will fail for sasmodels.sasview_model class
-                    # Should add a test to check that the class is correctly built 
-                    # by sasview_model.make_class_from_file?
-#                    try: 
-#                        tr_msg = _compile_file(self.fname)
-#                        msg = str(tr_msg.__str__())
-#                        # Compile error
-#                        if msg:
-#                            msg.replace("  ", "\n")
-#                            msg += "\nCompiling Failed"
-#                            try:
-#                                # try to remove pyc file if exists
-#                                _delete_file(self.fname)
-#                                _delete_file(self.fname + "c")
-#                            except:
-#                                pass
-#                    except:
-#                        pass
                 else:
                     msg = "Error: The func(x) must 'return' a value at least.\n"
@@ -1002 +983 @@
                 exec "from %s import Model" % name
             except:
-                pass
-#            except:
-#                msg = 'new model fails to import in python'
-#                try:
-#                    # try to remove pyc file if exists
-#                    _delete_file(self.fname + "c")
-#                except:
-#                    pass
-#
-# And also need to test if model runs            
-#        if self.base != None and not msg:
-#            try:
-#                Model().run(0.01)
-#            except:
-#                msg = "new model fails on run method:"
-#                _, value, _ = sys.exc_info()
-#                msg += "in %s:\n%s\n" % (name, value)
-#                try:
-#                    # try to remove pyc file if exists
-#                    _delete_file(self.fname + "c")
-#                except:
-#                    pass
+                logging.error(sys.exc_value)
+
         # Prepare the messagebox
         if msg:
@@ -1191 +1152 @@
 
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _PageAnchor = "#custom-model-editor"
+        _PageAnchor = "#new-plugin-model"
         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor,
-                                          "Custom Model Editor Help")
+                                          "Plugin Model Editor Help")
 
     def on_close(self, event):
@@ -1230 +1191 @@
 
 ## Templates for custom models
-#CUSTOM_TEMPLATE = """
-#from sas.models.pluginmodel import Model1DPlugin
-#from math import *
-#import os
-#import sys
-#import numpy
-##import scipy?
-#class Model(Model1DPlugin):
-#    name = basename without extension of __file__
-#    def __init__(self):
-#        Model1DPlugin.__init__(self, name=self.name)
-#        #set name same as file name
-#        #self.params here
-#        self.description = "%s"
-#        self.set_details()
-#    def function(self, x=0.0%s):
-#        #local params here
-#        #function here
-#"""
 
 CUSTOM_TEMPLATE = """
@@ -1419 +1361 @@
 
     def _clone(self, obj):
+        import copy
         obj.params     = copy.deepcopy(self.params)
         obj.description     = copy.deepcopy(self.description)

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -19 +19 @@
 
 from sas.sasgui.guiframe.panel_base import PanelBase
-from sas.sasgui.guiframe.utils import format_number, check_float, IdList, check_int
+from sas.sasgui.guiframe.utils import format_number, check_float, IdList, \
+    check_int
 from sas.sasgui.guiframe.events import PanelOnFocusEvent
 from sas.sasgui.guiframe.events import StatusEvent
@@ -42 +43 @@
 _QMAX_DEFAULT = 0.5
 _NPTS_DEFAULT = 50
-#Control panel width
+# Control panel width
 if sys.platform.count("win32") > 0:
     PANEL_WIDTH = 450
@@ -57 +58 @@
     This class provide general structure of  fitpanel page
     """
-    ## Internal name for the AUI manager
+    # Internal name for the AUI manager
     window_name = "Fit Page"
-    ## Title to appear on top of the window
+    # Title to appear on top of the window
     window_caption = "Fit Page "
 
@@ -75 +76 @@
         PanelBase.__init__(self, parent)
         self.SetupScrolling()
-        #Set window's font size
+        # Set window's font size
         self.SetWindowVariant(variant=FONT_VARIANT)
         self.SetBackgroundColour(color)
 
         self._ids = iter(self._id_pool)
-        ## parent of the page
+        # parent of the page
         self.parent = parent
-        ## manager is the fitting plugin
-        ## owner of the page (fitting plugin)
+        # manager is the fitting plugin
+        # owner of the page (fitting plugin)
         self.event_owner = None
-        ## current model
+        # current model
         self.model = None
         self.m_name = None
         self.index_model = None
         self.panel = None
-        ## data
+        # data
         self.data = None
-        #list of available data
+        # list of available data
         self.data_list = []
         self.mask = None
         self.uid = wx.NewId()
         self.graph_id = None
-        #Q range for data set
+        # Q range for data set
         self.qmin_data_set = numpy.inf
         self.qmax_data_set = None
         self.npts_data_set = 0
-        ## Q range
+        # Q range
         self.qmin = None
         self.qmax = None
@@ -107 +108 @@
         self.qmin_x = _QMIN_DEFAULT
         self.npts_x = _NPTS_DEFAULT
-        ## total number of point: float
+        # total number of point: float
         self.npts = None
         self.num_points = None
-        ## smear default
+        # smear default
         self.current_smearer = None
-        ## 2D smear accuracy default
+        # 2D smear accuracy default
         self.smear2d_accuracy = 'Low'
-        ## slit smear:
+        # slit smear:
         self.dxl = None
         self.dxw = None
-        ## pinhole smear
+        # pinhole smear
         self.dx_min = None
         self.dx_max = None
-        ##semar attrbs
+        # smear attrbs
         self.enable_smearer = None
         self.disable_smearer = None
         self.pinhole_smearer = None
         self.slit_smearer = None
-        ##weigth attrbs
+        # weight attrbs
         self.dI_noweight = None
         self.dI_didata = None
         self.dI_sqrdata = None
         self.dI_idata = None
-        ##other attrbs
+        # other attrbs
         self.dq_l = None
         self.dq_r = None
@@ -150 +151 @@
         self.disp_cb_dict = {}
 
-        #self.state = PageState(parent=parent)
-        ## dictionary containing list of models
+        # self.state = PageState(parent=parent)
+        # dictionary containing list of models
         self.model_list_box = {}
 
-        ## Data member to store the dispersion object created
+        # Data member to store the dispersion object created
         self._disp_obj_dict = {}
-        ## selected parameters to apply dispersion
+        # selected parameters to apply dispersion
         self.disp_cb_dict = {}
-        ## smearer object
+        # smearer object
         self.enable2D = False
         self._has_magnetic = False
@@ -166 +167 @@
         self.structurebox = None
         self.categorybox = None
-        ##list of model parameters. each item must have same length
-        ## each item related to a given parameters
-        ##[cb state, name, value, "+/-", error of fit, min, max , units]
+        # list of model parameters. each item must have same length
+        # each item related to a given parameters
+        # [cb state, name, value, "+/-", error of fit, min, max , units]
         self.parameters = []
         # non-fittable parameter whose value is astring
         self.str_parameters = []
-        ## list of parameters to fit , must be like self.parameters
+        # list of parameters to fit , must be like self.parameters
         self.param_toFit = []
-        ## list of looking like parameters but with non fittable parameters info
+        # list of looking like parameters but with non fittable parameters info
         self.fixed_param = []
-        ## list of looking like parameters but with  fittable parameters info
+        # list of looking like parameters but with  fittable parameters info
         self.fittable_param = []
-        ##list of dispersion parameters
+        # list of dispersion parameters
         self.disp_list = []
         self.disp_name = ""
 
-        ## list of orientation parameters
+        # list of orientation parameters
         self.orientation_params = []
         self.orientation_params_disp = []
@@ -189 +190 @@
 #       and this - commenting out on 4/8/2014 by PDB.  Remove once clear
 #       it is pointless.
-#        if self.model != None:
+#        if self.model is not None:
 #            self.disp_list = self.model.getDispParamList()
         self.temp_multi_functional = False
-        ##enable model 2D draw
+        # enable model 2D draw
         self.enable2D = False
-        ## check that the fit range is correct to plot the model again
+        # check that the fit range is correct to plot the model again
         self.fitrange = True
-        ## Create memento to save the current state
+        # Create memento to save the current state
         self.state = PageState(parent=self.parent,
                                model=self.model, data=self.data)
-        ## flag to determine if state has change
+        # flag to determine if state has change
         self.state_change = False
-        ## save customized array
+        # save customized array
         self.values = {}   # type: Dict[str, List[float, ...]]
         self.weights = {}   # type: Dict[str, List[float, ...]]
-        ## retrieve saved state
+        # retrieve saved state
         self.number_saved_state = 0
-        ## dictionary of saved state
+        # dictionary of saved state
         self.saved_states = {}
-        ## Create context menu for page
+        # Create context menu for page
         self.popUpMenu = wx.Menu()
 
@@ -221 +222 @@
         self.popUpMenu.AppendSeparator()
 
-        ## Default locations
+        # Default locations
         self._default_save_location = os.getcwd()
-        ## save initial state on context menu
-        #self.onSave(event=None)
+        # save initial state on context menu
+        # self.onSave(event=None)
         self.Bind(wx.EVT_CONTEXT_MENU, self.onContextMenu)
 
@@ -230 +231 @@
         self.Bind(wx.EVT_LEFT_DOWN, self.on_left_down)
 
-        ## create the basic structure of the panel with empty sizer
+        # create the basic structure of the panel with empty sizer
         self.define_page_structure()
-        ## drawing Initial dispersion parameters sizer
+        # drawing Initial dispersion parameters sizer
         self.set_dispers_sizer()
 
-        ## layout
+        # layout
         self.set_layout()
 
@@ -261 +262 @@
                     self._create_default_1d_data()
 
-            if self.model != None:
+            if self.model is not None:
                 if not self.data.is_data:
-                    self._manager.page_finder[self.uid].set_fit_data(data=\
-                                                                [self.data])
+                    self._manager.page_finder[self.uid].set_fit_data(
+                        data=[self.data])
             self.on_smear_helper(update=True)
             self.state.enable_smearer = self.enable_smearer.GetValue()
@@ -330 +331 @@
         self.data.id = str(self.uid) + " data"
         self.data.group_id = str(self.uid) + " Model2D"
-        ## Default values
+        # Default values
         self.data.detector.append(Detector())
         index = len(self.data.detector) - 1
@@ -347 +348 @@
         x = numpy.linspace(start=xmin, stop=xmax, num=qstep, endpoint=True)
         y = numpy.linspace(start=ymin, stop=ymax, num=qstep, endpoint=True)
-        ## use data info instead
+        # use data info instead
         new_x = numpy.tile(x, (len(y), 1))
         new_y = numpy.tile(y, (len(x), 1))
@@ -388 +389 @@
         Update menu1 on cliking the page tap
         """
-        if self._manager.menu1 != None:
-            chain_menu = self._manager.menu1.FindItemById(\
+        if self._manager.menu1 is not None:
+            chain_menu = self._manager.menu1.FindItemById(
                                                    self._manager.id_reset_flag)
             chain_menu.Enable(self.batch_on)
             sim_menu = self._manager.menu1.FindItemById(self._manager.id_simfit)
             flag = self.data.is_data\
-                            and (self.model != None)
+                            and (self.model is not None)
             sim_menu.Enable(not self.batch_on and flag)
             batch_menu = \
@@ -535 +536 @@
         fill sizer containing dispersity info
         """
-        #print "==== entering set_dispers_sizer ==="
+        # print "==== entering set_dispers_sizer ==="
         self.sizer4.Clear(True)
         name = "Polydispersity and Orientational Distribution"
@@ -541 +542 @@
         box_description.SetForegroundColour(wx.BLUE)
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
-        #----------------------------------------------------
+        # ----------------------------------------------------
         self.disable_disp = wx.RadioButton(self, wx.ID_ANY, 'Off', (10, 10),
                                            style=wx.RB_GROUP)
@@ -561 +562 @@
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param,
                   id=self.enable_disp.GetId())
-        #MAC needs SetValue
+        # MAC needs SetValue
         self.disable_disp.SetValue(True)
         sizer_dispersion = wx.BoxSizer(wx.HORIZONTAL)
@@ -573 +574 @@
         sizer_dispersion.Add(self.disp_help_bt)
 
-        ## fill a sizer for dispersion
+        # fill a sizer for dispersion
         boxsizer1.Add(sizer_dispersion, 0,
                       wx.TOP|wx.BOTTOM|wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE,
@@ -580 +581 @@
 
         boxsizer1.Add(self.sizer4_4)
-        #-----------------------------------------------------
+        # -----------------------------------------------------
         self.sizer4.Add(boxsizer1, 0, wx.EXPAND | wx.ALL, 10)
         self.sizer4_4.Layout()
@@ -587 +588 @@
 
         self.Refresh()
-        ## saving the state of enable dispersity button
+        # saving the state of enable dispersity button
         self.state.enable_disp = self.enable_disp.GetValue()
         self.state.disable_disp = self.disable_disp.GetValue()
@@ -597 +598 @@
         """
         menu = event.GetEventObject()
-        ## post help message for the selected model
+        # post help message for the selected model
         msg = menu.GetHelpString(event.GetId())
         msg += " reloaded"
@@ -604 +605 @@
         name = menu.GetLabel(event.GetId())
         self._on_select_model_helper()
-        if self.model != None:
+        if self.model is not None:
             self.m_name = self.model.name
         if name in self.saved_states.keys():
             previous_state = self.saved_states[name]
-            ## reset state of checkbox,textcrtl  and  regular parameters value
+            # reset state of checkbox,textcrtl  and  regular parameters value
 
             self.reset_page(previous_state)
@@ -631 +632 @@
         # Ask the user the location of the file to write to.
         path = None
-        if self.parent != None:
+        if self.parent is not None:
             self._default_save_location = \
                         self._manager.parent._default_save_location
@@ -641 +642 @@
             self._default_save_location = os.path.dirname(path)
             self._manager.parent._default_save_location = \
-                                self._default_save_location
+                self._default_save_location
         else:
             return None
@@ -648 +649 @@
         # Make sure the ext included in the file name
         fName = os.path.splitext(path)[0] + extens
-        #the manager write the state into file
+        # the manager write the state into file
         self._manager.save_fit_state(filepath=fName, fitstate=new_state)
         return new_state
@@ -656 +657 @@
         Copy Parameter values to the clipboad
         """
-        if event != None:
+        if event is not None:
             event.Skip()
         # It seems MAC needs wxCallAfter
@@ -672 +673 @@
         Paste Parameter values to the panel if possible
         """
-        #if event != None:
+        # if event is not None:
         #    event.Skip()
         # It seems MAC needs wxCallAfter for the setvalues
@@ -678 +679 @@
         wx.CallAfter(self.get_paste)
         # messages depending on the flag
-        #self._copy_info(True)
+        # self._copy_info(True)
 
     def _copy_info(self, flag):
@@ -687 +688 @@
         """
         # messages depending on the flag
-        if flag == None:
+        if flag is None:
             msg = " Parameter values are copied to the clipboard..."
             infor = 'warning'
@@ -715 +716 @@
         save history of the data and model
         """
-        if self.model == None:
+        if self.model is None:
             msg = "Can not bookmark; Please select Data and Model first..."
             wx.MessageBox(msg, 'Info')
@@ -721 +722 @@
         self.save_current_state()
         new_state = self.state.clone()
-        ##Add model state on context menu
+        # Add model state on context menu
         self.number_saved_state += 1
         current_time, current_date = self._get_time_stamp()
-        #name= self.model.name+"[%g]"%self.number_saved_state
+        # name= self.model.name+"[%g]"%self.number_saved_state
         name = "Fitting: %g]" % self.number_saved_state
         name += self.model.__class__.__name__
@@ -730 +731 @@
         self.saved_states[name] = new_state
 
-        ## Add item in the context menu
+        # Add item in the context menu
         msg = "Model saved at %s on %s" % (current_time, current_date)
-        ## post help message for the selected model
+        # post help message for the selected model
         msg += " Saved! right click on this page to retrieve this model"
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
@@ -766 +767 @@
         """
         try:
-            if path == None:
+            if path is None:
                 status = " Selected Distribution was not loaded: %s" % path
                 wx.PostEvent(self._manager.parent,
@@ -801 +802 @@
         Store current state
         """
-        ## save model option
-        if self.model != None:
+        # save model option
+        if self.model is not None:
             self.disp_list = self.model.getDispParamList()
             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:
+            # model combobox: complex code because of mac's silent error
+            if self.structurebox is not None:
                 if self.structurebox.IsShown():
                     self.state.structurecombobox = 'None'
                     s_select = self.structurebox.GetSelection()
                     if s_select > 0:
-                        self.state.structurecombobox = self.structurebox.\
-                        GetString(s_select)
-            if self.formfactorbox != None:
+                        self.state.structurecombobox = \
+                            self.structurebox.GetString(s_select)
+            if self.formfactorbox is not None:
                 f_select = self.formfactorbox.GetSelection()
                 if f_select > 0:
-                    self.state.formfactorcombobox = self.formfactorbox.\
-                    GetString(f_select)
-        if self.categorybox != None:
+                    self.state.formfactorcombobox = \
+                        self.formfactorbox.GetString(f_select)
+        if self.categorybox is not None:
             cb_select = self.categorybox.GetSelection()
             if cb_select > 0:
-                self.state.categorycombobox = self.categorybox.\
-                GetString(cb_select)
+                self.state.categorycombobox = \
+                    self.categorybox.GetString(cb_select)
 
         self.state.enable2D = copy.deepcopy(self.enable2D)
         self.state.values = copy.deepcopy(self.values)
         self.state.weights = copy.deepcopy(self.weights)
-        ## save data
+        # save data
         self.state.data = copy.deepcopy(self.data)
         self.state.qmax_x = self.qmax_x
@@ -864 +865 @@
             self.state.values = copy.deepcopy(self.values)
             self.state.weights = copy.deepcopy(self.weights)
-        ## save plotting range
+        # save plotting range
         self._save_plotting_range()
 
@@ -874 +875 @@
         self.state.str_parameters = []
 
-        ## save checkbutton state and txtcrtl values
+        # save checkbutton state and txtcrtl values
         self._copy_parameters_state(self.str_parameters,
                                     self.state.str_parameters)
@@ -886 +887 @@
                                     self.state.fittable_param)
         self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
-        #save chisqr
+        # save chisqr
         self.state.tcChi = self.tcChi.GetValue()
 
@@ -893 +894 @@
         Store current state for fit_page
         """
-        ## save model option
-        if self.model != None:
+        # save model option
+        if self.model is not None:
             self.disp_list = self.model.getDispParamList()
             self.state.disp_list = copy.deepcopy(self.disp_list)
@@ -902 +903 @@
         self.state.values = copy.deepcopy(self.values)
         self.state.weights = copy.deepcopy(self.weights)
-        ## save data
+        # save data
         self.state.data = copy.deepcopy(self.data)
 
@@ -923 +924 @@
         self.state.dI_sqrdata = copy.deepcopy(self.dI_sqrdata.GetValue())
         self.state.dI_idata = copy.deepcopy(self.dI_idata.GetValue())
-        if hasattr(self, "disp_box") and self.disp_box != None:
+        if hasattr(self, "disp_box") and self.disp_box is not None:
             self.state.disp_box = self.disp_box.GetCurrentSelection()
 
             if len(self.disp_cb_dict) > 0:
                 for k, v in self.disp_cb_dict.iteritems():
-                    if v == None:
+                    if v is None:
                         self.state.disp_cb_dict[k] = v
                     else:
@@ -942 +943 @@
             self.state.weights = copy.deepcopy(self.weights)
 
-        ## save plotting range
+        # save plotting range
         self._save_plotting_range()
 
-        ## save checkbutton state and txtcrtl values
+        # save checkbutton state and txtcrtl values
         self._copy_parameters_state(self.orientation_params,
                                     self.state.orientation_params)
@@ -964 +965 @@
             msg = "Please load Data and select Model to start..."
             wx.MessageBox(msg, 'Info')
-            return  True
+            return True
 
     def set_model_state(self, state):
@@ -973 +974 @@
         self.disp_list = state.disp_list
 
-        ## fill model combobox
+        # fill model combobox
         self._show_combox_helper()
-        #select the current model
+        # select the current model
         try:
             # to support older version
@@ -1014 +1015 @@
         self.structurebox.SetSelection(structfactor_pos)
 
-        if state.multi_factor != None:
+        if state.multi_factor is not None:
             self.multifactorbox.SetSelection(state.multi_factor)
 
-        ## reset state of checkbox,textcrtl  and  regular parameters value
+        # reset state of checkbox,textcrtl  and  regular parameters value
         self._reset_parameters_state(self.orientation_params_disp,
                                      state.orientation_params_disp)
@@ -1025 +1026 @@
                                      state.str_parameters)
         self._reset_parameters_state(self.parameters, state.parameters)
-        ## display dispersion info layer
+        # display dispersion info layer
         self.enable_disp.SetValue(state.enable_disp)
         self.disable_disp.SetValue(state.disable_disp)
 
-        if hasattr(self, "disp_box") and self.disp_box != None:
+        if hasattr(self, "disp_box") and self.disp_box is not None:
             self.disp_box.SetSelection(state.disp_box)
             n = self.disp_box.GetCurrentSelection()
@@ -1041 +1042 @@
 
                     if hasattr(self.disp_cb_dict[item], "SetValue"):
-                        self.disp_cb_dict[item].SetValue(\
+                        self.disp_cb_dict[item].SetValue(
                                                     state.disp_cb_dict[item])
                         # Create the dispersion objects
                         disp_model = POLYDISPERSITY_MODELS['array']()
                         if hasattr(state, "values") and \
-                                 self.disp_cb_dict[item].GetValue() == True:
+                                 self.disp_cb_dict[item].GetValue() is True:
                             if len(state.values) > 0:
                                 self.values = state.values
@@ -1057 +1058 @@
                         self._disp_obj_dict[item] = disp_model
                         # Set the new model as the dispersion object
-                        #for the selected parameter
+                        # for the selected parameter
                         self.model.set_dispersion(item, disp_model)
 
@@ -1067 +1068 @@
                 for item in keys:
                     if item in self.disp_list and \
-                        not item in self.model.details:
+                            item not in self.model.details:
                         self.model.details[item] = ["", None, None]
                 self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
                 self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
-        ## smearing info  restore
+        # smearing info  restore
         if hasattr(self, "enable_smearer"):
-            ## set smearing value whether or not the data
-            #contain the smearing info
+            # set smearing value whether or not the data
+            # contain the smearing info
             self.enable_smearer.SetValue(state.enable_smearer)
             self.disable_smearer.SetValue(state.disable_smearer)
@@ -1086 +1087 @@
         self.dI_idata.SetValue(state.dI_idata)
 
-        ## we have two more options for smearing
+        # we have two more options for smearing
         if self.pinhole_smearer.GetValue():
             self.onPinholeSmear(event=None)
@@ -1092 +1093 @@
             self.onSlitSmear(event=None)
 
-        ## reset state of checkbox,textcrtl  and dispersity parameters value
+        # 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
+        # draw the model with previous parameters value
         self._onparamEnter_helper()
         self.select_param(event=None)
-        #Save state_fit
+        # Save state_fit
         self.save_current_state_fit()
         self._lay_out()
@@ -1113 +1114 @@
                 if state.formfactorcombobox in list_item:
                     return self.categorybox.Items.index(key)
+        return 0
 
     def reset_page_helper(self, state):
@@ -1123 +1125 @@
             state of the graphic interface
         """
-        if state == None:
+        if state is None:
             return
         # set data, etc. from the state
@@ -1132 +1134 @@
         data = state.data
 
-        if data == None:
+        if data is None:
             data_min = state.qmin
             data_max = state.qmax
@@ -1156 +1158 @@
         self.disp_list = state.disp_list
 
-        ## set the state of the radio box
-        #self.shape_rbutton.SetValue(state.shape_rbutton)
-        #self.shape_indep_rbutton.SetValue(state.shape_indep_rbutton)
-        #self.struct_rbutton.SetValue(state.struct_rbutton)
-        #self.plugin_rbutton.SetValue(state.plugin_rbutton)
-
-        ## fill model combobox
+        # fill model combobox
         self._show_combox_helper()
-        #select the current model
+        # select the current model
         try:
             # to support older version
             category_pos = int(state.categorycombobox)
         except:
-            state.formfactorcombobox = unicode(state.formfactorcombobox.lower())
+            state.formfactorcombobox = state.formfactorcombobox.lower()
+            state.formfactorcombobox = \
+                state.formfactorcombobox.replace('model', '')
+            state.formfactorcombobox = unicode(state.formfactorcombobox)
             state.categorycombobox = unicode(state.categorycombobox)
-            category_pos = 0
             if state.categorycombobox in self.categorybox.Items:
                 category_pos = self.categorybox.Items.index(
@@ -1194 +1192 @@
         self.formfactorbox.Select(formfactor_pos)
 
+        structfactor_pos = 0
         try:
             # to support older version
@@ -1199 +1198 @@
         except:
             if state.structurecombobox is not None:
-                structfactor_pos = 0
                 state.structurecombobox = unicode(state.structurecombobox)
                 for ind_struct in range(self.structurebox.GetCount()):
                     if self.structurebox.GetString(ind_struct) == \
-                                                        (state.structurecombobox):
+                                                    (state.structurecombobox):
                         structfactor_pos = int(ind_struct)
                         break
@@ -1209 +1207 @@
         self.structurebox.SetSelection(structfactor_pos)
 
-        if state.multi_factor != None:
+        if state.multi_factor is not None:
             self.multifactorbox.SetSelection(state.multi_factor)
 
-        #draw the panel according to the new model parameter
+        # 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():
+        if data is None and self.model_view.IsEnabled():
             if self.enable2D:
                 self.model_view.SetLabel("2D Mode")
@@ -1222 +1220 @@
                 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
+        # reset state of checkbox,textcrtl  and  regular parameters value
         self._reset_parameters_state(self.orientation_params_disp,
                                      state.orientation_params_disp)
@@ -1233 +1228 @@
                                      state.str_parameters)
         self._reset_parameters_state(self.parameters, state.parameters)
-        ## display dispersion info layer
+        # display dispersion info layer
         self.enable_disp.SetValue(state.enable_disp)
         self.disable_disp.SetValue(state.disable_disp)
@@ -1241 +1236 @@
             self._set_dipers_Param(event=None)
             self._reset_page_disp_helper(state)
-        ##plotting range restore
+        # plotting range restore
         self._reset_plotting_range(state)
-        ## smearing info  restore
+        # smearing info  restore
         if hasattr(self, "enable_smearer"):
-            ## set smearing value whether or not the data
-            #contain the smearing info
+            # set smearing value whether or not the data
+            # contain the smearing info
             self.enable_smearer.SetValue(state.enable_smearer)
             self.disable_smearer.SetValue(state.disable_smearer)
@@ -1264 +1259 @@
             self.dI_idata.SetValue(False)
 
-        ## we have two more options for smearing
+        # we have two more options for smearing
         if self.pinhole_smearer.GetValue():
             self.dx_min = state.dx_min
             self.dx_max = state.dx_max
-            if self.dx_min != None:
+            if self.dx_min is not None:
                 self.smear_pinhole_min.SetValue(str(self.dx_min))
-            if self.dx_max != None:
+            if self.dx_max is not None:
                 self.smear_pinhole_max.SetValue(str(self.dx_max))
             self.onPinholeSmear(event=None)
@@ -1276 +1271 @@
             self.dxl = state.dxl
             self.dxw = state.dxw
-            if self.dxl != None:
+            if self.dxl is not None:
                 self.smear_slit_height.SetValue(str(self.dxl))
-            if self.dxw != None:
+            if self.dxw is not None:
                 self.smear_slit_width.SetValue(str(self.dxw))
             else:
@@ -1284 +1279 @@
             self.onSlitSmear(event=None)
 
-        ## reset state of checkbox,textcrtl  and dispersity parameters value
+        # 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
+        # draw the model with previous parameters value
         self._onparamEnter_helper()
-        #reset the value of chisqr when not consistent with the value computed
+        # reset the value of chisqr when not consistent with the value computed
         self.tcChi.SetValue(str(self.state.tcChi))
-        ## reset context menu items
+        # reset context menu items
         self._reset_context_menu()
 
-        ## set the value of the current state to the state given as parameter
+        # set the value of the current state to the state given as parameter
         self.state = state.clone()
         self.state.m_name = self.m_name
@@ -1306 +1301 @@
         for item in keys:
             if item in self.disp_list and \
-                not item in self.model.details:
+                            item not in self.model.details:
                 self.model.details[item] = ["", None, None]
-        #for k,v in self.state.disp_cb_dict.iteritems():
+        # for k,v in self.state.disp_cb_dict.iteritems():
         self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
         self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
@@ -1315 +1310 @@
 
         for key, disp_type in state._disp_obj_dict.iteritems():
-            #disp_model = disp
+            # disp_model = disp
             disp_model = POLYDISPERSITY_MODELS[disp_type]()
             self._disp_obj_dict[key] = disp_model
@@ -1324 +1319 @@
                 self.model.set_dispersion(param_name, disp_model)
                 self.model._persistency_dict[key] = \
-                                 [state.values, state.weights]
+                    [state.values, state.weights]
             except Exception:
                 logging.error(traceback.format_exc())
             selection = self._find_polyfunc_selection(disp_model)
             for list in self.fittable_param:
-                if list[1] == key and list[7] != None:
+                if list[1] == key and list[7] is not None:
                     list[7].SetSelection(selection)
                     # For the array disp_model, set the values and weights
@@ -1362 +1357 @@
         open a dialog file to selected the customized dispersity
         """
-        if self.parent != None:
+        if self.parent is not None:
             self._default_save_location = \
                         self._manager.parent.get_save_location()
@@ -1381 +1376 @@
         for name, _ in self.state.saved_states.iteritems():
             self.number_saved_state += 1
-            ## Add item in the context menu
+            # Add item in the context menu
             wx_id = ids.next()
             msg = 'Save model and state %g' % self.number_saved_state
@@ -1398 +1393 @@
         save radiobutton containing the type model that can be selected
         """
-        #self.state.shape_rbutton = self.shape_rbutton.GetValue()
-        #self.state.shape_indep_rbutton = self.shape_indep_rbutton.GetValue()
-        #self.state.struct_rbutton = self.struct_rbutton.GetValue()
-        #self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
+        # self.state.shape_rbutton = self.shape_rbutton.GetValue()
+        # self.state.shape_indep_rbutton = self.shape_indep_rbutton.GetValue()
+        # self.state.struct_rbutton = self.struct_rbutton.GetValue()
+        # self.state.plugin_rbutton = self.plugin_rbutton.GetValue()
         self.state.structurecombobox = self.structurebox.GetLabel()
         self.state.formfactorcombobox = self.formfactorbox.GetLabel()
         self.state.categorycombobox = self.categorybox.GetLabel()
 
-        ## post state to fit panel
+        # post state to fit panel
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
@@ -1418 +1413 @@
         self.state.npts = self.npts_x
 
-    def _onparamEnter_helper(self,is_modified = False):
+    def _onparamEnter_helper(self, is_modified=False):
         """
         check if values entered by the user are changed and valid to replot
@@ -1424 +1419 @@
         """
         # Flag to register when a parameter has changed.
-        #is_modified = False
+        # is_modified = False
         self.fitrange = True
         is_2Ddata = False
-        #self._undo.Enable(True)
+        # self._undo.Enable(True)
         # check if 2d data
         if self.data.__class__.__name__ == "Data2D":
             is_2Ddata = True
-        if self.model != None:
-            #Either we get a is_modified = True passed in because
-            #_update_paramv_on_fit() has been called already or
+        if self.model is not None:
+            # Either we get a is_modified = True passed in because
+            # _update_paramv_on_fit() has been called already or
             # we need to check here ourselves.
             if not is_modified:
@@ -1460 +1455 @@
                 self.fitrange = False
 
-            if not self.data.is_data:
-                is_modified = True
-
-            ## if any value is modify draw model with new value
+            # if any value is modify draw model with new value
             if not self.fitrange:
-                #self.btFit.Disable()
+                # self.btFit.Disable()
                 if is_2Ddata:
                     self.btEditMask.Disable()
@@ -1478 +1470 @@
                 self._draw_model()
                 self.Refresh()
+
+        # logging.info("is_modified flag set to %g",is_modified)
         return is_modified
 
@@ -1484 +1478 @@
         make sure that update param values just before the fitting
         """
-        #flag for qmin qmax check values
+        # flag for qmin qmax check values
         flag = True
         self.fitrange = True
         is_modified = False
 
-        #wx.PostEvent(self._manager.parent, StatusEvent(status=" \
-        #updating ... ",type="update"))
-
-        ##So make sure that update param values on_Fit.
-        #self._undo.Enable(True)
-        if self.model != None:
+        # wx.PostEvent(self._manager.parent, StatusEvent(status=" \
+        # updating ... ",type="update"))
+
+        # So make sure that update param values on_Fit.
+        # self._undo.Enable(True)
+        if self.model is not None:
             if self.Npts_total.GetValue() != self.Npts_fit.GetValue():
                 if not self.data.is_data:
-                    self._manager.page_finder[self.uid].set_fit_data(data=\
-                                                                [self.data])
-            ##Check the values
+                    self._manager.page_finder[self.uid].set_fit_data(
+                        data=[self.data])
+            # Check the values
             is_modified = (self._check_value_enter(self.fittable_param)
-                            or self._check_value_enter(self.fixed_param)
-                            or self._check_value_enter(self.parameters))
+                           or self._check_value_enter(self.fixed_param)
+                           or self._check_value_enter(self.parameters))
 
             # If qmin and qmax have been modified, update qmin and qmax and
@@ -1543 +1537 @@
                                               enable_smearer=enable_smearer,
                                               draw=False)
-                    if self.data != None:
-                        index_data = ((self.qmin_x <= self.data.x) & \
+                    if self.data is not None:
+                        index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = str(len(self.data.x[index_data == True]))
+                        val = str(len(self.data.x[index_data is True]))
                         self.Npts_fit.SetValue(val)
                     else:
@@ -1566 +1560 @@
             flag = False
 
-        #For invalid q range, disable the mask editor and fit button, vs.
+        # For invalid q range, disable the mask editor and fit button, vs.
         if not self.fitrange:
             if self._is_2D():
                 self.btEditMask.Disable()
         else:
-            if self._is_2D() and  self.data.is_data and not self.batch_on:
+            if self._is_2D() and self.data.is_data and not self.batch_on:
                 self.btEditMask.Enable(True)
 
@@ -1584 +1578 @@
             logging.error(traceback.format_exc())
 
-        return flag,is_modified
+        return flag, is_modified
 
     def _reset_parameters_state(self, listtorestore, statelist):
@@ -1598 +1592 @@
             item_page = listtorestore[j]
             item_page_info = statelist[j]
-            ##change the state of the check box for simple parameters
-            if item_page[0] != None:
+            # change the state of the check box for simple parameters
+            if item_page[0] is not None:
                 item_page[0].SetValue(item_page_info[0])
-            if item_page[2] != None:
+            if item_page[2] is not None:
                 item_page[2].SetValue(item_page_info[2])
                 if item_page[2].__class__.__name__ == "ComboBox":
@@ -1607 +1601 @@
                         fun_val = self.model.fun_list[item_page_info[2]]
                         self.model.setParam(item_page_info[1], fun_val)
-            if item_page[3] != None:
-                ## show or hide text +/-
+            if item_page[3] is not None:
+                # show or hide text +/-
                 if item_page_info[2]:
                     item_page[3].Show(True)
                 else:
                     item_page[3].Hide()
-            if item_page[4] != None:
-                ## show of hide the text crtl for fitting error
+            if item_page[4] is not None:
+                # show of hide the text crtl for fitting error
                 if item_page_info[4][0]:
                     item_page[4].Show(True)
@@ -1620 +1614 @@
                 else:
                     item_page[3].Hide()
-            if item_page[5] != None:
-                ## show of hide the text crtl for fitting error
+            if item_page[5] is not None:
+                # show of hide the text crtl for fitting error
                 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
+            if item_page[6] is not 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])
@@ -1642 +1636 @@
             item_page = listtorestore[j]
             item_page_info = statelist[j]
-            ##change the state of the check box for simple parameters
-
-            if item_page[0] != None:
+            # change the state of the check box for simple parameters
+
+            if item_page[0] is not None:
                 item_page[0].SetValue(format_number(item_page_info[0], True))
 
-            if item_page[2] != None:
+            if item_page[2] is not None:
                 param_name = item_page_info[1]
                 value = item_page_info[2]
@@ -1670 +1664 @@
 
             checkbox_state = None
-            if item[0] != None:
+            if item[0] is not None:
                 checkbox_state = item[0].GetValue()
             parameter_name = item[1]
             parameter_value = None
-            if item[2] != None:
+            if item[2] is not None:
                 parameter_value = item[2].GetValue()
             static_text = None
-            if item[3] != None:
+            if item[3] is not None:
                 static_text = item[3].IsShown()
             error_value = None
             error_state = None
-            if item[4] != None:
+            if item[4] is not None:
                 error_value = item[4].GetValue()
                 error_state = item[4].IsShown()
@@ -1687 +1681 @@
             min_value = None
             min_state = None
-            if item[5] != None:
+            if item[5] is not None:
                 min_value = item[5].GetValue()
                 min_state = item[5].IsShown()
@@ -1693 +1687 @@
             max_value = None
             max_state = None
-            if item[6] != None:
+            if item[6] is not None:
                 max_value = item[6].GetValue()
                 max_state = item[6].IsShown()
             unit = None
-            if item[7] != None:
+            if item[7] is not None:
                 unit = item[7].GetLabel()
 
@@ -1705 +1699 @@
                               [max_state, max_value], unit])
 
-
     def _draw_model(self, update_chisqr=True, source='model'):
         """
@@ -1724 +1717 @@
         :param chisqr: update chisqr value [bool]
         """
-        #if self.check_invalid_panel():
+        # if self.check_invalid_panel():
         #    return
-        if self.model != None:
+        if self.model is not None:
             temp_smear = None
             if hasattr(self, "enable_smearer"):
@@ -1738 +1731 @@
             is_2d = self._is_2D()
             self._manager.draw_model(self.model,
-                                    data=self.data,
-                                    smearer=temp_smear,
-                                    qmin=float(self.qmin_x),
-                                    qmax=float(self.qmax_x),
-                                    page_id=self.uid,
-                                    toggle_mode_on=toggle_mode_on,
-                                    state=self.state,
-                                    enable2D=is_2d,
-                                    update_chisqr=update_chisqr,
-                                    source='model',
-                                    weight=weight)
+                                     data=self.data,
+                                     smearer=temp_smear,
+                                     qmin=float(self.qmin_x),
+                                     qmax=float(self.qmax_x),
+                                     page_id=self.uid,
+                                     toggle_mode_on=toggle_mode_on,
+                                     state=self.state,
+                                     enable2D=is_2d,
+                                     update_chisqr=update_chisqr,
+                                     source='model',
+                                     weight=weight)
 
     def _on_show_sld(self, event=None):
@@ -1758 +1751 @@
 
         from sas.sasgui.plottools import Data1D as pf_data1d
-        #from sas.sasgui.perspectives.theory.profile_dialog import SLDPanel
+        # from sas.sasgui.perspectives.theory.profile_dialog import SLDPanel
         from sas.sasgui.guiframe.local_perspectives.plotting.profile_dialog \
-        import SLDPanel
+            import SLDPanel
         sld_data = pf_data1d(x, y)
         sld_data.name = 'SLD'
@@ -1813 +1806 @@
         self.structurebox.Disable()
         self.formfactorbox.Clear()
-        if mod_cat == None:
+        if mod_cat is None:
             return
         m_list = []
@@ -1875 +1868 @@
         """
         tcrtl = event.GetEventObject()
-        #Clear msg if previously shown.
+        # Clear msg if previously shown.
         msg = ""
         wx.PostEvent(self.parent, StatusEvent(status=msg))
@@ -1894 +1887 @@
                     tcrtl.SetBackgroundColour("pink")
                     msg = "Model Error: wrong value entered: %s" % \
-                                    sys.exc_info()[1]
+                          sys.exc_info()[1]
                     wx.PostEvent(self.parent, StatusEvent(status=msg))
                     return
@@ -1902 +1895 @@
                 wx.PostEvent(self.parent, StatusEvent(status=msg))
                 return
-            #Check if # of points for theory model are valid(>0).
-            if self.npts != None:
+            # Check if # of points for theory model are valid(>0).
+            if self.npts is not None:
                 if check_float(self.npts):
                     temp_npts = float(self.npts.GetValue())
@@ -1919 +1912 @@
         wx.PostEvent(self.parent, event)
         self.state_change = False
-        #Draw the model for a different range
+        # Draw the model for a different range
         if not self.data.is_data:
             self.create_default_data()
@@ -1930 +1923 @@
 
         tcrtl = event.GetEventObject()
-        #Clear msg if previously shown.
+        # Clear msg if previously shown.
         msg = ""
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
@@ -1951 +1944 @@
                     tcrtl.SetBackgroundColour("pink")
                     msg = "Model Error: wrong value entered: %s" % \
-                                        sys.exc_info()[1]
+                          sys.exc_info()[1]
                     wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
                     return
@@ -1959 +1952 @@
                 wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
                 return
-            #Check if # of points for theory model are valid(>0).
+            # Check if # of points for theory model are valid(>0).
             if self.Npts_total.IsEditable():
                 if check_float(self.Npts_total):
@@ -1977 +1970 @@
         wx.PostEvent(self.parent, event)
         self.state_change = False
-        #Draw the model for a different range
+        # Draw the model for a different range
         self.create_default_data()
         self._draw_model()
@@ -1985 +1978 @@
         call back for model selection
         """
-        ## reset dictionary containing reference to dispersion
+        # reset dictionary containing reference to dispersion
         self._disp_obj_dict = {}
         self.disp_cb_dict = {}
         self.temp_multi_functional = False
         f_id = self.formfactorbox.GetCurrentSelection()
-        #For MAC
+        # For MAC
         form_factor = None
         if f_id >= 0:
@@ -1997 +1990 @@
         if form_factor is None or \
             not hasattr(form_factor, 'is_form_factor') or \
-            not form_factor.is_form_factor:
+                not form_factor.is_form_factor:
             self.structurebox.Hide()
             self.text2.Hide()
@@ -2009 +2002 @@
             self.text2.Enable()
 
-        if form_factor != None:
+        if form_factor is not None:
             # set multifactor for Mutifunctional models
             if form_factor.is_multiplicity_model:
@@ -2017 +2010 @@
                 self._set_multfactor_combobox(multiplicity)
                 self._show_multfactor_combobox()
-                #ToDo:  this info should be called directly from the model
+                # ToDo: this info should be called directly from the model
                 text = form_factor.multiplicity_info[1]  # 'No. of Shells: '
 
@@ -2026 +2019 @@
 
                 self.multi_factor = self.multifactorbox.GetClientData(m_id)
-                if self.multi_factor == None:
+                if self.multi_factor is None:
                     self.multi_factor = 0
                 self.multifactorbox.SetSelection(m_id)
@@ -2032 +2025 @@
                 text = ''
                 if form_factor.multiplicity_info[0] == \
-                                        len(form_factor.multiplicity_info[2]):
+                        len(form_factor.multiplicity_info[2]):
                     text = form_factor.multiplicity_info[2][self.multi_factor]
                 self.mutifactor_text1.SetLabel(text)
@@ -2053 +2046 @@
         struct_factor = self.structurebox.GetClientData(s_id)
 
-        if  struct_factor != None:
-            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
+        if struct_factor is not None:
+            from sasmodels.sasview_model import MultiplicationModel
             self.model = MultiplicationModel(form_factor(self.multi_factor),
                                              struct_factor())
@@ -2060 +2053 @@
             if len(form_factor.non_fittable) > 0:
                 self.temp_multi_functional = True
-        elif form_factor != None:
+        elif form_factor is not None:
             if self.multi_factor is not None:
                 self.model = form_factor(self.multi_factor)
@@ -2075 +2068 @@
         else:
             self._has_magnetic = False
-        ## post state to fit panel
+        # post state to fit panel
         self.state.parameters = []
         self.state.model = self.model
@@ -2085 +2078 @@
         self.Layout()
 
-
     def _validate_qrange(self, qmin_ctrl, qmax_ctrl):
         """
@@ -2105 +2097 @@
             qmax = float(qmax_ctrl.GetValue())
             if qmin < qmax:
-                #Make sure to set both colours white.
+                # Make sure to set both colours white.
                 qmin_ctrl.SetBackgroundColour(wx.WHITE)
                 qmin_ctrl.Refresh()
@@ -2125 +2117 @@
         If valid, setvalues Npts_fit otherwise post msg.
         """
-        #default flag
+        # default flag
         flag = True
         # Theory
-        if self.data == None and self.enable2D:
+        if self.data is None and self.enable2D:
             return flag
         for data in self.data_list:
@@ -2134 +2126 @@
             radius = numpy.sqrt(data.qx_data * data.qx_data +
                                 data.qy_data * data.qy_data)
-            #get unmasked index
+            # get unmasked index
             index_data = (float(self.qmin.GetValue()) <= radius) & \
-                            (radius <= float(self.qmax.GetValue()))
+                         (radius <= float(self.qmax.GetValue()))
             index_data = (index_data) & (data.mask)
             index_data = (index_data) & (numpy.isfinite(data.data))
@@ -2152 +2144 @@
                 flag = False
             else:
-                self.Npts_fit.SetValue(str(len(index_data[index_data == True])))
+                self.Npts_fit.SetValue(str(len(index_data[index_data is True])))
                 self.fitrange = True
 
@@ -2162 +2154 @@
         If valid, setvalues Npts_fit otherwise post msg.
         """
-        #default flag
+        # default flag
         flag = True
         # Theory
-        if self.data == None:
+        if self.data is None:
             return flag
         for data in self.data_list:
             # q value from qx and qy
             radius = data.x
-            #get unmasked index
+            # get unmasked index
             index_data = (float(self.qmin.GetValue()) <= radius) & \
-                            (radius <= float(self.qmax.GetValue()))
+                         (radius <= float(self.qmax.GetValue()))
             index_data = (index_data) & (numpy.isfinite(data.y))
 
@@ -2187 +2179 @@
                 flag = False
             else:
-                self.Npts_fit.SetValue(str(len(index_data[index_data == True])))
+                self.Npts_fit.SetValue(str(len(index_data[index_data is True])))
                 self.fitrange = True
 
@@ -2207 +2199 @@
         is_modified = False
         for item in list:
-            #skip angle parameters for 1D
+            # skip angle parameters for 1D
             if not self.enable2D and item in self.orientation_params:
                 continue
@@ -2252 +2244 @@
                     max_ctrl.SetBackgroundColour("pink")
                     max_ctrl.Refresh()
-                    #msg = "Invalid fit range for %s: min must be smaller than max"%name
-                    #wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
+                    # msg = "Invalid fit range for %s: min must be smaller
+                    # than max"%name
+                    # wx.PostEvent(self._manager.parent,
+                    # StatusEvent(status=msg))
                     continue
 
@@ -2271 +2265 @@
                     # The configuration has changed but it won't change the
                     # computed curve so no need to set is_modified to True
-                    #is_modified = True
+                    # is_modified = True
                     self.model.details[name][1:3] = low, high
 
@@ -2289 +2283 @@
         Redraw the model with the default dispersity (Gaussian)
         """
-        ## On selction if no model exists.
-        if self.model == None:
+        # On selction if no model exists.
+        if self.model is None:
             self.disable_disp.SetValue(True)
             msg = "Please select a Model first..."
@@ -2300 +2294 @@
         self._reset_dispersity()
 
-        if self.model == None:
+        if self.model is None:
             self.model_disp.Hide()
             self.sizer4_4.Clear(True)
@@ -2306 +2300 @@
 
         if self.enable_disp.GetValue():
-            ## layout for model containing no dispersity parameters
+            # layout for model containing no dispersity parameters
 
             self.disp_list = self.model.getDispParamList()
@@ -2313 +2307 @@
                 self._layout_sizer_noDipers()
             else:
-                ## set gaussian sizer
+                # set gaussian sizer
                 self._on_select_Disp(event=None)
         else:
             self.sizer4_4.Clear(True)
 
-        ## post state to fit panel
+        # post state to fit panel
         self.save_current_state()
-        if event != None:
+        if event is not None:
             event = PageInfoEvent(page=self)
             wx.PostEvent(self.parent, event)
-        #draw the model with the current dispersity
-
-        #Wojtek P, Oct 8, 2016: Calling draw_model seems to be unessecary.
-        #By comenting it we save an extra Iq calculation
-        #self._draw_model()
-
-        ## Need to use FitInside again here to replace the next four lines.
-        ## Otherwised polydispersity off does not resize the scrollwindow.
-        ## PDB Nov 28, 2015
+        # draw the model with the current dispersity
+
+        # Wojtek P, Oct 8, 2016: Calling draw_model seems to be unessecary.
+        # By comenting it we save an extra Iq calculation
+        # self._draw_model()
+
+        # 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()
@@ -2375 +2369 @@
         self.weights = {}
 
-        #from sas.models.dispersion_models import GaussianDispersion
+        # from sas.models.dispersion_models import GaussianDispersion
         from sasmodels.weights import GaussianDispersion
         if len(self.disp_cb_dict) == 0:
@@ -2396 +2390 @@
                     logging.error(traceback.format_exc())
 
-        ## save state into
+        # save state into
         self.save_current_state()
         self.Layout()
@@ -2408 +2402 @@
         self._set_sizer_dispersion()
 
-        ## Redraw the model
+        # Redraw the model
         self._draw_model()
-        #self._undo.Enable(True)
+        # self._undo.Enable(True)
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
@@ -2425 +2419 @@
         """
         # get ready for new event
-        if event != None:
+        if event is not None:
             event.Skip()
         # Get event object
@@ -2438 +2432 @@
             dispersity = disp_box.GetClientData(selection)
 
-            #disp_model =  GaussianDispersion()
+            # disp_model =  GaussianDispersion()
             disp_model = dispersity()
             # Get param names to reset the values of the param
@@ -2451 +2445 @@
             else:
                 self._del_array_values(name1)
-                #self._reset_array_disp(param_name)
+                # self._reset_array_disp(param_name)
                 self._disp_obj_dict[name1] = disp_model
                 self.model.set_dispersion(param_name, disp_model)
@@ -2537 +2531 @@
         if path is None:
             self.disp_cb_dict[name].SetValue(False)
-            #self.noDisper_rbox.SetValue(True)
+            # self.noDisper_rbox.SetValue(True)
             return
         self._default_save_location = os.path.dirname(path)
-        if self._manager != None:
+        if self._manager is not None:
             self._manager.parent._default_save_location = \
                              self._default_save_location
@@ -2557 +2551 @@
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
         self._set_array_disp_model(name=name, disp=disp,
-                                    values=values, weights=weights)
+                                   values=values, weights=weights)
         return basename
 
@@ -2576 +2570 @@
         # Store the object to make it persist outside the
         # scope of this method
-        #TODO: refactor model to clean this up?
+        # TODO: refactor model to clean this up?
         self.state.values = {}
         self.state.weights = {}
@@ -2583 +2577 @@
 
         # Set the new model as the dispersion object for the
-        #selected parameter
-        #self.model.set_dispersion(p, disp_model)
+        # selected parameter
+        # self.model.set_dispersion(p, disp_model)
         # Store a reference to the weights in the model object
-        #so that
+        # so that
         # it's not lost when we use the model within another thread.
         self.state.model = self.model.clone()
         self.model._persistency_dict[name.split('.')[0]] = \
-                                        [values, weights]
+            [values, weights]
         self.state.model._persistency_dict[name.split('.')[0]] = \
-                                        [values, weights]
+            [values, weights]
 
     def _del_array_values(self, name=None):
@@ -2630 +2624 @@
             Layout after self._draw_model
         """
-        if ON_MAC == True:
+        if ON_MAC is True:
             time.sleep(1)
 
@@ -2652 +2646 @@
         """
         flag = True
-        ##For 3 different cases: Data2D, Data1D, and theory
-        if self.model == None:
+        # For 3 different cases: Data2D, Data1D, and theory
+        if self.model is None:
             msg = "Please select a model first..."
             wx.MessageBox(msg, 'Info')
@@ -2665 +2659 @@
             self.qmin_x = data_min
             self.qmax_x = math.sqrt(x * x + y * y)
-            #self.data.mask = numpy.ones(len(self.data.data),dtype=bool)
+            # self.data.mask = numpy.ones(len(self.data.data),dtype=bool)
             # check smearing
             if not self.disable_smearer.GetValue():
-                ## set smearing value whether or
+                # set smearing value whether or
                 # not the data contain the smearing info
                 if self.pinhole_smearer.GetValue():
@@ -2675 +2669 @@
                     flag = True
 
-        elif self.data == None:
+        elif self.data is None:
             self.qmin_x = _QMIN_DEFAULT
             self.qmax_x = _QMAX_DEFAULT
@@ -2686 +2680 @@
             # check smearing
             if not self.disable_smearer.GetValue():
-                ## set smearing value whether or
+                # set smearing value whether or
                 # not the data contain the smearing info
                 if self.slit_smearer.GetValue():
@@ -2697 +2691 @@
             flag = False
 
-        if flag == False:
+        if flag is False:
             msg = "Cannot Plot :Must enter a number!!!  "
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
@@ -2714 +2708 @@
         self.state.qmax = self.qmax_x
 
-        #reset the q range values
+        # reset the q range values
         self._reset_plotting_range(self.state)
         self._draw_model()
@@ -2755 +2749 @@
                 logging.error(traceback.format_exc())
         # Make sure the resduals plot goes to the last
-        if res_item != None:
+        if res_item is not None:
             graphs.append(res_item[0])
             canvases.append(res_item[1])
@@ -2774 +2768 @@
         the # to the browser.
 
-        :param evt: on Help Button pressed event
-        """
-
-        if self.model != None:
+        :param event: on Help Button pressed event
+        """
+
+        if self.model is not None:
             name = self.formfactorbox.GetValue()
-            _TreeLocation = 'user/models/'+ name.lower()+'.html'
+            _TreeLocation = 'user/models/' + name.lower()+'.html'
             _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation,
                                               "", name + " Help")
@@ -2786 +2780 @@
             _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation,
                                               "", "General Model Help")
-
 
     def on_model_help_clicked(self, event):
@@ -2798 +2791 @@
         give the message that none is available.
 
-        :param evt: on Description Button pressed event
-        """
-
-        if self.model == None:
+        :param event: on Description Button pressed event
+        """
+
+        if self.model is None:
             name = 'index.html'
         else:
@@ -2808 +2801 @@
         msg = 'Model description:\n'
         info = "Info"
-        if self.model != None:
-#                frame.Destroy()
+        if self.model is not None:
+            # frame.Destroy()
             if str(self.model.description).rstrip().lstrip() == '':
                 msg += "Sorry, no information is available for this model."
@@ -2878 +2871 @@
             for key in self.model.magnetic_params:
                 if key.count('M0') > 0:
-                    #reset mag value to zero fo safety
+                    # reset mag value to zero fo safety
                     self.model.setParam(key, 0.0)
 
         self.Show(False)
         self.set_model_param_sizer(self.model)
-        #self._set_sizer_dispersion()
+        # self._set_sizer_dispersion()
         self.state.magnetic_on = self.magnetic_on
         self.SetupScrolling()
@@ -2898 +2891 @@
         running "file:///...."
 
-        :param evt: Triggers on clicking ? in polydispersity box
+        :param event: Triggers on clicking ? in polydispersity box
         """
 
@@ -2936 +2929 @@
         content = 'sasview_parameter_values:'
         # Do it if params exist
-        if  self.parameters != []:
+        if self.parameters:
 
             # go through the parameters
@@ -2980 +2973 @@
 
         # Do it if params exist
-        if  self.parameters != []:
+        if self.parameters:
 
             for param in self.parameters:
-                content += param[1] #parameter name
+                content += param[1]  # parameter name
                 content += tab
                 content += param[1] + "_err"
@@ -2990 +2983 @@
             content += crlf
 
-            #row of values and errors...
+            # row of values and errors...
             for param in self.parameters:
-                content += param[2].GetValue() #value
+                content += param[2].GetValue()  # value
                 content += tab
-                content += param[4].GetValue() #error
+                content += param[4].GetValue()  # error
                 content += tab
 
@@ -3000 +2993 @@
         else:
             return False
-
 
     def get_copy_latex(self):
@@ -3022 +3014 @@
 
         # Do it if params exist
-        if  self.parameters != []:
+        if self.parameters:
 
             content += '{|'
@@ -3031 +3023 @@
 
             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"
@@ -3039 +3031 @@
             content += crlf
 
-            #row of values and errors...
+            # row of values and errors...
             for index, param in enumerate(self.parameters):
-                content += param[2].GetValue() #parameter value
+                content += param[2].GetValue()  # parameter value
                 content += ' & '
-                content += param[4].GetValue() #parameter error
+                content += param[4].GetValue()  # parameter error
                 if index < len(self.parameters) - 1:
                     content += ' & '
@@ -3054 +3046 @@
         else:
             return False
-
 
     def set_clipboard(self, content=None):
@@ -3101 +3092 @@
             # 1D
             else:
-                ## for 1D all parameters except orientation
+                # for 1D all parameters except orientation
                 if not item[1] in orient_param:
                     try:
@@ -3133 +3124 @@
             except Exception:
                 logging.error(traceback.format_exc())
-            content += name + ',' + str(check) + ',' +\
-                    value + disfunc + ',' + bound_lo + ',' +\
-                    bound_hi + ':'
+            content += name + ',' + str(check) + ',' + value + disfunc + ',' + \
+                       bound_lo + ',' + bound_hi + ':'
 
         return content
@@ -3213 +3203 @@
 
         # Do it if params exist
-        if  self.parameters != []:
+        if self.parameters:
             # go through the parameters
             self._get_paste_helper(self.parameters,
@@ -3261 +3251 @@
                                 pd = int(pd)
                         except Exception:
-                            #continue
+                            # continue
                             if not pd and pd != '':
                                 continue
@@ -3289 +3279 @@
                     else:
                         is_true = None
-                    if is_true != None:
+                    if is_true is not None:
                         item[0].SetValue(is_true)
             # 1D
             else:
-                ## for 1D all parameters except orientation
+                # for 1D all parameters except orientation
                 if not item[1] in orient_param:
                     name = item[1]
@@ -3302 +3292 @@
                         pd = value[0]
                         if name.count('.') > 0:
-                            # If this is parameter.width, then pd may be a floating
-                            # point value or it may be an array distribution.
-                            # Nothing to do for parameter.npts or parameter.nsigmas.
+                            # If this is parameter.width, then pd may be a
+                            # floating point value or it may be an array
+                            # distribution. Nothing to do for parameter.npts or
+                            # parameter.nsigmas.
                             try:
                                 pd = float(pd)
@@ -3310 +3301 @@
                                     pd = int(pd)
                             except:
-                                #continue
+                                # continue
                                 if not pd and pd != '':
                                     continue
@@ -3338 +3329 @@
                         else:
                             is_true = None
-                        if is_true != None:
+                        if is_true is not None:
                             item[0].SetValue(is_true)
+
+        self.select_param(event=None)
+        self.Refresh()
 
     def _paste_poly_help(self, item, value):
@@ -3402 +3396 @@
             logging.error(traceback.format_exc())
             print "Error in BasePage._paste_poly_help: %s" % \
-                                    sys.exc_info()[1]
+                  sys.exc_info()[1]
 
     def _set_disp_cb(self, isarray, item):
@@ -3468 +3462 @@
         self.categorybox.Clear()
         cat_list = sorted(self.master_category_dict.keys())
-        if not uncat_str in cat_list:
+        if uncat_str not in cat_list:
             cat_list.append(uncat_str)
 
@@ -3478 +3472 @@
             self.categorybox.SetSelection(0)
         else:
-            self.categorybox.SetSelection(\
+            self.categorybox.SetSelection(
                 self.categorybox.GetSelection())
-        #self._on_change_cat(None)
+        # self._on_change_cat(None)
 
     def _on_change_cat(self, event):
@@ -3488 +3482 @@
         self.model_name = None
         category = self.categorybox.GetStringSelection()
-        if category == None:
+        if category is None:
             return
         self.model_box.Clear()
@@ -3499 +3493 @@
         else:
             for (model, enabled) in sorted(self.master_category_dict[category],
-                                      key=lambda name: name[0]):
+                                           key=lambda name: name[0]):
                 if(enabled):
                     self.model_box.Append(model)
@@ -3508 +3502 @@
         """
         # 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...
+        # print "==== Entering _fill_model_sizer"
+        # Add model function Details button in fitpanel.
+        # The following 3 lines are for Mac. Let JHC know before modifying...
         title = "Model"
         self.formfactorbox = None
@@ -3542 +3536 @@
         self._populate_listbox()
         wx.EVT_COMBOBOX(self.categorybox, wx.ID_ANY, self._show_combox)
-        #self.shape_rbutton = wx.RadioButton(self, wx.ID_ANY, 'Shapes',
+        # self.shape_rbutton = wx.RadioButton(self, wx.ID_ANY, 'Shapes',
         #                                     style=wx.RB_GROUP)
-        #self.shape_indep_rbutton = wx.RadioButton(self, wx.ID_ANY,
+        # self.shape_indep_rbutton = wx.RadioButton(self, wx.ID_ANY,
         #                                          "Shape-Independent")
-        #self.struct_rbutton = wx.RadioButton(self, wx.ID_ANY,
+        # self.struct_rbutton = wx.RadioButton(self, wx.ID_ANY,
         #                                     "Structure Factor ")
-        #self.plugin_rbutton = wx.RadioButton(self, wx.ID_ANY,
+        # self.plugin_rbutton = wx.RadioButton(self, wx.ID_ANY,
         #                                     "Uncategorized")
 
-        #self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
+        # self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
         #                   id=self.shape_rbutton.GetId())
-        #self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
+        # self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
         #                    id=self.shape_indep_rbutton.GetId())
-        #self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
+        # self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
         #                    id=self.struct_rbutton.GetId())
-        #self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
+        # self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
         #                    id=self.plugin_rbutton.GetId())
-        #MAC needs SetValue
+        # MAC needs SetValue
 
         show_cat_button = wx.Button(self, wx.ID_ANY, "Modify")
         cat_tip = "Modify model categories \n"
         cat_tip += "(also accessible from the menu bar)."
-        show_cat_button.SetToolTip( wx.ToolTip(cat_tip) )
+        show_cat_button.SetToolTip(wx.ToolTip(cat_tip))
         show_cat_button.Bind(wx.EVT_BUTTON, self._on_modify_cat)
         sizer_cat_box.Add(self.categorybox, 1, wx.RIGHT, 3)
-        sizer_cat_box.Add((10,10))
+        sizer_cat_box.Add((10, 10))
         sizer_cat_box.Add(show_cat_button)
-        #self.shape_rbutton.SetValue(True)
+        # self.shape_rbutton.SetValue(True)
 
         sizer_radiobutton = wx.GridSizer(2, 2, 5, 5)
-        #sizer_radiobutton.Add(self.shape_rbutton)
-        #sizer_radiobutton.Add(self.shape_indep_rbutton)
-        sizer_radiobutton.Add((5,5))
+        # sizer_radiobutton.Add(self.shape_rbutton)
+        # sizer_radiobutton.Add(self.shape_indep_rbutton)
+        sizer_radiobutton.Add((5, 5))
         sizer_radiobutton.Add(self.model_view, 1, wx.RIGHT, 5)
-        #sizer_radiobutton.Add(self.plugin_rbutton)
-        #sizer_radiobutton.Add(self.struct_rbutton)
-#        sizer_radiobutton.Add((5,5))
+        # sizer_radiobutton.Add(self.plugin_rbutton)
+        # sizer_radiobutton.Add(self.struct_rbutton)
+        # sizer_radiobutton.Add((5,5))
         sizer_radiobutton.Add(self.model_help, 1, wx.RIGHT | wx.LEFT, 5)
-#        sizer_radiobutton.Add((5,5))
+        # sizer_radiobutton.Add((5,5))
         sizer_radiobutton.Add(self.model_func, 1, wx.RIGHT, 5)
         sizer_cat.Add(sizer_cat_box, 1, wx.LEFT, 2.5)
@@ -3596 +3590 @@
         self.formfactorbox = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
         self.formfactorbox.SetToolTip(wx.ToolTip("Select a Model"))
-        if self.model != None:
+        if self.model is not None:
             self.formfactorbox.SetValue(self.model.name)
         self.structurebox = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
@@ -3605 +3599 @@
         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:
+        # check model type to show sizer
+        if self.model is not None:
             print "_set_model_sizer_selection: disabled."
-            #self._set_model_sizer_selection(self.model)
+            # self._set_model_sizer_selection(self.model)
 
         sizer_selection.Add(self.text1)
@@ -3707 +3701 @@
         """
 
+
 class ModelTextCtrl(wx.TextCtrl):
     """
@@ -3719 +3714 @@
 
     """
-    ## Set to True when the mouse is clicked while whole string is selected
+    # Set to True when the mouse is clicked while whole string is selected
     full_selection = False
-    ## Call back for EVT_SET_FOCUS events
+    # Call back for EVT_SET_FOCUS events
     _on_set_focus_callback = None
 
@@ -3743 +3738 @@
             if set_focus_callback is None else set_focus_callback
         self.Bind(wx.EVT_SET_FOCUS, self._on_set_focus)
-        self.Bind(wx.EVT_KILL_FOCUS, self._silent_kill_focus \
-            if kill_focus_callback is None else kill_focus_callback)
-        self.Bind(wx.EVT_TEXT_ENTER, parent._onparamEnter \
-            if text_enter_callback is None else text_enter_callback)
+        self.Bind(wx.EVT_KILL_FOCUS, self._silent_kill_focus
+        if kill_focus_callback is None else kill_focus_callback)
+        self.Bind(wx.EVT_TEXT_ENTER, parent._onparamEnter
+        if text_enter_callback is None else text_enter_callback)
         if not ON_MAC:
-            self.Bind(wx.EVT_LEFT_UP, self._highlight_text \
-                if mouse_up_callback is None else mouse_up_callback)
+            self.Bind(wx.EVT_LEFT_UP, self._highlight_text
+            if mouse_up_callback is None else mouse_up_callback)
 
     def _on_set_focus(self, event):
@@ -3789 +3784 @@
 
         event.Skip()
-        #pass
+        # pass

src/sas/sasgui/perspectives/fitting/fitpage.py

@@ -14 +14 @@
 from sasmodels.weights import MODELS as POLYDISPERSITY_MODELS
 
-from sas.sasgui.guiframe.events import StatusEvent
-from sas.sasgui.guiframe.events import NewPlotEvent
-from sas.sasgui.guiframe.events import PlotQrangeEvent
+from sas.sasgui.guiframe.events import StatusEvent, NewPlotEvent, \
+    PlotQrangeEvent
 from sas.sasgui.guiframe.dataFitting import check_data_validity
-from sas.sasgui.guiframe.utils import format_number
-from sas.sasgui.guiframe.utils import check_float
+from sas.sasgui.guiframe.utils import format_number, check_float
 from sas.sasgui.guiframe.documentation_window import DocumentationWindow
+
+from sas.sasgui.perspectives.fitting.basepage import BasicPage as BasicPage
+from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent as \
+    PageInfoEvent
+from sas.sascalc.data_util.qsmearing import smear_selection
+from .basepage import ModelTextCtrl
 
 (Chi2UpdateEvent, EVT_CHI2_UPDATE) = wx.lib.newevent.NewEvent()
@@ -28 +32 @@
 SMEAR_SIZE_H = 0.00
 
-from sas.sasgui.perspectives.fitting.basepage import BasicPage as BasicPage
-from sas.sasgui.perspectives.fitting.basepage import PageInfoEvent as PageInfoEvent
-from sas.sascalc.data_util.qsmearing import smear_selection
-from .basepage import ModelTextCtrl
-
 
 class FitPage(BasicPage):
@@ -49 +48 @@
         BasicPage.__init__(self, parent, color=color)
 
-        ## draw sizer
+        # draw sizer
         self._fill_data_sizer()
         self.is_2D = None
@@ -72 +71 @@
         self.enable_fit_button()
         self.fill_data_combobox(data_list=self.data_list)
-        #create a default data for an empty panel
+        # create a default data for an empty panel
         self.create_default_data()
         self._manager.frame.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
@@ -105 +104 @@
         self.data_box_description.SetForegroundColour(dname_color)
         boxsizer1 = wx.StaticBoxSizer(self.data_box_description, wx.VERTICAL)
-        #----------------------------------------------------------
+        # ----------------------------------------------------------
         sizer_data = wx.BoxSizer(wx.HORIZONTAL)
         self.dataSource = wx.ComboBox(self, wx.ID_ANY, style=wx.CB_READONLY)
@@ -134 +133 @@
         self.enable_datasource()
         if len(data_list) > 0:
-            #find the maximum range covering all data
+            # find the maximum range covering all data
             qmin, qmax, npts = self.compute_data_set_range(data_list)
             self.qmin_data_set = qmin
@@ -186 +185 @@
 
         :return: True or False
-
         """
         if self.data.__class__.__name__ == "Data2D" or \
@@ -200 +198 @@
         buttons, xi^2, number of points etc.
         """
-        is_2Ddata = False
+        is_2d_data = False
 
         # Check if data is 2D
         if self.data.__class__.__name__ == "Data2D" or \
                         self.enable2D:
-            is_2Ddata = True
+            is_2d_data = True
 
         title = "Fitting"
-        #smear messages & titles
+        # smear messages & titles
         smear_message_none = "No smearing is selected..."
         smear_message_dqdata = "The dQ data is being used for smearing..."
@@ -226 +224 @@
         self._get_smear_info()
 
-        #Sizers
+        # Sizers
         box_description_range = wx.StaticBox(self, wx.ID_ANY, str(title))
         box_description_range.SetForegroundColour(wx.BLUE)
@@ -245 +243 @@
         sizer_weighting = wx.BoxSizer(wx.HORIZONTAL)
         weighting_box.SetMinSize((_DATA_BOX_WIDTH, 40))
-        #Filling the sizer containing weighting info.
+        # Filling the sizer containing weighting info.
         self.dI_noweight = wx.RadioButton(self, wx.ID_ANY,
                                           'No Weighting', style=wx.RB_GROUP)
@@ -287 +285 @@
                         self._on_select_accuracy)
 
-        #Fit button
+        # Fit button
         self.btFit = wx.Button(self, self._ids.next(), 'Fit')
         self.default_bt_colour = self.btFit.GetDefaultAttributes()
@@ -293 +291 @@
         self.btFit.SetToolTipString("Start fitting.")
 
-        #General Help button
+        # General Help button
         self.btFitHelp = wx.Button(self, wx.ID_ANY, 'Help')
         self.btFitHelp.SetToolTipString("General fitting help.")
         self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp)
         
-        #Resolution Smearing Help button (for now use same technique as
-        #used for dI help to get tiniest possible button that works
-        #both on MAC and PC.  Should completely rewrite the fitting sizer 
-        #in future.  This is minimum to get out release 3.1
+        # Resolution Smearing Help button (for now use same technique as
+        # used for dI help to get tiniest possible button that works
+        # both on MAC and PC.  Should completely rewrite the fitting sizer
+        # in future.  This is minimum to get out release 3.1
         #        comment June 14, 2015     --- PDB
         if sys.platform.count("win32") > 0:
-            size_q = (20, 15)  #on PC
+            size_q = (20, 15)  # on PC
         else:
-            size_q = (30, 20)  #on MAC
+            size_q = (30, 20)  # on MAC
         self.btSmearHelp = wx.Button(self, wx.ID_ANY, '?',
                                      style=wx.BU_EXACTFIT, size=size_q)
@@ -312 +310 @@
         self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp)
         
-        #textcntrl for custom resolution
+        # textcntrl for custom resolution
         self.smear_pinhole_max = ModelTextCtrl(self, wx.ID_ANY,
                             size=(_BOX_WIDTH - 25, 20),
@@ -330 +328 @@
                             text_enter_callback=self.onSlitSmear)
 
-        ## smear
+        # smear
         self.smear_data_left = BGTextCtrl(self, wx.ID_ANY,
                                           size=(_BOX_WIDTH - 25, 20), style=0)
@@ -338 +336 @@
         self.smear_data_right.SetValue(str(self.dq_r))
 
-        #set default values for smear
+        # set default values for smear
         self.smear_pinhole_max.SetValue(str(self.dx_max))
         self.smear_pinhole_min.SetValue(str(self.dx_min))
@@ -344 +342 @@
         self.smear_slit_width.SetValue(str(self.dxw))
 
-        #Filling the sizer containing instruments smearing info.
+        # Filling the sizer containing instruments smearing info.
         self.disable_smearer = wx.RadioButton(self, wx.ID_ANY,
                                               'None', style=wx.RB_GROUP)
         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.enable_smearer.SetToolTipString(
+        # "Click to use the loaded dQ data for smearing.")
         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.pinhole_smearer.SetToolTipString
+        # ("Click to input custom resolution for pinhole smearing.")
         self.slit_smearer = wx.RadioButton(self, wx.ID_ANY, 'Custom Slit Smear')
-        #self.slit_smearer.SetToolTipString
-        #("Click to input custom resolution for slit smearing.")
+        # self.slit_smearer.SetToolTipString
+        # ("Click to input custom resolution for slit smearing.")
         self.Bind(wx.EVT_RADIOBUTTON, self.onSmear,
                   id=self.disable_smearer.GetId())
@@ -379 +377 @@
         self.Npts_fit = BGTextCtrl(self, wx.ID_ANY, "-", size=(75, 20), style=0)
         self.Npts_fit.SetToolTipString(
-                            " Npts : number of points selected for fitting")
+            " Npts : number of points selected for fitting")
         self.Npts_total = ModelTextCtrl(self, wx.ID_ANY, size=(_BOX_WIDTH, 20),
-                            style=wx.TE_PROCESS_ENTER,
-                            text_enter_callback=self._onQrangeEnter)
+                                        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")
+        self.Npts_total.SetToolTipString(
+            " Total Npts : total number of data points")
 
         # Update and Draw button
@@ -430 +428 @@
         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(\
+        self.smear_description_2d_y.SetToolTipString(
                                     " dQs(perpendicular) in q_phi direction.")
         self.smear_description_pin_min = wx.StaticText(self, wx.ID_ANY,
@@ -441 +439 @@
                         smear_message_slit_width_title, style=wx.ALIGN_LEFT)
 
-        #arrange sizers
+        # arrange sizers
         self.sizer_set_smearer.Add(sizer_smearer)
         self.sizer_set_smearer.Add((10, 10))
         self.sizer_set_smearer.Add(self.smear_description_none,
-                                    0, wx.CENTER, 10)
+                                   0, wx.CENTER, 10)
         self.sizer_set_smearer.Add(self.smear_description_dqdata,
-                                    0, wx.CENTER, 10)
+                                   0, wx.CENTER, 10)
         self.sizer_set_smearer.Add(self.smear_description_2d,
-                                    0, wx.CENTER, 10)
+                                   0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_description_type,
-                                  0, wx.CENTER, 10)
+                                 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_description_accuracy_type,
-                                  0, wx.CENTER, 10)
+                                 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_accuracy)
         self.sizer_new_smear.Add(self.smear_description_smear_type,
-                                  0, wx.CENTER, 10)
+                                 0, wx.CENTER, 10)
         self.sizer_new_smear.Add((15, -1))
-        self.sizer_new_smear.Add(self.smear_description_2d_x,
-                                  0, wx.CENTER, 10)
+        self.sizer_new_smear.Add(self.smear_description_2d_x, 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_description_pin_min,
-                                  0, wx.CENTER, 10)
+                                 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_description_slit_height,
-                                  0, wx.CENTER, 10)
-
-        self.sizer_new_smear.Add(self.smear_pinhole_min,
-                                  0, wx.CENTER, 10)
-        self.sizer_new_smear.Add(self.smear_slit_height,
-                                  0, wx.CENTER, 10)
-        self.sizer_new_smear.Add(self.smear_data_left,
-                                  0, wx.CENTER, 10)
+                                 0, wx.CENTER, 10)
+
+        self.sizer_new_smear.Add(self.smear_pinhole_min, 0, wx.CENTER, 10)
+        self.sizer_new_smear.Add(self.smear_slit_height, 0, wx.CENTER, 10)
+        self.sizer_new_smear.Add(self.smear_data_left, 0, wx.CENTER, 10)
         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)
@@ -502 +496 @@
 
         # Show only the relevant smear messages, etc
-        if self.current_smearer == None:
-            if not is_2Ddata:
+        if self.current_smearer is None:
+            if not is_2d_data:
                 self.smear_description_none.Show(True)
                 self.enable_smearer.Disable()
@@ -509 +503 @@
                 self.smear_description_none.Show(True)
                 self.slit_smearer.Disable()
-            if self.data == None:
+            if self.data is None:
                 self.slit_smearer.Disable()
                 self.pinhole_smearer.Disable()
@@ -516 +510 @@
             self._show_smear_sizer()
         boxsizer_range.Add(self.sizer_set_masking)
-        #2D data? default
-        is_2Ddata = False
-
-        #check if it is 2D data
+        # 2D data? default
+        is_2d_data = False
+
+        # check if it is 2D data
         if self.data.__class__.__name__ == "Data2D" or self.enable2D:
-            is_2Ddata = True
+            is_2d_data = True
 
         self.sizer5.Clear(True)
@@ -569 +563 @@
         sizer.Add(wx.StaticText(self, wx.ID_ANY, ' Max[1/A]'))
         sizer.Add(self.EditMask_title)
-        sizer.Add((-1,5))
+        sizer.Add((-1, 5))
 
         sizer.Add(self.reset_qrange)
@@ -575 +569 @@
         sizer.Add(self.qmax)
         sizer.Add(self.btEditMask)
-        sizer.Add((-1,5))
-
-        sizer.AddMany(5*[(-1,5)])
+        sizer.Add((-1, 5))
+
+        sizer.AddMany(5*[(-1, 5)])
 
         sizer.Add(box_description_1, 0, 0)
@@ -583 +577 @@
         sizer.Add(self.points_sizer, 0, 0)
         sizer.Add(self.draw_button, 0, 0)
-        sizer.Add((-1,5))
+        sizer.Add((-1, 5))
         
         sizer.Add(self.tcChi, 0, 0)
@@ -593 +587 @@
         boxsizer_range.Add(sizer_chi2)
         boxsizer_range.Add(sizer)
-        if is_2Ddata:
+        if is_2d_data:
             self.btEditMask.Enable()
             self.EditMask_title.Enable()
@@ -599 +593 @@
             self.btEditMask.Disable()
             self.EditMask_title.Disable()
-        ## save state
+        # save state
         self.save_current_state()
         self.sizer5.Add(boxsizer_range, 0, wx.EXPAND | wx.ALL, 10)
         self.sizer5.Layout()
 
-
     def _set_sizer_dispersion(self):
         """
@@ -614 +607 @@
 
         self.sizer4_4.Clear(True)
-        if self.model == None:
-            ##no model is selected
+        if self.model is None:
+            # no model is selected
             return
         if not self.enable_disp.GetValue():
-            ## the user didn't select dispersity display
+            # the user didn't select dispersity display
             return
 
         self._reset_dispersity()
 
-        ## fill a sizer with the combobox to select dispersion type
+        # fill a sizer with the combobox to select dispersion type
         model_disp = wx.StaticText(self, wx.ID_ANY, 'Function')
         CHECK_STATE = self.cb1.GetValue()
@@ -646 +639 @@
             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), \
+        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, wx.ID_ANY, 'Min')
-        self.sizer4_4.Add(self.text_disp_min, (iy, ix), (1, 1), \
+        self.sizer4_4.Add(self.text_disp_min, (iy, ix), (1, 1),
                             wx.EXPAND | wx.ADJUST_MINSIZE, 0)
 
@@ -684 +677 @@
                 if item in self.model.magnetic_params:
                     continue
-            if not item in self.model.orientation_params:
-                if not item in self.disp_cb_dict:
+            if item not in self.model.orientation_params:
+                if item not in self.disp_cb_dict:
                     self.disp_cb_dict[item] = None
                 name0 = "Distribution of " + item
@@ -691 +684 @@
                 name2 = item + ".npts"
                 name3 = item + ".nsigmas"
-                if not name1 in self.model.details:
+                if name1 not in self.model.details:
                     self.model.details[name1] = ["", None, None]
 
@@ -717 +710 @@
                         ctl1.SetValue(str(format_number(value, True)))
                         self.sizer4_4.Add(ctl1, (iy, ix), (1, 1), wx.EXPAND)
-                        ## text to show error sign
+                        # text to show error sign
                         ix = 2
                         text2 = wx.StaticText(self, wx.ID_ANY, '+/-')
@@ -777 +770 @@
                         Tct2.SetValue(str(format_number(value)))
                         self.sizer4_4.Add(Tct2, (iy, ix), (1, 1),
-                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+                                          wx.EXPAND | wx.ADJUST_MINSIZE, 0)
                         self.fixed_param.append([None, name3, Tct2,
                                                  None, None, None,
@@ -803 +796 @@
                 if item in self.model.magnetic_params:
                     continue
-            if  item in self.model.orientation_params:
-                if not item in self.disp_cb_dict:
+            if item in self.model.orientation_params:
+                if item not in self.disp_cb_dict:
                     self.disp_cb_dict[item] = None
                 name0 = "Distribution of " + item
@@ -811 +804 @@
                 name3 = item + ".nsigmas"
 
-                if not name1 in self.model.details:
+                if name1 not in self.model.details:
                     self.model.details[name1] = ["", None, None]
 
@@ -856 +849 @@
 
                         self.sizer4_4.Add(ctl1, (iy, ix), (1, 1), wx.EXPAND)
-                        ## text to show error sign
+                        # text to show error sign
                         ix = 2
                         text2 = wx.StaticText(self, wx.ID_ANY, '+/-')
@@ -969 +962 @@
 
         self.state.model = self.model.clone()
-        ## save state into
-        self.state.cb1 = self.cb1.GetValue()
+
+        # save state into
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.orientation_params_disp,
@@ -980 +973 @@
         wx.PostEvent(self.parent,
                      StatusEvent(status=" Selected Distribution: Gaussian"))
-        #Fill the list of fittable parameters
-        #self.select_all_param(event=None)
+
+        # Fill the list of fittable parameters
         self.get_all_checked_params()
         self.Layout()
@@ -989 +982 @@
         Update and Draw the model
         """
-        if self.model == None:
+        if self.model is None:
             msg = "Please select a Model first..."
             wx.MessageBox(msg, 'Info')
@@ -999 +992 @@
             self.create_default_data()
         """
-        flag,is_modified = self._update_paramv_on_fit()
-
-        wx.CallAfter(self._onparamEnter_helper,is_modified)
+        flag, is_modified = self._update_paramv_on_fit()
+
+        wx.CallAfter(self._onparamEnter_helper, is_modified)
         if not flag:
             msg = "The parameters are invalid"
@@ -1011 +1004 @@
         Allow to fit
         """
-        if event != None:
+        if event is not None:
             event.Skip()
         if self.fit_started:
@@ -1051 +1044 @@
             return
 
-        self.select_param(event=None)
+        self.select_param()
 
         # Remove or do not allow fitting on the Q=0 point, especially
@@ -1062 +1055 @@
                                     qmax=self.qmax_x)
 
-        #single fit
-        #self._manager.onFit(uid=self.uid)
+        # single fit
+        # self._manager.onFit(uid=self.uid)
         self.fit_started = self._manager.onFit(uid=self.uid)
         wx.CallAfter(self.set_fitbutton)
@@ -1076 +1069 @@
         versions of Wx (before 2.9) and thus not the release version of
         installers, the help comes up at the top level of the file as
-        webbrowser does not pass anything past the # to the browser when it is
+        web browser does not pass anything past the # to the browser when it is
         running "file:///...."
 
-    :param evt: Triggers on clicking the help button
-    """
+        :param evt: Triggers on clicking the help button
+        """
 
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
@@ -1095 +1088 @@
         versions of Wx (before 2.9) and thus not the release version of
         installers, the help comes up at the top level of the file as
-        webbrowser does not pass anything past the # to the browser when it is
+        web browser does not pass anything past the # to the browser when it is
         running "file:///...."
 
-    :param evt: Triggers on clicking the help button
-    """
+        :param evt: Triggers on clicking the help button
+        """
 
         _TreeLocation = "user/sasgui/perspectives/fitting/sm_help.html"
@@ -1111 +1104 @@
         """
         # Skip this feature if we are not on Windows
-        #NOTE: the is_mac data member actually means "is no Windows".
+        # NOTE: the is_mac data member actually means "is no Windows".
         if self.is_mac:
             return
@@ -1121 +1114 @@
             label = "Fit"
             color = "black"
-        #self.btFit.Enable(False)
+        # self.btFit.Enable(False)
         self.btFit.SetLabel(label)
         self.btFit.SetForegroundColour(color)
@@ -1152 +1145 @@
         Stop fit
         """
-        if event != None:
+        if event is not None:
             event.Skip()
         self._manager.stop_fit(self.uid)
@@ -1172 +1165 @@
         copy_flag = False
         is_poly_enabled = None
-        if event != None:
-            if (event.GetEventObject() == self.formfactorbox\
+        if event is not None:
+            if (event.GetEventObject() == self.formfactorbox
                         and self.structurebox.GetLabel() != 'None')\
                         or event.GetEventObject() == self.structurebox\
@@ -1186 +1179 @@
             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)
@@ -1216 +1208 @@
                     self._keep.Enable(not self.batch_on)
                     self._set_save_flag(True)
+                    self._set_smear(self.data)
 
             # more disables for 2D
@@ -1229 +1222 @@
             except:
                 raise
-                ## error occured on chisqr computation
-                #pass
-            ## event to post model to fit to fitting plugins
+                # error occured on chisqr computation
+                # pass
+            # 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
+            # set smearing value whether or not data contain the smearing info
             evt = ModelEventbox(model=self.model,
                             smearer=temp_smear,
@@ -1245 +1237 @@
 
             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()
             self.state.model.name = self.model.name
 
-        if event != None:
-            ## post state to fit panel
+        if event is not None:
+            # post state to fit panel
             new_event = PageInfoEvent(page=self)
             wx.PostEvent(self.parent, new_event)
-            #update list of plugins if new plugin is available
+            # update list of plugins if new plugin is available
             custom_model = 'Customized Models'
             mod_cat = self.categorybox.GetStringSelection()
@@ -1267 +1260 @@
                     self.formfactorbox.SetValue(current_val)
             # when select a model only from guictr/button
-            if is_poly_enabled != None:
+            if is_poly_enabled is not None:
                 self.enable_disp.SetValue(is_poly_enabled)
                 self.disable_disp.SetValue(not is_poly_enabled)
@@ -1295 +1288 @@
         when enter value on panel redraw model according to changed
         """
-        if self.model == None:
+        if self.model is None:
             msg = "Please select a Model first..."
             wx.MessageBox(msg, 'Info')
             return
 
-        #default flag
+        # default flag
         flag = False
         self.fitrange = True
-        #get event object
+        # get event object
         tcrtl = event.GetEventObject()
-        #Clear msg if previously shown.
+        # Clear msg if previously shown.
         msg = ""
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
@@ -1316 +1309 @@
                 if not self.disable_smearer.GetValue():
                     temp_smearer = self.current_smearer
-                    ## set smearing value whether or not
-                    #        the data contain the smearing info
+                    # set smearing value whether or not data contain the
+                    # smearing info
                     if self.slit_smearer.GetValue():
                         flag1 = self.update_slit_smear()
@@ -1334 +1327 @@
                                               enable_smearer=enable_smearer)
                 if flag:
-                    #self.compute_chisqr(smearer= temp_smearer)
-
-                    ## new state posted
+                    # self.compute_chisqr(smearer= temp_smearer)
+
+                    # new state posted
                     if self.state_change:
-                        #self._undo.Enable(True)
+                        # self._undo.Enable(True)
                         event = PageInfoEvent(page=self)
                         wx.PostEvent(self.parent, event)
@@ -1348 +1341 @@
         else:
             self.save_current_state()
-            msg = "Cannot Plot :Must enter a number!!!  "
+            msg = "Cannot Plot: Must enter a number!!!  "
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
 
@@ -1359 +1352 @@
         """
         tcrtl = event.GetEventObject()
-        #Clear msg if previously shown.
+        # Clear msg if previously shown.
         msg = ""
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
@@ -1377 +1370 @@
             tcrtl.SetBackgroundColour(wx.WHITE)
 
-        #self._undo.Enable(True)
+        # self._undo.Enable(True)
         self.save_current_state()
         event = PageInfoEvent(page=self)
@@ -1387 +1380 @@
         ON Qrange focus
         """
-        if event != None:
+        if event is not None:
             event.Skip()
-        #tcrtl = event.GetEventObject()
+        # tcrtl = event.GetEventObject()
         self._validate_qrange(self.qmin, self.qmax)
 
@@ -1396 +1389 @@
         On Qrange textctrl click, make the qrange lines in the plot
         """
-        if event != None:
+        if event is not None:
             event.Skip()
         if self.data.__class__.__name__ == "Data2D":
@@ -1414 +1407 @@
         #On q range value updated. DO not combine with qrange_click().
         """
-        if event != None:
+        if event is not None:
             event.Skip()
         if self.data.__class__.__name__ == "Data2D":
@@ -1442 +1435 @@
         length = len(self.data.x)
         indx = (numpy.abs(self.data.x - x_data)).argmin()
-        #return array.flat[idx]
+        # return array.flat[idx]
         if key == wx.WXK_PAGEUP or key == wx.WXK_NUMPAD_PAGEUP:
             indx += 1
@@ -1461 +1454 @@
         """
         tcrtl = event.GetEventObject()
-        #Clear msg if previously shown.
+        # Clear msg if previously shown.
         msg = ""
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
@@ -1491 +1484 @@
                 wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
                 return
-            #Check if # of points for theory model are valid(>0).
+            # Check if # of points for theory model are valid(>0).
             # check for 2d
             if self.data.__class__.__name__ == "Data2D" or \
@@ -1498 +1491 @@
                 radius = numpy.sqrt(self.data.qx_data * self.data.qx_data +
                                     self.data.qy_data * self.data.qy_data)
-                index_data = ((self.qmin_x <= radius) & \
-                                (radius <= self.qmax_x))
+                index_data = ((self.qmin_x <= radius) & (radius <= self.qmax_x))
                 index_data = (index_data) & (self.data.mask)
                 index_data = (index_data) & (numpy.isfinite(self.data.data))
@@ -1509 +1501 @@
                     return
                 else:
-                    #self.data.mask = index_data
-                    #self.Npts_fit.SetValue(str(len(self.data.mask)))
+                    # self.data.mask = index_data
+                    # self.Npts_fit.SetValue(str(len(self.data.mask)))
                     self.show_npts2fit()
             else:
-                index_data = ((self.qmin_x <= self.data.x) & \
+                index_data = ((self.qmin_x <= self.data.x) &
                               (self.data.x <= self.qmax_x))
                 self.Npts_fit.SetValue(str(len(self.data.x[index_data])))
@@ -1546 +1538 @@
             for item in self.parameters:
                 if item[0].IsShown():
-                    #Skip the angle parameters if 1D data
+                    # Skip the angle parameters if 1D data
                     if self.data.__class__.__name__ != "Data2D" and \
                             not self.enable2D:
@@ -1553 +1545 @@
                     if item in self.param_toFit:
                         continue
-                    ## hide statictext +/-
+                    # hide statictext +/-
                     if len(item) < 4:
                         continue
-                    if item[3] != None and item[3].IsShown():
+                    if item[3] is not None and item[3].IsShown():
                         item[3].Hide()
-                    ## hide textcrtl  for error after fit
-                    if item[4] != None and item[4].IsShown():
+                    # hide textcrtl  for error after fit
+                    if item[4] is not None and item[4].IsShown():
                         item[4].Hide()
 
@@ -1565 +1557 @@
             for item in self.fittable_param:
                 if item[0].IsShown():
-                    #Skip the angle parameters if 1D data
+                    # Skip the angle parameters if 1D data
                     if self.data.__class__.__name__ != "Data2D" and \
                             not self.enable2D:
@@ -1574 +1566 @@
                     if len(item) < 4:
                         continue
-                    ## hide statictext +/-
-                    if item[3] != None and item[3].IsShown():
+                    # hide statictext +/-
+                    if item[3] is not None and item[3].IsShown():
                         item[3].Hide()
-                    ## hide textcrtl  for error after fit
-                    if item[4] != None and item[4].IsShown():
+                    # hide textcrtl  for error after fit
+                    if item[4] is not None and item[4].IsShown():
                         item[4].Hide()
         return
@@ -1587 +1579 @@
         """
         # get the default values
-        if self.dxl == None:
+        if self.dxl is None:
             self.dxl = 0.0
-        if self.dxw == None:
+        if self.dxw is None:
             self.dxw = ""
-        if self.dx_min == None:
+        if self.dx_min is None:
             self.dx_min = SMEAR_SIZE_L
-        if self.dx_max == None:
+        if self.dx_max is None:
             self.dx_max = SMEAR_SIZE_H
 
@@ -1614 +1606 @@
         elif self.data.__class__.__name__ == "Data2D" or \
             self.enable2D:
-            if data.dqx_data == None or  data.dqy_data == None:
+            if data.dqx_data is None or data.dqy_data is None:
                 return
-            elif self.current_smearer != None \
+            elif self.current_smearer is not None \
                 and data.dqx_data.any() != 0 \
                 and data.dqx_data.any() != 0:
@@ -1626 +1618 @@
                 return
         # check if it is pinhole smear and get min max if it is.
-        if data.dx != None and all(data.dx != 0):
+        if data.dx is not None and not numpy.any(data.dx):
             self.smear_type = "Pinhole"
             self.dq_l = data.dx[0]
@@ -1632 +1624 @@
 
         # check if it is slit smear and get min max if it is.
-        elif data.dxl != None or data.dxw != None:
+        elif data.dxl is not None or data.dxw is not None:
             self.smear_type = "Slit"
-            if data.dxl != None and all(data.dxl != 0):
+            if data.dxl is not None and not numpy.all(data.dxl, 0):
                 self.dq_l = data.dxl[0]
-            if data.dxw != None and all(data.dxw != 0):
+            if data.dxw is not None and not numpy.all(data.dxw, 0):
                 self.dq_r = data.dxw[0]
-        #return self.smear_type,self.dq_l,self.dq_r
+        # return self.smear_type,self.dq_l,self.dq_r
 
     def _show_smear_sizer(self):
@@ -1662 +1654 @@
 
             self.smear_description_dqdata.Show(True)
-            if self.smear_type != None:
+            if self.smear_type is not None:
                 self.smear_description_smear_type.Show(True)
                 if self.smear_type == 'Slit':
@@ -1753 +1745 @@
         Select an accuracy in 2D custom smear: Xhigh, High, Med, or Low
         """
-        #event.Skip()
+        # event.Skip()
         # Check if the accuracy is same as before
-        #self.smear2d_accuracy = event.GetEventObject().GetValue()
+        # self.smear2d_accuracy = event.GetEventObject().GetValue()
         self.smear2d_accuracy = self.smear_accuracy.GetValue()
         if self.pinhole_smearer.GetValue():
@@ -1761 +1753 @@
         else:
             self.onSmear(event=None)
-            if self.current_smearer != None:
+            if self.current_smearer is not None:
                 self.current_smearer.set_accuracy(accuracy=\
                                                   self.smear2d_accuracy)
@@ -1793 +1785 @@
         Build a panel to allow to edit Mask
         """
-        from sas.sasgui.guiframe.local_perspectives.plotting.masking \
-        import MaskPanel as MaskDialog
+        from sas.sasgui.guiframe.local_perspectives.plotting.masking import \
+            MaskPanel as MaskDialog
 
         self.panel = MaskDialog(base=self, data=self.data, id=wx.NewId())
@@ -1805 +1797 @@
         is_valid_qrange = self._update_paramv_on_fit()
 
-        if is_valid_qrange and self.model != None:
+        if is_valid_qrange and self.model is not None:
             self.panel.MakeModal(False)
             event.Skip()
@@ -1811 +1803 @@
             self._draw_model()
             self.show_npts2fit()
-        elif self.model == None:
+        elif self.model is None:
             self.panel.MakeModal(False)
             event.Skip()
@@ -1878 +1870 @@
                     npts = len(data.x)
                 except:
-                    msg = "Unable to find min/max/length of \n data named %s" % \
+                    msg = "Unable to find min/max/length of \n data named %s" %\
                                 data.filename
                     wx.PostEvent(self._manager.parent, StatusEvent(status=msg,
@@ -1895 +1887 @@
                                                info="error"))
                     raise ValueError, msg
-                ## Maximum value of data
+                # Maximum value of data
                 qmax = math.sqrt(x * x + y * y)
                 npts = len(data.data)
@@ -1907 +1899 @@
         flag = False
         is_data = False
+        npts = 0
         try:
             old_id = self.data.id
@@ -1918 +1911 @@
                 flag = True
         if data is not None:
-            id = data.id
             if is_data:
                 self.graph_id = self.data.group_id
@@ -1933 +1925 @@
             self._set_save_flag(False)
         else:
-            if self.model != None:
+            if self.model is not None:
                 self._set_bookmark_flag(not self.batch_on)
                 self._keep.Enable(not self.batch_on)
@@ -1940 +1932 @@
                 self._set_preview_flag(True)
 
-            self._set_smear(data)
             # more disables for 2D
             if self.data.__class__.__name__ == "Data2D" or \
@@ -1947 +1938 @@
                 self.pinhole_smearer.Enable(True)
                 self.default_mask = copy.deepcopy(self.data.mask)
-                if self.data.err_data == None or\
-                        (self.data.err_data == 1).all() or\
-                        (self.data.err_data == 0).all():
+                if self.data.err_data is None or\
+                        numpy.all(err == 1 for err in self.data.err_data) or \
+                        not numpy.any(self.data.err_data):
                     self.dI_didata.Enable(False)
                     self.dI_noweight.SetValue(True)
@@ -1960 +1951 @@
                 self.slit_smearer.Enable(True)
                 self.pinhole_smearer.Enable(True)
-                if self.data.dy == None or\
-                     (self.data.dy == 1).all() or\
-                     (self.data.dy == 0).all():
+
+                if self.data.dy is None or\
+                     numpy.all(self.data.dy == 1) or\
+                     not numpy.any(self.data.dy):
                     self.dI_didata.Enable(False)
                     self.dI_noweight.SetValue(True)
@@ -1970 +1962 @@
                     self.dI_didata.SetValue(True)
                     self.weightbt_string = self.dI_didata.GetLabelText()
-            # Enable weighting radio uttons
+            # Enable weighting radio buttons
             self.dI_noweight.Enable(True)
             self.dI_sqrdata.Enable(True)
@@ -1979 +1971 @@
             data_name = self.data.name
             _, _, npts = self.compute_data_range(self.data)
-            #set maximum range for x in linear scale
+            # set maximum range for x in linear scale
             if not hasattr(self.data, "data"):  # Display only for 1D data fit
                 self.btEditMask.Disable()
@@ -1988 +1980 @@
 
         self.Npts_total.SetValue(str(npts))
-        #default:number of data points selected to fit
+        # default:number of data points selected to fit
         self.Npts_fit.SetValue(str(npts))
         self.Npts_total.SetEditable(False)
-        self.Npts_total.SetBackgroundColour(\
+        self.Npts_total.SetBackgroundColour(
                                     self.GetParent().GetBackgroundColour())
 
@@ -2001 +1993 @@
         # send graph_id to page_finder
         self._manager.set_graph_id(uid=self.uid, graph_id=self.graph_id)
-        #focus the page
+        # focus the page
         if check_data_validity(data):
             self.data_box_description.SetForegroundColour(wx.BLUE)
@@ -2013 +2005 @@
         self.on_set_focus(None)
         self.Refresh()
-        #update model plot with new data information
+        # update model plot with new data information
         if flag:
-            #set model view button
-            self.onSmear(None)
-
             if self.data.__class__.__name__ == "Data2D":
                 self.enable2D = True
@@ -2025 +2014 @@
                 self.model_view.SetLabel("1D Mode")
             self.model_view.Disable()
-            #replace data plot on combo box selection
-            #by removing the previous selected data
+            #  replace data plot on combo box selection
+            # by removing the previous selected data
             try:
                 wx.PostEvent(self._manager.parent,
@@ -2033 +2022 @@
             except:
                 pass
-            #plot the current selected data
+            # plot the current selected data
             wx.PostEvent(self._manager.parent,
                          NewPlotEvent(action="check", plot=self.data,
@@ -2053 +2042 @@
             self.reset_page_helper(state)
 
-            self.select_param(event=None)
-            #Save state_fit
+            self.select_param()
+            # Save state_fit
             self.save_current_state_fit()
         except:
@@ -2093 +2082 @@
         else:
             for qx in self.data.x:
-                if qx >= qmin and qx <= qmax:
+                if qmax >= qx >= qmin:
                     npts2fit += 1
         return npts2fit
@@ -2122 +2111 @@
         # make sure stop button to fit button all the time
         self._on_fit_complete()
-        if out == None or not numpy.isfinite(chisqr):
+        if out is None or not numpy.isfinite(chisqr):
             raise ValueError, "Fit error occured..."
 
@@ -2129 +2118 @@
         dispersity = ''
 
-        #Hide textctrl boxes of errors.
+        # Hide textctrl boxes of errors.
         self._clear_Err_on_Fit()
 
-        #Check if chi2 is finite
-        if chisqr != None and numpy.isfinite(chisqr):
-            #format chi2
+        # Check if chi2 is finite
+        if chisqr is not None and numpy.isfinite(chisqr):
+            # format chi2
             chi2 = format_number(chisqr, True)
             self.tcChi.SetValue(chi2)
@@ -2141 +2130 @@
             self.tcChi.SetValue("-")
 
-        #Hide error title
+        # Hide error title
         if self.text2_3.IsShown() and not self.is_mac:
             self.text2_3.Hide()
@@ -2148 +2137 @@
             if self.enable_disp.GetValue():
                 if hasattr(self, "text_disp_1"):
-                    if self.text_disp_1 != None and not self.is_mac:
+                    if self.text_disp_1 is not None and not self.is_mac:
                         self.text_disp_1.Hide()
         except:
@@ -2155 +2144 @@
 
         i = 0
-        #Set the panel when fit result are list
+        # Set the panel when fit result are list
 
         for item in self.param_toFit:
-            if len(item) > 5 and item != None:
+            if len(item) > 5 and item is not None:
 
                 if item[0].IsShown():
-                    ## reset error value to initial state
+                    # reset error value to initial state
                     if not self.is_mac:
                         item[3].Hide()
@@ -2168 +2157 @@
                         if item[1] == p_name[ind]:
                             break
-                    if len(out) > 0 and out[ind] != None:
+                    if len(out) > 0 and out[ind] is not None:
                         val_out = format_number(out[ind], True)
                         item[2].SetValue(val_out)
 
-                    if(cov != None and len(cov) == len(out)):
+                    if(cov is not None and len(cov) == len(out)):
                         try:
-                            if dispersity != None:
+                            if dispersity is not None:
                                 if self.enable_disp.GetValue():
                                     if hasattr(self, "text_disp_1"):
-                                        if self.text_disp_1 != None:
+                                        if self.text_disp_1 is not None:
                                             if not self.text_disp_1.IsShown()\
-                                                and not self.is_mac:
+                                                  and not self.is_mac:
                                                 self.text_disp_1.Show(True)
                         except:
                             pass
 
-                        if cov[ind] != None:
+                        if cov[ind] is not None:
                             if numpy.isfinite(float(cov[ind])):
                                 val_err = format_number(cov[ind], True)
-                                item[4].SetForegroundColour(wx.BLACK)
+                                item[4].SetForegroundColour(wx.BLACK)
                             else:
                                 val_err = 'NaN'
@@ -2199 +2188 @@
             else:
                 raise ValueError, "onsetValues: Invalid parameters..."
-        #Show error title when any errors displayed
+        # Show error title when any errors displayed
         if has_error:
             if not self.text2_3.IsShown():
                 self.text2_3.Show(True)
-        ## save current state
+        # save current state
         self.save_current_state()
 
@@ -2210 +2199 @@
             self.Refresh()
         self._mac_sleep(0.1)
-        #plot model ( when drawing, do not update chisqr value again)
+        # plot model ( when drawing, do not update chisqr value again)
         self._draw_model(update_chisqr=False, source='fit')
 
@@ -2226 +2215 @@
         # compute weight for the current data
         flag_weight = self.get_weight_flag()
-        if is_2D == None:
+        if is_2D is None:
             is_2D = self._is_2D()
         self._manager.set_fit_weight(uid=self.uid,
@@ -2245 +2234 @@
         self._update_paramv_on_fit()
 
-        if event != None:
+        if event is not None:
             tcrtl = event.GetEventObject()
             # event case of radio button
-            if tcrtl.GetValue() == True:
+            if tcrtl.GetValue():
                 self.dx_min = 0.0
                 self.dx_max = 0.0
@@ -2266 +2255 @@
 
         self.sizer_set_smearer.Layout()
-        ## we need FitInside here not just self.Layout to ensure all the sizers
-        ## end up with the necessasary space to in the scroll panel. In
-        ## particular the compute and fit buttons end up on top of each other
-        ## PDB Nov 28 2015. 
+        # we need FitInside here not just self.Layout to ensure all the sizers
+        # end up with the necessasary space to in the scroll panel. In
+        # particular the compute and fit buttons end up on top of each other
+        # PDB Nov 28 2015.
         self.FitInside()
 
-        if event != None:
+        if event is not None:
             event.Skip()
-        #self._undo.Enable(True)
+        # self._undo.Enable(True)
         self.save_current_state()
         event = PageInfoEvent(page=self)
@@ -2349 +2338 @@
                 get_pin_max.SetBackgroundColour("pink")
                 msg = "Model Error:This value can not be negative!!!"
-            elif self.dx_min != None and self.dx_max != None:
+            elif self.dx_min is not None and self.dx_max is not None:
                 if self._is_2D():
                     data.dqx_data[data.dqx_data == 0] = self.dx_min
@@ -2360 +2349 @@
                                            self.dx_max + step / 1.1,
                                            step)
-            elif self.dx_min != None:
+            elif self.dx_min is not None:
                 if self._is_2D():
                     data.dqx_data[data.dqx_data == 0] = self.dx_min
                 else:
                     data.dx[data.dx == 0] = self.dx_min
-            elif self.dx_max != None:
+            elif self.dx_max is not None:
                 if self._is_2D():
                     data.dqy_data[data.dqy_data == 0] = self.dx_max
@@ -2373 +2362 @@
             # 2D need to set accuracy
             if self._is_2D():
-                self.current_smearer.set_accuracy(accuracy=\
-                                                  self.smear2d_accuracy)
-
-        if msg != None:
+                self.current_smearer.set_accuracy(
+                    accuracy=self.smear2d_accuracy)
+
+        if msg is not None:
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
         else:
             get_pin_min.SetBackgroundColour("white")
             get_pin_max.SetBackgroundColour("white")
-        ## set smearing value whether or not the data contain the smearing info
+        # set smearing value whether or not the data contain the smearing info
 
         enable_smearer = not self.disable_smearer.GetValue()
@@ -2407 +2396 @@
         wx.CallAfter(self.save_current_state)
 
-        if msg != None:
+        if msg is not None:
             return False
         else:
@@ -2423 +2412 @@
         msg = None
         # for event given
-        if event != None:
+        if event is not None:
             tcrtl = event.GetEventObject()
             # event case of radio button
@@ -2444 +2433 @@
         self._show_smear_sizer()
         self.sizer_set_smearer.Layout()
-        ## we need FitInside here not just self.Layout to ensure all the sizers
-        ## end up with the necessasary space to in the scroll panel. In
-        ## particular the compute and fit buttons end up on top of each other
-        ## PDB Nov 28 2015. 
+        # we need FitInside here not just self.Layout to ensure all the sizers
+        # end up with the necessasary space to in the scroll panel. In
+        # particular the compute and fit buttons end up on top of each other
+        # PDB Nov 28 2015.
         self.FitInside()
 
-        if event != None:
+        if event is not None:
             event.Skip()
         self.save_current_state()
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
-        if msg != None:
+        if msg is not None:
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
 
@@ -2544 +2533 @@
 
         self.current_smearer = smear_selection(data, self.model)
-        ## set smearing value whether or not the data contain the smearing info
+        # set smearing value whether or not the data contain the smearing info
         enable_smearer = not self.disable_smearer.GetValue()
         self._manager.set_smearer(smearer=self.current_smearer,
@@ -2567 +2556 @@
         if self._is_changed_slit():
             msg = self._set_slit_smear()
-        #self._undo.Enable(True)
+        # self._undo.Enable(True)
         self.save_current_state()
 
-        if msg != None:
+        if msg is not None:
             return False
         else:
@@ -2580 +2569 @@
         are computed when fitting
         """
-        if event != None:
+        if event is not None:
             event.Skip()
         if self.data is None:
@@ -2593 +2582 @@
 
         self.sizer_set_smearer.Layout()
-        ## we need FitInside here not just self.Layout to ensure all the sizers
-        ## end up with the necessasary space to in the scroll panel. In
-        ## particular the compute and fit buttons end up on top of each other
-        ## PDB Nov 28 2015. 
+        # we need FitInside here not just self.Layout to ensure all the sizers
+        # end up with the necessasary space to in the scroll panel. In
+        # particular the compute and fit buttons end up on top of each other
+        # PDB Nov 28 2015.
         self.FitInside()
         self._set_weight()
 
-        ## set smearing value whether or not the data contain the smearing info
+        # set smearing value whether or not the data contain the smearing info
         enable_smearer = not self.disable_smearer.GetValue()
         wx.CallAfter(self._manager.set_smearer, uid=self.uid,
@@ -2621 +2610 @@
         """
         self._get_smear_info()
-        #renew smear sizer
+        # renew smear sizer
         if self.smear_type is not None:
             self.smear_description_smear_type.SetValue(str(self.smear_type))
@@ -2661 +2650 @@
         """
         try:
-            if event == None:
+            if event is None:
                 output = "-"
             elif not numpy.isfinite(event.output):
@@ -2696 +2685 @@
         self._manager.set_param2fit(self.uid, param2fit)
 
-    def select_all_param(self, event):
-        """
-        set to true or false all checkBox given the main checkbox value cb1
-        """
-        self.param_toFit = []
-        if  self.parameters != []:
-            if  self.cb1.GetValue():
-                for item in self.parameters:
-                    if item[0].IsShown():
-                        ## for data2D select all to fit
-                        if self.data.__class__.__name__ == "Data2D" or \
-                                self.enable2D:
-                            item[0].SetValue(True)
-                            self.param_toFit.append(item)
-                        else:
-                            ## for 1D all parameters except orientation
-                            if not item in self.orientation_params:
-                                item[0].SetValue(True)
-                                self.param_toFit.append(item)
-                    else:
-                        item[0].SetValue(False)
-                #if len(self.fittable_param)>0:
-                for item in self.fittable_param:
-                    if item[0].IsShown():
-                        if self.data.__class__.__name__ == "Data2D" or \
-                                self.enable2D:
-                            item[0].SetValue(True)
-                            self.param_toFit.append(item)
-                            try:
-                                if len(self.values[item[1]]) > 0:
-                                    item[0].SetValue(False)
-                            except:
-                                pass
-
-                        else:
-                            ## for 1D all parameters except orientation
-                            if not item in self.orientation_params_disp:
-                                item[0].SetValue(True)
-                                self.param_toFit.append(item)
-                                try:
-                                    if len(self.values[item[1]]) > 0:
-                                        item[0].SetValue(False)
-                                except:
-                                    pass
-                    else:
-                        item[0].SetValue(False)
-
-            else:
-                for item in self.parameters:
-                    item[0].SetValue(False)
-                for item in self.fittable_param:
-                    item[0].SetValue(False)
-                self.param_toFit = []
-
-        self.save_current_state_fit()
-
-        if event != None:
-            #self._undo.Enable(True)
-            ## post state to fit panel
-            event = PageInfoEvent(page=self)
-            wx.PostEvent(self.parent, event)
-        param2fit = []
-        for item in self.param_toFit:
-            if item[0] and item[0].IsShown():
-                param2fit.append(item[1])
-        self.parent._manager.set_param2fit(self.uid, param2fit)
-
-    def select_param(self, event):
+
+    def select_param(self, event=None):
         """
         Select TextCtrl  checked for fitting purpose and stores them
@@ -2770 +2693 @@
         self.param_toFit = []
         for item in self.parameters:
-            #Skip t ifhe angle parameters if 1D data
+            # Skip t ifhe angle parameters if 1D data
             if self.data.__class__.__name__ != "Data2D" and\
                         not self.enable2D:
                 if item in self.orientation_params:
                     continue
-            #Select parameters to fit for list of primary parameters
+            # Select parameters to fit for list of primary parameters
             if item[0].GetValue() and item[0].IsShown():
                 if not (item in self.param_toFit):
@@ -2784 +2707 @@
                     self.param_toFit.remove(item)
 
-        #Select parameters to fit for list of fittable parameters
+        # Select parameters to fit for list of fittable parameters
         #        with dispersion
         for item in self.fittable_param:
-            #Skip t ifhe angle parameters if 1D data
+            # Skip t ifhe angle parameters if 1D data
             if self.data.__class__.__name__ != "Data2D" and\
                         not self.enable2D:
@@ -2796 +2719 @@
                     self.param_toFit.append(item)
             else:
-                #remove parameters from the fitting list
+                # remove parameters from the fitting list
                 if item in self.param_toFit:
                     self.param_toFit.remove(item)
 
-        #Calculate num. of angle parameters
+        # Calculate num. of angle parameters
         if self.data.__class__.__name__ == "Data2D" or \
                        self.enable2D:
@@ -2806 +2729 @@
         else:
             len_orient_para = len(self.orientation_params)  # assume even len
-        #Total num. of angle parameters
+        # Total num. of angle parameters
         if len(self.fittable_param) > 0:
             len_orient_para *= 2
@@ -2817 +2740 @@
 
         self.save_current_state_fit()
-        if event != None:
-            ## post state to fit panel
+        if event is not None:
+            # post state to fit panel
             event = PageInfoEvent(page=self)
             wx.PostEvent(self.parent, event)
@@ -2844 +2767 @@
         self.orientation_params_disp = []
 
-        if model == None:
+        if model is None:
             self.sizer3.Layout()
             self.SetupScrolling()
@@ -2852 +2775 @@
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         sizer = wx.GridBagSizer(5, 5)
-        ## save the current model
+        # save the current model
         self.model = model
 
         keys = self.model.getParamList()
 
-        #list of dispersion parameters
+        # list of dispersion parameters
         self.disp_list = self.model.getDispParamList()
 
@@ -2890 +2813 @@
                 return -1
             # both have a number
-            if num_a != None and num_b != None:
+            if num_a is not None and num_b is not None:
                 if num_a > num_b:
                     return -1
@@ -2903 +2826 @@
                     return 1
             # one of them has a number
-            elif num_a != None:
+            elif num_a is not None:
                 return 1
-            elif num_b != None:
+            elif num_b is not None:
                 return -1
             # no numbers
@@ -2911 +2834 @@
                 return cmp(a.lower(), b.lower())
         
-        # keys obtained now from ordered dict, so commenting alphabetical ordering
-        #keys.sort(custom_compare)
+        # keys obtained now from ordered dict, so commenting alphabetical
+        # ordering keys.sort(custom_compare)
 
         iy = 0
@@ -2926 +2849 @@
         ix += 1
         self.text2_2 = wx.StaticText(self, wx.ID_ANY, 'Value')
-        sizer.Add(self.text2_2, (iy, ix), (1, 1), \
+        sizer.Add(self.text2_2, (iy, ix), (1, 1),
                             wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         ix += 2
         self.text2_3 = wx.StaticText(self, wx.ID_ANY, 'Error')
-        sizer.Add(self.text2_3, (iy, ix), (1, 1), \
-                            wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+        sizer.Add(self.text2_3, (iy, ix), (1, 1),
+                  wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         if not self.is_mac:
             self.text2_3.Hide()
         ix += 1
         self.text2_min = wx.StaticText(self, wx.ID_ANY, 'Min')
-        sizer.Add(self.text2_min, (iy, ix), (1, 1), \
-                            wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-        #self.text2_min.Hide()
+        sizer.Add(self.text2_min, (iy, ix), (1, 1),
+                  wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+        # self.text2_min.Hide()
         ix += 1
         self.text2_max = wx.StaticText(self, wx.ID_ANY, 'Max')
-        sizer.Add(self.text2_max, (iy, ix), (1, 1), \
-                            wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-        #self.text2_max.Hide()
+        sizer.Add(self.text2_max, (iy, ix), (1, 1),
+                  wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+        # self.text2_max.Hide()
         ix += 1
         self.text2_4 = wx.StaticText(self, wx.ID_ANY, '[Units]')
-        sizer.Add(self.text2_4, (iy, ix), (1, 1), \
-                            wx.EXPAND | wx.ADJUST_MINSIZE, 0)
+        sizer.Add(self.text2_4, (iy, ix), (1, 1),
+                  wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         self.text2_4.Hide()
 
@@ -2953 +2876 @@
         for item in keys:
 
-            if not item in self.disp_list and not item in \
+            if item not in self.disp_list and not item in \
                     self.model.orientation_params:
 
-                ##prepare a spot to store errors
-                if not item in self.model.details:
+                # prepare a spot to store errors
+                if item not in self.model.details:
                     self.model.details[item] = ["", None, None]
 
                 iy += 1
                 ix = 0
-                if (self.model.__class__ in \
-                    self.model_list_box["Multi-Functions"] or \
+                if (self.model.__class__ in
+                    self.model_list_box["Multi-Functions"] or
                     self.temp_multi_functional)\
                     and (item in self.model.non_fittable):
                     non_fittable_name = wx.StaticText(self, wx.ID_ANY, item)
-                    sizer.Add(non_fittable_name, (iy, ix), (1, 1), \
+                    sizer.Add(non_fittable_name, (iy, ix), (1, 1),
                             wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 21)
-                    ## add parameter value
+                    # add parameter value
                     ix += 1
                     value = self.model.getParam(item)
                     if len(self.model.fun_list) > 0:
-                        #num = item.split('_')[1][5:7]
+                        # num = item.split('_')[1][5:7]
                         fun_box = wx.ComboBox(self, wx.ID_ANY, size=(100, -1),
                                     style=wx.CB_READONLY, name='%s' % item)
                         self._set_fun_box_list(fun_box)
                         fun_box.SetSelection(0)
-                        #self.fun_box.SetToolTipString("A function
+                        # self.fun_box.SetToolTipString("A function
                         #    describing the interface")
                         wx.EVT_COMBOBOX(fun_box, wx.ID_ANY, self._on_fun_box)
@@ -2985 +2908 @@
                                                 size=(_BOX_WIDTH, 20),
                                 style=wx.TE_PROCESS_ENTER, name='%s' % item)
-                        fun_box.SetToolTipString(\
+                        fun_box.SetToolTipString(
                                 "Hit 'Enter' after typing to update the plot.")
                         fun_box.SetValue(format_number(value, True))
@@ -2993 +2916 @@
                                                 None, None])
                 else:
-                    ## add parameters name with checkbox for selecting to fit
+                    # add parameters name with checkbox for selecting to fit
                     cb = wx.CheckBox(self, wx.ID_ANY, item)
                     cb.SetValue(CHECK_STATE)
                     cb.SetToolTipString(" Check mark to fit.")
-                    #cb.SetValue(True)
+                    # cb.SetValue(True)
                     wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
 
@@ -3003 +2926 @@
                               wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
 
-                    ## add parameter value
+                    # add parameter value
                     ix += 1
                     value = self.model.getParam(item)
                     ctl1 = ModelTextCtrl(self, wx.ID_ANY, size=(_BOX_WIDTH, 20),
                                          style=wx.TE_PROCESS_ENTER)
-                    ctl1.SetToolTipString(\
+                    ctl1.SetToolTipString(
                                 "Hit 'Enter' after typing to update the plot.")
                     ctl1.SetValue(format_number(value, True))
                     sizer.Add(ctl1, (iy, ix), (1, 1), wx.EXPAND)
-                    ## text to show error sign
+                    # text to show error sign
                     ix += 1
                     text2 = wx.StaticText(self, wx.ID_ANY, '+/-')
-                    sizer.Add(text2, (iy, ix), (1, 1), \
+                    sizer.Add(text2, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
                     if not self.is_mac:
@@ -3076 +2999 @@
         iy += 1
         ix = 0
-        #Add tile for orientational angle
+        # Add tile for orientational angle
         for item in keys:
             if item in self.model.orientation_params:
@@ -3083 +3006 @@
                 mag_on_button.SetToolTipString("Turn Pol Beam/Mag scatt on/off")
                 mag_on_button.Bind(wx.EVT_BUTTON, self._on_mag_on)
-                mag_angle_help_button = wx.Button(self, wx.ID_ANY, "Magnetic angles?")
+                mag_angle_help_button = wx.Button(self, wx.ID_ANY,
+                                                  "Magnetic angles?")
                 mag_angle_help_button.SetToolTipString("see angle definitions")
                 mag_help_button = wx.Button(self, wx.ID_ANY, "Mag HELP")
                 mag_help_button.SetToolTipString("Help on pol beam/mag fitting")
                 mag_help_button.Bind(wx.EVT_BUTTON, self._on_mag_help)
-                mag_angle_help_button.Bind(wx.EVT_BUTTON, \
+                mag_angle_help_button.Bind(wx.EVT_BUTTON,
                                             self._on_mag_angle_help)
                 sizer.Add(orient_angle, (iy, ix), (1, 1),
@@ -3101 +3025 @@
                           wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
 
-                #handle the magnetic buttons
-                #clean this up so that assume mag is off then turn 
-                #all buttons on IF mag has mag and has 2D
+                # handle the magnetic buttons
+                # clean this up so that assume mag is off then turn
+                # all buttons on IF mag has mag and has 2D
                 if not self._has_magnetic:
                     mag_on_button.Show(False)
@@ -3129 +3053 @@
                 break
 
-        #For Gaussian only
+        # For Gaussian only
         if type.lower() != "array":
             for item in self.model.orientation_params:
@@ -3135 +3059 @@
                     if item in self.model.magnetic_params:
                         continue
-                if not item in self.disp_list:
-                    ##prepare a spot to store min max
-                    if not item in self.model.details:
+                if item not in self.disp_list:
+                    # prepare a spot to store min max
+                    if item not in self.model.details:
                         self.model.details[item] = ["", None, None]
 
                     iy += 1
                     ix = 0
-                    ## add parameters name with checkbox for selecting to fit
+                    # add parameters name with checkbox for selecting to fit
                     cb = wx.CheckBox(self, wx.ID_ANY, item)
                     cb.SetValue(CHECK_STATE)
@@ -3155 +3079 @@
                               wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
 
-                    ## add parameter value
+                    # add parameter value
                     ix += 1
                     value = self.model.getParam(item)
                     ctl1 = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
                                          style=wx.TE_PROCESS_ENTER)
-                    ctl1.SetToolTipString(\
+                    ctl1.SetToolTipString(
                                 "Hit 'Enter' after typing to update the plot.")
                     ctl1.SetValue(format_number(value, True))
@@ -3169 +3093 @@
                         ctl1.Hide()
                     sizer.Add(ctl1, (iy, ix), (1, 1), wx.EXPAND)
-                    ## text to show error sign
+                    # text to show error sign
                     ix += 1
                     text2 = wx.StaticText(self, -1, '+/-')
-                    sizer.Add(text2, (iy, ix), (1, 1), \
+                    sizer.Add(text2, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
 
@@ -3237 +3161 @@
         iy += 1
         box_description.SetForegroundColour(wx.BLUE)
-        #Display units text on panel
+        # Display units text on panel
         for item in keys:
             if item in self.model.details:
                 self.text2_4.Show()
-        #Fill the list of fittable parameters
+        # Fill the list of fittable parameters
         self.get_all_checked_params()
         self.save_current_state_fit()
@@ -3253 +3177 @@
         Get key stroke event
         """
-        if self.data == None:
+        if self.data is None:
             return
         # Figuring out key combo: Cmd for copy, Alt for paste

src/sas/sasgui/perspectives/fitting/fitpanel.py

@@ -187 +187 @@
         """
 
-        # get number of pages
-        nop = self.GetPageCount()
         # use while-loop, for-loop will not do the job well.
-        while (nop > 0):
+        while (self.GetPageCount() > 0):
             # delete the first page until no page exists
             page = self.GetPage(0)
@@ -197 +195 @@
             self._close_helper(selected_page=page)
             self.DeletePage(0)
-            nop = self.GetPageCount()
         # Clear list of names
         self.fit_page_name = {}
@@ -240 +237 @@
         # close all panels only when svs file opened
         self.close_all()
-        self._manager.mypanels = []
         self.sim_page = None
         self.batch_page = None
@@ -248 +244 @@
         close page and remove all references to the closed page
         """
-        nbr_page = self.GetPageCount()
         selected_page = self.GetPage(self.GetSelection())
-        if nbr_page == 1:
+        if self.GetPageCount() == 1:
             if selected_page.get_data() is not None:
                 if event is not None:
@@ -293 +288 @@
         copy a dictionary of model into its own dictionary
 
-        :param m_dict: dictionnary made of model name as key and model class
+        :param dict: dictionnary made of model name as key and model class
             as value
         """
@@ -320 +315 @@
         if caption == "Const & Simul Fit":
             self.sim_page = SimultaneousFitPage(self, page_finder=page_finder,
-                                                 id= wx.ID_ANY, batch_on=False)
+                                                 id=wx.ID_ANY, batch_on=False)
             self.sim_page.window_caption = caption
             self.sim_page.window_name = caption
@@ -397 +392 @@
             raise ValueError, "Fitpanel delete_data expect list of id"
         else:
-            n = self.GetPageCount()
             for page in self.opened_pages.values():
                 pos = self.GetPageIndex(page)
@@ -441 +435 @@
         if data_1d_list and data_2d_list:
             # need to warning the user that this batch is a special case
-            from sas.sasgui.perspectives.fitting.fitting_widgets import BatchDataDialog
+            from sas.sasgui.perspectives.fitting.fitting_widgets import \
+                BatchDataDialog
             dlg = BatchDataDialog(self)
             if dlg.ShowModal() == wx.ID_OK:
@@ -461 +456 @@
                 page = self.add_empty_page()
             if data_1d_list and not data_2d_list:
-                #only on type of data
+                # only on type of data
                 page.fill_data_combobox(data_1d_list)
             elif not data_1d_list and data_2d_list:
@@ -477 +472 @@
         Add a fitting page on the notebook contained by fitpanel
 
-        :param data: data to fit
+        :param data_list: data to fit
 
         :return panel : page just added for further used.

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -1521 +1521 @@
             for uid in page_id:
                 res = result[index]
+                fit_msg = res.mesg
                 if res.fitness is None or \
                     not numpy.isfinite(res.fitness) or \
                     numpy.any(res.pvec == None) or \
                     not numpy.all(numpy.isfinite(res.pvec)):
-                    msg = "Fitting did not converge!!!"
-                    evt = StatusEvent(status=msg, info="warning", type="stop")
-                    wx.PostEvent(self.parent, evt)
+                    fit_msg += "\nFitting did not converge!!!"
                     wx.CallAfter(self._update_fit_button, page_id)
                 else:
@@ -1550 +1549 @@
                         wx.CallAfter(cpage._on_fit_complete)
                     except KeyboardInterrupt:
-                        msg = "Singular point: Fitting Stoped."
-                        evt = StatusEvent(status=msg, info="info", type="stop")
-                        wx.PostEvent(self.parent, evt)
+                        fit_msg += "\nSingular point: Fitting stopped."
                     except:
-                        msg = "Singular point: Fitting Error occurred."
-                        evt = StatusEvent(status=msg, info="error", type="stop")
-                        wx.PostEvent(self.parent, evt)
+                        fit_msg += "\nSingular point: Fitting error occurred."
+                if fit_msg:
+                   evt = StatusEvent(status=fit_msg, info="warning", type="stop")
+                   wx.PostEvent(self.parent, evt)
 
         except:

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -163 +163 @@
 ^^^^^^^^^^^^^^^^
 
+Relatively straightforward models can be programmed directly from the SasView GUI 
+using the *New Plugin Model Function*.
+
 .. image:: new_model.bmp
 
-A model template generated by this option can be viewed and further modified using
+When using this feature, be aware that even if your code has errors, including 
+syntax errors, a model file is still generated. When you then correct the errors 
+and click 'Apply' again to re-compile you will get an error informing you that 
+the model already exists if the 'Overwrite' box is not checked. In this case you 
+will need to supply a new model function name. By default the 'Overwrite' box is 
+*checked*\ .
+
+Also note that the 'Fit Parameters' have been split into two sections: those which 
+can be polydisperse (shape and orientation parameters) and those which are not
+(eg, scattering length densities).
+
+A model file generated by this option can be viewed and further modified using
 the :ref:`Advanced_Plugin_Editor` .
-
-*NB: "Fit Parameters" has been split into two sections, those which can be
-polydisperse (shape and orientation parameters) and those which are not
-(scattering length densities, for example).*
 
 Sum|Multi(p1,p2)

src/sas/sasgui/perspectives/fitting/media/plugin.rst

@@ -11 +11 @@
 There are essentially three ways to generate new fitting models for SasView:
 
-* Using the SasView :ref:`New_Plugin_Model` helper dialog (best for beginners and/or relatively simple models)
-* By copying/editing an existing model (this can include models generated by the *New Plugin Model* dialog) in the :ref:`Python_shell` or :ref:`Advanced_Plugin_Editor` as described below (suitable for all use cases)
-* By writing a model from scratch outside of SasView (only recommended for code monkeys!)
+* Using the SasView :ref:`New_Plugin_Model` helper dialog (best for beginners
+  and/or relatively simple models)
+* By copying/editing an existing model (this can include models generated by
+  the *New Plugin Model* dialog) in the :ref:`Python_shell` or
+  :ref:`Advanced_Plugin_Editor` as described below (suitable for all use cases)
+* By writing a model from scratch outside of SasView (only recommended for
+  code monkeys!)
 
 Overview
@@ -23 +27 @@
 
 the next time SasView is started it will compile the plugin and add
-it to the list of *Plugin Models* in a FitPage.
+it to the list of *Customized Models* in a FitPage.
 
 SasView models can be of three types:
@@ -57 +61 @@
 - If necessary use underscore to separate words (i.e. barbell not BarBell or
   broad_peak not BroadPeak)
-- Do not include “modelâ€ￜ in the name (i.e. barbell not BarBellModel)
+- Do not include "model" in the name (i.e. barbell not BarBellModel)
 
 
@@ -479 +483 @@
     }
 
-The C model operates on a single $q$ value at a time.  The code will be
-run in parallel across different $q$ values, either on the graphics card
-or the processor.
-
-Rather than returning NAN from Iq, you must define the *INVALID(v)*.  The
-*v* parameter lets you access all the parameters in the model using
-*v.par1*, *v.par2*, etc. For example::
-
-    #define INVALID(v) (v.bell_radius < v.radius)
-
 *Iqxy* is similar to *Iq*, except it uses parameters *qx, qy* instead of *q*,
-and it includes orientation parameters. As in python models, *form_volume*
-includes only the volume parameters.  *Iqxy* will default to
-*Iq(sqrt(qx**2 + qy**2), par1, ...)* and *form_volume* will default to 1.0.
-
-The C code follows the C99 standard, including the usual math functions,
-as defined in
-`OpenCL <https://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/mathFunctions.html>`_.
-
-The standard constants and functions include the following::
-
-    M_PI = pi
-    M_PI_2 = pi/2
-    M_PI_4 = pi/4
-    M_E = e
-    M_SQRT1_2 = 1/sqrt(2)
-    NAN = NaN
-    INFINITY = 1/0
-    erf(x) = error function
-    erfc(x) = 1-erf(x)
-    expm1(x) = exp(x) - 1
-    tgamma(x) = gamma function
-
-Some non-standard constants and functions are also provided::
-
-    M_PI_180 = pi/180
-    M_4PI_3 = 4pi/3
-    square(x) = x*x
-    cube(x) = x*x*x
-    sinc(x) = sin(x)/x, with sin(0)/0 -> 1
-    SINCOS(x, s, c) sets s=sin(angle) and c=cos(angle)
-    powr(x, y) = x^y for x >= 0
-    pown(x, n) = x^n for n integer
-
-**source=['lib/fn.c', ...]** includes the listed C source files in the
+and it includes orientation parameters.
+
+*form_volume* defines the volume of the shape. As in python models, it 
+includes only the volume parameters.
+
+*Iqxy* will default to *Iq(sqrt(qx**2 + qy**2), par1, ...)* and
+*form_volume* will default to 1.0.
+
+**source=['fn.c', ...]** includes the listed C source files in the
 program before *Iq* and *Iqxy* are defined. This allows you to extend the
-library of available C functions. Additional special functions and
-scattering calculations are defined in
-`sasmodels/models/lib <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib>`_,
-including::
-
-    sph_j1c(x) = 3 j1(x)/x = 3 (sin(x) - x cos(x))/x^3  [spherical bessel function]
-    sas_J1c(x) = 2 J1(x)/x  [bessel function of the first kind]
-    sas_gamma(x) = gamma function  [tgamma is unstable below 1]
-    sas_erf(x) = error function [erf is broken on some Intel OpenCL drivers]
-    sas_erfc(x) = 1-erf(x)
-    sas_J0(x) = J0(x)
-    sas_J1(x) = J1(x)
-    sas_JN(x) = JN(x)
-    Si(x) = integral sin(z)/z from 0 to x
-    Gauss76Wt = gaussian quadrature weights for 76 point integral
-    Gauss76Z = gaussian quadrature values for 76 point integral
-
-These functions have been tuned to be fast and numerically stable down
-to $q=0$ even in single precision.  In some cases they work around bugs
-which appear on some platforms but not others. So use them where needed!!!
+library of C functions available to your model.
 
 Models are defined using double precision declarations for the
-parameters and return values.  Declarations and constants will be converted
-to float or long double depending on the precision requested.
+parameters and return values.  When a model is run using single
+precision or long double precision, each variable is converted
+to the target type, depending on the precision requested.
 
 **Floating point constants must include the decimal point.**  This allows us
@@ -558 +509 @@
 use the builtin constant M_PI rather than 4*atan(1); it is faster and smaller!
 
-FLOAT_SIZE is the number of bytes in the converted variables. If your
-algorithm depends on precision (which is not uncommon for numerical
-algorithms), use the following::
-
-    #if FLOAT_SIZE>4
-    ... code for double precision ...
-    #else
-    ... code for single precision ...
-    #endif
-
-A value defined as SAS_DOUBLE will stay double precision; this should
-not be used since some graphics cards do not support double precision.
-
+The C model operates on a single $q$ value at a time.  The code will be
+run in parallel across different $q$ values, either on the graphics card
+or the processor.
+
+Rather than returning NAN from Iq, you must define the *INVALID(v)*.  The
+*v* parameter lets you access all the parameters in the model using
+*v.par1*, *v.par2*, etc. For example::
+
+    #define INVALID(v) (v.bell_radius < v.radius)
+
+Special Functions
+.................
+
+The C code follows the C99 standard, with the usual math functions,
+as defined in
+`OpenCL <https://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/mathFunctions.html>`_.
+This includes the following:
+
+    M_PI, M_PI_2, M_PI_4, M_SQRT1_2, M_E:
+        $\pi$, $\pi/2$, $\pi/4$, $1/\sqrt{2}$ and Euler's constant $e$
+    exp, log, pow(x,y), expm1, sqrt:
+        Power functions $e^x$, $\ln x$, $x^y$, $e^x - 1$, $\sqrt{x}$.
+        The function expm1(x) is accurate across all $x$, including $x$
+        very close to zero.
+    sin, cos, tan, asin, acos, atan:
+        Trigonometry functions and inverses, operating on radians.
+    sinh, cos, tanh, asinh, acosh, atanh:
+        Hyperbolic trigonometry functions.
+    atan2(y,x):
+        Angle from the $x$\ -axis to the point $(x,y)$, which is equal to
+        $\tan^{-1}(y/x)$ corrected for quadrant.  That is, if $x$ and $y$ are
+        both negative, then atan2(y,x) returns a value in quadrant III where
+        atan(y/x) would return a value in quadrant I. Similarly for
+        quadrants II and IV when $x$ and $y$ have opposite sign.
+    fmin(x,y), fmax(x,y), trunc, rint:
+        Floating point functions.  rint(x) returns the nearest integer.
+    NAN:
+        NaN, Not a Number, $0/0$.  Use isnan(x) to test for NaN.  Note that
+        you cannot use :code:`x == NAN` to test for NaN values since that
+        will always return false.  NAN does not equal NAN!
+    INFINITY:
+        $\infty, 1/0$.  Use isinf(x) to test for infinity, or isfinite(x)
+        to test for finite and not NaN.
+    erf, erfc, tgamma, lgamma:  **do not use**
+        Special functions that should be part of the standard, but are missing
+        or inaccurate on some platforms. Use sas_erf, sas_erfc and sas_gamma
+        instead (see below). Note: lgamma(x) has not yet been tested.
+
+Some non-standard constants and functions are also provided:
+
+    M_PI_180, M_4PI_3:
+        $\pi/{180}$, $\tfrac{4}{3}\pi$
+    SINCOS(x, s, c):
+        Macro which sets s=sin(x) and c=cos(x). The variables *c* and *s*
+        must be declared first.
+    square(x):
+        $x^2$
+    cube(x):
+        $x^3$
+    sinc(x):
+        $\sin(x)/x$, with limit $\sin(0)/0 = 1$.
+    powr(x, y):
+        $x^y$ for $x \ge 0$; this is faster than general $x^y$ on some GPUs.
+    pown(x, n):
+        $x^n$ for $n$ integer; this is faster than general $x^n$ on some GPUs.
+    FLOAT_SIZE:
+        The number of bytes in a floating point value.  Even though all
+        variables are declared double, they may be converted to single
+        precision float before running. If your algorithm depends on
+        precision (which is not uncommon for numerical algorithms), use
+        the following::
+
+            #if FLOAT_SIZE>4
+            ... code for double precision ...
+            #else
+            ... code for single precision ...
+            #endif
+    SAS_DOUBLE:
+        A replacement for :code:`double` so that the declared variable will
+        stay double precision; this should generally not be used since some
+        graphics cards do not support double precision.  There is no provision
+        for forcing a constant to stay double precision.
+
+The following special functions and scattering calculations are defined in
+`sasmodels/models/lib <https://github.com/SasView/sasmodels/tree/master/sasmodels/models/lib>`_.
+These functions have been tuned to be fast and numerically stable down
+to $q=0$ even in single precision.  In some cases they work around bugs
+which appear on some platforms but not others. So use them where needed!!!
+
+    polevl(x, c, n):
+        Polynomial evaluation $p(x) = \sum_{i=0}^n c_i x^{n-i}$ using Horner's
+        method so it is faster and more accurate.
+
+        :code:`source = ["lib/polevl.c", ...]`
+
+    sas_gamma:
+        Gamma function $\text{sas_gamma}(x) = \Gamma(x)$.  The standard math
+        library gamma function, tgamma(x) is unstable below 1 on some platforms.
+
+        :code:`source = ["lib/sasgamma.c", ...]`
+
+    erf, erfc:
+        Error function
+        $\text{erf}(x) = \frac{1}{\sqrt\pi}\int_0^x e^{-t^2}\,dt$
+        and complementary error function
+        $\text{erfc}(x) = \frac{1}{\sqrt\pi}\int_x^\inf e^{-t^2}\,dt$.
+        The standard math library erf and erfc are slower and broken
+        on some platforms.
+
+        :code:`source = ["lib/polevl.c", "lib/sas_erf.c", ...]`
+
+    sas_J0:
+        Bessel function of the first kind where
+        $J_0(x) = \frac{1}{\pi}\int_0^\pi \cos(x\sin(\tau))\,d\tau$.
+
+        :code:`source = ["lib/polevl.c", "lib/sas_J0.c", ...]`
+
+    sas_J1:
+        Bessel function of the first kind where
+        $J_1(x) = \frac{1}{\pi}\int_0^\pi \cos(\tau - x\sin(\tau))\,d\tau$.
+
+        :code:`source = ["lib/polevl.c", "lib/sas_J1.c", ...]`
+
+    sas_JN:
+        Bessel function of the first kind where
+        $J_n(x) = \frac{1}{\pi}\int_0^\pi \cos(n\tau - x\sin(\tau))\,d\tau$.
+
+        :code:`source = ["lib/polevl.c", "lib/sas_J0.c", "lib/sas_J1.c", "lib/sas_JN.c", ...]`
+
+    Si:
+        Sine integral $\text{Si}(x) = \int_0^x \tfrac{\sin t}{t}\,dt$.
+
+        :code:`soure = ["lib/Si.c", ...]`
+
+    sph_j1c(qr):
+        Spherical Bessel form
+        $F(qr) = 3 j_1(qr)/(qr) = 3 (\sin(qr) - qr \cos(qr))/{(qr)^3}$,
+        with a limiting value of 1 at $qr=0$.  This function uses a Taylor
+        series for small $qr$ for numerical accuracy.
+
+        :code:`source = ["lib/sph_j1c.c", ...]`
+
+    sas_J1c(qr):
+        Bessel form $F(qr) = 2 J_1(qr)/{(qr)}$, with a limiting value of 1 at $qr=0$.
+
+        :code:`source = ["lib/polevl.c", "lib/sas_J1.c", ...]`
+
+    Gauss76z[i], Gauss76Wt[i]:
+        Points $z_i$ and weights $w_i$ for 76-point Gaussian quadrature,
+        computing $\int_{-1}^1 f(z)\,dz \approx \sum_{i=1}^{76} w_i f(z_i)$.
+        Similar arrays are available in :code:`gauss20.c` for 20 point
+        quadrature and in :code:`gauss150.c` for 150 point quadrature.
+
+        :code:`source = ["gauss76.c", ...]`
+
+Problems with C models
+......................
+
+The graphics processor (GPU) in your computer is a specialized computer tuned
+for certain kinds of problems.  This leads to strange restrictions that you
+need to be aware of.  Your code may work fine on some platforms or for some
+models, but then return bad values on other platforms.  Some examples of
+particular problems:
+
+  **(1) Code is too complex, or uses too much memory.**  GPU devices only have a
+  limited amount of memory available for each processor.  If you run programs
+  which take too much memory, then rather than running multiple values in parallel
+  as it usually does, the GPU may only run a single version of the code at a
+  time, making it slower than running on the CPU.  It may fail to run on
+  some platforms, or worse, cause the screen to go blank or the system to reboot.
+
+  **(2) Code takes too long.**  Because GPU devices are used for the computer
+  display, the OpenCL drivers are very careful about the amount of time they
+  will allow any code to run.  For example, on OS X, the model will stop running
+  after 5 seconds regardless of whether the computation is complete.  You may end up
+  with only some of your 2D array defined, with the rest containing random
+  data. Or it may cause the screen to go blank or the system to reboot.
+
+  **(3) Memory is not aligned**.  The GPU hardware is specialized to operate on
+  multiple values simultaneously.  To keep the GPU simple the values in memory
+  must be aligned with the different GPU compute engines.  Not following these
+  rules can lead to unexpected values being loaded into memory, and wrong answers
+  computed.  The conclusion from a very long and strange debugging session was
+  that any arrays that you declare in your model should be a multiple of four.
+  For example::
+
+      double Iq(q, p1, p2, ...)
+      {
+          double vector[8];  // Only going to use seven slots, but declare 8
+          ...
+      }
+
+The first step when your model is behaving strangely is to set **single=False**.
+This automatically restricts the model to only run on the CPU, or on high-end
+GPU cards.  There can still be problems even on high-end cards, so you can force
+the model off the GPU by setting **opencl=False**.  This runs the model
+as a normal C program without any GPU restrictions so you know that
+strange results are probably from your code rather than the environment.  Once
+the code is debugged, you can compare your output to the output on the GPU.
+
+Although it can be difficult to get your model to work on the GPU, the reward
+can be a model that runs 1000x faster on a good card.  Even your laptop may
+show a 50x improvement or more over the equivalent pure python model.
 
 External C Models
@@ -577 +718 @@
 External C models are very much like embedded C models, except that
 *Iq*, *Iqxy* and *form_volume* are defined in an external source file
-loaded using the *source=[...]*  method. You need to supply the function
+loaded using the *source=[...]* statement. You need to supply the function
 declarations for each of these that you need instead of building them
 automatically from the parameter table.
@@ -804 +945 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 10Oct2016
+.. note::  This help document was last changed by Steve King, 25Oct2016

src/sas/sasgui/perspectives/fitting/models.py

@@ -356 +356 @@
         """
         if int(evt.GetId()) in self.form_factor_dict.keys():
-            from sas.sascalc.fit.MultiplicationModel import MultiplicationModel
+            from sasmodels.sasview_model import MultiplicationModel
             self.model_dictionary[MultiplicationModel.__name__] = MultiplicationModel
             model1, model2 = self.form_factor_dict[int(evt.GetId())]

src/sas/sasgui/perspectives/fitting/pagestate.py

@@ -46 +46 @@
                             ["npts", "npts", "float"],
                             ["categorycombobox", "categorycombobox", "string"],
-                            ["formfactorcombobox", "formfactorcombobox", "string"],
-                            ["structurecombobox", "structurecombobox", "string"],
+                            ["formfactorcombobox", "formfactorcombobox",
+                             "string"],
+                            ["structurecombobox", "structurecombobox",
+                             "string"],
                             ["multi_factor", "multi_factor", "float"],
                             ["magnetic_on", "magnetic_on", "bool"],
@@ -65 +67 @@
                             ["smearer", "smearer", "float"],
                             ["smear_type", "smear_type", "string"],
-                            ["dq_l", "dq_l", "string"],
-                            ["dq_r", "dq_r", "string"],
+                            ["dq_l", "dq_l", "float"],
+                            ["dq_r", "dq_r", "float"],
                             ["dx_max", "dx_max", "float"],
                             ["dx_min", "dx_min", "float"],
@@ -80 +82 @@
                             ["str_parameters", "str_parameters"],
                             ["orientation_parameters", "orientation_params"],
-                            ["dispersity_parameters", "orientation_params_disp"],
+                            ["dispersity_parameters",
+                             "orientation_params_disp"],
                             ["fixed_param", "fixed_param"],
                             ["fittable_param", "fittable_param"]]
@@ -120 +123 @@
             try:
                 return node.get(item[0]).strip() == "True"
-            except:
+            except Exception:
                 return None
         else:
             try:
                 return float(node.get(item[0]))
-            except:
+            except Exception:
                 return None
 
@@ -188 +191 @@
         # page name
         self.page_name = ""
-        # Contains link between model, all its parameters, and panel organization
+        # Contains link between model, its parameters, and panel organization
         self.parameters = []
         # String parameter list that can not be fitted
@@ -305 +308 @@
         obj.fittable_param = copy.deepcopy(self.fittable_param)
         obj.orientation_params = copy.deepcopy(self.orientation_params)
-        obj.orientation_params_disp = copy.deepcopy(self.orientation_params_disp)
+        obj.orientation_params_disp = \
+            copy.deepcopy(self.orientation_params_disp)
         obj.enable_disp = copy.deepcopy(self.enable_disp)
         obj.disable_disp = copy.deepcopy(self.disable_disp)
@@ -397 +401 @@
         rep += "data : %s\n" % str(self.data)
         rep += "Plotting Range: min: %s, max: %s, steps: %s\n" % \
-               (str(self.qmin),str(self.qmax), str(self.npts))
+               (str(self.qmin), str(self.qmax), str(self.npts))
         rep += "Dispersion selection : %s\n" % str(self.disp_box)
         rep += "Smearing enable : %s\n" % str(self.enable_smearer)
@@ -413 +417 @@
 
         rep += "2D enable : %s\n" % str(self.enable2D)
-        rep += "All parameters checkbox selected: %s\n" % str(self.cb1)
+        rep += "All parameters checkbox selected: %s\n" % self.cb1
         rep += "Value of Chisqr : %s\n" % str(self.tcChi)
-        rep += "Smear object : %s\n" % str(self.smearer)
-        rep += "Smear type : %s\n" % str(self.smear_type)
+        rep += "Smear object : %s\n" % self.smearer
+        rep += "Smear type : %s\n" % self.smear_type
         rep += "dq_l  : %s\n" % self.dq_l
         rep += "dq_r  : %s\n" % self.dq_r
@@ -478 +482 @@
                 value = content[1]
             except Exception:
-                msg = "Report string expected 'name: value' but got %r"%line
+                msg = "Report string expected 'name: value' but got %r" % line
                 logging.error(msg)
             if name.count("State created"):
@@ -493 +497 @@
             if name == "value":
                 param_string += value + ','
+            fixed_parameter = False
             if name == "selected":
                 if value == u' False':
                     fixed_parameter = True
-                else:
-                    fixed_parameter = False
             if name == "error value":
                 if fixed_parameter:
@@ -617 +620 @@
         dialog.Show()
 
-    def _toXML_helper(self, thelist, element, newdoc):
+    def _to_xml_helper(self, thelist, element, newdoc):
         """
         Helper method to create xml file for saving state
@@ -635 +638 @@
             element.appendChild(sub_element)
 
-    def toXML(self, file="fitting_state.fitv", doc=None,
-              entry_node=None, batch_fit_state=None):
+    def to_xml(self, file="fitting_state.fitv", doc=None,
+               entry_node=None, batch_fit_state=None):
         """
         Writes the state of the fit panel to file, as XML.
@@ -648 +651 @@
         :param entry_node: XML node within the XML document at which we
                            will append the data [optional]
+        :param batch_fit_state: simultaneous fit state
         """
         from xml.dom.minidom import getDOMImplementation
@@ -746 +750 @@
         for item in LIST_OF_STATE_PARAMETERS:
             element = newdoc.createElement(item[0])
-            self._toXML_helper(thelist=getattr(self, item[1]),
-                               element=element, newdoc=newdoc)
+            self._to_xml_helper(thelist=getattr(self, item[1]),
+                                element=element, newdoc=newdoc)
             inputs.appendChild(element)
 
@@ -765 +769 @@
             for constraint in batch_fit_state.constraints_list:
                 if constraint.model_cbox.GetValue() != "":
-                    # model_cbox, param_cbox, egal_txt, constraint, btRemove, sizer
+                    # model_cbox, param_cbox, egal_txt, constraint,
+                    # btRemove, sizer
                     doc_cons = newdoc.createElement('constraint')
                     doc_cons.setAttribute('model_cbox',
@@ -808 +813 @@
             return newdoc
 
-    def _fromXML_helper(self, node, list):
+    def _from_xml_helper(self, node, list):
         """
         Helper function to write state to xml
@@ -858 +863 @@
                          [maximum_displayed, maximum_value], unit])
 
-    def fromXML(self, file=None, node=None):
+    def from_xml(self, file=None, node=None):
         """
         Load fitting state from a file
@@ -887 +892 @@
                     logging.error(msg)
 
-            # Parse fitting attributes
-            entry = get_content('ns:Attributes', node)
-            for item in LIST_OF_DATA_ATTRIBUTES:
-                node = get_content('ns:%s' % item[0], entry)
-                setattr(self, item[0], parse_entry_helper(node, item))
-
             if entry is not None:
+                # Parse fitting attributes
+                entry = get_content('ns:Attributes', node)
+                for item in LIST_OF_DATA_ATTRIBUTES:
+                    node = get_content('ns:%s' % item[0], entry)
+                    setattr(self, item[0], parse_entry_helper(node, item))
+
                 for item in LIST_OF_STATE_ATTRIBUTES:
                     node = get_content('ns:%s' % item[0], entry)
@@ -900 +905 @@
                 for item in LIST_OF_STATE_PARAMETERS:
                     node = get_content("ns:%s" % item[0], entry)
-                    self._fromXML_helper(node=node, list=getattr(self, item[1]))
+                    self._from_xml_helper(node=node,
+                                          list=getattr(self, item[1]))
 
                 # Recover _disp_obj_dict from xml file
@@ -950 +956 @@
         """
         images = []
-        # some imports
-        import wx
 
         # Reset memory
@@ -958 +962 @@
 
         # For no figures in the list, prepare empty plot
-        if figs == None or len(figs) == 0:
+        if figs is None or len(figs) == 0:
             figs = [None]
 
@@ -965 +969 @@
         self.imgRAM = wx.MemoryFSHandler()
         for fig in figs:
-            if figs != None:
+            if fig is not None:
                 ind = figs.index(fig)
                 canvas = canvases[ind]
 
-            #store the image in wx.FileSystem Object
+            # store the image in wx.FileSystem Object
             wx.FileSystem.AddHandler(wx.MemoryFSHandler())
 
@@ -975 +979 @@
             ind = figs.index(fig)
 
-            #AddFile, image can be retrieved with 'memory:filename'
+            # AddFile, image can be retrieved with 'memory:filename'
             self.imgRAM.AddFile('img_fit%s.png' % ind,
                                 canvas.bitmap, wx.BITMAP_TYPE_PNG)
 
-            #append figs
+            # append figs
             images.append(fig)
 
@@ -989 +993 @@
     Class to load a .fitv fitting file
     """
-    ## File type
+    # File type
     type_name = "Fitting"
 
-    ## Wildcards
+    # Wildcards
     type = ["Fitting files (*.fitv)|*.fitv"
             "SASView file (*.svs)|*.svs"]
-    ## List of allowed extensions
+    # List of allowed extensions
     ext = ['.fitv', '.FITV', '.svs', 'SVS']
 
@@ -1009 +1013 @@
 
         """
-        ## Call back method to be executed after a file is read
+        # Call back method to be executed after a file is read
         self.call_back = call_back
-        ## CanSAS format flag
+        # CanSAS format flag
         self.cansas = cansas
         self.state = None
@@ -1027 +1031 @@
 
         """
-        if self.cansas == True:
+        if self.cansas:
             return self._read_cansas(path)
 
@@ -1061 +1065 @@
         for item in datainfo.run:
             runname = {}
-            if datainfo.run_name.has_key(item) and \
+            if item in datainfo.run_name and \
                             len(str(datainfo.run_name[item])) > 1:
                 runname = {'name': datainfo.run_name[item]}
@@ -1076 +1080 @@
             root_node = doc.createElement(item[0])
             new_node.appendChild(root_node)
-            temp_list = None
             temp_list = getattr(datainfo, item[1])
 
@@ -1113 +1116 @@
                                        datainfo.sample.position.z,
                                        {"unit": datainfo.sample.position_unit})
-        if written == True:
+        if written:
             sample.appendChild(pos)
 
@@ -1121 +1124 @@
         written = written | write_node(doc, ori, "pitch",
                                        datainfo.sample.orientation.y,
-                                       {"unit": datainfo.sample.orientation_unit})
+                                       {"unit":
+                                            datainfo.sample.orientation_unit})
         written = written | write_node(doc, ori, "yaw",
                                        datainfo.sample.orientation.z,
-                                       {"unit": datainfo.sample.orientation_unit})
-        if written == True:
+                                       {"unit":
+                                            datainfo.sample.orientation_unit})
+        if written:
             sample.appendChild(ori)
 
@@ -1153 +1158 @@
                                        datainfo.source.beam_size.z,
                                        {"unit": datainfo.source.beam_size_unit})
-        if written == True:
+        if written:
             source.appendChild(size)
 
@@ -1198 +1203 @@
                 written = written | write_node(doc, size, "z", apert.size.z,
                                                {"unit": apert.size_unit})
-                if written == True:
+                if written:
                     ap.appendChild(size)
 
@@ -1210 +1215 @@
                                            item.slit_length,
                                            {"unit": item.slit_length_unit})
-            if written == True:
+            if written:
                 instr.appendChild(det)
 
@@ -1220 +1225 @@
             written = written | write_node(doc, off, "z", item.offset.z,
                                            {"unit": item.offset_unit})
-            if written == True:
+            if written:
                 det.appendChild(off)
 
@@ -1232 +1237 @@
                                            item.beam_center.z,
                                            {"unit": item.beam_center_unit})
-            if written == True:
+            if written:
                 det.appendChild(center)
 
@@ -1242 +1247 @@
             written = written | write_node(doc, pix, "z", item.pixel_size.z,
                                            {"unit": item.pixel_size_unit})
-            if written == True:
+            if written:
                 det.appendChild(pix)
 
@@ -1253 +1258 @@
             written = written | write_node(doc, ori, "yaw", item.orientation.z,
                                            {"unit": item.orientation_unit})
-            if written == True:
+            if written:
                 det.appendChild(ori)
 
@@ -1290 +1295 @@
                 # Create an empty state
                 state = PageState()
-                state.fromXML(node=nodes[0])
+                state.from_xml(node=nodes[0])
 
         except:
@@ -1314 +1319 @@
                 simfitstate_0 = simfitstate[0]
                 all = simfitstate_0.xpath('ns:select_all',
-                                        namespaces={'ns': CANSAS_NS})
+                                          namespaces={'ns': CANSAS_NS})
                 atts = all[0].attrib
                 checked = atts.get('checked')
                 sim_fit_state.select_all = bool(checked)
                 model_list = simfitstate_0.xpath('ns:model_list',
-                                               namespaces={'ns': CANSAS_NS})
+                                                 namespaces={'ns': CANSAS_NS})
                 model_list_items = model_list[0].xpath('ns:model_list_item',
-                                                   namespaces={'ns': CANSAS_NS})
+                                                       namespaces={'ns':
+                                                                    CANSAS_NS})
                 for model in model_list_items:
                     attrs = model.attrib
@@ -1368 +1374 @@
             return return_value, _
 
-        #Parse 2D
+        # Parse 2D
         data_info = Data2D()
 
@@ -1590 +1596 @@
         for entry in nodes:
             for item in LIST_OF_DATA_2D_ATTR:
-                #get node
+                # get node
                 node = get_content('ns:%s' % item[0], entry)
                 setattr(data_info, item[1], parse_entry_helper(node, item))
@@ -1633 +1639 @@
                     entry_list = root.xpath('ns:SASentry',
                                             namespaces={'ns': CANSAS_NS})
-                    name_map = {}
                     for entry in entry_list:
                         try:
@@ -1679 +1684 @@
                         state.data.is_data = state.is_data
                     if output[ind].run_name is not None\
-                        and len(output[ind].run_name) != 0:
+                         and len(output[ind].run_name) != 0:
                         if isinstance(output[ind].run_name, dict):
                             name = output[ind].run_name.keys()[0]
@@ -1715 +1720 @@
             # Write the XML document
         else:
-            doc = fitstate.toXML(file=filename)
+            doc = fitstate.to_xml(file=filename)
 
         # Save the document no matter the type
@@ -1749 +1754 @@
 
         if state is not None:
-            doc = state.toXML(doc=doc, file=data.filename, entry_node=sasentry,
-                              batch_fit_state=self.batchfit_params)
+            doc = state.to_xml(doc=doc, file=data.filename, entry_node=sasentry,
+                               batch_fit_state=self.batchfit_params)
 
         return doc

src/sas/sasgui/perspectives/invariant/media/invariant_help.rst

@@ -116 +116 @@
 Academic Press, New York, 1982
 
-http://physchem.kfunigraz.ac.at/sm/
+http://web.archive.org/web/20110824105537/http://physchem.kfunigraz.ac.at/sm/Service/Glatter_Kratky_SAXS_1982.zip
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

src/sas/sasgui/perspectives/pr/pr.py

@@ -1276 +1276 @@
                     wx.PostEvent(self.parent, StatusEvent(status=msg, info='error'))
                     return
-                msg += "Prview does not allow multiple data!\n"
+                msg = "Prview does not allow multiple data!\n"
                 msg += "Please select one.\n"
                 if len(data_list) > 1: