Changeset b9a5f0e in sasview


Ignore:
Timestamp:
Feb 13, 2015 2:52:52 AM (9 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
Files:
1 added
1 deleted
58 edited
1 moved

Legend:

Unmodified
Added
Removed

  • src/sas/guiframe/gui_manager.py

    r79492222 rb9a5f0e  
    6969    logging.info(sys.executable) 
    7070    logging.info(str(sys.argv)) 
    71     from sas import sansview as sasview 
     71    from sas import sasview as sasview 
    7272    app_path = os.path.dirname(sasview.__file__) 
    7373    logging.info("Using application path: %s", app_path) 
    … …  
    113113    if config is None: 
    114114        # Didn't find local config, load the default  
    115 import sas.guiframe.config as config 
     115        import sas.guiframe.config as config 
    116116        logging.info("using default local_config")         
    117117    else: 
    … …  
    21162116        """ 
    21172117        if config._do_aboutbox: 
    2118 import sas.guiframe.aboutbox as AboutBox 
     2118            import sas.guiframe.aboutbox as AboutBox 
    21192119            dialog = AboutBox.DialogAbout(None, -1, "") 
    21202120            dialog.ShowModal()    

  • src/sas/perspectives/calculator/calculator.py

    r79492222 rb9a5f0e  
    8181        slit_length_help = "Computes the slit length from the beam profile." 
    8282        resolution_help = "Approximately estimates the " 
    83         resolution_help += "resolution of Q in 2D based on the SANS " 
     83        resolution_help += "resolution of Q in 2D based on the SAS " 
    8484        resolution_help += "instrumental parameter values." 
    8585        mass_volume_help = "Based on the chemical formula, " 
    8686        mass_volume_help += "compute the mass density or the molar volume." 
    87         gensans_help = "Generic SANS" 
     87        gensas_help = "Generic SAS" 
    8888        pyconsole_help = "Python Console." 
    8989        imageviewer_help = "Load an image file and display the image." 
    … …  
    9898                ("Kiessig Thickness Calculator",  
    9999                        kiessig_help, self.on_calculate_kiessig), 
    100                           ("SANS Resolution Estimator",  
     100                          ("SAS Resolution Estimator",  
    101101                        resolution_help, self.on_calculate_resoltuion), 
    102102                ("Generic Scattering Calculator",  
    103                         gensans_help, self.on_gen_model), 
     103                        gensas_help, self.on_gen_model), 
    104104                ("Python Shell/Editor", pyconsole_help, self.on_python_console), 
    105105                ("Image Viewer", imageviewer_help, self.on_image_viewer),] 

  • src/sas/perspectives/calculator/data_operator.py

    r79492222 rb9a5f0e  
    600600        self.output.name = name 
    601601        self.output.run = "Data Operation" 
    602         self.output.instrument = "SansView" 
     602        self.output.instrument = "SasView" 
    603603        self.output.id = str(name) + str(time.time()) 
    604604        data = {self.output.id :self.output} 

  • src/sas/perspectives/calculator/gen_scatter_panel.py

    r79492222 rb9a5f0e  
    2929from sas.guiframe.utils import format_number 
    3030from sas.guiframe.events import StatusEvent   
    31 from sas.calculator import sans_gen  
     31from sas.calculator import sas_gen  
    3232from sas.perspectives.calculator.calculator_widgets import OutputTextCtrl 
    3333from sas.perspectives.calculator.calculator_widgets import InputTextCtrl 
    … …  
    116116    """ 
    117117    ## Internal nickname for the window, used by the AUI manager 
    118     window_name = "Generic SANS Calculator" 
     118    window_name = "Generic SAS Calculator" 
    119119    ## Name to appear on the window title bar 
    120     window_caption = "Generic SANS " 
     120    window_caption = "Generic SAS " 
    121121    ## Flag to tell the AUI manager to put this panel in the center pane 
    122122    CENTER_PANE = True 
    … …  
    133133        self.reader = None 
    134134        self.ext = None 
    135         self.id = 'GenSANS' 
     135        self.id = 'GenSAS' 
    136136        self.file_name = '' 
    137137        self.time_text = None 
    138138        self.orient_combo = None 
    139         self.omfreader = sans_gen.OMFReader() 
    140         self.sldreader = sans_gen.SLDReader() 
    141         self.pdbreader = sans_gen.PDBReader() 
    142         self.model = sans_gen.GenSAS() 
     139        self.omfreader = sas_gen.OMFReader() 
     140        self.sldreader = sas_gen.SLDReader() 
     141        self.pdbreader = sas_gen.PDBReader() 
     142        self.model = sas_gen.GenSAS() 
    143143        self.param_dic = self.model.params 
    144144        self.parameters = [] 
    … …  
    451451        """ 
    452452        sld_n_default = 6.97e-06 
    453         omfdata = sans_gen.OMFData() 
    454         omf2sld = sans_gen.OMF2SLD() 
     453        omfdata = sas_gen.OMFData() 
     454        omf2sld = sas_gen.OMF2SLD() 
    455455        omf2sld.set_data(omfdata, self.default_shape) 
    456456        self.sld_data = omf2sld.output 
    … …  
    538538            if self.parent.parent is None: 
    539539                return  
    540             msg = "Generic SANS Calculator: %s" % (sys.exc_value) 
     540            msg = "Generic SAS Calculator: %s" % (sys.exc_value) 
    541541            wx.PostEvent(self.parent.parent, 
    542542                          StatusEvent(status=msg, type='stop')) 
    … …  
    572572            self.is_avg = False 
    573573            if self.ext in self.omfreader.ext: 
    574                 gen = sans_gen.OMF2SLD() 
     574                gen = sas_gen.OMF2SLD() 
    575575                gen.set_data(data) 
    576576                #omf_data = data 
    … …  
    591591                raise 
    592592            msg = "Loading Error: This file format is not supported " 
    593             msg += "for GenSANS."  
     593            msg += "for GenSAS."  
    594594            wx.PostEvent(self.parent.parent, 
    595595                          StatusEvent(status=msg, type='stop', info='Error')) 
    … …  
    684684        graph_title = self._sld_plot_helper(ax, output, has_arrow) 
    685685        # Use y, z axes (in mpl 3d) as z, y axes  
    686         # that consistent with our SANS detector coords. 
     686        # that consistent with our SAS detector coords. 
    687687        ax.set_xlabel('x ($\A%s$)'% output.pos_unit) 
    688688        ax.set_ylabel('z ($\A%s$)'% output.pos_unit) 
    … …  
    12101210        # Object that receive status event 
    12111211        self.parent = parent 
    1212         self.sld_data = sans_gen.MagSLD([0], [0], [0])  
     1212        self.sld_data = sas_gen.MagSLD([0], [0], [0])  
    12131213        self.sld_ctl = None 
    12141214        self.default_shape = 'rectangular' 
    … …  
    12771277        """ 
    12781278        """ 
    1279         omfdata = sans_gen.OMFData() 
     1279        omfdata = sas_gen.OMFData() 
    12801280        sets = {} 
    12811281        try: 
    … …  
    12981298                exec "omfdata.%s = sets['%s']"% (key, key)             
    12991299 
    1300             omf2sld = sans_gen.OMF2SLD() 
     1300            omf2sld = sas_gen.OMF2SLD() 
    13011301            omf2sld.set_data(omfdata, self.default_shape) 
    13021302            self.sld_data = omf2sld.output 
    … …  
    16281628        self.parent.set_main_panel_sld_data(self.sld_data) 
    16291629         
    1630         reader = sans_gen.SLDReader()  
     1630        reader = sas_gen.SLDReader()  
    16311631        extension = '*.sld' 
    16321632        path = None 
    … …  
    18101810        self.panel = SasGenPanel(parent=self) 
    18111811        self.data = None 
    1812         self.omfdata = sans_gen.OMFData() 
     1812        self.omfdata = sas_gen.OMFData() 
    18131813        self.sld_data = None 
    18141814        self._default_save_location = os.getcwd()  
    … …  
    21172117 
    21182118        media = calmedia.get_data_path(media='media') 
    2119         path = os.path.join(media,"gen_sans_help.html")  
     2119        path = os.path.join(media,"gen_sas_help.html")  
    21202120        name = "Generic Scattering Calculator" 
    21212121        frame = HelpWindow(self, -1,  
    2122                            title=' Help: GenSANS',   
     2122                           title=' Help: GenSAS',   
    21232123                           pageToOpen=path, size=(865, 450))    
    21242124        try:  

  • src/sas/perspectives/calculator/help_panel.py

    r79492222 rb9a5f0e  
    5555        if pageToOpen != None: 
    5656            path = os.path.dirname(pageToOpen) 
    57             self.path = os.path.join(path, "gen_sans_help.html") 
     57            self.path = os.path.join(path, "gen_sas_help.html") 
    5858        else: 
    5959            self.path = calculator.get_data_path(media='media') 
    … …  
    8080            <li><a href ="resolution_calculator_help.html"  
    8181            target ="showframe">Resolution Estimator</a><br></li> 
    82             <li><a href ="gen_sans_help.html"  
     82            <li><a href ="gen_sas_help.html"  
    8383            target ="showframe">Generic Scattering Calculator</a><br></li> 
    8484            <li><a href ="pycrust_help.html"  

  • src/sas/perspectives/calculator/kiessig_calculator_panel.py

    r79492222 rb9a5f0e  
    114114        hint_msg += "the thickness of a layer" 
    115115        hint_msg += " or the diameter of particles\n " 
    116         hint_msg += "from the Kiessig fringe width in SANS/NR data." 
     116        hint_msg += "from the Kiessig fringe width in SAS/NR data." 
    117117        hint_msg += "" 
    118118        self.hint_txt = wx.StaticText(self, -1, hint_msg) 

  • src/sas/perspectives/calculator/media/data_operator_help.html

    r79492222 rb9a5f0e  
    23234) If the operation is successful, hit the Apply button to make the new data. 
    2424Then the data name will be shown up in the data box in the data explorer.<br> 
    25 Note: The errors and warnings will be displayed at the bottom of the SansView window.  
     25Note: The errors and warnings will be displayed at the bottom of the SasView window.  
    2626</p>  
    2727<p> 

  • src/sas/perspectives/calculator/media/kiessig_calculator_help.html

    r79492222 rb9a5f0e  
    1111This tool is to approximately estimate the thickness of a layer 
    1212 or the diameter of particles from the Kiessig fringe in  
    13  SANS/NR data, and uses the Kiessig relation; 
     13 SAS/NR data, and uses the Kiessig relation; 
    1414 thickness = 2*Pi/fringe_width. 
    1515   

  • src/sas/perspectives/calculator/media/resolution_calculator_help.html

    r79492222 rb9a5f0e  
    11<html> 
    22<body> 
    3 <h4>SANS Q Resolution Estimator</h4> 
     3<h4>SAS Q Resolution Estimator</h4> 
    44<ul> 
    55<li><a href="#Description">Description</a></li> 
    … …  
    1111<p> 
    1212This tool is to approximately estimate the resolution of Q based on the 
    13 SANS instrumental parameter values assuming that the detector is flat  
     13SAS instrumental parameter values assuming that the detector is flat  
    1414and vertical to the incident beam direction. 
    1515</p> 
    … …  
    5252the variance is slightly under estimated.</p> 
    5353<p>7. The summary can be accessed by clicking the 'light-bulb' icon  
    54 at the bottom of the SansView main window. 
     54at the bottom of the SasView main window. 
    5555</p> 
    5656<p><img src="resolution_tutor.gif"> 

  • src/sas/perspectives/calculator/media/slit_calculator_help.html

    r79492222 rb9a5f0e  
    2727 
    2828<p> 
    29 To see the file format, check the file, 'beam profile.DAT', in the 'test' folder of SansView.  
     29To see the file format, check the file, 'beam profile.DAT', in the 'test' folder of SasView.  
    3030</p> 
    3131</body> 

  • src/sas/perspectives/calculator/resolution_calculator_panel.py

    r79492222 rb9a5f0e  
    5858    """ 
    5959    ## Internal nickname for the window, used by the AUI manager 
    60     window_name = "SANS Resolution Estimator" 
     60    window_name = "SAS Resolution Estimator" 
    6161    ## Name to appear on the window title bar 
    6262    window_caption = "" 
    … …  
    13971397    """ 
    13981398    def __init__(self, parent = None, manager=None,  
    1399                  title = "SANS Resolution Estimator", 
     1399                 title = "SAS Resolution Estimator", 
    14001400                 size=(PANEL_WIDTH * 2, PANEL_HEIGHT), *args, **kwds): 
    14011401        kwds['title'] = title 

  • 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""" 

  • src/sas/perspectives/invariant/help_panel.py

    r79492222 rb9a5f0e  
    8282        self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER,  
    8383                                     size=(500, -1)) 
    84 import sas.perspectives.invariant as invariant 
     84        import sas.perspectives.invariant as invariant 
    8585        path = invariant.get_data_path(media='media') 
    8686        self.path = os.path.join(path,"invariant_help.html") 

  • src/sas/perspectives/invariant/invariant.py

    r79492222 rb9a5f0e  
    2222from sas.guiframe.events import StatusEvent 
    2323from sas.guiframe.gui_style import GUIFRAME_ID 
    24 from sas import Reader as reader 
     24from sas.perspectives.invariant.invariant_state import Reader as reader 
    2525from sas.dataloader.loader import Loader 
    26 from sas import InvariantPanel 
     26from sas.perspectives.invariant.invariant_panel import InvariantPanel 
    2727from sas.guiframe.plugin_base import PluginBase 
    2828 

  • src/sas/perspectives/invariant/invariant_panel.py

    r79492222 rb9a5f0e  
    1414from sas.guiframe.events import StatusEvent 
    1515from sas.guiframe.events import AppendBookmarkEvent 
    16 from sas import InvariantDetailsPanel 
    17 from sas import InvariantContainer 
    18 from sas import OutputTextCtrl 
    19 from sas import InvTextCtrl 
    20 from sas import InvariantState as IState 
     16from sas.perspectives.invariant.invariant_details import InvariantDetailsPanel 
     17from sas.perspectives.invariant.invariant_details import InvariantContainer 
     18from sas.perspectives.invariant.invariant_widgets import OutputTextCtrl 
     19from sas.perspectives.invariant.invariant_widgets import InvTextCtrl 
     20from sas.perspectives.invariant.invariant_state import InvariantState as IState 
    2121from sas.guiframe.panel_base import PanelBase 
    2222# The minimum q-value to be used when extrapolating 
    … …  
    766766        : param event: report button event 
    767767        """ 
    768         from sas import ReportDialog 
     768        from sas.perspectives.invariant.report_dialog import ReportDialog 
    769769 
    770770        self.state.set_report_string() 
    … …  
    19141914        self.loader = Loader() 
    19151915        import invariant 
    1916         path = "C:/ECLPS/workspace/trunk/sansdataloader/test/ascii_test_3.txt" 
     1916        path = "C:/ECLPS/workspace/trunk/sasdataloader/test/ascii_test_3.txt" 
    19171917        data = self.loader.load(path) 
    19181918        self.panel = InvariantPanel(self) 

  • src/sas/perspectives/invariant/invariant_state.py

    r79492222 rb9a5f0e  
    106106        self.wximbmp = None 
    107107        # report_html strings 
    108 import sas.perspectives.invariant as invariant 
     108        import sas.perspectives.invariant as invariant 
    109109        path = invariant.get_data_path(media='media') 
    110110        path_report_html = os.path.join(path,"report_template.html") 
    … …  
    643643    ## Wildcards 
    644644    type = ["Invariant file (*.inv)|*.inv", 
    645             "SANSView file (*.svs)|*.svs"] 
     645            "SASView file (*.svs)|*.svs"] 
    646646    ## List of allowed extensions 
    647647    ext = ['.inv', '.INV', '.svs', 'SVS']   

  • src/sas/perspectives/pr/inversion_state.py

    r79492222 rb9a5f0e  
    359359    ## Wildcards 
    360360    type = ["P(r) files (*.prv)|*.prv", 
    361             "SANSView files (*.svs)|*.svs"] 
     361            "SASView files (*.svs)|*.svs"] 
    362362    ## List of allowed extensions 
    363363    ext = ['.prv', '.PRV', '.svs', '.SVS']   

  • src/sas/plottools/fitDialog.py

    r79492222 rb9a5f0e  
    430430                    tempdy = numpy.asarray(tempdy) 
    431431                    tempdy[tempdy == 0] = 1 
    432                     chisqr, out, cov = fittings.sansfit(self.model, 
     432                    chisqr, out, cov = fittings.sasfit(self.model, 
    433433                                                        [self.cstA, self.cstB], 
    434434                                                        tempx, tempy, 
    … …  
    439439                    tempdy = numpy.asarray(tempdy) 
    440440                    tempdy[tempdy == 0] = 1 
    441                     chisqr, out, cov = fittings.sansfit(self.model, 
     441                    chisqr, out, cov = fittings.sasfit(self.model, 
    442442                                                        [self.cstA, self.cstB], 
    443443                                                        tempx, tempy, tempdy, 

  • src/sas/plottools/fittings.py

    r79492222 rb9a5f0e  
    2727     
    2828     
    29 def sansfit(model, pars, x, y, err_y , qmin=None, qmax=None): 
     29def sasfit(model, pars, x, y, err_y , qmin=None, qmax=None): 
    3030    """ 
    3131    Fit function 
    … …  
    9090    cstB = Parameter(line, 'B', event.cstB) 
    9191    y = line.run() 
    92     chisqr, out, cov = sansfit(line, [cstA, cstB], event.x, y, 0) 
     92    chisqr, out, cov = sasfit(line, [cstA, cstB], event.x, y, 0) 
    9393    # print "Output parameters:", out 
    9494    print "The right answer is [70.0, 1.0]" 

  • src/sas/pr/Doxyfile

    r79492222 rb9a5f0e  
    44# Project related configuration options 
    55#--------------------------------------------------------------------------- 
    6 PROJECT_NAME           = sanspr 
     6PROJECT_NAME           = saspr 
    77PROJECT_NUMBER         =  
    88OUTPUT_DIRECTORY       = doc 

  • src/sas/pr/__init__.py

    r79492222 rb9a5f0e  
    11""" 
    2     P(r) inversion for SANS 
     2    P(r) inversion for SAS 
    33""" 
    4 ## \mainpage P(r) inversion for SANS 
     4## \mainpage P(r) inversion for SAS 
    55# 
    66# \section intro_sec Introduction 
    … …  
    99# technique can be found elsewhere [1-5]. The module is useable as a  
    1010# standalone application but its functionality is meant to be presented  
    11 # to end-users through the user interface developed as part of the SANS  
     11# to end-users through the user interface developed as part of the SAS  
    1212# flagship application.  
    1313# 

  • src/sas/pr/c_extensions/Cinvertor.c

    r79492222 rb9a5f0e  
    11141114 
    11151115    d = PyModule_GetDict(module); 
    1116     CinvertorError = PyErr_NewException("sans.pr.invertor.Cinvertor.InvertorError", PyExc_RuntimeError, NULL); 
     1116    CinvertorError = PyErr_NewException("sas.pr.invertor.Cinvertor.InvertorError", PyExc_RuntimeError, NULL); 
    11171117    PyDict_SetItemString(d, "CinvertorError", CinvertorError); 
    11181118} 

  • src/sas/pr/release_notes.txt

    r79492222 rb9a5f0e  
    2121 
    2222        - Release date: 5/28/2008 
    23         - Provide python module sans.pr 
     23        - Provide python module sas.pr 
    2424 
    25252- Downloading and Installing 
    … …  
    2929 
    3030        2.2- Installing: 
    31                 - Get the code from svn://danse.us/sans/releases/pr_inversion-0.1.0 
     31                - Get the code from svn://danse.us/sas/releases/pr_inversion-0.1.0 
    3232                - The following modules are required: 
    3333                        * matplotlib 

  • src/sas/realspace/VolumeCanvas.py

    r79492222 rb9a5f0e  
    22""" Volume Canvas 
    33 
    4     Simulation canvas for real-space simulation of SANS scattering intensity. 
     4    Simulation canvas for real-space simulation of SAS scattering intensity. 
    55    The user can create an arrangement of basic shapes and estimate I(q) and 
    66    I(q_x, q_y). Error estimates on the simulation are also available.  

  • src/sas/realspace/__init__.py

    r79492222 rb9a5f0e  
    11""" 
    2     Real-Space Modeling for SANS 
     2    Real-Space Modeling for SAS 
    33"""  
    4 ## \mainpage Real-Space Modeling for SANS 
     4## \mainpage Real-Space Modeling for SAS 
    55# 
    66# \section intro_sec Introduction 
    7 # This module provides SANS scattering intensity simulation  
     7# This module provides SAS scattering intensity simulation  
    88# based on real-space modeling. 
    99# 

  • src/sas/simulation/analmodelpy/analmodelpymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = analmodelpymodule 
    1616MODULE = analmodelpy 

  • src/sas/simulation/analmodelpy/libanalmodelpy/Make.mm

    r79492222 rb9a5f0e  
    5555EXPORT_HEADERS = \ 
    5656    analytical_model.h  \ 
    57     sans_model.h 
     57    sas_model.h 
    5858 
    5959EXPORT_LIBS = $(PROJ_SAR) 

  • src/sas/simulation/analmodelpy/libanalmodelpy/analytical_model.h

    r79492222 rb9a5f0e  
    1 /** \file analytical_model.h class AnalyticalModel:SANSModel */ 
     1/** \file analytical_model.h class AnalyticalModel:SASModel */ 
    22 
    33#ifndef ANALYTICALMODEL_H 
    44#define ANALYTICALMODEL_H 
    55 
    6 #include "sans_model.h" 
     6#include "sas_model.h" 
    77#include "geo_shape.h" 
    88#include "iq.h" 
    99 
    10 class AnalyticalModel : public SANSModel{ 
     10class AnalyticalModel : public SASModel{ 
    1111 
    1212 public: 

  • src/sas/simulation/analmodelpy/tests/Make.mm

    r79492222 rb9a5f0e  
    1616                     ../../geoshapespy/libgeoshapespy 
    1717 
    18 PROJECT = SANSsimulation 
     18PROJECT = SASsimulation 
    1919PACKAGE = tests 
    2020 

  • src/sas/simulation/analmodelpy/tests/testanal_model.py

    r79492222 rb9a5f0e  
    1414if __name__ == "__main__": 
    1515 
    16     from SANSsimulation import analmodelpy as analmodelpymodule 
    17     from SANSsimulation import iqPy 
    18     from SANSsimulation import geoshapespy 
     16    from SASsimulation import analmodelpy as analmodelpymodule 
     17    from SASsimulation import iqPy 
     18    from SASsimulation import geoshapespy 
    1919 
    2020    print "copyright information:" 

  • src/sas/simulation/geoshapespy/geoshapespymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = geoshapespymodule 
    1616MODULE = geoshapespy 

  • src/sas/simulation/geoshapespy/tests/testshapes.py

    r79492222 rb9a5f0e  
    1414if __name__ == "__main__": 
    1515 
    16     from SANSsimulation import geoshapespy 
     16    from SASsimulation import geoshapespy 
    1717 
    1818    print 

  • src/sas/simulation/iqPy/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515 
    1616# directory structure 

  • src/sas/simulation/iqPy/examples/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = examples 
    1616 

  • src/sas/simulation/iqPy/iqPy/Make.mm

    r79492222 rb9a5f0e  
    1111# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 
    1212 
    13 PROJECT = SANSsimulation 
     13PROJECT = SASsimulation 
    1414PACKAGE = iqPy 
    1515 

  • src/sas/simulation/iqPy/iqPymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = iqPymodule 
    1616MODULE = iqPy 

  • src/sas/simulation/iqPy/tests/testiq.py

    r79492222 rb9a5f0e  
    1414if __name__ == "__main__": 
    1515 
    16         from SANSsimulation import iqPy 
     16        from SASsimulation import iqPy 
    1717        iqPy.new_iq(10,0.01,0.4) 
    1818 

  • src/sas/simulation/pointsmodelpy/libpointsmodelpy/points_model.h

    r79492222 rb9a5f0e  
    1 /** \file points_model.h child class of SANSmodel*/ 
     1/** \file points_model.h child class of SASmodel*/ 
    22 
    33#ifndef POINTSMODEL_H 
    … …  
    99#include "Point3D.h" 
    1010#include "iq.h" 
    11 #include "sans_model.h" 
     11#include "sas_model.h" 
    1212 
    1313using namespace std; 
    1414 
    15 class PointsModel : public SANSModel{ 
     15class PointsModel : public SASModel{ 
    1616 public: 
    1717  PointsModel(); 

  • src/sas/simulation/pointsmodelpy/pointsmodelpymodule/Make.mm

    r79492222 rb9a5f0e  
    1212# 
    1313 
    14 PROJECT = SANSsimulation 
     14PROJECT = SASsimulation 
    1515PACKAGE = pointsmodelpymodule 
    1616MODULE = pointsmodelpy 

  • src/sas/simulation/pointsmodelpy/tests/testcomplexmodel.py

    r79492222 rb9a5f0e  
    1 from sansModeling.pointsmodelpy import pointsmodelpy 
    2 from sansModeling.iqPy import iqPy 
    3 from sansModeling.geoshapespy import geoshapespy 
     1from sasModeling.pointsmodelpy import pointsmodelpy 
     2from sasModeling.iqPy import iqPy 
     3from sasModeling.geoshapespy import geoshapespy 
    44 
    55#First testing: a normal case, a lores model holds a sphere 

  • src/sas/simulation/pointsmodelpy/tests/testlores.py

    r79492222 rb9a5f0e  
    11if __name__ == "__main__": 
    22 
    3     from sansModeling.iqPy import iqPy 
    4     #from sansModeling.analmodelpy import analmodelpy as analmodelpymodule 
    5     from sansModeling.geoshapespy import geoshapespy 
    6     from sansModeling.pointsmodelpy import pointsmodelpy 
     3    from sasModeling.iqPy import iqPy 
     4    #from sasModeling.analmodelpy import analmodelpy as analmodelpymodule 
     5    from sasModeling.geoshapespy import geoshapespy 
     6    from sasModeling.pointsmodelpy import pointsmodelpy 
    77 
    88#    print "copyright information:" 

  • src/sas/simulation/pointsmodelpy/tests/testlores2d.py

    r79492222 rb9a5f0e  
    11def test_lores2d(phi): 
    2   from sansModeling.pointsmodelpy import pointsmodelpy  
    3   from sansModeling.iqPy import iqPy 
    4   from sansModeling.geoshapespy import geoshapespy 
     2  from sasModeling.pointsmodelpy import pointsmodelpy  
     3  from sasModeling.iqPy import iqPy 
     4  from sasModeling.geoshapespy import geoshapespy 
    55 
    66  #lores model is to hold several geometric objects 
    … …  
    1515  pointsmodelpy.lores_add(lm,c,3.0) 
    1616 
    17   #retrieve the points from lores model for sans calculation 
     17  #retrieve the points from lores model for sas calculation 
    1818  vp = pointsmodelpy.new_point3dvec() 
    1919  pointsmodelpy.get_lorespoints(lm,vp) 
    … …  
    3030  from Numeric import arange,zeros 
    3131  from enthought.util.numerix import Float,zeros 
    32   from sansModeling.file2array import readfile2array 
    33   from sansModeling.pointsmodelpy import pointsmodelpy 
    34   from sansModeling.geoshapespy import geoshapespy 
     32  from sasModeling.file2array import readfile2array 
     33  from sasModeling.pointsmodelpy import pointsmodelpy 
     34  from sasModeling.geoshapespy import geoshapespy 
    3535 
    3636  lm = pointsmodelpy.new_loresmodel(0.1) 
    … …  
    7070  from Numeric import arange,zeros 
    7171  from enthought.util.numerix import Float,zeros 
    72   from sansModeling.file2array import readfile2array 
    73   from sansModeling.pointsmodelpy import pointsmodelpy 
    74   from sansModeling.geoshapespy import geoshapespy 
     72  from sasModeling.file2array import readfile2array 
     73  from sasModeling.pointsmodelpy import pointsmodelpy 
     74  from sasModeling.geoshapespy import geoshapespy 
    7575 
    7676  lm = pointsmodelpy.new_loresmodel(0.1) 

  • src/sas/simulation/pointsmodelpy/tests/testnegativepr.py

    r79492222 rb9a5f0e  
    11if __name__ == "__main__": 
    2   from sansModeling.pointsmodelpy import pointsmodelpy 
    3   from sansModeling.iqPy import iqPy 
    4   from sansModeling.geoshapespy import geoshapespy 
     2  from sasModeling.pointsmodelpy import pointsmodelpy 
     3  from sasModeling.iqPy import iqPy 
     4  from sasModeling.geoshapespy import geoshapespy 
    55 
    66  a = geoshapespy.new_sphere(10) 

  • src/sas/simulation/setup.py

    r79492222 rb9a5f0e  
    11""" 
    2  Installation script for SANS models 
     2 Installation script for SAS models 
    33 
    44  - To compile and install: 
    … …  
    2727 
    2828# Top package name 
    29 #pck_top = "sansModeling" 
     29#pck_top = "sasModeling" 
    3030pck_top = "sas.simulation" 
    3131pck_dir = os.path.join("src","sas", "simulation") 
    … …  
    9898 
    9999setup( 
    100     name="sansrealspace_modeling", 
     100    name="sasrealspace_modeling", 
    101101    version = "0.2", 
    102     description = "Python module for SANS simulation", 
     102    description = "Python module for SAS simulation", 
    103103    author = "University of Tennessee", 
    104104    url = "http://danse.us/trac/sas", 
Note: See TracChangeset for help on using the changeset viewer.