Changes in / [600bea1:cd5e29b] in sasview

Files:

• .gitignore (modified) (2 diffs)
• run.py (modified) (1 diff)
• setup.py (modified) (5 diffs)
• src/sas/models/dispersion_models.py (modified) (1 diff)
• src/sas/perspectives/fitting/basepage.py (modified) (212 diffs)
• src/sas/perspectives/fitting/fitpage.py (modified) (176 diffs)
• src/sas/perspectives/fitting/models.py (modified) (4 diffs)

.gitignore

@@ -13 +13 @@
 .pydevproject
 .vagrant
+.idea
+build
+dist
+sasview.egg-info
+sasview.egg-info
+
 .mplconfig
+doctrees
+html
+build
 
 /dist
-/build
+**/build
 sasview.egg-info
 sasview-install
@@ -34 +43 @@
 /docs/sphinx-docs/source/user/perspectives
 
+default_categories.json

run.py

@@ -104 +104 @@
     addpath(joinpath(root, 'src'))
 
+    # sasmodels on the path
+    addpath(joinpath(root, '../sasmodels/'))
+
     # Import the sasview package from root/sasview as sas.sasview.  It would
     # be better to just store the package in src/sas/sasview.

setup.py

@@ -244 +244 @@
 model_dir = os.path.join("src", "sas","models")
 
-if os.path.isdir(wrapper_dir):
-    for file in os.listdir(wrapper_dir): 
-        file_path =  os.path.join(wrapper_dir, file)
-        os.remove(file_path)
-else:
-    os.makedirs(wrapper_dir)
-sys.path.append(os.path.join("src", "sas", "models", "c_extension", "python_wrapper"))
-from wrapping import generate_wrappers
-generate_wrappers(header_dir = includedir, 
-                  output_dir = model_dir,
-                  c_wrapper_dir = wrapper_dir)
+#if os.path.isdir(wrapper_dir):
+#    for file in os.listdir(wrapper_dir):
+#        file_path =  os.path.join(wrapper_dir, file)
+#        os.remove(file_path)
+#else:
+#    os.makedirs(wrapper_dir)
+#sys.path.append(os.path.join("src", "sas", "models", "c_extension", "python_wrapper"))
+#from wrapping import generate_wrappers
+#generate_wrappers(header_dir = includedir,
+#                  output_dir = model_dir,
+#                  c_wrapper_dir = wrapper_dir)
 
 IGNORED_FILES = [".svn"]
@@ -283 +283 @@
 model_sources = []
 append_file(file_list=model_sources, dir_path=igordir)
-append_file(file_list=model_sources, dir_path=c_model_dir)
-append_file(file_list=model_sources, dir_path=wrapper_dir)
+#append_file(file_list=model_sources, dir_path=c_model_dir)
+#append_file(file_list=model_sources, dir_path=wrapper_dir)
 
 smear_sources = []
@@ -303 +303 @@
 
 c_models = [ 
-    Extension("sas.models.sas_extension.c_models",
-        sources=model_sources,                 
-        include_dirs=[
-            igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
-        ],
-    ),
+    #Extension("sas.models.sas_extension.c_models",
+    #    sources=model_sources,
+    #    include_dirs=[
+    #        igordir, includedir, c_model_dir, numpy_incl_path, cephes_dir
+    #    ],
+    #),
 
     # Smearer extension
@@ -340 +340 @@
 ext_modules.extend(c_models)
 
+packages.append("sas.models")
 # SasView
 
@@ -350 +351 @@
                                'test/save_states/*',
                                'test/upcoming_formats/*', 
-                               'default_categories.json']
+                                 'default_categories.json']
 packages.append("sas.sasview")
 

src/sas/models/dispersion_models.py

@@ -154 +154 @@
         c_models.set_dispersion_weights(self.cdisp, values, weights)
         
-models = {"gaussian":GaussianDispersion,  "rectangula":RectangleDispersion,
+models = {"gaussian":GaussianDispersion,  "rectangular":RectangleDispersion,
           "array":ArrayDispersion, "schulz":SchulzDispersion, 
           "lognormal":LogNormalDispersion}       

src/sas/perspectives/fitting/basepage.py

@@ -57 +57 @@
     ## Title to appear on top of the window
     window_caption = "Fit Page "
-
+    
     def __init__(self, parent, color='blue', **kwargs):
         """
@@ -66 +66 @@
         #Set window's font size
         self.SetWindowVariant(variant=FONT_VARIANT)
-
+      
         self.SetBackgroundColour(color)
         ## parent of the page
@@ -126 +126 @@
         self.Npts_fit = None
         self.Npts_total = None
-        self.theory_qmin = None
+        self.theory_qmin = None 
         self.theory_qmax = None
         self.theory_qmin_x = None
@@ -135 +135 @@
         self.sld_axes = None
         self.multi_factor = None
-
+       
         self.disp_cb_dict = {}
-
+   
         #self.state = PageState(parent=parent)
         ## dictionary containing list of models
         self.model_list_box = {}
-
+       
         ## Data member to store the dispersion object created
         self._disp_obj_dict = {}
@@ -169 +169 @@
         self.disp_list = []
         self.disp_name = ""
-
+        
         ## list of orientation parameters
         self.orientation_params = []
         self.orientation_params_disp = []
-#       Self.model should ALWAYS be None here.  It was set to none above in
+#       Self.model should ALWAYS be None here.  It was set to none above in 
 #       this long init setting.  no obvious function call in between setting
-#       and this - commenting out on 4/8/2014 by PDB.  Remove once clear
+#       and this - commenting out on 4/8/2014 by PDB.  Remove once clear 
 #       it is pointless.
 #        if self.model != None:
@@ -198 +198 @@
         ## Create context menu for page
         self.popUpMenu = wx.Menu()
-
+    
         id = wx.NewId()
         self._keep = wx.MenuItem(self.popUpMenu, id, "Add bookmark",
@@ -208 +208 @@
         wx.EVT_MENU(self, id, self.on_bookmark)
         self.popUpMenu.AppendSeparator()
-
+    
         ## Default locations
         self._default_save_location = os.getcwd()
@@ -214 +214 @@
         #self.onSave(event=None)
         self.Bind(wx.EVT_CONTEXT_MENU, self.onContextMenu)
-
+        
         # bind key event
         self.Bind(wx.EVT_LEFT_DOWN, self.on_left_down)
-
+        
         ## create the basic structure of the panel with empty sizer
         self.define_page_structure()
         ## drawing Initial dispersion parameters sizer
         self.set_dispers_sizer()
-
+        
         ## layout
         self.set_layout()
-
+    
     def set_index_model(self, index):
         """
@@ -231 +231 @@
         """
         self.index_model = index
-
+        
     def create_default_data(self):
         """
@@ -248 +248 @@
                 else:
                     self._create_default_1d_data()
-
+                        
             if self.model != None:
                 if not self.data.is_data:
@@ -258 +258 @@
             self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
             self.state.slit_smearer = self.slit_smearer.GetValue()
-
+        
     def _create_default_1d_data(self):
         """
@@ -264 +264 @@
         Only when the page is on theory mode.
         :warning: This data is never plotted.
-
+        
         """
         x = numpy.linspace(start=self.qmin_x, stop=self.qmax_x,
@@ -274 +274 @@
         self.data.id = str(self.uid) + " data"
         self.data.group_id = str(self.uid) + " Model1D"
-
+         
     def _create_log_1d_data(self):
         """
@@ -280 +280 @@
         Only when the page is on theory mode.
         :warning: This data is never plotted.
-
+        
         """
         if self.qmin_x >= 1.e-10:
             qmin = numpy.log10(self.qmin_x)
         else:
-            qmin = -10.
-
+            qmin = -10.    
+            
         if self.qmax_x <= 1.e10:
             qmax = numpy.log10(self.qmax_x)
         else:
-            qmax = 10.
-
+            qmax = 10. 
+               
         x = numpy.logspace(start=qmin, stop=qmax,
                            num=self.npts_x, endpoint=True, base=10.0)
@@ -300 +300 @@
         self.data.id = str(self.uid) + " data"
         self.data.group_id = str(self.uid) + " Model1D"
-
+      
     def _create_default_2d_data(self):
         """
@@ -358 +358 @@
         #xstep = x_size / len(x_bins - 1)
         #ystep = y_size / len(y_bins - 1)
-
+  
         self.data.source = Source()
         self.data.data = numpy.ones(len(mask))
@@ -381 +381 @@
             wx.PostEvent(self._manager.parent, PanelOnFocusEvent(panel=self))
             self.on_tap_focus()
-
+               
     def on_tap_focus(self):
         """
@@ -397 +397 @@
                     self._manager.menu1.FindItemById(self._manager.id_batchfit)
             batch_menu.Enable(self.batch_on and flag)
-
+    
     def set_page_info(self, page_info):
         """
         set some page important information at once
         """
-#       THIS METHOD/FUNCTION NO LONGE APPEARS TO BE CALLED.  Started up program
+#       THIS METHOD/FUNCTION NO LONGE APPEARS TO BE CALLED.  Started up program 
 #       and started new fit window and PR and Invariant and a fit in fitting
 #       but never entered this routine which should be an initialization
-#       routine.  Leave for a while but probably something to clean up at
+#       routine.  Leave for a while but probably something to clean up at 
 #       some point?
 #
@@ -426 +426 @@
         ## Data member to store the dispersion object created
         self.populate_box(model_dict=self.model_list_box)
-
+        
     def onContextMenu(self, event):
         """
@@ -433 +433 @@
         # Skipping the save state functionality for release 0.9.0
         #return
-
+    
         pos = event.GetPosition()
         pos = self.ScreenToClient(pos)
-
+       
         self.PopupMenu(self.popUpMenu, pos)
-
+      
     def onUndo(self, event):
         """
@@ -445 +445 @@
         event = PreviousStateEvent(page=self)
         wx.PostEvent(self.parent, event)
-
+        
     def onRedo(self, event):
         """
@@ -452 +452 @@
         event = NextStateEvent(page=self)
         wx.PostEvent(self.parent, event)
-
+    
     def define_page_structure(self):
         """
@@ -465 +465 @@
         self.sizer5 = wx.BoxSizer(wx.VERTICAL)
         self.sizer6 = wx.BoxSizer(wx.VERTICAL)
-
+        
         self.sizer0.SetMinSize((PANEL_WIDTH, -1))
         self.sizer1.SetMinSize((PANEL_WIDTH, -1))
@@ -473 +473 @@
         self.sizer5.SetMinSize((PANEL_WIDTH, -1))
         self.sizer6.SetMinSize((PANEL_WIDTH, -1))
-
+        
         self.vbox.Add(self.sizer0)
         self.vbox.Add(self.sizer1)
@@ -481 +481 @@
         self.vbox.Add(self.sizer5)
         self.vbox.Add(self.sizer6)
-
+        
     def set_layout(self):
         """
@@ -490 +490 @@
         self.SetSizer(self.vbox)
         self.Centre()
-
+ 
     def set_owner(self, owner):
         """
         set owner of fitpage
-
+        
         :param owner: the class responsible of plotting
-
+        
         """
         self.event_owner = owner
         self.state.event_owner = owner
-
+        
     def get_state(self):
         """
@@ -506 +506 @@
         """
         return self.state
-
+    
     def get_data(self):
         """
@@ -512 +512 @@
         """
         return self.data
-
+    
     def get_data_list(self):
         """
@@ -518 +518 @@
         """
         return self.data_list
-
+    
     def set_manager(self, manager):
         """
         set panel manager
-
+        
         :param manager: instance of plugin fitting
-
+        
         """
         self._manager = manager
         self.state.manager = manager
-
+        
     def populate_box(self, model_dict):
         """
         Store list of model
-
+        
         :param model_dict: dictionary containing list of models
-
+        
         """
         self.model_list_box = model_dict
         self.state.model_list_box = self.model_list_box
         self.initialize_combox()
-
+        
     def set_model_dictionary(self, model_dict):
         """
@@ -551 +551 @@
         """
         put default value in the combobox
-        """
+        """  
         ## fill combox box
         if self.model_list_box is None:
@@ -560 +560 @@
         ## These are called for first time by formfactor_combo_init
         ## itself called from fitpanel only.  If we find that I'm wrong and
-        ## we DO need to initialize somehow here - do it by a call to
-        ## formfactor_combo_init
+        ## we DO need to initialize somehow here - do it by a call to 
+        ## formfactor_combo_init 
         ## self.formfator_combo_init()
-        ## BUT NOT HERE -- make it last line of this
+        ## BUT NOT HERE -- make it last line of this 
         ## method so that structure box is populated before _show_comboox_helper
         ## is called.  Otherwise wx will complain mightily:-)
@@ -575 +575 @@
 #                               self.model_list_box["Shapes"])
             self._populate_box(self.structurebox,
-                               self.model_list_box["Structure Factors"])
+                                self.model_list_box["Structure Factors"])
             self.structurebox.Insert("None", 0, None)
             self.structurebox.SetSelection(0)
@@ -582 +582 @@
             self.structurebox.Disable()
             self.text2.Disable()
-
+             
             if self.model.__class__ in self.model_list_box["P(Q)*S(Q)"]:
                 self.structurebox.Show()
@@ -589 +589 @@
                 self.text2.Enable()
 
-
+                
     def set_dispers_sizer(self):
         """
@@ -601 +601 @@
         #----------------------------------------------------
         self.disable_disp = wx.RadioButton(self, -1, 'Off', (10, 10),
-                                           style=wx.RB_GROUP)
+                                            style=wx.RB_GROUP)
         self.enable_disp = wx.RadioButton(self, -1, 'On', (10, 30))
         # best size for MAC and PC
@@ -614 +614 @@
                                id=self.disp_help_bt.GetId())
         self.disp_help_bt.SetToolTipString("Helps for Polydispersion.")
-
+        
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param,
-                  id=self.disable_disp.GetId())
+                     id=self.disable_disp.GetId())
         self.Bind(wx.EVT_RADIOBUTTON, self._set_dipers_Param,
-                  id=self.enable_disp.GetId())
+                   id=self.enable_disp.GetId())
         #MAC needs SetValue
         self.disable_disp.SetValue(True)
