Changeset b9c94fa in sasview

Timestamp:

Oct 5, 2016 4:36:14 PM (8 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:

• docs/sphinx-docs/source/user/opencl_installation.rst (modified) (2 diffs)
• docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (modified) (4 diffs)
• docs/sphinx-docs/source/user/user.rst (modified) (2 diffs)
• docs/sphinx-docs/source/user/working.rst (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) (3 diffs)
• src/sas/sasgui/guiframe/gui_manager.py (modified) (1 diff)

docs/sphinx-docs/source/user/opencl_installation.rst

@@ -14 +14 @@
 
     * Go to: Start -> Control Panel -> Administrative Tools
-    * Double Click on Computer Managment
+    * Double Click on Computer Management
     * Click on Device Manager
     * Click open Display Adapters
@@ -32 +32 @@
 Windows
 =========
-    Depeneding on the graphic card on your system, drivers
+    Depending on the graphic card on your system, drivers
     can be obtained from different sources:
 

docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst

@@ -3 +3 @@
 .. This is a port of the original SasView html help file to ReSTructured text
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
+.. WG Bouwman, DUT, added during CodeCamp-V in Oct 2016 the SESANS data format
 
 .. _Formats:
@@ -9 +10 @@
 ============
 
-SasView reads several different 1D (I(Q) vs Q) and 2D (I(Qx,Qy) vs (Qx,Qy))
+SasView reads several different 1D (I(Q) vs Q), 2D SANS(I(Qx,Qy) vs (Qx,Qy))
+and SESANS (P(z) vs z)
 data files. But please note that SasView does not at present load data where
 the Q and I(Q) data are in separate files.
 
-1D Formats
-----------
+1D Formats SANS
+---------------
 
 SasView will read files with 2 to 4 columns of numbers in the following order: 
@@ -46 +48 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-2D Formats
-----------
+2D Formats SANS
+---------------
 
 SasView will only read files in the NIST 2D format with the extensions 
@@ -60 +62 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 01May2015
+Format SESANS
+---------------
+
+The current file extension is .ses or .sesans (not case sensitive).
+
+The 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.
+
+Following that is a 6 column list of instrument experimental variables:
+
+- Spin echo length (z, in Angstroms)
+- Spin echo length error (:math:`\Delta` z, in Angstroms) (experimental resolution)
+- neutron wavelength (:math:`\lambda`, in Angstroms) (essential for ToF instruments)
+- neutron wavelength error (:math:`\Delta \lambda`, in Angstroms)
+- Normalized polarization (:math:`P/P_0`, unitless)
+- Normalized polarization error (:math:`\Delta(P/P_0)`, unitless) (measurement error)
+
+
+.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
+
+.. note::  This help document was last changed by Wim Bouwman, 05Oct2016

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

@@ -7 +7 @@
    :maxdepth: 1
 
-   SasView Model Documentation <index>
+   Model Documentation <index>
+   
+   Menu Bar <menu_bar>
 
    Analysis <analysis>
@@ -14 +16 @@
          
    Working with SasView <working>
-
-   Computations with GPU <gpu_computations>

docs/sphinx-docs/source/user/working.rst

@@ -16 +16 @@
       
    Tutorial <tutorial.rst>
+   
+   Computations with a GPU <gpu_computations>
+   

src/sas/sasgui/perspectives/fitting/media/plugin.rst

@@ -48 +48 @@
 - If necessary use underscore to separate words (i.e. barbell not BarBell or
   broad_peak not BroadPeak)
-- Do not include “model” in the name (i.e. barbell not BarBellModel)
+- Do not include “modelâ€ￜ in the name (i.e. barbell not BarBellModel)
 
 
@@ -644 +644 @@
 - a dictionary of parameter values. This can be {} using the default
   parameters, or filled with some parameters that will be different
-  from the default, such as {‘radius’:10.0, ‘sld’:4}. Unlisted parameters
+  from the default, such as {‘radius’:10.0, ‘sld’:4}. Unlisted parameters
   will be given the default values.
 - the input $q$ value or tuple of $(q_x, q_y)$ values.
@@ -664 +664 @@
 
 If you are editing your model from the SasView GUI, you can test it
-by selecting *Run > Compile* from the *Model Editor* menu bar. An
+by selecting *Run > Check Model* from the *Model Editor* menu bar. An
 *Info* box will appear with the results of the compilation and a
 check that the model runs.

src/sas/sasgui/guiframe/gui_manager.py

@@ -1345 +1345 @@
         self._help_menu.Append(wx_id, '&Documentation', '')
         wx.EVT_MENU(self, wx_id, self._onSphinxDocs)
+        self._help_menu.AppendSeparator()
 
         if config._do_tutorial and (IS_WIN or sys.platform == 'darwin'):
-            self._help_menu.AppendSeparator()
             wx_id = wx.NewId()
             self._help_menu.Append(wx_id, '&Tutorial', 'Software tutorial')
             wx.EVT_MENU(self, wx_id, self._onTutorial)
+            self._help_menu.AppendSeparator()
+
 
         if config._do_acknowledge:
-            self._help_menu.AppendSeparator()
             wx_id = wx.NewId()
             self._help_menu.Append(wx_id, '&Acknowledge', 'Acknowledging SasView')
             wx.EVT_MENU(self, wx_id, self._onAcknowledge)
+            self._help_menu.AppendSeparator()
+
 
         if config._do_aboutbox:
+            logging.info("Doing help menu")
+            wx_id = wx.NewId()
+            self._help_menu.Append(wx_id, '&About', 'Software information')
+            wx.EVT_MENU(self, wx_id, self._onAbout)
             self._help_menu.AppendSeparator()
-            self._help_menu.Append(wx.ID_ABOUT, '&About', 'Software information')
-            wx.EVT_MENU(self, wx.ID_ABOUT, self._onAbout)
+
 
         # Checking for updates