Changeset b9c94fa in sasview


Ignore:
Timestamp:
Oct 5, 2016 4:36:14 PM (5 years ago)
Author:
ajj
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:
44c0746, b61bd57, ec860a8f
Parents:
3fac0df (diff), 6673d2f (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.
Message:

Merge branch 'master' of https://github.com/SasView/sasview

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • docs/sphinx-docs/source/user/opencl_installation.rst

    r6e0c7b2 r6673d2f  
    1414 
    1515    * Go to: Start -> Control Panel -> Administrative Tools 
    16     * Double Click on Computer Managment 
     16    * Double Click on Computer Management 
    1717    * Click on Device Manager 
    1818    * Click open Display Adapters 
     
    3232Windows 
    3333========= 
    34     Depeneding on the graphic card on your system, drivers 
     34    Depending on the graphic card on your system, drivers 
    3535    can be obtained from different sources: 
    3636 
  • docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst

    r49148bb r756f288  
    33.. This is a port of the original SasView html help file to ReSTructured text 
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
     5.. WG Bouwman, DUT, added during CodeCamp-V in Oct 2016 the SESANS data format 
    56 
    67.. _Formats: 
     
    910============ 
    1011 
    11 SasView reads several different 1D (I(Q) vs Q) and 2D (I(Qx,Qy) vs (Qx,Qy)) 
     12SasView reads several different 1D (I(Q) vs Q), 2D SANS(I(Qx,Qy) vs (Qx,Qy)) 
     13and SESANS (P(z) vs z) 
    1214data files. But please note that SasView does not at present load data where 
    1315the Q and I(Q) data are in separate files. 
    1416 
    15 1D Formats 
    16 ---------- 
     171D Formats SANS 
     18--------------- 
    1719 
    1820SasView will read files with 2 to 4 columns of numbers in the following order:  
     
    4648.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    4749 
    48 2D Formats 
    49 ---------- 
     502D Formats SANS 
     51--------------- 
    5052 
    5153SasView will only read files in the NIST 2D format with the extensions  
     
    6062.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    6163 
    62 .. note::  This help document was last changed by Steve King, 01May2015 
     64Format SESANS 
     65--------------- 
     66 
     67The current file extension is .ses or .sesans (not case sensitive). 
     68 
     69The file format is to have a list of name-value pairs as a header at the top of the file, detailing general experimental parameters necessary for fitting and analyzing data. This list should contain all information necessary for the file to be 'portable' between users. 
     70 
     71Following that is a 6 column list of instrument experimental variables: 
     72 
     73- Spin echo length (z, in Angstroms) 
     74- Spin echo length error (:math:`\Delta` z, in Angstroms) (experimental resolution) 
     75- neutron wavelength (:math:`\lambda`, in Angstroms) (essential for ToF instruments) 
     76- neutron wavelength error (:math:`\Delta \lambda`, in Angstroms) 
     77- Normalized polarization (:math:`P/P_0`, unitless) 
     78- Normalized polarization error (:math:`\Delta(P/P_0)`, unitless) (measurement error) 
     79 
     80 
     81.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     82 
     83.. note::  This help document was last changed by Wim Bouwman, 05Oct2016 
  • docs/sphinx-docs/source/user/user.rst

    r20a3c55 rbdae317  
    77   :maxdepth: 1 
    88 
    9    SasView Model Documentation <index> 
     9   Model Documentation <index> 
     10    
     11   Menu Bar <menu_bar> 
    1012 
    1113   Analysis <analysis> 
     
    1416          
    1517   Working with SasView <working> 
    16  
    17    Computations with GPU <gpu_computations> 
  • docs/sphinx-docs/source/user/working.rst

    r3a6b10d rc43953ef  
    1616       
    1717   Tutorial <tutorial.rst> 
     18    
     19   Computations with a GPU <gpu_computations> 
     20    
  • src/sas/sasgui/perspectives/fitting/media/plugin.rst

    re925f61 rcbbb6a4  
    4848- If necessary use underscore to separate words (i.e. barbell not BarBell or 
    4949  broad_peak not BroadPeak) 
    50 - Do not include “model” in the name (i.e. barbell not BarBellModel) 
     50- Do not include “modelâ€ᅵ in the name (i.e. barbell not BarBellModel) 
    5151 
    5252 
     
    644644- a dictionary of parameter values. This can be {} using the default 
    645645  parameters, or filled with some parameters that will be different 
    646   from the default, such as {‘radius’:10.0, ‘sld’:4}. Unlisted parameters 
     646  from the default, such as {‘radius’:10.0, ‘sld’:4}. Unlisted parameters 
    647647  will be given the default values. 
    648648- the input $q$ value or tuple of $(q_x, q_y)$ values. 
     
    664664 
    665665If you are editing your model from the SasView GUI, you can test it 
    666 by selecting *Run > Compile* from the *Model Editor* menu bar. An 
     666by selecting *Run > Check Model* from the *Model Editor* menu bar. An 
    667667*Info* box will appear with the results of the compilation and a 
    668668check that the model runs. 
  • src/sas/sasgui/guiframe/gui_manager.py

    rc8a641e8 r3fac0df  
    13451345        self._help_menu.Append(wx_id, '&Documentation', '') 
    13461346        wx.EVT_MENU(self, wx_id, self._onSphinxDocs) 
     1347        self._help_menu.AppendSeparator() 
    13471348 
    13481349        if config._do_tutorial and (IS_WIN or sys.platform == 'darwin'): 
    1349             self._help_menu.AppendSeparator() 
    13501350            wx_id = wx.NewId() 
    13511351            self._help_menu.Append(wx_id, '&Tutorial', 'Software tutorial') 
    13521352            wx.EVT_MENU(self, wx_id, self._onTutorial) 
     1353            self._help_menu.AppendSeparator() 
     1354 
    13531355 
    13541356        if config._do_acknowledge: 
    1355             self._help_menu.AppendSeparator() 
    13561357            wx_id = wx.NewId() 
    13571358            self._help_menu.Append(wx_id, '&Acknowledge', 'Acknowledging SasView') 
    13581359            wx.EVT_MENU(self, wx_id, self._onAcknowledge) 
     1360            self._help_menu.AppendSeparator() 
     1361 
    13591362 
    13601363        if config._do_aboutbox: 
     1364            logging.info("Doing help menu") 
     1365            wx_id = wx.NewId() 
     1366            self._help_menu.Append(wx_id, '&About', 'Software information') 
     1367            wx.EVT_MENU(self, wx_id, self._onAbout) 
    13611368            self._help_menu.AppendSeparator() 
    1362             self._help_menu.Append(wx.ID_ABOUT, '&About', 'Software information') 
    1363             wx.EVT_MENU(self, wx.ID_ABOUT, self._onAbout) 
     1369 
    13641370 
    13651371        # Checking for updates 
Note: See TracChangeset for help on using the changeset viewer.