@@ -630 +630 @@
         sizer_dispersion.Add((25, 20))
         sizer_dispersion.Add(self.disp_help_bt)
-
+        
         ## fill a sizer for dispersion
         boxsizer1.Add(sizer_dispersion, 0,
-                      wx.TOP|wx.BOTTOM|wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE,
-                      border=5)
+                wx.TOP | wx.BOTTOM | wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE,
+                border=5)
         self.sizer4_4 = wx.GridBagSizer(6, 5)
 
@@ -643 +643 @@
         self.sizer4.Layout()
         self.Layout()
-
+     
         self.Refresh()
         ## saving the state of enable dispersity button
@@ -649 +649 @@
         self.state.disable_disp = self.disable_disp.GetValue()
         self.SetupScrolling()
-
+    
     def onResetModel(self, event):
         """
@@ -667 +667 @@
             previous_state = self.saved_states[name]
             ## reset state of checkbox,textcrtl  and  regular parameters value
-
+            
             self.reset_page(previous_state)
         self.state.m_name = self.m_name
         self.Show(True)
-
+               
     def on_preview(self, event):
         """
@@ -680 +680 @@
         # get the report dialog
         self.state.report(images, canvases)
-
+        
     def on_save(self, event):
         """
@@ -693 +693 @@
                         self._manager.parent._default_save_location
         dlg = wx.FileDialog(self, "Choose a file", self._default_save_location,
-                            self.window_caption, "*.fitv", wx.SAVE)
+                                        self.window_caption, "*.fitv", wx.SAVE)
 
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPath()
             self._default_save_location = os.path.dirname(path)
-            self._manager.parent._default_save_location = \
-                                self._default_save_location
+            self._manager.parent._default_save_location =\
+                                 self._default_save_location
         else:
             return None
@@ -709 +709 @@
         self._manager.save_fit_state(filepath=fName, fitstate=new_state)
         return new_state
-
+    
     def on_copy(self, event):
         """
@@ -726 +726 @@
             wx.CallAfter(self.get_copy)
 
-
+        
     def on_paste(self, event):
         """
@@ -738 +738 @@
         # messages depending on the flag
         #self._copy_info(True)
-
+        
     def _copy_info(self, flag):
         """
         Send event dpemding on flag
-
+        
         : Param flag: flag that distinguish event
         """
@@ -758 +758 @@
         # inform msg to wx
         wx.PostEvent(self._manager.parent,
-                     StatusEvent(status=msg, info=infor))
-
+                    StatusEvent(status=msg, info=infor))
+        
     def _get_time_stamp(self):
         """
@@ -769 +769 @@
         current_date = str(month) + "/" + str(day) + "/" + str(year)
         return current_time, current_date
-
+      
     def on_bookmark(self, event):
         """
@@ -788 +788 @@
         name += "bookmarked at %s on %s" % (current_time, current_date)
         self.saved_states[name] = new_state
-
+        
         ## Add item in the context menu
         msg = "Model saved at %s on %s" % (current_time, current_date)
@@ -794 +794 @@
         msg += " Saved! right click on this page to retrieve this model"
         wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-
+        
         id = wx.NewId()
         self.popUpMenu.Append(id, name, str(msg))
@@ -802 +802 @@
                                          hint=str(msg),
                                          handler=self._back_to_bookmark))
-
+    
     def _back_to_bookmark(self, event):
         """
@@ -810 +810 @@
         self.onResetModel(event)
         self._draw_model()
-
+                
     def onSetFocus(self, evt):
         """
@@ -817 +817 @@
         """
         return
-
+    
     def read_file(self, path):
         """
         Read two columns file
-
+        
         :param path: the path to the file to read
-
+        
         """
         try:
@@ -856 +856 @@
         """
         return self.state.clone()
-
+    
     def save_current_state(self):
         """
@@ -866 +866 @@
             self.state.disp_list = copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
-
+            
             #model combobox: complex code because of mac's silent error
             if self.structurebox != None:
@@ -885 +885 @@
                 self.state.categorycombobox = self.categorybox.\
                 GetString(cb_select)
-
+        
         self.state.enable2D = copy.deepcopy(self.enable2D)
         self.state.values = copy.deepcopy(self.values)
@@ -902 +902 @@
             self.state.enable_disp = self.enable_disp.GetValue()
             self.state.disable_disp = self.disable_disp.GetValue()
-
+            
         self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self, "enable_smearer"):
@@ -917 +917 @@
         self.state.dxw = copy.deepcopy(self.dxw)
         self.state.slit_smearer = copy.deepcopy(self.slit_smearer.GetValue())
-
+                  
         if len(self._disp_obj_dict) > 0:
             for k, v in self._disp_obj_dict.iteritems():
@@ -926 +926 @@
         ## save plotting range
         self._save_plotting_range()
-
+        
         self.state.orientation_params = []
         self.state.orientation_params_disp = []
@@ -941 +941 @@
         self._copy_parameters_state(self.orientation_params_disp,
                                      self.state.orientation_params_disp)
-
+        
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.fittable_param,
@@ -948 +948 @@
         #save chisqr
         self.state.tcChi = self.tcChi.GetValue()
-
+        
     def save_current_state_fit(self):
         """
@@ -958 +958 @@
             self.state.disp_list = copy.deepcopy(self.disp_list)
             self.state.model = self.model.clone()
-
+            
         self.state.enable2D = copy.deepcopy(self.enable2D)
         self.state.values = copy.deepcopy(self.values)
@@ -964 +964 @@
         ## save data
         self.state.data = copy.deepcopy(self.data)
-
+        
         if hasattr(self, "enable_disp"):
             self.state.enable_disp = self.enable_disp.GetValue()
             self.state.disable_disp = self.disable_disp.GetValue()
-
+            
         self.state.smearer = copy.deepcopy(self.current_smearer)
         if hasattr(self, "enable_smearer"):
@@ -975 +975 @@
             self.state.disable_smearer = \
                                 copy.deepcopy(self.disable_smearer.GetValue())
-
+            
         self.state.pinhole_smearer = \
                                 copy.deepcopy(self.pinhole_smearer.GetValue())
@@ -998 +998 @@
                 for k, v in self._disp_obj_dict.iteritems():
                     self.state._disp_obj_dict[k] = v
-
+                        
             self.state.values = copy.deepcopy(self.values)
             self.state.weights = copy.deepcopy(self.weights)
-
+           
         ## save plotting range
         self._save_plotting_range()
-
+        
         ## save checkbutton state and txtcrtl values
         self._copy_parameters_state(self.orientation_params,
-                                    self.state.orientation_params)
+                                     self.state.orientation_params)
         self._copy_parameters_state(self.orientation_params_disp,
-                                    self.state.orientation_params_disp)
+                                     self.state.orientation_params_disp)
         self._copy_parameters_state(self.parameters, self.state.parameters)
         self._copy_parameters_state(self.fittable_param,
-                                    self.state.fittable_param)
+                                             self.state.fittable_param)
         self._copy_parameters_state(self.fixed_param, self.state.fixed_param)
-
+    
     def check_invalid_panel(self):
         """
@@ -1025 +1025 @@
             wx.MessageBox(msg, 'Info')
             return  True
-
+        
     def set_model_state(self, state):
         """
@@ -1032 +1032 @@
         self.disp_cb_dict = state.disp_cb_dict
         self.disp_list = state.disp_list
-
+      
         ## set the state of the radio box
         #self.shape_rbutton.SetValue(state.shape_rbutton)
@@ -1038 +1038 @@
         #self.struct_rbutton.SetValue(state.struct_rbutton)
         #self.plugin_rbutton.SetValue(state.plugin_rbutton)
-
+        
         ## fill model combobox
         self._show_combox_helper()
@@ -1052 +1052 @@
                     category_pos = int(ind_cat)
                     break
-
+            
         self.categorybox.Select(category_pos)
         try:
@@ -1064 +1064 @@
                     formfactor_pos = int(ind_form)
                     break
-
+            
         self.formfactorbox.Select(formfactor_pos)
-
+        
         try:
             # to support older version
@@ -1077 +1077 @@
                     structfactor_pos = int(ind_struct)
                     break
-
+                
         self.structurebox.SetSelection(structfactor_pos)
-
+        
         if state.multi_factor != None:
             self.multifactorbox.SetSelection(state.multi_factor)
-
+            
         ## reset state of checkbox,textcrtl  and  regular parameters value
         self._reset_parameters_state(self.orientation_params_disp,
@@ -1094 +1094 @@
         self.enable_disp.SetValue(state.enable_disp)
         self.disable_disp.SetValue(state.disable_disp)
-
+        
         if hasattr(self, "disp_box") and self.disp_box != None:
             self.disp_box.SetSelection(state.disp_box)
@@ -1102 +1102 @@
 
             self._set_dipers_Param(event=None)
-
+       
             if name == "ArrayDispersion":
-
+                
                 for item in self.disp_cb_dict.keys():
-
+                    
                     if hasattr(self.disp_cb_dict[item], "SetValue"):
                         self.disp_cb_dict[item].SetValue(\
                                                     state.disp_cb_dict[item])
                         # Create the dispersion objects
-                        from sas.models.dispersion_models import ArrayDispersion
+                        #from sas.models.dispersion_models import ArrayDispersion
+                        from sasmodels.weights import ArrayDispersion
                         disp_model = ArrayDispersion()
                         if hasattr(state, "values") and \
@@ -1122 +1123 @@
                             else:
                                 self._reset_dispersity()
-
+                        
                         self._disp_obj_dict[item] = disp_model
                         # Set the new model as the dispersion object
                         #for the selected parameter
                         self.model.set_dispersion(item, disp_model)
-
+                    
                         self.model._persistency_dict[item] = \
                                                 [state.values, state.weights]
-
+                    
             else:
                 keys = self.model.getParamList()
@@ -1148 +1149 @@
         self.pinhole_smearer.SetValue(state.pinhole_smearer)
         self.slit_smearer.SetValue(state.slit_smearer)
-
+        
         self.dI_noweight.SetValue(state.dI_noweight)
         self.dI_didata.SetValue(state.dI_didata)
         self.dI_sqrdata.SetValue(state.dI_sqrdata)
         self.dI_idata.SetValue(state.dI_idata)
-
+        
         ## we have two more options for smearing
         if self.pinhole_smearer.GetValue():
@@ -1159 +1160 @@
         elif self.slit_smearer.GetValue():
             self.onSlitSmear(event=None)
-
+       
         ## reset state of checkbox,textcrtl  and dispersity parameters value
         self._reset_parameters_state(self.fittable_param, state.fittable_param)
         self._reset_parameters_state(self.fixed_param, state.fixed_param)
-
+        
         ## draw the model with previous parameters value
         self._onparamEnter_helper()
@@ -1171 +1172 @@
         self._lay_out()
         self.Refresh()
-
+        
     def reset_page_helper(self, state):
         """
         Use page_state and change the state of existing page
-
+        
         :precondition: the page is already drawn or created
-
+        
         :postcondition: the state of the underlying data change as well as the
             state of the graphic interface
@@ -1203 +1204 @@
         else:
             self.set_data(data)
-
+            
         self.enable2D = state.enable2D
         try:
@@ -1213 +1214 @@
         self.disp_cb_dict = state.disp_cb_dict
         self.disp_list = state.disp_list
-
+      
         ## set the state of the radio box
         #self.shape_rbutton.SetValue(state.shape_rbutton)
@@ -1219 +1220 @@
         #self.struct_rbutton.SetValue(state.struct_rbutton)
         #self.plugin_rbutton.SetValue(state.plugin_rbutton)
-
+        
         ## fill model combobox
         self._show_combox_helper()
@@ -1233 +1234 @@
                     category_pos = int(ind_cat)
                     break
-
+            
         self.categorybox.Select(category_pos)
         self._show_combox(None)
@@ -1246 +1247 @@
                     formfactor_pos = int(ind_form)
                     break
-
+            
         self.formfactorbox.Select(formfactor_pos)
-
+        
         try:
             # to support older version
@@ -1259 +1260 @@
                     structfactor_pos = int(ind_struct)
                     break
-
+            
         self.structurebox.SetSelection(structfactor_pos)
 
@@ -1267 +1268 @@
         #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():
@@ -1274 +1275 @@
             else:
                 self.model_view.SetLabel("1D Mode")
-        
+                
         ## set the select all check box to the a given state
         self.cb1.SetValue(state.cb1)
