Changeset b9a5f0e in sasview for src/sas/perspectives/fitting


Ignore:
Timestamp:
Feb 13, 2015 4:52:52 AM (10 years ago)
Author:
krzywon
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
fd5ac0d
Parents:
35ec279
Message:

90% complete with the conversion.

Location:
src/sas/perspectives/fitting
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r79492222 rb9a5f0e  
    20152015                    temp_smear = self.current_smearer 
    20162016            # compute weight for the current data 
    2017             from sas import get_weight 
     2017            from sas.perspectives.fitting.utils import get_weight 
    20182018            flag = self.get_weight_flag() 
    20192019            weight = get_weight(data=self.data, is2d=self._is_2D(), flag=flag) 
    … …  
    31363136        """ 
    31373137        from help_panel import  HelpWindow 
    3138 import sas.models as models 
     3138        import sas.models as models 
    31393139         
    31403140        # Get models help model_function path 
    … …  
    31733173        Get the string copies of the param names and values in the tap 
    31743174        """ 
    3175         content = 'sansview_parameter_values:' 
     3175        content = 'sasview_parameter_values:' 
    31763176        # Do it if params exist 
    31773177        if  self.parameters != []: 
    … …  
    34023402        # put the text into dictionary 
    34033403        lines = text.split(':') 
    3404         if lines[0] != 'sansview_parameter_values': 
     3404        if lines[0] != 'sasview_parameter_values': 
    34053405            self._copy_info(False) 
    34063406            return False 

  • src/sas/perspectives/fitting/console.py

    r79492222 rb9a5f0e  
    147147                d_flag = (hasattr(self.result, "data") and \ 
    148148                    self.result.data is not None and \ 
    149                     hasattr(self.result.data, "sans_data") and  
    150                     self.result.data.sans_data is not None) 
     149                    hasattr(self.result.data, "sas_data") and  
     150                    self.result.data.sas_data is not None) 
    151151                m_flag = (hasattr(self.result, "model") and \ 
    152152                          self.result.model is not None) 
    153153                if d_flag: 
    154                     data_name = self.result.data.sans_data.name 
     154                    data_name = self.result.data.sas_data.name 
    155155                if m_flag: 
    156156                    model_name = str(self.result.model.name) 

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

    r79492222 rb9a5f0e  
    608608        model_disp = wx.StaticText(self, -1, 'Function') 
    609609        CHECK_STATE = self.cb1.GetValue() 
    610 import sas.models.dispersion_models 
     610        import sas.models.dispersion_models 
    611611        self.polydisp = sas.models.dispersion_models.models 
    612612 
    … …  
    21752175        """ 
    21762176        # compute weight for the current data 
    2177         from sas import get_weight 
     2177        from sas.perspectives.fitting.utils import get_weight 
    21782178        flag_weight = self.get_weight_flag() 
    21792179        if is_2D == None: 

  • src/sas/perspectives/fitting/fitting.py

    r79492222 rb9a5f0e  
    3333from sas.guiframe.data_processor import BatchCell 
    3434from sas.fit.Fitting import Fit 
    35 from sas import ConsoleUpdate 
    36 from sas import FitProblemDictionary 
    37 from sas import FitPanel 
    38 from sas import ResultPanel, PlotResultEvent 
    39  
    40 from sas import FitThread 
    41 from sas import Reader 
    42 from sas import Chi2UpdateEvent 
     35from sas.perspectives.fitting.console import ConsoleUpdate 
     36from sas.perspectives.fitting.fitproblem import FitProblemDictionary 
     37from sas.perspectives.fitting.fitpanel import FitPanel 
     38from sas.perspectives.fitting.resultpanel import ResultPanel, PlotResultEvent 
     39 
     40from sas.perspectives.fitting.fit_thread import FitThread 
     41from sas.perspectives.fitting.pagestate import Reader 
     42from sas.perspectives.fitting.fitpage import Chi2UpdateEvent 
    4343from sas.perspectives.calculator.model_editor import TextDialog 
    4444from sas.perspectives.calculator.model_editor import EditorWindow 

  • src/sas/perspectives/fitting/ftol_dialog.py

    r79492222 rb9a5f0e  
    1717# default ftol 
    1818F_TOL = 1.49012e-08 
    19 SANS_F_TOL = 5e-05 
     19SAS_F_TOL = 5e-05 
    2020 
    2121PANEL_WIDTH = 270 
    … …  
    3838        vbox = wx.BoxSizer(wx.VERTICAL) 
    3939        title_text = wx.StaticText(self, id=wx.NewId(), label='FTol selection (Leastsq)') 
    40         self.default_bt = wx.RadioButton(self, -1, 'SansView Default (5e-05)', (15, 30), style=wx.RB_GROUP) 
     40        self.default_bt = wx.RadioButton(self, -1, 'SasView Default (5e-05)', (15, 30), style=wx.RB_GROUP) 
    4141        self.default_bt.SetValue(True) 
    4242        self.default_bt.Bind(wx.EVT_RADIOBUTTON, self.OnFtolSelection) 
    … …  
    8888        """ 
    8989        if self.default_bt.GetValue(): 
    90             return SANS_F_TOL 
     90            return SAS_F_TOL 
    9191        elif self.sci_default_bt.GetValue(): 
    9292            return F_TOL 
    … …  
    102102            except: 
    103103                return None 
    104         return SANS_F_TOL 
     104        return SAS_F_TOL 

  • src/sas/perspectives/fitting/media/category_manager_help.html

    r79492222 rb9a5f0e  
    99<p> 
    1010 
    11 Our SANS models are, by default, classified into 5 categories; shapes, shape-independent,  
     11Our SAS models are, by default, classified into 5 categories; shapes, shape-independent,  
    1212structure factor, and customized models, where these categories (except the customized models) can be reassigned, added, and removed using 'Category Manager'. 
    1313Each models can also be enabled(shown)/disabled(hidden) from the category that they 

  • src/sas/perspectives/fitting/media/model_use_help.html

    r79492222 rb9a5f0e  
    3131        See 'Custom model editor' in the side menu on left. 
    3232        Advanced users can write your own model and save it (in .py format) into <b>plugin_models</b> directory 
    33         in .sansview of your home directory (eg., username\.sansview>\plugin_models). You plugin 
     33        in .sasview of your home directory (eg., username\.sasview>\plugin_models). You plugin 
    3434        model will be added into "<>Customized Models</>"  on the next model selection. 
    3535</p> 

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

    r79492222 rb9a5f0e  
    159159    dir = find_plugins_dir() 
    160160    if not os.path.isdir(dir): 
    161         msg = "SansView couldn't locate Model plugin folder." 
     161        msg = "SasView couldn't locate Model plugin folder." 
    162162        msg += """ "%s" does not exist""" % dir 
    163163        logging.warning(msg) 

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

    r79492222 rb9a5f0e  
    973973    ## Wildcards 
    974974    type = ["Fitting files (*.fitv)|*.fitv" 
    975             "SANSView file (*.svs)|*.svs"] 
     975            "SASView file (*.svs)|*.svs"] 
    976976    ## List of allowed extensions 
    977977    ext = ['.fitv', '.FITV', '.svs', 'SVS'] 

  • src/sas/perspectives/fitting/plugin_models/polynomial5.py

    r79492222 rb9a5f0e  
    1111Please select the 'Compile' from the menubar after the modification and saving. 
    1212Note that we recommend to save the file as a different file name. 
    13 Otherwise, it could be removed in the future on re-installation of the SansView. 
     13Otherwise, it could be removed in the future on re-installation of the SasView. 
    1414## ***************************************************************************** 
    1515""" 

  • src/sas/perspectives/fitting/plugin_models/sph_bessel_jn.py

    r79492222 rb9a5f0e  
    1111Please select the 'Compile' from the menubar after the modification and saving. 
    1212Note that we recommend to save the file as a different file name. 
    13 Otherwise, it could be removed in the future on re-installation of the SansView. 
     13Otherwise, it could be removed in the future on re-installation of the SasView. 
    1414## ***************************************************************************** 
    1515""" 

  • src/sas/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py

    r79492222 rb9a5f0e  
    88Please select the 'Compile' from the menubar after the modification and saving. 
    99Note that we recommend to save the file as a different file name. 
    10 Otherwise, it could be removed in the future on re-installation of the SansView. 
     10Otherwise, it could be removed in the future on re-installation of the SasView. 
    1111## ***************************************************************************** 
    1212""" 

  • src/sas/perspectives/fitting/plugin_models/sum_p1_p2.py

    r79492222 rb9a5f0e  
    88Please select the 'Compile' from the menubar after the modification and saving. 
    99Note that we recommend to save the file as a different file name. 
    10 Otherwise, it could be removed in the future on re-installation of the SansView. 
     10Otherwise, it could be removed in the future on re-installation of the SasView. 
    1111## ***************************************************************************** 
    1212""" 

  • src/sas/perspectives/fitting/plugin_models/testmodel.py

    r79492222 rb9a5f0e  
    1111Please select the 'Compile' from the menubar after the modification and saving. 
    1212Note that we recommend to save the file as a different file name. 
    13 Otherwise, it could be removed in the future on re-installation of the SansView. 
     13Otherwise, it could be removed in the future on re-installation of the SasView. 
    1414## ***************************************************************************** 
    1515""" 

  • src/sas/perspectives/fitting/plugin_models/testmodel_2.py

    r79492222 rb9a5f0e  
    1111Please select the 'Compile' from the menubar after the modification and saving. 
    1212Note that we recommend to save the file as a different file name. 
    13 Otherwise, it could be removed in the future on re-installation of the SansView. 
     13Otherwise, it could be removed in the future on re-installation of the SasView. 
    1414## ***************************************************************************** 
    1515""" 
Note: See TracChangeset for help on using the changeset viewer.