Changeset 4ed199e in sasview


Ignore:
Timestamp:
Oct 8, 2016 1:29:53 PM (8 years ago)
Author:
wojciech
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
1404cce
Parents:
47f2b5d (diff), b4818d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
wpotrzebowski <Wojciech.Potrzebowski@…> (10/08/16 13:22:49)
git-committer:
wpotrzebowski <Wojciech.Potrzebowski@…> (10/08/16 13:29:53)
Message:

Removing an extra Iq evaluation when model is loaded

Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/source/user/tools.rst

    r0639476 r3150541  
    1111   Data Operations Utility <sasgui/perspectives/calculator/data_operator_help> 
    1212 
     13   SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help> 
     14 
    1315   Density/Volume Calculator <sasgui/perspectives/calculator/density_calculator_help> 
     16 
     17   Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help> 
     18 
     19   Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help> 
     20 
     21   Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help> 
    1422 
    1523   Generic SANS Calculator <sasgui/perspectives/calculator/sas_calculator_help> 
    1624 
     25   Python Shell <sasgui/perspectives/calculator/python_shell_help> 
     26 
    1727   Image Viewer <sasgui/perspectives/calculator/image_viewer_help> 
    1828 
    19    Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help> 
    20  
    21    SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help> 
    22  
    23    Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help> 
    24  
    25    Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help> 
    26  
    27    Python Shell <sasgui/perspectives/calculator/python_shell_help> 
    28  
    2929   File Converter <sasgui/perspectives/file_converter/file_converter_help> 
     30    

  • sasview/setup_mac.py

    r3d8e3c7 rb58654c  
    6262 
    6363APP = ['sasview.py'] 
    64 DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py', 
    65                'default_categories.json'] 
     64DATA_FILES += ['images','test','media', 'custom_config.py', 'local_config.py'] 
    6665if os.path.isfile("BUILD_NUMBER"): 
    6766    DATA_FILES.append("BUILD_NUMBER") 

  • sasview/test/README.txt

    r850a498 r3f9a18a  
    11Test data sets are included as a convenience to our users. The data sets are organized based on their data structure; 1D data (ie, I(Q)), 2D data (ie, I(Qx,Qy)), coordinate data (eg, PDB files), image data (eg, TIFF files), SasView saved states, SESANS data, and data in formats that are not yet implemented but which are in the works for future releases. 
    22 
    3 1D data sets EITHER a) have at least two columns of data with I(abs. units) on the y-axis and Q on the x-axis, OR b) have I and Q in separate files. Data in the latter format need to be converted to a single file format with the File Converter tool before SasView will analyse them. 
     31D data sets EITHER a) have at least two columns of data with I(abs. units) on the y-axis and Q on the x-axis, OR b) have I and Q in separate files. Data in the latter format (/convertible_files) need to be converted to a single file format with the File Converter tool before SasView will analyse them. 
    44 
    552D data sets are data sets that give the deduced intensity for each detector pixel. Depending on the file extension, uncertainty and metadata may also be available. 

  • sasview/test/media/testdata_help.rst

    rda456fb r3f9a18a  
    1010 
    1111- *1D data* 
     12- *convertible 1D data files* 
    1213- *2D data* 
    1314- *coordinate data* 
    … …  
    2930- the I(Q) and Q data in separate files *with no other information*. 
    3031 
    31 Data in the latter format need to be converted to a single file format with the :ref:`File_Converter_Tool` before they can be analysed in SasView. 
     32Data in the latter format need to be converted to a single file format with the :ref:`File_Converter_Tool` before they can be analysed in SasView. Test files are located in the /convertible_files folder. 
    3233 
    33341D Test Data 
    … …  
    3637  - Data from a magnetically-oriented surfactant liquid crystal output by the Mantid framework. The data was collected on the SANS2D instrument at ISIS. 
    3738 
    38 10wtAOT_Reline_120_reduced / Anton-Paar_PDH / saxsess_example 
     3910wtAOT_Reline_120_reduced / Anton-Paar / saxsess_example 
    3940  - Data from Anton-Paar SAXSess instruments saved in Otto Glatter's PDH format. 
    4041   
    … …  
    4849  - ASCII data from the DND-CAT beamline at the APS. 
    4950 
    50 APS_X / APS_Y 
    51   - ASCII data output by a reduction software package at the APS. 
    52   - Suitable for testing the :ref:`File_Converter_Tool` . 
    53  
    54 FIT2D_I / FIT2D_Q 
    55   - ASCII data output by the FIT2D software package at the ESRF. 
    56   - Suitable for testing the :ref:`File_Converter_Tool` . 
    57  
    5851hSDS_D2O 
    5952  - h25-sodium dodecyl sulphate solutions at two concentrations: 0.5wt% (just  
    … …  
    6457ISIS_83404 / ISIS_98929 
    6558  - Polyamide-6 fibres hydrated in D2O exhibiting a broad lamellar peak from the semi-crystalline nanostructure. 
    66   - This is the *same data* as that in Z8300* / Z9800* but in an amalgamated ASCII format! 
     59  - This is the *same data* as that in the BSL/OTOKO Z8300* / Z9800* files but in an amalgamated ASCII format! 
    6760  - Suitable for testing :ref:`Correlation_Function_Analysis` . 
    6861 
    … …  
    7669    Pluronic P123 in water at three concentrations: 10wt%, 30wt%, and 40wt%. 
    7770  - Suitable for testing paracrystal models. 
     71 
     72.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     73 
     74Convertible 1D Data 
     75^^^^^^^^^^^^^^^^^^^ 
     76 
     77APS_X / APS_Y 
     78  - ASCII data output by a reduction software package at the APS. 
     79  - Suitable for testing the :ref:`File_Converter_Tool` . 
     80 
     81FIT2D_I / FIT2D_Q 
     82  - ASCII data output by the FIT2D software package at the ESRF. 
     83  - Suitable for testing the :ref:`File_Converter_Tool` . 
    7884 
    7985Z8300*.I1D / Z8300*.QAX / Z9800*.I1D / Z9800*.QAX 

  • src/sas/sasgui/guiframe/gui_manager.py

    r95eef00 ra4c2445  
    677677        update edit menu if available 
    678678        """ 
    679         if event != None: 
     679        if event is not None: 
    680680            self.panel_on_focus = event.panel 
    681681        if self.panel_on_focus is not None: 
    682             #Disable save application if the current panel is in batch mode 
    683             flag = self.panel_on_focus.get_save_flag() 
    684             if self._save_appl_menu != None: 
    685                 self._save_appl_menu.Enable(flag) 
    686  
    687             if self.panel_on_focus not in self.plot_panels.values(): 
    688                 for ID in self.panels.keys(): 
    689                     if self.panel_on_focus != self.panels[ID]: 
    690                         self.panels[ID].on_kill_focus(None) 
    691  
    692             if self._data_panel is not None and \ 
    693                             self.panel_on_focus is not None: 
    694                 self.set_panel_on_focus_helper() 
    695                 #update toolbar 
    696                 self._update_toolbar_helper() 
    697                 #update edit menu 
    698                 self.enable_edit_menu() 
     682            # Disable save application if the current panel is in batch mode 
     683            try: 
     684                flag = self.panel_on_focus.get_save_flag() 
     685                if self._save_appl_menu != None: 
     686                    self._save_appl_menu.Enable(flag) 
     687 
     688                if self.panel_on_focus not in self.plot_panels.values(): 
     689                    for ID in self.panels.keys(): 
     690                        if self.panel_on_focus != self.panels[ID]: 
     691                            self.panels[ID].on_kill_focus(None) 
     692 
     693                if self._data_panel is not None and \ 
     694                                self.panel_on_focus is not None: 
     695                    self.set_panel_on_focus_helper() 
     696                    #update toolbar 
     697                    self._update_toolbar_helper() 
     698                    #update edit menu 
     699                    self.enable_edit_menu() 
     700            except wx._core.PyDeadObjectError: 
     701                pass 
    699702 
    700703    def disable_app_menu(self, p_panel=None): 
    … …  
    19041907    def _on_open_state_project(self, event): 
    19051908        """ 
     1909        Load in a .svs project file after removing all data from SasView 
    19061910        """ 
    19071911        path = None 
    19081912        if self._default_save_location == None: 
    19091913            self._default_save_location = os.getcwd() 
    1910         msg = "This operation will set SasView to its freshly opened state " 
    1911         msg += "before loading the project. Do you wish to continue?" 
     1914        msg = "This operation will set remove all data, plots and analyses from" 
     1915        msg += " SasView before loading the project. Do you wish to continue?" 
     1916        self._data_panel.selection_cbox.SetValue('Select all Data') 
     1917        self._data_panel._on_selection_type(None) 
     1918        for _, theory_dict in self._data_panel.list_cb_theory.iteritems(): 
     1919            for  key, value in theory_dict.iteritems(): 
     1920                item, _, _ = value 
     1921                item.Check(True) 
    19121922        if not self._data_panel.on_remove(None, msg): 
    19131923            wx.PostEvent(self, StatusEvent(status="Loading Project file...")) 
    … …  
    19341944        self._data_panel.set_panel_on_focus() 
    19351945        # Remove all loaded data 
    1936         self._data_panel.selection_cbox.SetValue('Select all Data') 
    1937         self._data_panel._on_selection_type(None) 
    19381946        for plugin in self.plugins: 
    19391947            plugin.clear_panel() 

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

    rd85c194 ra0c1e1d  
    8080                ("Kiessig Thickness Calculator", 
    8181                        kiessig_help, self.on_calculate_kiessig), 
    82                           ("SAS Resolution Estimator", 
     82                          ("Q Resolution Estimator", 
    8383                        resolution_help, self.on_calculate_resoltuion), 
    8484                ("Generic Scattering Calculator", 

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

    rf1cbae7 r0912b405  
    231231        if result.path: 
    232232            self.bufferCreate(result.path) 
     233 
     234        # See if there is a corresponding C file 
     235        if result.path != None: 
     236            c_filename = os.path.splitext(result.path)[0] + ".c" 
     237            if os.path.isfile(c_filename): 
     238                self.bufferCreate(c_filename) 
     239 
    233240        cancel = False 
    234241        return cancel 

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

    rd0248bd ra0c1e1d  
    6363    """ 
    6464    ## Internal nickname for the window, used by the AUI manager 
    65     window_name = "SAS Resolution Estimator" 
     65    window_name = "Q Resolution Estimator" 
    6666    ## Name to appear on the window title bar 
    6767    window_caption = "" 
    … …  
    13291329    """ 
    13301330    def __init__(self, parent=None, manager=None, 
    1331                  title="SAS Resolution Estimator", 
     1331                 title="Q Resolution Estimator", 
    13321332                 size=(PANEL_WIDTH * 2, PANEL_HEIGHT), *args, **kwds): 
    13331333        kwds['title'] = title 

  • src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst

    rda456fb rd73998c  
    99----------- 
    1010 
    11 This tool converts file formats with the Q data and intensity data in separate 
    12 files, into a single CanSAS XML or NXcanSAS HDF5 file. 
     11This tool converts file formats with the Q data and Intensity data stored in separate 
     12files, into a single CanSAS (XML) or NXcanSAS (HDF5) file. 
    1313 
    14 It can also convert 2D BSL files into NXcanSAS HDF5 files. 
     14It can also convert 2D BSL/OTOKO files into a NXcanSAS file. 
    1515 
    16 Supported input file formats: 
     16Supported input file formats (examples may be found in the /test/convertible_files folder): 
    1717 
    18 *   Single column ASCII data, with lines that end with a digit (no delimiter), 
    19     comma or semi-colon. 
    20 *   `One-Dimensional OTOKO formatted 
     18*   Single-column ASCII data, with lines that end without any delimiter, 
     19    or with a comma or semi-colon delimiter 
     20*   `1D BSL/OTOKO format 
    2121    <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/ 
    22     SAXS-Software/CCP13/XOTOKO.html>`_ data. 
    23 *   `Two-Dimensional BSL formatted 
     22    SAXS-Software/CCP13/BSL.html>`_ data 
     23*   `2D BSL/OTOKO format 
    2424    <http://www.diamond.ac.uk/Beamlines/Soft-Condensed-Matter/small-angle/ 
    25     SAXS-Software/CCP13/BSL.html>`_ data. 
     25    SAXS-Software/CCP13/BSL.html>`_ data 
    2626 
    27 Supported output file formats@ 
     27Supported output file formats: 
    2828 
    29 *   `CanSAS XML <http://www.cansas.org/formats/canSAS1d/1.1/doc/>`_ 
    30 *   `NXcanSAS HDF5 <http://download.nexusformat.org/sphinx/classes/contributed_definitions/NXcanSAS.html>`_ 
     29*   `CanSAS <http://www.cansas.org/formats/canSAS1d/1.1/doc/>`_ 
     30*   `NXcanSAS <http://download.nexusformat.org/sphinx/classes/contributed_definitions/NXcanSAS.html>`_ 
    3131 
    3232.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    … …  
    3535-------------- 
    3636 
    37 1) Select the files containing your Q-Axis and Intensity-Axis data 
    38 2) Chose whether the files are in ASCII, OTOKO or BSL format 
    39 3) Chose where you would like to save the converted file 
     371) Select the files containing your Q-axis and Intensity-axis data 
     382) Choose whether the files are in ASCII, 1D BSL/OTOKO or 2D BSL/OTOKO format 
     393) Choose where you would like to save the converted file 
    40404) Optionally, input some metadata such as sample size, detector name, etc 
    41 5) Click *Convert* to save the converted file to disk 
     415) Click *Convert* to save the converted file 
    4242 
    4343Files With Multiple Frames 
    4444^^^^^^^^^^^^^^^^^^^^^^^^^^ 
    4545 
    46 If a BSL/OTOKO file with multiple frames is selected for the intensity-axis 
     46If a BSL/OTOKO file with multiple frames is selected for the Intensity-axis 
    4747file, a dialog will appear asking which frames you would like converted. You 
    4848may enter a start frame, end frame & increment, and all frames in that subset 
    49 will be converted. For example: entering 0, 50 and 10 for the first frame, last 
    50 frame, and increment respectively will convert frames 0, 10, 20, 30, 40 & 50. 
     49will be converted. For example, entering 0, 50 and 10 will convert frames 0,  
     5010, 20, 30, 40 & 50. 
     51 
    5152To convert a single frame, enter the same value for first frame & last frame, 
    5253and 1 as the increment. 
    … …  
    5455CanSAS XML files can become quite large when exporting multiple frames to a 
    5556single file, so there is an option in the *Select Frame* dialog to output each 
    56 frame to it's own file. The single file option will produce one file with 
    57 multiple `<SASdata>` elements. The multiple file option will output a file for 
    58 each frame; each file will have one `<SASdata>` element, and the frame number 
    59 will appended to the file name. 
     57frame to its own file. The single file option will produce one file with 
     58multiple `<SASdata>` elements. The multiple file option will output a separate  
     59file with one `<SASdata>` element for each frame. The frame number will also be  
     60appended to the file name. 
    6061 
    61 The multiple file option is not available when exporting to NXcanSAS. All 
    62 frames will be written to the same file, since the HDF5 format is designed for 
    63 handling large amounts of data. 
     62The multiple file option is not available when exporting to NXcanSAS because  
     63the HDF5 format is more efficient at handling large amounts of data. 
     64 
     65 
     66.. note:: 
     67    This help document was last changed by Steve King, 08Oct2016 

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

    r47f2b5d r4ed199e  
    514514    def initialize_combox(self): 
    515515        """ 
    516         put default value in the combobox 
    517         """ 
    518         ## fill combox box 
    519         if self.model_list_box is None: 
    520             return 
    521         if len(self.model_list_box) > 0: 
     516        put default value in the combo box 
     517        """ 
     518        if self.model_list_box is not None and len(self.model_list_box) > 0: 
    522519            self._populate_box(self.structurebox, 
    523520                               self.model_list_box["Structure Factors"]) 
    … …  
    528525            self.structurebox.Disable() 
    529526            self.text2.Disable() 
    530  
    531             if self.model.__class__ in self.model_list_box["P(Q)*S(Q)"]: 
    532                 self.structurebox.Show() 
    533                 self.text2.Show() 
    534                 self.structurebox.Enable() 
    535                 self.text2.Enable() 
    536527 
    537528    def set_dispers_sizer(self): 
    … …  
    19621953            form_factor = self.formfactorbox.GetClientData(f_id) 
    19631954 
    1964         if not form_factor in  self.model_list_box["multiplication"]: 
     1955        if form_factor is None or not form_factor.is_form_factor: 
    19651956            self.structurebox.Hide() 
    19661957            self.text2.Hide() 

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

    r4c3be25 rb4818d9  
    364364        self.Bind(wx.EVT_RADIOBUTTON, self.onSlitSmear, 
    365365                  id=self.slit_smearer.GetId()) 
    366         self.disable_smearer.SetValue(True) 
     366        self.enable_smearer.SetValue(True) 
    367367 
    368368        sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10) 
Note: See TracChangeset for help on using the changeset viewer.