-
+     
         ## reset state of checkbox,textcrtl  and  regular parameters value
         self._reset_parameters_state(self.orientation_params_disp,
@@ -1316 +1317 @@
             self.dI_sqrdata.SetValue(False)
             self.dI_idata.SetValue(False)
-
+ 
         ## we have two more options for smearing
         if self.pinhole_smearer.GetValue():
@@ -1332 +1333 @@
                 self.smear_slit_height.SetValue(str(self.dxl))
             if self.dxw != None:
-                self.smear_slit_width.SetValue(str(self.dxw))
+                self.smear_slit_width.SetValue(str(self.dxw))  
             else:
-                self.smear_slit_width.SetValue('')
+                self.smear_slit_width.SetValue('')  
             self.onSlitSmear(event=None)
-
+        
         ## reset state of checkbox,textcrtl  and dispersity parameters value
         self._reset_parameters_state(self.fittable_param, state.fittable_param)
         self._reset_parameters_state(self.fixed_param, state.fixed_param)
-
+        
         ## draw the model with previous parameters value
         self._onparamEnter_helper()
@@ -1347 +1348 @@
         ## reset context menu items
         self._reset_context_menu()
-
+        
         ## set the value of the current state to the state given as parameter
         self.state = state.clone()
         self.state.m_name = self.m_name
-
+    
     def _reset_page_disp_helper(self, state):
         """
@@ -1366 +1367 @@
         self.values = copy.deepcopy(state.values)
         self.weights = copy.deepcopy(state.weights)
-
+        
         for key, disp in state._disp_obj_dict.iteritems():
             # From saved file, disp_model can not be sent in model obj.
@@ -1372 +1373 @@
             if disp.__class__.__name__ == 'str':
                 disp_model = None
-                com_str = "from sas.models.dispersion_models "
+                #com_str = "from sas.models.dispersion_models "
+                com_str = "from sasmodels.weights "
                 com_str += "import %s as disp_func \ndisp_model = disp_func()"
                 exec com_str % disp
@@ -1413 +1415 @@
                         except:
                             logging.error(sys.exc_info()[1])
-
+    
         # Make sure the check box updated when all checked
         if self.cb1.GetValue():
             self.select_all_param(None)
-
+      
     def _selectDlg(self):
         """
-        open a dialog file to selected the customized dispersity
+        open a dialog file to selected the customized dispersity 
         """
         if self.parent != None:
@@ -1426 +1428 @@
                         self._manager.parent.get_save_location()
         dlg = wx.FileDialog(self, "Choose a weight file",
-                            self._default_save_location, "",
-                            "*.*", wx.OPEN)
+                                self._default_save_location, "",
+                                "*.*", wx.OPEN)
         path = None
         if dlg.ShowModal() == wx.ID_OK:
@@ -1445 +1447 @@
             self.popUpMenu.Append(id, name, msg)
             wx.EVT_MENU(self, id, self.onResetModel)
-
+    
     def _reset_plotting_range(self, state):
         """
@@ -1464 +1466 @@
         self.state.formfactorcombobox = self.formfactorbox.GetLabel()
         self.state.categorycombobox = self.categorybox.GetLabel()
-
+       
         ## post state to fit panel
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
-
+        
     def _save_plotting_range(self):
         """
@@ -1476 +1478 @@
         self.state.qmax = self.qmax_x
         self.state.npts = self.npts_x
-
+            
     def _onparamEnter_helper(self):
         """
@@ -1493 +1495 @@
             try:
                 is_modified = self._check_value_enter(self.fittable_param,
-                                                      is_modified)
+                                                     is_modified)
                 is_modified = self._check_value_enter(self.fixed_param,
                                                       is_modified)
@@ -1513 +1515 @@
                     self.qmax_x = tempmax
                     is_modified = True
-
+            
                 if is_2Ddata:
                     # set mask
                     is_modified = self._validate_Npts()
-
+                    
             else:
                 self.fitrange = False
-
+                
             if not self.data.is_data:
                 is_modified = True
@@ -1540 +1542 @@
                 self.Refresh()
         return is_modified
-
+    
     def _update_paramv_on_fit(self):
         """
@@ -1565 +1567 @@
             self._check_value_enter(self.parameters, is_modified)
 
-            # If qmin and qmax have been modified, update qmin and qmax and
+            # If qmin and qmax have been modified, update qmin and qmax and 
             # Here we should check whether the boundaries have been modified.
-            # If qmin and qmax have been modified, update qmin and qmax and
+            # If qmin and qmax have been modified, update qmin and qmax and 
             # set the is_modified flag to True
             self.fitrange = self._validate_qrange(self.qmin, self.qmax)
@@ -1594 +1596 @@
                                                   qmax=float(self.qmax_x),
                                                   enable_smearer=enable_smearer,
-                                                  draw=False)
+                                                      draw=False)
                 elif not self._is_2D():
                     enable_smearer = not self.disable_smearer.GetValue()
@@ -1603 +1605 @@
                                               qmax=float(self.qmax_x),
                                               enable_smearer=enable_smearer,
-                                              draw=False)
+                                                 draw=False)
                     if self.data != None:
                         index_data = ((self.qmin_x <= self.data.x) & \
@@ -1639 +1641 @@
             msg += " model or Fitting range is not valid!!!  "
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-
+        
         try:
             self.save_current_state()
         except:
             logging.error(sys.exc_info()[1])
-
+   
         return flag
-
+               
     def _is_modified(self, is_modified):
         """
@@ -1652 +1654 @@
         """
         return is_modified
-
+                       
     def _reset_parameters_state(self, listtorestore, statelist):
         """
@@ -1691 +1693 @@
                 item_page[5].Show(item_page_info[5][0])
                 item_page[5].SetValue(item_page_info[5][1])
-
+                
             if item_page[6] != None:
                 ## show of hide the text crtl for fitting error
                 item_page[6].Show(item_page_info[6][0])
                 item_page[6].SetValue(item_page_info[6][1])
-
+                    
     def _reset_strparam_state(self, listtorestore, statelist):
         """
@@ -1705 +1707 @@
 
         listtorestore = copy.deepcopy(statelist)
-
+        
         for j in range(len(listtorestore)):
             item_page = listtorestore[j]
             item_page_info = statelist[j]
             ##change the state of the check box for simple parameters
-
+            
             if item_page[0] != None:
                 item_page[0].SetValue(format_number(item_page_info[0], True))
@@ -1722 +1724 @@
                 item_page[2].SetValue(selection)
                 self.model.setParam(param_name, selection)
-
+                                      
     def _copy_parameters_state(self, listtocopy, statelist):
         """
         copy the state of button
-
+        
         :param listtocopy: the list of check button to copy
         :param statelist: list of state object to store the current state
-
+        
         """
         if len(listtocopy) == 0:
             return
-
+       
         for item in listtocopy:
-
+  
             checkbox_state = None
             if item[0] != None:
@@ -1751 +1753 @@
                 error_value = item[4].GetValue()
                 error_state = item[4].IsShown()
-
+                
             min_value = None
             min_state = None
@@ -1757 +1759 @@
                 min_value = item[5].GetValue()
                 min_state = item[5].IsShown()
-
+                
             max_value = None
             max_state = None
@@ -1766 +1768 @@
             if item[7] != None:
                 unit = item[7].GetLabel()
-
+               
             statelist.append([checkbox_state, parameter_name, parameter_value,
                               static_text, [error_state, error_value],
                               [min_state, min_value],
                               [max_state, max_value], unit])
-
-
+           
+                
     def _draw_model(self, update_chisqr=True, source='model'):
         """
@@ -1778 +1780 @@
         The method will use the data member from the model page
         to build a call to the fitting perspective manager.
-
+        
         :param chisqr: update chisqr value [bool]
         """
         wx.CallAfter(self._draw_model_after, update_chisqr, source)
-
+        
     def _draw_model_after(self, update_chisqr=True, source='model'):
         """
@@ -1788 +1790 @@
         The method will use the data member from the model page
         to build a call to the fitting perspective manager.
-
+        
         :param chisqr: update chisqr value [bool]
         """
@@ -1816 +1818 @@
                                     source='model',
                                     weight=weight)
-
+       
     def _on_show_sld(self, event=None):
         """
@@ -1831 +1833 @@
         sld_data.name = 'SLD'
         sld_data.axes = self.sld_axes
-        self.panel = SLDPanel(self, data=sld_data, axes=self.sld_axes, id= -1)
+        self.panel = SLDPanel(self, data=sld_data, axes=self.sld_axes, id=-1)
         self.panel.ShowModal()
-
+        
     def _set_multfactor_combobox(self, multiplicity=10):
         """
@@ -1843 +1845 @@
             self.multifactorbox.Append(str(idx), int(idx))
         self._hide_multfactor_combobox()
-
+        
     def _show_multfactor_combobox(self):
         """
@@ -1853 +1855 @@
         if not self.multifactorbox.IsShown():
             self.multifactorbox.Show(True)
-
+             
     def _hide_multfactor_combobox(self):
         """
@@ -1863 +1865 @@
         if self.multifactorbox.IsShown():
             self.multifactorbox.Hide()
-
+    
     def formfactor_combo_init(self):
         """
@@ -1869 +1871 @@
         """
         self._show_combox(None)
-
+                
     def _show_combox_helper(self):
         """
@@ -1902 +1904 @@
                          StatusEvent(status=msg, info="error"))
         self._populate_box(self.formfactorbox, m_list)
-
-    def _on_modify_cat(self, event=None):
+    
+    def _on_modify_cat(self, event=None):  
         """
         Called when category manager is opened
         """
-        self._manager.parent.on_category_panel(event)
-
+        self._manager.parent.on_category_panel(event)  
+        
     def _show_combox(self, event=None):
         """
@@ -1922 +1924 @@
         self.Layout()
         self.Refresh()
-
+  
     def _populate_box(self, combobox, list):
         """
         fill combox box with dict item
-
+        
         :param list: contains item to fill the combox
             item must model class
@@ -1935 +1937 @@
             name = model.__class__.__name__
             if models.__name__ != "NoStructure":
-                if hasattr(model, "name"):
+                if hasattr(model, "oldname"):
+                    name = model.oldname
+                elif hasattr(model, "name"):
                     name = model.name
                 mlist.append((name, models))
-
+                
         # Sort the models
         mlist_sorted = sorted(mlist)
@@ -1944 +1948 @@
             combobox.Append(item[0], item[1])
         return 0
-
+    
     def _onQrangeEnter(self, event):
         """
         Check validity of value enter in the Q range field
-
+        
         """
         tcrtl = event.GetEventObject()
@@ -2001 +2005 @@
             self.create_default_data()
         self._draw_model()
-
+                   
     def _theory_qrange_enter(self, event):
         """
         Check validity of value enter in the Q range field
         """
-
+        
         tcrtl = event.GetEventObject()
         #Clear msg if previously shown.
@@ -2058 +2062 @@
         self.create_default_data()
         self._draw_model()
-
+                   
     def _on_select_model_helper(self):
         """
@@ -2084 +2088 @@
             self.structurebox.Enable()
             self.text2.Enable()
-
+            
         if form_factor != None:
             # set multifactor for Mutifunctional models
@@ -2101 +2105 @@
                     # default value
                     m_id = 1
-
+                    
                 self.multi_factor = self.multifactorbox.GetClientData(m_id)
                 if self.multi_factor == None:
@@ -2129 +2133 @@
             self.show_sld_button.Hide()
             self.multi_factor = None
-
+              
         s_id = self.structurebox.GetCurrentSelection()
         struct_factor = self.structurebox.GetClientData(s_id)
-
+        
         if  struct_factor != None:
             from sas.models.MultiplicationModel import MultiplicationModel
@@ -2147 +2151 @@
         # check if model has magnetic parameters
         if len(self.model.magnetic_params) > 0:
-            self._has_magnetic = True
+            self._has_magnetic = True 
         else:
-            self._has_magnetic = False
+            self._has_magnetic = False  
         ## post state to fit panel
         self.state.parameters = []
@@ -2159 +2163 @@
         self.on_set_focus(None)
         self.Layout()
-
+        
     def _validate_qrange(self, qmin_ctrl, qmax_ctrl):
         """
         Verify that the Q range controls have valid values
         and that Qmin < Qmax.
-
+        
         :param qmin_ctrl: text control for Qmin
         :param qmax_ctrl: text control for Qmax
-
+        
         :return: True is the Q range is value, False otherwise
-
+        
         """
         qmin_validity = check_float(qmin_ctrl)
@@ -2193 +2197 @@
                 return False
         return True
-
+    
     def _validate_Npts(self):
         """
@@ -2228 +2232 @@
                 self.Npts_fit.SetValue(str(len(index_data[index_data == True])))
                 self.fitrange = True
-
+            
         return flag
 
@@ -2263 +2267 @@
                 self.Npts_fit.SetValue(str(len(index_data[index_data == True])))
                 self.fitrange = True
-
+            
         return flag
-
+    
     def _check_value_enter(self, list, modified):
         """
@@ -2287 +2291 @@
             #try:
             name = str(item[1])
-
+            
             if string.find(name, ".npts") == -1 and \
                                         string.find(name, ".nsigmas") == -1:
@@ -2293 +2297 @@
                 param_min = None
                 param_max = None
-
+               
                 ## check minimun value
                 if item[5] != None and item[5] != "":
@@ -2302 +2306 @@
                                 if numpy.isfinite(param_min):
                                     item[2].SetValue(format_number(param_min))
-
+                            
                             item[5].SetBackgroundColour(wx.WHITE)
                             item[2].SetBackgroundColour(wx.WHITE)
-
+                                           
                         except:
                             msg = "Wrong fit parameter range entered"
@@ -2320 +2324 @@
                                 if numpy.isfinite(param_max):
                                     item[2].SetValue(format_number(param_max))
-
+                            
                             item[6].SetBackgroundColour(wx.WHITE)
                             item[2].SetBackgroundColour(wx.WHITE)
@@ -2329 +2333 @@
                             raise ValueError, msg
                         is_modified = True
-
+                
                 if param_min != None and param_max != None:
                     if not self._validate_qrange(item[5], item[6]):
@@ -2336 +2340 @@
                         wx.PostEvent(self._manager.parent,
                                      StatusEvent(status=msg))
-
+                
                 if name in self.model.details.keys():
                     self.model.details[name][1:3] = param_min, param_max
@@ -2357 +2361 @@
                 msg = "Wrong Fit parameter value entered "
                 wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-
+                
         return is_modified
-
+        
     def _set_dipers_Param(self, event):
         """
@@ -2378 +2382 @@
 
         self._reset_dispersity()
-
+    
         if self.model == None:
             self.model_disp.Hide()
@@ -2386 +2390 @@
         if self.enable_disp.GetValue():
             ## layout for model containing no dispersity parameters
-
+            
             self.disp_list = self.model.getDispParamList()
-
+             
             if len(self.disp_list) == 0 and len(self.disp_cb_dict) == 0:
                 self._layout_sizer_noDipers()
@@ -2396 +2400 @@
         else:
             self.sizer4_4.Clear(True)
-
+            
         ## post state to fit panel
         self.save_current_state()
@@ -2408 +2412 @@
         self.Layout()
         self.Refresh()
-
+          
     def _layout_sizer_noDipers(self):
         """
@@ -2418 +2422 @@
         self.fixed_param = []
         self.orientation_params_disp = []
-
+        
         self.sizer4_4.Clear(True)
         text = "No polydispersity available for this model"
@@ -2426 +2430 @@
         self.sizer4_4.Layout()
         self.sizer4.Layout()
-
+    
     def _reset_dispersity(self):
         """
@@ -2439 +2443 @@
                 if item in self.param_toFit:
                     self.param_toFit.remove(item)
-
+         
         self.fittable_param = []
         self.fixed_param = []
@@ -2445 +2449 @@
         self.values = {}
         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:
             self.save_current_state()
