Changeset 4ed199e in sasview for src/sas/sasgui/perspectives


Ignore:
Timestamp:
Oct 8, 2016 3: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 15:22:49)
git-committer:
wpotrzebowski <Wojciech.Potrzebowski@…> (10/08/16 15:29:53)
Message:

Removing an extra Iq evaluation when model is loaded

Location:
src/sas/sasgui/perspectives
Files:
6 edited

Legend:

Unmodified
Added
Removed

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