@@ -2457 +2462 @@
                 # Go back to Gaussian model (with 0 pts)
                 disp_model = GaussianDispersion()
-
+               
                 self._disp_obj_dict[p] = disp_model
                 # Set the new model as the dispersion object
@@ -2470 +2475 @@
         self.Layout()
         self.Refresh()
-
+                  
     def _on_select_Disp(self, event):
         """
@@ -2483 +2488 @@
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
-
+        
         self.sizer4_4.Layout()
         self.sizer4.Layout()
         self.SetupScrolling()
-
+    
     def _on_disp_func(self, event=None):
         """
         Select a distribution function for the polydispersion
-
+        
         :Param event: ComboBox event
         """
@@ -2507 +2512 @@
             disp_name = disp_box.GetValue()
             dispersity = disp_box.GetClientData(selection)
-
+    
             #disp_model =  GaussianDispersion()
             disp_model = dispersity()
@@ -2525 +2530 @@
                 self.model.set_dispersion(param_name, disp_model)
                 self.state._disp_obj_dict[name1] = disp_model
-
+ 
                 value1 = str(format_number(self.model.getParam(name1), True))
                 value2 = str(format_number(self.model.getParam(name2)))
@@ -2553 +2558 @@
             for item in self.fixed_param:
                 if item[1] == name2:
-                    item[2].SetValue(value2)
+                    item[2].SetValue(value2) 
                     # Disable Npts for array
                     if disp_name.lower() == "array":
@@ -2566 +2571 @@
                     else:
                         item[2].Enable()
-
+                
             # Make sure the check box updated when all checked
             if self.cb1.GetValue():
@@ -2587 +2592 @@
             wx.PostEvent(self._manager.parent,
                          StatusEvent(status=msg, info="error"))
-
+        
     def _set_array_disp(self, name=None, disp=None):
         """
         Set array dispersion
-
+        
         :param name: name of the parameter for the dispersion to be set
         :param disp: the polydisperion object
@@ -2608 +2613 @@
         self._default_save_location = os.path.dirname(path)
         if self._manager != None:
-            self._manager.parent._default_save_location = \
+            self._manager.parent._default_save_location =\
                              self._default_save_location
 
         basename = os.path.basename(path)
         values, weights = self.read_file(path)
-
+        
         # If any of the two arrays is empty, notify the user that we won't
         # proceed
@@ -2626 +2631 @@
                                     values=values, weights=weights)
         return basename
-
+    
     def _set_array_disp_model(self, name=None, disp=None,
                               values=[], weights=[]):
         """
         Set array dispersion model
-
+        
         :param name: name of the parameter for the dispersion to be set
         :param disp: the polydisperion object
@@ -2660 +2665 @@
         self.state.model._persistency_dict[name.split('.')[0]] = \
                                         [values, weights]
-
+                                        
     def _del_array_values(self, name=None):
         """
         Reset array dispersion
-
+        
         :param name: name of the parameter for the dispersion to be set
         """
@@ -2678 +2683 @@
         except:
             logging.error(sys.exc_info()[1])
-
+                                            
     def _lay_out(self):
         """
         returns self.Layout
-
+        
         :Note: Mac seems to like this better when self.
             Layout is called after fitting.
@@ -2689 +2694 @@
         self.Layout()
         return
-
+    
     def _sleep4sec(self):
         """
@@ -2698 +2703 @@
         if ON_MAC == True:
             time.sleep(1)
-
+            
     def _find_polyfunc_selection(self, disp_func=None):
         """
         FInd Comboox selection from disp_func
-
+        
         :param disp_function: dispersion distr. function
         """
@@ -2716 +2721 @@
         except:
             return 3
-
+                            
     def on_reset_clicked(self, event):
         """
@@ -2728 +2733 @@
             flag = False
             return
-
+            
         elif self.data.__class__.__name__ == "Data2D":
             data_min = 0
@@ -2734 +2739 @@
             y = max(math.fabs(self.data.ymin), math.fabs(self.data.ymax))
             self.qmin_x = data_min
-            self.qmax_x = math.sqrt(x * x + y * y)
+            self.qmax_x = math.sqrt(x*x + y*y)
             #self.data.mask = numpy.ones(len(self.data.data),dtype=bool)
             # check smearing
@@ -2744 +2749 @@
                 else:
                     flag = True
-
+                    
         elif self.data == None:
             self.qmin_x = _QMIN_DEFAULT
@@ -2750 +2755 @@
             self.num_points = _NPTS_DEFAULT
             self.state.npts = self.num_points
-
+            
         elif self.data.__class__.__name__ != "Data2D":
             self.qmin_x = min(self.data.x)
@@ -2766 +2771 @@
         else:
             flag = False
-
+            
         if flag == False:
             msg = "Cannot Plot :Must enter a number!!!  "
@@ -2783 +2788 @@
         self.state.qmin = self.qmin_x
         self.state.qmax = self.qmax_x
-
+        
         #reset the q range values
         self._reset_plotting_range(self.state)
         self._draw_model()
-
+        
     def select_log(self, event):
         """
@@ -2796 +2801 @@
         """
         Get the images of the plots corresponding this panel for report
-
+        
         : return graphs: list of figures
         : Need Move to guiframe
@@ -2820 +2825 @@
                         # append to the list
                         graphs.append(item2.figure)
-                        canvases.append(item2.canvas)
+                        canvases.append(item2.canvas)  
             except:
                 # Not for control panels
@@ -2870 +2875 @@
         :param evt: on Description Button pressed event
         """
-
+        
         if self.model == None:
             name = 'index.html'
@@ -2876 +2881 @@
             name = self.formfactorbox.GetValue()
 
-        msg = 'Model description:\n'
+                msg = 'Model description:\n'
         info = "Info"
         if self.model != None:
 #                frame.Destroy()
-            if str(self.model.description).rstrip().lstrip() == '':
-                msg += "Sorry, no information is available for this model."
+                if str(self.model.description).rstrip().lstrip() == '':
+                    msg += "Sorry, no information is available for this model."
+                else:
+                    msg += self.model.description + '\n'
+                wx.MessageBox(msg, info)
             else:
-                msg += self.model.description + '\n'
-            wx.MessageBox(msg, info)
-        else:
             msg += "You must select a model to get information on this"
             wx.MessageBox(msg, info)
@@ -2909 +2914 @@
                                           "Magnetic Angle Defintions")
 
-    def _on_mag_help(self, event):
+    def _on_mag_help(self, event):    
         """
         Bring up Magnetic Angle definition bmp image whenever the ? button
@@ -2929 +2934 @@
                                           "Polarized Beam/Magnetc Help")
 
-    def _on_mag_on(self, event):
+    def _on_mag_on(self, event):    
         """
         Magnetic Parameters ON/OFF
@@ -2950 +2955 @@
                     #reset mag value to zero fo safety
                     self.model.setParam(key, 0.0)
-
-        self.Show(False)
+                    
+        self.Show(False)    
         self.set_model_param_sizer(self.model)
         #self._set_sizer_dispersion() 
@@ -2957 +2962 @@
         self.SetupScrolling()
         self.Show(True)
-
+            
     def on_pd_help_clicked(self, event):
         """
@@ -2967 +2972 @@
         webbrowser does not pass anything past the # to the browser when it is
         running "file:///...."
-
+        
         :param evt: Triggers on clicking ? in polydispersity box
         """
@@ -2975 +2980 @@
         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation,
                                           _PageAnchor, "Polydispersity Help")
-
+        
     def on_left_down(self, event):
         """
@@ -2990 +2995 @@
         # make event free
         event.Skip()
-
+        
     def get_copy(self):
         """
@@ -2999 +3004 @@
         self._copy_info(flag)
         return flag
-
+            
     def get_copy_params(self):
         """
@@ -3007 +3012 @@
         # Do it if params exist
         if  self.parameters != []:
-
+            
             # go through the parameters
             strings = self._get_copy_helper(self.parameters,
                                            self.orientation_params)
             content += strings
-
+            
             # go through the fittables
             strings = self._get_copy_helper(self.fittable_param,
@@ -3022 +3027 @@
                                            self.orientation_params_disp)
             content += strings
-
+                
             # go through the str params
             strings = self._get_copy_helper(self.str_parameters,
@@ -3055 +3060 @@
                 content += param[1] #parameter name
                 content += tab
-                content += param[1] + "_err"
+                content += param[1]+"_err"
                 content += tab
 
@@ -3063 +3068 @@
             for param in self.parameters:
                 content += param[2].GetValue() #value
-                content += tab
+                content +=tab
                 content += param[4].GetValue() #error
-                content += tab
+                content +=tab
 
             return content
@@ -3101 +3106 @@
 
             for index, param in enumerate(self.parameters):
-                content += param[1].replace('_', '\_') #parameter name
+                content += param[1].replace('_','\_') #parameter name
                 content += ' & '
-                content += param[1].replace('_', '\_') + "\_err"
-                if index < len(self.parameters) - 1:
+                content += param[1].replace('_','\_')+"\_err"
+                if index < len(self.parameters)-1:
                     content += ' & '
             content += '\\\\ \\hline'
@@ -3114 +3119 @@
                 content += ' & '
                 content += param[4].GetValue() #parameter error
-                if index < len(self.parameters) - 1:
+                if index < len(self.parameters)-1:
                     content += ' & '
             content += '\\\\ \\hline'
@@ -3137 +3142 @@
             return True
         return None
-
+    
     def _get_copy_helper(self, param, orient_param):
         """
         Helping get value and name of the params
-
+        
         : param param:  parameters
         : param orient_param = oritational params
@@ -3158 +3163 @@
             except:
                 logging.error(sys.exc_info()[1])
-
+            
             # 2D
             if self.data.__class__.__name__ == "Data2D":
@@ -3180 +3185 @@
             # add to the content
             if disfunc != '':
-
+                
                 disfunc = ',' + disfunc
             # Need to support array func for copy/paste
@@ -3196 +3201 @@
 
         return content
-
+   
     def get_clipboard(self):
         """
@@ -3216 +3221 @@
             wx.TheClipboard.Close()
         return text
-
+    
     def get_paste(self):
         """
@@ -3225 +3230 @@
         self._copy_info(flag)
         return flag
-
+        
     def get_paste_params(self, text=''):
         """
@@ -3254 +3259 @@
                     val = [float(a_val) for a_val in array_values[1:]]
                     weit = [float(a_weit) for a_weit in array_weights[1:]]
-
+                    
                     context[name].append(val)
                     context[name].append(weit)
@@ -3277 +3282 @@
             self._get_paste_helper(self.fixed_param,
                                    self.orientation_params_disp, context)
-
+            
             # go through the str params
             self._get_paste_helper(self.str_parameters,
                                    self.orientation_params, context)
-
+                
             return True
         return None
-
+    
     def _get_paste_helper(self, param, orient_param, content):
         """
         Helping set values of the params
-
+        
         : param param:  parameters
         : param orient_param: oritational params
@@ -3316 +3321 @@
                             fun_val = self.model.fun_list[content[name][1]]
                             self.model.setParam(name, fun_val)
-
+                    
                     value = content[name][1:]
                     self._paste_poly_help(item, value)
@@ -3362 +3367 @@
                         if is_true != None:
                             item[0].SetValue(is_true)
-
+                        
     def _paste_poly_help(self, item, value):
         """
         Helps get paste for poly function
-
+        
         :param item: Gui param items
         :param value: the values for parameter ctrols
@@ -3406 +3411 @@
                                             [self.state.values,
                                              self.state.weights]
-
+                         
             except:
                 logging.error(sys.exc_info()[1])
                 print "Error in BasePage._paste_poly_help: %s" % \
                                         sys.exc_info()[1]
-
+    
     def _set_disp_array_cb(self, item):
         """
@@ -3425 +3430 @@
         item[6].SetValue('')
         item[6].Enable(False)
-
+        
     def update_pinhole_smear(self):
         """
@@ -3447 +3452 @@
             if not os.path.isfile(categorization_file):
                 categorization_file = CategoryInstaller.get_default_file()
-            cat_file = open(categorization_file, 'rb')
+            cat_file = open(categorization_file, 'rb')                           
             self.master_category_dict = json.load(cat_file)
             self._regenerate_model_dict()
@@ -3459 +3464 @@
     def _regenerate_model_dict(self):
         """
-        regenerates self.by_model_dict which has each model name as the
+        regenerates self.by_model_dict which has each model name as the 
         key and the list of categories belonging to that model
         along with the enabled mapping
@@ -3468 +3473 @@
                 self.by_model_dict[model].append(category)
                 self.model_enabled_dict[model] = enabled
-
+    
     def _populate_listbox(self):
         """
@@ -3480 +3485 @@
         if not uncat_str in cat_list:
             cat_list.append(uncat_str)
-
+        
         for category in cat_list:
             if category != '':
@@ -3488 +3493 @@
             self.categorybox.SetSelection(0)
         else:
-            self.categorybox.SetSelection(\
+            self.categorybox.SetSelection( \
                 self.categorybox.GetSelection())
         #self._on_change_cat(None)
@@ -3508 +3513 @@
 
         else:
-            for (model, enabled) in sorted(self.master_category_dict[category],
-                                      key=lambda name: name[0]):
+            for (model,enabled) in sorted(self.master_category_dict[category],
+                                      key = lambda name: name[0]):
                 if(enabled):
                     self.model_box.Append(model)
@@ -3539 +3544 @@
         hint = "toggle view of model from 1D to 2D  or 2D to 1D"
         self.model_view.SetToolTipString(hint)
-
+        
         cat_set_box = wx.StaticBox(self, -1, 'Category')
         sizer_cat_box = wx.StaticBoxSizer(cat_set_box, wx.HORIZONTAL)
         sizer_cat_box.SetMinSize((200, 50))
         self.categorybox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        self.categorybox.SetToolTip(wx.ToolTip("Select a Category/Type"))
+        self.categorybox.SetToolTip( wx.ToolTip("Select a Category/Type") )
         self._populate_listbox()
         wx.EVT_COMBOBOX(self.categorybox, -1, self._show_combox)
@@ -3553 +3558 @@
         #self.struct_rbutton = wx.RadioButton(self, -1, "Structure Factor ")
         #self.plugin_rbutton = wx.RadioButton(self, -1, "Uncategorized")
-
+                
         #self.Bind(wx.EVT_RADIOBUTTON, self._show_combox,
         #                   id=self.shape_rbutton.GetId())
@@ -3563 +3568 @@
         #                    id=self.plugin_rbutton.GetId())
         #MAC needs SetValue
-
+        
         show_cat_button = wx.Button(self, -1, "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)
-
+      
         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((5,5))
         sizer_radiobutton.Add(self.model_view, 1, wx.RIGHT, 5)
         #sizer_radiobutton.Add(self.plugin_rbutton)
@@ -3589 +3594 @@
         sizer_selection = wx.BoxSizer(wx.HORIZONTAL)
         mutifactor_selection = wx.BoxSizer(wx.HORIZONTAL)
-
+        
         self.text1 = wx.StaticText(self, -1, "")
         self.text2 = wx.StaticText(self, -1, "P(Q)*S(Q)")
@@ -3598 +3603 @@
 
         self.formfactorbox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
-        self.formfactorbox.SetToolTip(wx.ToolTip("Select a Model"))
+        self.formfactorbox.SetToolTip( wx.ToolTip("Select a Model") )
         if self.model != None:
             self.formfactorbox.SetValue(self.model.name)
@@ -3612 +3617 @@
             print "_set_model_sizer_selection: disabled."
             #self._set_model_sizer_selection(self.model)
-
+        
         sizer_selection.Add(self.text1)
         sizer_selection.Add((10, 5))
@@ -3620 +3625 @@
         sizer_selection.Add((5, 5))
         sizer_selection.Add(self.structurebox)
-
+       
         mutifactor_selection.Add((13, 5))
         mutifactor_selection.Add(self.mutifactor_text)
@@ -3634 +3639 @@
         boxsizer1.Add((10, 10))
         boxsizer1.Add(mutifactor_selection)
-
+        
         self._set_multfactor_combobox()
         self.multifactorbox.SetSelection(1)
@@ -3640 +3645 @@
         sizer.Add(boxsizer1, 0, wx.EXPAND | wx.ALL, 10)
         sizer.Layout()
-
+        
     def on_smear_helper(self, update=False):
         """
         Help for onSmear if implemented
-
+        
         :param update: force or not to update
         """
@@ -3653 +3658 @@
     def onSmear(self, event):
         """
-        Create a smear object if implemented
+        Create a smear object if implemented 
         """
     def onPinholeSmear(self, event):

src/sas/perspectives/fitting/fitpage.py

@@ -34 +34 @@
     FitPanel class contains fields allowing to display results when
     fitting  a model and one data
-
+    
     :note: For Fit to be performed the user should check at least one parameter
         on fit Panel window.
@@ -44 +44 @@
         """
         BasicPage.__init__(self, parent, color=color)
-
+        
         ## draw sizer
         self._fill_data_sizer()
@@ -71 +71 @@
         self.create_default_data()
         self._manager.frame.Bind(wx.EVT_SET_FOCUS, self.on_set_focus)
-
+    
     def enable_fit_button(self):
         """
@@ -111 +111 @@
         self.sizer0.Add(boxsizer1, 0, wx.EXPAND | wx.ALL, 10)
         self.sizer0.Layout()
-
+        
     def enable_datasource(self):
         """
@@ -120 +120 @@
         else:
             self.dataSource.Enable()
-
+            
     def fill_data_combobox(self, data_list):
         """
@@ -155 +155 @@
         if len(data_list) == 1:
             self.dataSource.Disable()
-
+                
     def on_select_data(self, event=None):
         """
@@ -167 +167 @@
             data = self.dataSource.GetClientData(pos)
             self.set_data(data)
-
+    
     def _on_fit_complete(self):
         """
@@ -174 +174 @@
         self.fit_started = False
         self.set_fitbutton()
-
+        
     def _is_2D(self):
         """
         Check if data_name is Data2D
-
+        
         :return: True or False
-
+        
         """
         if self.data.__class__.__name__ == "Data2D" or \
@@ -186 +186 @@
             return True
         return False
-
+            
     def _fill_range_sizer(self):
         """
@@ -195 +195 @@
         """
         is_2Ddata = False
-
+        
         # Check if data is 2D
         if self.data.__class__.__name__ == "Data2D" or \
                         self.enable2D:
             is_2Ddata = True
-
+            
         title = "Fitting"
         #smear messages & titles
@@ -217 +217 @@
         smear_message_slit_height_title = "Slit height[1/A]:"
         smear_message_slit_width_title = "Slit width[1/A]:"
-
+        
         self._get_smear_info()
-
+        
         #Sizers
         box_description_range = wx.StaticBox(self, -1, str(title))
@@ -232 +232 @@
         sizer_smearer_box = wx.StaticBoxSizer(smear_set_box, wx.HORIZONTAL)
         sizer_smearer_box.SetMinSize((_DATA_BOX_WIDTH, 60))
-
+        
         weighting_set_box = wx.StaticBox(self, -1, \
                                 'Set Weighting by Selecting dI Source')
@@ -267 +267 @@
         self.dI_idata.Enable(False)
         weighting_box.Add(sizer_weighting)
-
+        
         # combobox for smear2d accuracy selection
         self.smear_accuracy = wx.ComboBox(self, -1, size=(50, -1),
@@ -276 +276 @@
         self.smear_accuracy.SetToolTipString(\
             "'Higher' uses more Gaussian points for smearing computation.")
-
+                   
         wx.EVT_COMBOBOX(self.smear_accuracy, -1, self._on_select_accuracy)
 
@@ -284 +284 @@
         self.btFit.Bind(wx.EVT_BUTTON, self._onFit, id=self.btFit.GetId())
         self.btFit.SetToolTipString("Start fitting.")
-
+        
         #General Help button
         self.btFitHelp = wx.Button(self, -1, 'Help')
@@ -324 +324 @@
         ## smear
         self.smear_data_left = BGTextCtrl(self, -1,
-                                          size=(_BOX_WIDTH - 25, 20), style=0)
+                                         size=(_BOX_WIDTH - 25, 20), style=0)
         self.smear_data_left.SetValue(str(self.dq_l))
         self.smear_data_right = BGTextCtrl(self, -1,
-                                           size=(_BOX_WIDTH - 25, 20), style=0)
+                                        size=(_BOX_WIDTH - 25, 20), style=0)
         self.smear_data_right.SetValue(str(self.dq_r))
 
@@ -359 +359 @@
                   id=self.slit_smearer.GetId())
         self.disable_smearer.SetValue(True)
-
+        
         sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10)
         sizer_smearer.Add(self.enable_smearer)
@@ -366 +366 @@
         sizer_smearer.Add(self.btSmearHelp)
         sizer_smearer.Add((10, 10))
-
+        
         # StaticText for chi2, N(for fitting), Npts + Log/linear spacing
         self.tcChi = BGTextCtrl(self, -1, "-", size=(75, 20), style=0)
@@ -374 +374 @@
                             " Npts : number of points selected for fitting")
         self.Npts_total = ModelTextCtrl(self, -1,
-                            size=(_BOX_WIDTH, 20),
-                            style=wx.TE_PROCESS_ENTER,
-                            text_enter_callback=self._onQrangeEnter)
+                        size=(_BOX_WIDTH, 20),
+                        style=wx.TE_PROCESS_ENTER,
+                        text_enter_callback=self._onQrangeEnter)
         self.Npts_total.SetValue(format_number(self.npts_x))
         self.Npts_total.SetToolTipString(\
                                 " Total Npts : total number of data points")
-
+                
         # Update and Draw button
         self.draw_button = wx.Button(self, wx.NewId(), 'Compute')
@@ -386 +386 @@
                               self._onDraw, id=self.draw_button.GetId())
         self.draw_button.SetToolTipString("Compute and Draw.")
-
-        self.points_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        
+        self.points_sizer = wx.BoxSizer(wx.HORIZONTAL) 
         self.pointsbox = wx.CheckBox(self, -1, 'Log?', (10, 10))
         self.pointsbox.SetValue(False)
         self.pointsbox.SetToolTipString("Check mark to use log spaced points")
         wx.EVT_CHECKBOX(self, self.pointsbox.GetId(), self.select_log)
-
+        
         self.points_sizer.Add(wx.StaticText(self, -1, 'Npts    '))
         self.points_sizer.Add(self.pointsbox)
@@ -403 +403 @@
                                     smear_message_none, style=wx.ALIGN_LEFT)
         self.smear_description_dqdata = wx.StaticText(self,
-                                - 1, smear_message_dqdata, style=wx.ALIGN_LEFT)
+                                -1, smear_message_dqdata, style=wx.ALIGN_LEFT)
         self.smear_description_type = wx.StaticText(self,
-                                     - 1, "Type:", style=wx.ALIGN_LEFT)
+                                     -1, "Type:", style=wx.ALIGN_LEFT)
         self.smear_description_accuracy_type = wx.StaticText(self, -1,
                                         "Accuracy:", style=wx.ALIGN_LEFT)
@@ -434 +434 @@
         self.smear_description_slit_width = wx.StaticText(self, -1,
                         smear_message_slit_width_title, style=wx.ALIGN_LEFT)
-
+        
         #arrange sizers
         self.sizer_set_smearer.Add(sizer_smearer)
@@ -467 +467 @@
         self.sizer_new_smear.Add((20, -1))
         self.sizer_new_smear.Add(self.smear_description_2d_y,
-                                  0, wx.CENTER, 10)
+                                  0, wx.CENTER, 10 )
         self.sizer_new_smear.Add(self.smear_description_pin_max,
-                                  0, wx.CENTER, 10)
+                                  0, wx.CENTER, 10 )
         self.sizer_new_smear.Add(self.smear_description_slit_width,
-                                  0, wx.CENTER, 10)
+                                  0, wx.CENTER, 10 )
 
         self.sizer_new_smear.Add(self.smear_pinhole_max, 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_slit_width, 0, wx.CENTER, 10)
         self.sizer_new_smear.Add(self.smear_data_right, 0, wx.CENTER, 10)
-
+           
         self.sizer_set_smearer.Add(self.smear_message_new_s, 0, wx.CENTER, 10)
         self.sizer_set_smearer.Add(self.smear_message_new_p, 0, wx.CENTER, 10)
         self.sizer_set_smearer.Add((5, 2))
         self.sizer_set_smearer.Add(self.sizer_new_smear, 0, wx.CENTER, 10)
-
+        
         # add all to chi2 sizer
         sizer_smearer_box.Add(self.sizer_set_smearer)
@@ -488 +488 @@
         sizer_chi2.Add(weighting_box)
         sizer_chi2.Add((-1, 5))
-
+        
         # hide all smear messages and textctrl
         self._hide_all_smear_info()
-
+        
         # get smear_selection
         self.current_smearer = smear_selection(self.data, self.model)
@@ -512 +512 @@
         #2D data? default
         is_2Ddata = False
-
+        
         #check if it is 2D data
         if self.data.__class__.__name__ == "Data2D" or self.enable2D:
             is_2Ddata = True
-
+            
         self.sizer5.Clear(True)
-
+     
         self.qmin = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
-                                  style=wx.TE_PROCESS_ENTER,
-                                  set_focus_callback=self.qrang_set_focus,
-                                  text_enter_callback=self._onQrangeEnter,
-                                  name='qmin')
+                                    style=wx.TE_PROCESS_ENTER,
+                                    set_focus_callback=self.qrang_set_focus,
+                                    text_enter_callback=self._onQrangeEnter,
+                                    name='qmin')
         self.qmin.SetValue(str(self.qmin_x))
         q_tip = "Click outside of the axes\n to remove the lines."
@@ -529 +529 @@
         qmin_tip += q_tip
         self.qmin.SetToolTipString(qmin_tip)
-
+     
         self.qmax = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
-                                  style=wx.TE_PROCESS_ENTER,
-                                  set_focus_callback=self.qrang_set_focus,
-                                  text_enter_callback=self._onQrangeEnter,
-                                  name='qmax')
+                                       style=wx.TE_PROCESS_ENTER,
+                                       set_focus_callback=self.qrang_set_focus,
+                                       text_enter_callback=self._onQrangeEnter,
+                                       name='qmax')
         self.qmax.SetValue(str(self.qmax_x))
         qmax_tip = "Maximum value of Q.\n"
@@ -547 +547 @@
         wx_id = wx.NewId()
         self.reset_qrange = wx.Button(self, wx_id, 'Reset')
-
+      
         self.reset_qrange.Bind(wx.EVT_BUTTON, self.on_reset_clicked, id=wx_id)
         self.reset_qrange.SetToolTipString("Reset Q range to the default")
-
+     
         sizer = wx.GridSizer(5, 5, 2, 6)
 
@@ -558 +558 @@
         self.btEditMask.SetToolTipString("Edit Mask.")
         self.EditMask_title = wx.StaticText(self, -1, ' Masking(2D)')
-
+        
         sizer.Add(wx.StaticText(self, -1, '   Q range'))
         sizer.Add(wx.StaticText(self, -1, ' Min[1/A]'))
@@ -598 +598 @@
         self.sizer5.Layout()
 
-
+        
     def _set_sizer_dispersion(self):
         """
@@ -614 +614 @@
             ## the user didn't select dispersity display
             return
-
+            
         self._reset_dispersity()
-
+        
         ## fill a sizer with the combobox to select dispersion type
         model_disp = wx.StaticText(self, -1, 'Function')
         CHECK_STATE = self.cb1.GetValue()
-        import sas.models.dispersion_models
-        self.polydisp = sas.models.dispersion_models.models
+        #import sas.models.dispersion_models
+        #self.polydisp = sas.models.dispersion_models.models
+        import sasmodels.weights
+        self.polydisp = sasmodels.weights.models
 
         ix = 0
@@ -644 +646 @@
         self.sizer4_4.Add(self.text_disp_1, (iy, ix), (1, 1), \
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+        
         ix += 1
         self.text_disp_min = wx.StaticText(self, -1, 'Min')
@@ -654 +656 @@
         self.sizer4_4.Add(self.text_disp_max, (iy, ix), (1, 1),
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+       
         ix += 1
         npts = wx.StaticText(self, -1, 'Npts')
@@ -672 +674 @@
         self.sizer4_4.Add(model_disp, (iy, ix), (1, 1),
                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+        
         self.text_disp_max.Show(True)
         self.text_disp_min.Show(True)
@@ -692 +694 @@
                 iy += 1
                 for p in self.model.dispersion[item].keys():
-
+        
                     if p == "width":
                         ix = 0
@@ -704 +706 @@
                         value = self.model.getParam(name1)
                         ctl1 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 1.3, 20),
-                                             style=wx.TE_PROCESS_ENTER)
+                                                  size=(_BOX_WIDTH / 1.3, 20),
+                                                  style=wx.TE_PROCESS_ENTER)
                         ctl1.SetLabel('PD[ratio]')
                         poly_text = "Polydispersity (STD/mean) of %s\n" % item
@@ -725 +727 @@
                                            size=(_BOX_WIDTH / 1.3, 20),
                                            style=0)
-
+                  
                         self.sizer4_4.Add(ctl2, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -733 +735 @@
                         ix = 4
                         ctl3 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2, 20),
-                                             style=wx.TE_PROCESS_ENTER,
-                            text_enter_callback=self._onparamRangeEnter)
-
+                                                  size=(_BOX_WIDTH / 2, 20),
+                                                  style=wx.TE_PROCESS_ENTER,
+                                text_enter_callback=self._onparamRangeEnter)
+                        
                         self.sizer4_4.Add(ctl3, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+                       
                         ix = 5
                         ctl4 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2, 20),
-                                             style=wx.TE_PROCESS_ENTER,
+                                                  size=(_BOX_WIDTH / 2, 20),
+                                                  style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self._onparamRangeEnter)
-
+                        
                         self.sizer4_4.Add(ctl4, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -751 +753 @@
                         ctl3.Show(True)
                         ctl4.Show(True)
-
+                                                              
                     elif p == "npts":
                         ix = 6
                         value = self.model.getParam(name2)
                         Tctl = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2.2, 20),
-                                             style=wx.TE_PROCESS_ENTER)
-
+                                                  size=(_BOX_WIDTH / 2.2, 20),
+                                                  style=wx.TE_PROCESS_ENTER)
+                        
                         Tctl.SetValue(str(format_number(value)))
                         self.sizer4_4.Add(Tctl, (iy, ix), (1, 1),
@@ -768 +770 @@
                         value = self.model.getParam(name3)
                         Tct2 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2.2, 20),
-                                             style=wx.TE_PROCESS_ENTER)
-
+                                                  size=(_BOX_WIDTH / 2.2, 20),
+                                                  style=wx.TE_PROCESS_ENTER)
+                        
                         Tct2.SetValue(str(format_number(value)))
                         self.sizer4_4.Add(Tct2, (iy, ix), (1, 1),
@@ -789 +791 @@
                 self.fittable_param.append([cb, name1, ctl1, text2,
                                             ctl2, ctl3, ctl4, disp_box])
-
+                           
         ix = 0
         iy += 1
@@ -806 +808 @@
                 name2 = item + ".npts"
                 name3 = item + ".nsigmas"
-
+                
                 if not name1 in self.model.details:
                     self.model.details[name1] = ["", None, None]
-
+ 
                 iy += 1
                 for p in self.model.dispersion[item].keys():
-
+        
                     if p == "width":
                         ix = 0
@@ -829 +831 @@
                         value = self.model.getParam(name1)
                         ctl1 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 1.3, 20),
-                                             style=wx.TE_PROCESS_ENTER)
+                                                  size=(_BOX_WIDTH / 1.3, 20),
+                                                  style=wx.TE_PROCESS_ENTER)
                         poly_tip = "Absolute Sigma for %s." % item
                         ctl1.SetToolTipString(poly_tip)
@@ -844 +846 @@
                                 poly_text += "It is the STD (ratio*mean)"
                                 poly_text += " of the distribution.\n "
-
+                            
                                 values.SetToolTipString(poly_text)
                                 first_orient = False
@@ -850 +852 @@
                         elif ctl1.IsShown():
                             ctl1.Hide()
-
+                        
                         self.sizer4_4.Add(ctl1, (iy, ix), (1, 1), wx.EXPAND)
                         ## text to show error sign
@@ -864 +866 @@
                                            size=(_BOX_WIDTH / 1.3, 20),
                                            style=0)
-
+                    
                         self.sizer4_4.Add(ctl2, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
@@ -874 +876 @@
                                 text2.Show(True)
                                 ctl2.Show(True)
-
+                            
                         ix = 4
                         ctl3 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2, 20),
-                                             style=wx.TE_PROCESS_ENTER,
+                                                  size=(_BOX_WIDTH / 2, 20),
+                                                  style=wx.TE_PROCESS_ENTER,
                                 text_enter_callback=self._onparamRangeEnter)
 
@@ -885 +887 @@
 
                         ctl3.Hide()
-
+                
                         ix = 5
                         ctl4 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2, 20),
-                                             style=wx.TE_PROCESS_ENTER,
+                            size=(_BOX_WIDTH / 2, 20),
+                            style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self._onparamRangeEnter)
                         self.sizer4_4.Add(ctl4, (iy, ix), (1, 1),
                                           wx.EXPAND | wx.ADJUST_MINSIZE, 0)
                         ctl4.Hide()
-
+                        
                         if self.data.__class__.__name__ == "Data2D" or \
                                 self.enable2D:
                             ctl3.Show(True)
                             ctl4.Show(True)
-
+                             
                     elif p == "npts":
                         ix = 6
                         value = self.model.getParam(name2)
                         Tctl = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2.2, 20),
-                                             style=wx.TE_PROCESS_ENTER)
-
+                                                 size=(_BOX_WIDTH / 2.2, 20),
+                                                 style=wx.TE_PROCESS_ENTER)
+                        
                         Tctl.SetValue(str(format_number(value)))
                         if self.data.__class__.__name__ == "Data2D" or \
@@ -924 +926 @@
                         value = self.model.getParam(name3)
                         Tct2 = ModelTextCtrl(self, -1,
-                                             size=(_BOX_WIDTH / 2.2, 20),
-                                             style=wx.TE_PROCESS_ENTER)
-
+                                                  size=(_BOX_WIDTH / 2.2, 20),
+                                                  style=wx.TE_PROCESS_ENTER)
+                        
                         Tct2.SetValue(str(format_number(value)))
                         if self.data.__class__.__name__ == "Data2D" or \
@@ -938 +940 @@
                         self.fixed_param.append([None, name3, Tct2,
                                                  None, None, None, None, None])
-
+                                                   
                         self.orientation_params_disp.append([None, name3,
                                         Tct2, None, None, None, None, None])
@@ -955 +957 @@
                 self.orientation_params_disp.append([cb, name1, ctl1,
                                             text2, ctl2, ctl3, ctl4, disp_box])
-
+                       
                 if self.data.__class__.__name__ == "Data2D" or \
                                 self.enable2D:
@@ -961 +963 @@
                 else:
                     disp_box.Hide()
-
+        
         self.state.disp_cb_dict = copy.deepcopy(self.disp_cb_dict)
-
+          
         self.state.model = self.model.clone()
         ## save state into
@@ -996 +998 @@
         """
         flag = self._update_paramv_on_fit()
-
+    
         wx.CallAfter(self._onparamEnter_helper)
         if not flag:
@@ -1002 +1004 @@
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
             return
-
+        
     def _onFit(self, event):
         """
@@ -1027 +1029 @@
                          StatusEvent(status="Fit: %s" % msg, type="stop"))
             return
-
+        
         if len(self.param_toFit) <= 0:
             msg = "Select at least one parameter to fit"
@@ -1034 +1036 @@
                          StatusEvent(status=msg, type="stop"))
             return
-
+        
         flag = self._update_paramv_on_fit()
-
+        
         if self.batch_on and not self._is_2D():
             if not self._validate_Npts_1D():
                 return
-
+                
         if not flag:
             msg = "Fitting range or parameters are invalid"
@@ -1046 +1048 @@
                          StatusEvent(status=msg, type="stop"))
             return
-
+              
         self.select_param(event=None)
 
@@ -1062 +1064 @@
         self.fit_started = self._manager.onFit(uid=self.uid)
         wx.CallAfter(self.set_fitbutton)
-
+    
     def _onFitHelp(self, event):
         """
@@ -1110 +1112 @@
         if self.is_mac:
             return
-
+        
         if self.fit_started:
             label = "Stop"
@@ -1121 +1123 @@
         self.btFit.SetForegroundColour(color)
         self.btFit.Enable(True)
-
+                     
     def get_weight_flag(self):
         """
@@ -1143 +1145 @@
                 break
         return flag
-
+                
     def _StopFit(self, event=None):
         """
@@ -1153 +1155 @@
         self._manager._reset_schedule_problem(value=0)
         self._on_fit_complete()
-
+         
     def rename_model(self):
         """
@@ -1160 +1162 @@
         if self.model is not None:
             self.model.name = "M" + str(self.index_model)
-
+    
     def _on_select_model(self, event=None):
         """
@@ -1192 +1194 @@
         self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
         self.state.slit_smearer = self.slit_smearer.GetValue()
-
+    
         self.state.structurecombobox = self.structurebox.GetLabel()
         self.state.formfactorcombobox = self.formfactorbox.GetLabel()
@@ -1208 +1210 @@
                     self._keep.Enable(not self.batch_on)
                     self._set_save_flag(True)
-
+    
             # more disables for 2D
             self._set_smear_buttons()
-
+            
             try:
                 # update smearer sizer
@@ -1225 +1227 @@
             ## 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
@@ -1235 +1237 @@
                             caption=self.window_caption,
                             qmax=float(self.qmax_x))
-
+   
             self._manager._on_model_panel(evt=evt)
-            self.mbox_description.SetLabel("Model [ %s ]" % str(self.model.name))
+            self.mbox_description.SetLabel("Model [ %s ]"% str(self.model.name))
             self.mbox_description.SetForegroundColour(wx.BLUE)
             self.state.model = self.model.clone()
@@ -1270 +1272 @@
                 self.get_paste_params(copy_flag)
                 wx.CallAfter(self._onDraw, None)
-
+                
         else:
             self._draw_model()
-
+            
         if self.batch_on:
             self.slit_smearer.Enable(False)
@@ -1279 +1281 @@
             self.btEditMask.Disable()
             self.EditMask_title.Disable()
-
+            
         self.Show(True)
         self.SetupScrolling()
-
+         
     def _onparamEnter(self, event):
         """
@@ -1325 +1327 @@
                                               qmax=float(self.qmax_x),
                                               enable_smearer=enable_smearer,
-                                              draw=True)
+                                            draw=True)
                 if flag:
                     #self.compute_chisqr(smearer= temp_smearer)
-
+        
                     ## new state posted
                     if self.state_change:
@@ -1343 +1345 @@
             msg = "Cannot Plot :Must enter a number!!!  "
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-
+             
         self.save_current_state()
         return
-
+   
     def _onparamRangeEnter(self, event):
         """
@@ -1369 +1371 @@
         else:
             tcrtl.SetBackgroundColour(wx.WHITE)
-
+           
         #self._undo.Enable(True)
         self.save_current_state()
@@ -1375 +1377 @@
         wx.PostEvent(self.parent, event)
         self.state_change = False
-
-    def qrang_set_focus(self, event=None):
+        
+    def qrang_set_focus(self, event=None):  
         """
         ON Qrange focus
@@ -1384 +1386 @@
         #tcrtl = event.GetEventObject()
         self._validate_qrange(self.qmin, self.qmax)
-
+        
     def qrange_click(self, event):
         """
@@ -1398 +1400 @@
             d_group_id = self.data.group_id
             act_ctrl = event.GetEventObject()
-            wx.PostEvent(self._manager.parent,
-                         PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id,
+            wx.PostEvent(self._manager.parent, 
+                         PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id, 
                                      group_id=d_group_id, leftdown=is_click,
                                      active=act_ctrl))
-
+            
     def on_qrange_text(self, event):
         """
@@ -1414 +1416 @@
         d_id = self.data.id
         d_group_id = self.data.group_id
-        wx.PostEvent(self._manager.parent,
-                     PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id,
-                                     group_id=d_group_id, leftdown=False,
+        wx.PostEvent(self._manager.parent, 
+                     PlotQrangeEvent(ctrl=[self.qmin, self.qmax], id=d_id, 
+                                     group_id=d_group_id, leftdown=False, 
                                      active=act_ctrl))
         self._validate_qrange(self.qmin, self.qmax)
-
-    def on_key(self, event):
+    
+    def on_key(self, event):   
         """
         On Key down
@@ -1431 +1433 @@
             x_data = float(ctrl.GetValue())
         except:
-            return
+            return 
         key = event.GetKeyCode()
         length = len(self.data.x)
@@ -1448 +1450 @@
         ctrl.SetValue(str(self.data.x[indx]))
         self._validate_qrange(self.qmin, self.qmax)
-
+               
     def _onQrangeEnter(self, event):
         """
@@ -1509 +1511 @@
                               (self.data.x <= self.qmax_x))
                 self.Npts_fit.SetValue(str(len(self.data.x[index_data])))
-
+            
             self.npts_x = self.Npts_total.GetValue()
             self.create_default_data()
@@ -1517 +1519 @@
             msg = "Model Error:wrong value entered!!!"
             wx.PostEvent(self._manager.parent, StatusEvent(status=msg))
-
+        
         self._draw_model()
         self.save_current_state()
@@ -1524 +1526 @@
         self.state_change = False
         return
-
+    
     def _clear_Err_on_Fit(self):
         """
@@ -1554 +1556 @@
                     if item[4] != None and item[4].IsShown():
                         item[4].Hide()
-
+  
         if len(self.fittable_param) > 0:
             for item in self.fittable_param:
@@ -1574 +1576 @@
                         item[4].Hide()
         return
-
+                
     def _get_defult_custom_smear(self):
         """
@@ -1588 +1590 @@
         if self.dx_max == None:
             self.dx_max = SMEAR_SIZE_H
-
+        
     def _get_smear_info(self):
         """
         Get the smear info from data.
-
+       
         :return: self.smear_type, self.dq_l and self.dq_r,
             respectively the type of the smear, dq_min and
@@ -1623 +1625 @@
             self.dq_l = data.dx[0]
             self.dq_r = data.dx[-1]
-
+            
         # check if it is slit smear and get min max if it is.
         elif data.dxl != None or data.dxw != None:
@@ -1632 +1634 @@
                 self.dq_r = data.dxw[0]
         #return self.smear_type,self.dq_l,self.dq_r
-
+    
     def _show_smear_sizer(self):
         """
@@ -1696 +1698 @@
         self.smear_description_2d_y.Hide()
         self.smear_description_2d.Hide()
-
+        
         self.smear_accuracy.Hide()
         self.smear_data_left.Hide()
@@ -1710 +1712 @@
         self.smear_message_new_p.Hide()
         self.smear_message_new_s.Hide()
-
+    
     def _set_accuracy_list(self):
         """
@@ -1720 +1722 @@
         for idx in range(len(list)):
             self.smear_accuracy.Append(list[idx], idx)
-
+            
     def _set_fun_box_list(self, fun_box):
         """
@@ -1741 +1743 @@
                     break
             ind += 1
-
+        
     def _on_select_accuracy(self, event):
         """
@@ -1756 +1758 @@
             if self.current_smearer != None:
                 self.current_smearer.set_accuracy(accuracy=\
-                                                  self.smear2d_accuracy)
+                                                  self.smear2d_accuracy) 
         event.Skip()
 
@@ -1781 +1783 @@
         # get ready for new event
         event.Skip()
-
+        
     def _onMask(self, event):
         """
@@ -1788 +1790 @@
         from sas.guiframe.local_perspectives.plotting.masking \
         import MaskPanel as MaskDialog
-
+        
         self.panel = MaskDialog(base=self, data=self.data, id=wx.NewId())
         self.panel.ShowModal()
-
+        
     def _draw_masked_model(self, event):
         """
@@ -1842 +1844 @@
         """
         return self.enable2D
-
+    
     def compute_data_set_range(self, data_list):
         """
@@ -1855 +1857 @@
                 self.npts_data_set += npts
         return self.qmin_data_set, self.qmax_data_set, self.npts_data_set
-
+        
     def compute_data_range(self, data):
         """
@@ -1871 +1873 @@
                     npts = len(data.x)
                 except:
-                    msg = "Unable to find min/max/length of \n data named %s" % \
-                                data.filename
+                    msg = "Unable to find min/max/length of \n data named %s"% \
+                                data.filename  
                     wx.PostEvent(self._manager.parent, StatusEvent(status=msg,
                                                info="error"))
                     raise ValueError, msg
-
+                    
             else:
                 qmin = 0
@@ -1883 +1885 @@
                     y = max(math.fabs(data.ymin), math.fabs(data.ymax))
                 except:
-                    msg = "Unable to find min/max of \n data named %s" % \
-                                data.filename
+                    msg = "Unable to find min/max of \n data named %s"% \
+                                data.filename  
                     wx.PostEvent(self._manager.parent, StatusEvent(status=msg,
                                                info="error"))
@@ -1892 +1894 @@
                 npts = len(data.data)
         return qmin, qmax, npts
-
+            
     def set_data(self, data):
         """
@@ -1919 +1921 @@
             self.graph_id = data.group_id
         self.data.group_id = self.graph_id
-
+        
         if self.data is None:
             data_name = ""
@@ -1929 +1931 @@
                 self._set_bookmark_flag(not self.batch_on)
                 self._keep.Enable(not self.batch_on)
-            if self.data.is_data:
+            if self.data.is_data:    
                 self._set_save_flag(True)
                 self._set_preview_flag(True)
@@ -1967 +1969 @@
             self.dI_sqrdata.Enable(True)
             self.dI_idata.Enable(True)
-
+              
             self.formfactorbox.Enable()
             self.structurebox.Enable()
@@ -1979 +1981 @@
                 self.btEditMask.Enable()
                 self.EditMask_title.Enable()
-
+    
         self.Npts_total.SetValue(str(npts))
         #default:number of data points selected to fit
@@ -1986 +1988 @@
         self.Npts_total.SetBackgroundColour(\
                                     self.GetParent().GetBackgroundColour())
-
+        
         self.Npts_total.Bind(wx.EVT_MOUSE_EVENTS, self._npts_click)
         self.pointsbox.Disable()
@@ -1997 +1999 @@
         if check_data_validity(data):
             self.data_box_description.SetForegroundColour(wx.BLUE)
-
+        
         if self.batch_on:
             self.slit_smearer.Enable(False)
@@ -2031 +2033 @@
                                       title=str(self.data.title)))
             self._draw_model()
-
+    
     def _npts_click(self, event):
         """
@@ -2038 +2040 @@
         """
         pass
-
+    
     def reset_page(self, state, first=False):
         """
@@ -2045 +2047 @@
         try:
             self.reset_page_helper(state)
-
+    
             self.select_param(event=None)
             #Save state_fit
@@ -2053 +2055 @@
             msg = "Error: This model state has missing or outdated "
             msg += "information.\n"
-            msg += "%s" % (sys.exc_value)
+            msg += "%s"% (sys.exc_value)
             wx.PostEvent(self._manager.parent,
                          StatusEvent(status=msg, info="error"))
         self._lay_out()
         self.Refresh()
-
+        
     def get_range(self):
         """
@@ -2064 +2066 @@
         """
         return float(self.qmin_x), float(self.qmax_x)
-
+    
     def get_npts2fit(self):
         """
         return numbers of data points within qrange
-
+        
         :Note: This is to normalize chisq by Npts of fit
-
+        
         """
         if self.data is None:
@@ -2095 +2097 @@
         """
         self.Npts_fit.SetValue(str(self.get_npts2fit()))
-
+        
     def get_chi2(self):
         """
@@ -2101 +2103 @@
         """
         return self.tcChi.GetValue()
-
+        
     def onsetValues(self, chisqr, p_name, out, cov):
         """
         Build the panel from the fit result
-
+        
         :param chisqr: Value of the goodness of fit metric
         :param p_name: the name of parameters
         :param out: list of parameter with the best value found during fitting
         :param cov: Covariance matrix
-
-        """
-
+   
+        """
+        
         # make sure stop button to fit button all the time
         self._on_fit_complete()
         if out == None or not numpy.isfinite(chisqr):
             raise ValueError, "Fit error occured..."
-
+        
         is_modified = False
         has_error = False
         dispersity = ''
-
+        
         #Hide textctrl boxes of errors.
         self._clear_Err_on_Fit()
-
+        
         #Check if chi2 is finite
         if chisqr != None and numpy.isfinite(chisqr):
@@ -2133 +2135 @@
         else:
             self.tcChi.SetValue("-")
-
+        
         #Hide error title
         if self.text2_3.IsShown() and not self.is_mac:
             self.text2_3.Hide()
-
+      
         try:
             if self.enable_disp.GetValue():
@@ -2146 +2148 @@
             dispersity = None
             pass
-
+      
         i = 0
         #Set the panel when fit result are list
@@ -2164 +2166 @@
                         val_out = format_number(out[ind], True)
                         item[2].SetValue(val_out)
-
+    
                     if(cov != None and len(cov) == len(out)):
                         try:
@@ -2176 +2178 @@
                         except:
                             pass
-
+                        
                         if cov[ind] != None:
                             if numpy.isfinite(float(cov[ind])):
                                 val_err = format_number(cov[ind], True)
-                                item[4].SetForegroundColour(wx.BLACK)
-                            else:
-                                val_err = 'NaN'
+                                    item[4].SetForegroundColour(wx.BLACK)
+                            else:
+                                val_err = 'NaN'
                                 item[4].SetForegroundColour(wx.RED)
-                            if not self.is_mac:
-                                item[3].Show(True)
-                                item[4].Show(True)
-                            item[4].SetValue(val_err)
-                            has_error = True
+                                if not self.is_mac:
+                                    item[3].Show(True)
+                                    item[4].Show(True)
+                                item[4].SetValue(val_err)
+                                has_error = True
                 i += 1
             else:
@@ -2198 +2200 @@
         ## save current state
         self.save_current_state()
-
+        
         if not self.is_mac:
             self.Layout()
@@ -2205 +2207 @@
         #plot model ( when drawing, do not update chisqr value again)
         self._draw_model(update_chisqr=False, source='fit')
-
+    
     def onWeighting(self, event):
         """
@@ -2212 +2214 @@
         self.weightbt_string = event.GetEventObject().GetLabelText()
         self._set_weight()
-
+        
     def _set_weight(self, is_2D=None):
         """
@@ -2225 +2227 @@
                                      is2d=is_2D,
                                      fid=None)
-
+    
     def onPinholeSmear(self, event):
         """
         Create a custom pinhole smear object that will change the way residuals
         are compute when fitting
-
+        
         :Note: accuracy is given by strings'High','Med', 'Low' FOR 2d,
                      None for 1D
-
+                     
         """
         # Need update param values
@@ -2254 +2256 @@
         # hide all silt sizer
         self._hide_all_smear_info()
-
+        
         # show relevant slit sizers
         self._show_smear_sizer()
@@ -2260 +2262 @@
         self.sizer_set_smearer.Layout()
         self.Layout()
-
+        
         if event != None:
             event.Skip()
@@ -2267 +2269 @@
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
-
+        
     def _is_changed_pinhole(self):
         """
         check if any of pinhole smear is changed
-
+        
         :return: True or False
-
+        
         """
         # get the values
         pin_min = self.smear_pinhole_min.GetValue()
         pin_max = self.smear_pinhole_max.GetValue()
-
+                    
         # Check changes in slit width
         try:
@@ -2286 +2288 @@
         if self.dx_min != dx_min:
             return True
-
+        
         # Check changes in slit heigth
         try:
@@ -2295 +2297 @@
             return True
         return False
-
+    
     def _set_pinhole_smear(self):
         """
         Set custom pinhole smear
-
+        
         :return: msg
-
+        
         """
         # copy data
@@ -2317 +2319 @@
             data.dxw = None
         msg = None
-
+   
         get_pin_min = self.smear_pinhole_min
         get_pin_max = self.smear_pinhole_max
@@ -2371 +2373 @@
             get_pin_max.SetBackgroundColour("white")
         ## 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,
-                                  fid=self.data.id,
-                                  qmin=float(self.qmin_x),
-                                  qmax=float(self.qmax_x),
+                            fid=self.data.id,
+                            qmin=float(self.qmin_x),
+                            qmax=float(self.qmax_x),
                                   enable_smearer=enable_smearer,
-                                  uid=self.uid)
+                            uid=self.uid)
         return msg
-
+        
     def update_pinhole_smear(self):
         """
         called by kill_focus on pinhole TextCntrl
         to update the changes
-
+        
         :return: False when wrong value was entered
-
+        
         """
         # msg default
@@ -2400 +2402 @@
         else:
             return True
-
+                     
     def onSlitSmear(self, event):
         """
@@ -2423 +2425 @@
         else:
             is_new_slit = True
-
+        
         # if any value is changed
         if is_new_slit:
             msg = self._set_slit_smear()
-
+            
         # hide all silt sizer
         self._hide_all_smear_info()
@@ -2446 +2448 @@
         """
         check if any of slit lengths is changed
-
+        
         :return: True or False
-
+        
         """
         # get the values
         width = self.smear_slit_width.GetValue()
         height = self.smear_slit_height.GetValue()
-
+        
         # check and change the box bg color if it was pink
         #    but it should be white now
@@ -2461 +2463 @@
         if width.lstrip().rstrip() == "":
             self.smear_slit_width.SetBackgroundColour(wx.WHITE)
-
+            
         # Check changes in slit width
         if width == "":
@@ -2472 +2474 @@
         if self.dxw != dxw:
             return True
-
+        
         # Check changes in slit heigth
         if height == "":
@@ -2485 +2487 @@
 
         return False
-
+    
     def _set_slit_smear(self):
         """
         Set custom slit smear
-
+        
         :return: message to inform the user about the validity
             of the values entered for slit smear
@@ -2502 +2504 @@
         data.dxw = None
         msg = None
-
+   
         try:
             self.dxl = float(self.smear_slit_height.GetValue())
@@ -2527 +2529 @@
             else:
                 self.smear_slit_width.SetBackgroundColour(wx.WHITE)
-
+              
         self.current_smearer = smear_selection(data, self.model)
         ## 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,
-                                  fid=self.data.id,
-                                  qmin=float(self.qmin_x),
-                                  qmax=float(self.qmax_x),
+                                 fid=self.data.id,
+                                 qmin=float(self.qmin_x),
+                                 qmax=float(self.qmax_x),
                                   enable_smearer=enable_smearer,
-                                  uid=self.uid)
+                                 uid=self.uid)
         return msg
-
+    
     def update_slit_smear(self):
         """
         called by kill_focus on pinhole TextCntrl
         to update the changes
-
+        
         :return: False when wrong value was entered
-
+        
         """
         # msg default
@@ -2559 +2561 @@
         else:
             return True
-
+                            
     def onSmear(self, event):
         """
@@ -2576 +2578 @@
                 self._manager.page_finder[self.uid].add_data(data=self.data)
         temp_smearer = self.on_smear_helper()
-
+        
         self.sizer_set_smearer.Layout()
         self.Layout()
         self._set_weight()
-
+        
         ## set smearing value whether or not the data contain the smearing info
         enable_smearer = not self.disable_smearer.GetValue()
@@ -2590 +2592 @@
                      enable_smearer=enable_smearer,
                      draw=True)
-
+        
         self.state.enable_smearer = self.enable_smearer.GetValue()
         self.state.disable_smearer = self.disable_smearer.GetValue()
         self.state.pinhole_smearer = self.pinhole_smearer.GetValue()
         self.state.slit_smearer = self.slit_smearer.GetValue()
-
+        
     def on_smear_helper(self, update=False):
         """
         Help for onSmear
-
+        
         :param update: force or not to update
         """
@@ -2611 +2613 @@
         self._hide_all_smear_info()
         data = copy.deepcopy(self.data)
-
+        
         # make sure once more if it is smearer
         temp_smearer = smear_selection(data, self.model)
@@ -2634 +2636 @@
             self.onSlitSmear(None)
         self._show_smear_sizer()
-
+        
         return temp_smearer
-
+    
     def on_complete_chisqr(self, event):
         """
@@ -2653 +2655 @@
         except:
             pass
-
+            
     def get_all_checked_params(self):
         """
@@ -2669 +2671 @@
                     self.param_toFit.append(item)
         self.save_current_state_fit()
-
+       
         event = PageInfoEvent(page=self)
         wx.PostEvent(self.parent, event)
@@ -2677 +2679 @@
                 param2fit.append(item[1])
         self._manager.set_param2fit(self.uid, param2fit)
-
+                
     def select_all_param(self, event):
         """
@@ -2711 +2713 @@
                             except:
                                 pass
-
+    
                         else:
                             ## for 1D all parameters except orientation
@@ -2731 +2733 @@
                     item[0].SetValue(False)
                 self.param_toFit = []
-
+           
         self.save_current_state_fit()
-
+       
         if event != None:
             #self._undo.Enable(True)
@@ -2744 +2746 @@
                 param2fit.append(item[1])
         self.parent._manager.set_param2fit(self.uid, param2fit)
-
+    
     def select_param(self, event):
         """
@@ -2797 +2799 @@
         else:
             self.cb1.SetValue(False)
-
+       
         self.save_current_state_fit()
         if event != None:
@@ -2803 +2805 @@
             event = PageInfoEvent(page=self)
             wx.PostEvent(self.parent, event)
-
+        
         param2fit = []
         for item in self.param_toFit:
@@ -2809 +2811 @@
                 param2fit.append(item[1])
         self._manager.set_param2fit(self.uid, param2fit)
-
+        
     def set_model_param_sizer(self, model):
         """
         Build the panel from the model content
-
+        
         :param model: the model selected in combo box for fitting purpose
-
+        
         """
         self.sizer3.Clear(True)
@@ -2825 +2827 @@
         self.orientation_params = []
         self.orientation_params_disp = []
-
+        
         if model == None:
             self.sizer3.Layout()
@@ -2836 +2838 @@
         ## save the current model
         self.model = model
-
+           
         keys = self.model.getParamList()
-
+        
         #list of dispersion parameters
         self.disp_list = self.model.getDispParamList()
@@ -2894 +2896 @@
 
         keys.sort(custom_compare)
-
+    
         iy = 0
         ix = 0
@@ -2902 +2904 @@
         self.cb1.SetToolTipString("To check/uncheck all the boxes below.")
         self.cb1.SetValue(True)
-
+        
         sizer.Add(self.cb1, (iy, ix), (1, 1), \
                              wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
@@ -2930 +2932 @@
                             wx.EXPAND | wx.ADJUST_MINSIZE, 0)
         self.text2_4.Hide()
-
+        
         CHECK_STATE = self.cb1.GetValue()
         for item in keys:
-
+            
             if not item 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:
                     self.model.details[item] = ["", None, None]
-
+         
                 iy += 1
                 ix = 0
@@ -2964 +2966 @@
                     else:
                         fun_box = ModelTextCtrl(self, -1,
-                                                size=(_BOX_WIDTH, 20),
+                                                     size=(_BOX_WIDTH, 20),
                                 style=wx.TE_PROCESS_ENTER, name='%s' % item)
                         fun_box.SetToolTipString(\
@@ -2980 +2982 @@
                     #cb.SetValue(True)
                     wx.EVT_CHECKBOX(self, cb.GetId(), self.select_param)
-
+                    
                     sizer.Add(cb, (iy, ix), (1, 1),
                               wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
@@ -2988 +2990 @@
                     value = self.model.getParam(item)
                     ctl1 = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
-                                         style=wx.TE_PROCESS_ENTER)
+                                        style=wx.TE_PROCESS_ENTER)
                     ctl1.SetToolTipString(\
                                 "Hit 'Enter' after typing to update the plot.")
@@ -3010 +3012 @@
                     ix += 1
                     ctl3 = ModelTextCtrl(self, -1,
-                                         size=(_BOX_WIDTH / 1.9, 20),
-                                         style=wx.TE_PROCESS_ENTER,
+                                              size=(_BOX_WIDTH / 1.9, 20),
+                                              style=wx.TE_PROCESS_ENTER,
                                 text_enter_callback=self._onparamRangeEnter)
                     min_bound = self.model.details[item][1]
@@ -3019 +3021 @@
                     sizer.Add(ctl3, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+            
                     ix += 1
                     ctl4 = ModelTextCtrl(self, -1,
-                                         size=(_BOX_WIDTH / 1.9, 20),
-                                         style=wx.TE_PROCESS_ENTER,
+                                              size=(_BOX_WIDTH / 1.9, 20),
+                                              style=wx.TE_PROCESS_ENTER,
                                 text_enter_callback=self._onparamRangeEnter)
                     max_bound = self.model.details[item][2]
@@ -3030 +3032 @@
                     sizer.Add(ctl4, (iy, ix), (1, 1),
                               wx.EXPAND | wx.FIXED_MINSIZE, 0)
-
+    
                     ix += 1
                     # Units
@@ -3041 +3043 @@
                     sizer.Add(units, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+                        
                     self.parameters.append([cb, item, ctl1,
                                             text2, ctl2, ctl3, ctl4, units])
-
+                                  
         iy += 1
         sizer.Add((10, 10), (iy, ix), (1, 1),
                   wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-
+        
         # type can be either Guassian or Array
         if len(self.model.dispersion.values()) > 0:
@@ -3054 +3056 @@
         else:
             type = "Gaussian"
-
+            
         iy += 1
         ix = 0
@@ -3061 +3063 @@
             if item in self.model.orientation_params:
                 orient_angle = wx.StaticText(self, -1, '[For 2D only]:')
-                mag_on_button = wx.Button(self, -1, "Magnetic ON")
+                mag_on_button = wx.Button(self, -1, "Magnetic ON" )
                 mag_on_button.SetToolTipString("Turn Pol Beam/Mag scatt on/off")
                 mag_on_button.Bind(wx.EVT_BUTTON, self._on_mag_on)
@@ -3068 +3070 @@
                 mag_help_button = wx.Button(self, -1, "Mag HELP")
                 mag_help_button.SetToolTipString("Help on pol beam/mag fitting")
-                mag_help_button.Bind(wx.EVT_BUTTON, self._on_mag_help)
+                mag_help_button.Bind(wx.EVT_BUTTON,self._on_mag_help)
                 mag_angle_help_button.Bind(wx.EVT_BUTTON, \
                                             self._on_mag_angle_help)
@@ -3074 +3076 @@
                           wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
                 iy += 1
-                sizer.Add(mag_on_button, (iy, ix), (1, 1),
-                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
+                sizer.Add(mag_on_button,(iy, ix ),(1,1), 
+                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 
                 ix += 1
                 sizer.Add(mag_angle_help_button, (iy, ix), (1, 1),
                           wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-                sizer.Add(mag_help_button, (iy, ix + 1), (1, 1),
-                          wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15)
-
+                sizer.Add(mag_help_button,(iy, ix + 1),(1,1), 
+                          wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 
+                
                 #handle the magnetic buttons
                 #clean this up so that assume mag is off then turn 
@@ -3096 +3098 @@
                     if self.magnetic_on:
                         mag_on_button.SetLabel("Magnetic OFF")
-                        mag_help_button.Show(True)
+                        mag_help_button.Show(True) 
                         mag_angle_help_button.Show(True)
                     else:
@@ -3102 +3104 @@
                         mag_help_button.Show(False)
                         mag_angle_help_button.Show(False)
-
+                        
                 if not self.data.__class__.__name__ == "Data2D" and \
                         not self.enable2D:
@@ -3109 +3111 @@
                     orient_angle.Show(True)
                 break
-
+      
         #For Gaussian only
         if type.lower() != "array":
@@ -3120 +3122 @@
                     if not item in self.model.details:
                         self.model.details[item] = ["", None, None]
-
+                          
                     iy += 1
                     ix = 0
@@ -3135 +3137 @@
                     sizer.Add(cb, (iy, ix), (1, 1),
                               wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 5)
-
+    
                     ## add parameter value
                     ix += 1
                     value = self.model.getParam(item)
                     ctl1 = ModelTextCtrl(self, -1, size=(_BOX_WIDTH, 20),
-                                         style=wx.TE_PROCESS_ENTER)
+                                        style=wx.TE_PROCESS_ENTER)
                     ctl1.SetToolTipString(\
                                 "Hit 'Enter' after typing to update the plot.")
@@ -3164 +3166 @@
 
                     ctl2.Hide()
-
+                    
                     ix += 1
                     ctl3 = ModelTextCtrl(self, -1,
-                                         size=(_BOX_WIDTH / 1.8, 20),
-                                         style=wx.TE_PROCESS_ENTER,
+                                              size=(_BOX_WIDTH / 1.8, 20),
+                                              style=wx.TE_PROCESS_ENTER,
                                 text_enter_callback=self._onparamRangeEnter)
-
+                    
                     sizer.Add(ctl3, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
                     ctl3.Hide()
-
+                 
                     ix += 1
                     ctl4 = ModelTextCtrl(self, -1,
-                                         size=(_BOX_WIDTH / 1.8, 20),
-                                         style=wx.TE_PROCESS_ENTER,
+                                              size=(_BOX_WIDTH / 1.8, 20),
+                                              style=wx.TE_PROCESS_ENTER,
                             text_enter_callback=self._onparamRangeEnter)
                     sizer.Add(ctl4, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+                   
                     ctl4.Hide()
-
+                    
                     if self.data.__class__.__name__ == "Data2D" or \
                             self.enable2D:
@@ -3192 +3194 @@
                         ctl3.Show(True)
                         ctl4.Show(True)
-
+                    
                     ix += 1
                     # Units
@@ -3207 +3209 @@
                     else:
                         units.Hide()
-
+                    
                     sizer.Add(units, (iy, ix), (1, 1),
                               wx.EXPAND | wx.ADJUST_MINSIZE, 0)
-
+                                          
                     self.parameters.append([cb, item, ctl1,
                                             text2, ctl2, ctl3, ctl4, units])
                     self.orientation_params.append([cb, item, ctl1,
                                             text2, ctl2, ctl3, ctl4, units])
-
+              
         iy += 1
         box_description.SetForegroundColour(wx.BLUE)
@@ -3251 +3253 @@
             wx.PostEvent(self._manager.parent,
                         StatusEvent(status=msg, info=infor))
-
+        
     def _onModel2D(self, event):
         """
@@ -3259 +3261 @@
             self.model_view.SetLabel("Show 1D")
             self.enable2D = True
-
+              
         else:
             self.model_view.SetLabel("Show 2D")
@@ -3274 +3276 @@
         self.SetupScrolling()
         self._draw_model()
-
+        
         self.state.enable2D = copy.deepcopy(self.enable2D)
-
+    
     def _set_smear_buttons(self):
         """
@@ -3290 +3292 @@
             self.slit_smearer.Enable(True)
             self.pinhole_smearer.Enable(True)
-
-
+            
+            
 class BGTextCtrl(wx.TextCtrl):
     """
@@ -3302 +3304 @@
         self.SetEditable(False)
         self.SetBackgroundColour(self.GetParent().parent.GetBackgroundColour())
-
+        
         # Bind to mouse event to avoid text highlighting
         # The event will be skipped once the call-back
         # is called.
         self.Bind(wx.EVT_MOUSE_EVENTS, self._click)
-
+        
     def _click(self, event):
         """

src/sas/perspectives/fitting/models.py

@@ -6 +6 @@
 import os
 import sys
+import math
 import os.path
 # Time is needed by the log method
@@ -12 +13 @@
 import py_compile
 import shutil
+from sas.guiframe.events import StatusEvent
 # Explicitly import from the pluginmodel module so that py2exe
 # places it in the distribution. The Model1DPlugin class is used
 # as the base class of plug-in models.
 from sas.models.pluginmodel import Model1DPlugin
+from sas.models.BaseComponent import BaseComponent
 from sas.guiframe.CategoryInstaller import CategoryInstaller
 
+from sasmodels.sasview_model import make_class
+   
 PLUGIN_DIR = 'plugin_models'
 
@@ -314 +319 @@
 
         # regular model names only
-        base_message = "Unable to load model {0}"
-        try:
-            self.model_name_list = []
-            from sas.models.SphereModel import SphereModel
-            self.model_dictionary[SphereModel.__name__] = SphereModel
-            #        self.shape_list.append(SphereModel)
-            self.multiplication_factor.append(SphereModel)
-            self.model_name_list.append(SphereModel.__name__)
-        except:
-            logging.error(base_message.format(SphereModel.__name__))
+        self.model_name_list = []
+
+        #Build list automagically from sasmodels package
+        import pkgutil
+        from importlib import import_module
+        import sasmodels.models
+        for importer,modname,ispkg in pkgutil.iter_modules(sasmodels.models.__path__):
+            if not ispkg:
+                module = import_module('.'+modname,'sasmodels.models')
+                self.model_dictionary[module.oldname] = make_class(module, dtype='single',namestyle='oldname')
+                self.model_name_list.append(module.oldname)
+
+
+        ### NASTY HACK - Comment out most of these lines as models are added to sasmodels.
+        ### Still need the lines that put models into multiplication etc
+
+        try:
+        #     # from sas.models.SphereModel import SphereModel
+        #     from sasmodels.models import sphere
+        #     SphereModel = make_class(sphere, dtype='single',namestyle='oldname')
+        #     self.model_dictionary[SphereModel.__name__] = SphereModel
+        #     #        self.shape_list.append(SphereModel)
+             self.multiplication_factor.append(SphereModel)
+        #     self.model_name_list.append(SphereModel.__name__)
+        except:
+            pass
 
         try:
@@ -1068 +1089 @@
         new_plugins = _findModels(dir)
         for name, plug in  new_plugins.iteritems():
-            for stored_name, _ in self.stored_plugins.iteritems():
+            for stored_name, stored_plug in self.stored_plugins.iteritems():
                 if name == stored_name:
                     del self.stored_plugins[name]