Changeset 3444492 in sasview

Timestamp:

Apr 5, 2017 11:42:59 AM (8 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

54557b5

Parents:

0d8ee36 (diff), 98c44f3 (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' into batch_slicer

Files:

• .travis.yml (modified) (1 diff)
• src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) (3 diffs)
• src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (11 diffs)
• src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted)
• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) (moved from src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py)
• src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added)

.travis.yml

@@ -1 @@
-# Test Travis CL
-
 language: python
-
 matrix:
   include:
-    - os: linux
-      env:
-        - PY=2.7
-        - NUMPYSPEC=numpy
-    - os: osx
-      language: generic
-      env:
-        - PY=2.7
-        - NUMPYSPEC=numpy
-
-# whitelist
+  - os: linux
+    env:
+    - PY=2.7
+    - NUMPYSPEC=numpy
+  - os: osx
+    language: generic
+    env:
+    - PY=2.7
+    - NUMPYSPEC=numpy
 branches:
   only:
-    - master
-
+  - master
 addons:
   apt:
     packages:
-      - opencl-headers
-      - fglrx
-      - libblas-dev
-      - libatlas-dev
-      - libatlas-base-dev
-      - liblapack-dev
-      - gfortran
-      - libhdf5-serial-dev
-
+    - opencl-headers
+    - fglrx
+    - libblas-dev
+    - libatlas-dev
+    - libatlas-base-dev
+    - liblapack-dev
+    - gfortran
+    - libhdf5-serial-dev
 before_install:
-  - echo $TRAVIS_OS_NAME
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-        sudo apt-get update; sudo apt-get install python-pyopencl;
-    elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-        wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;
-    fi
-
-  - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
-  - hash -r
-  - conda update --yes conda
-
-  # Useful for debugging any issues with conda
-  - conda info -a
-
-  # could install other dependencies, but they're locked to specific
-  # versions in build/requirements.txt
-  - conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
-
+- echo $TRAVIS_OS_NAME
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+  -O miniconda.sh; sudo apt-get update; sudo apt-get install python-pyopencl; elif
+  [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh
+  -O miniconda.sh; fi
+- bash miniconda.sh -b -p $HOME/miniconda
+- export PATH="$HOME/miniconda/bin:$PATH"
+- hash -r
+- conda update --yes conda
+- conda info -a
+- conda install --yes python=$PY $NUMPYSPEC scipy cython pylint wxpython
 install:
-  - pip install -r build_tools/requirements.txt
-  - pip install matplotlib
-
-#before_script:
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-#        "export DISPLAY=:99.0"; "sh -e /etc/init.d/xvfb start"; sleep 3; # give xvfb some time to start
-#    fi
-
+- pip install -r build_tools/requirements.txt
+- pip install matplotlib
 script:
-  - cd ..
-  # this should be the directory above the sasview directory, where we want to
-  # clone the sasmodels
-  - export WORKSPACE=$(pwd)
-  - git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels
-
-  # required for documentation
-  - git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
-
-  - ls -ltr
-  - if [ ! -d "utils" ]; then mkdir utils; fi
-  - /bin/sh -xe sasview/build_tools/travis_build.sh
-  - export LC_ALL=en_US.UTF-8
-  - export LANG=en_US.UTF-8
-#  - python setup.py docs; echo 0
-#  - python setup.py bdist_egg --skip-build
-
+- cd ..
+- export WORKSPACE=$(pwd)
+- git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git sasmodels
+- git clone --depth=50 --branch=master https://github.com/bumps/bumps.git
+- ls -ltr
+- if [ ! -d "utils" ]; then mkdir utils; fi
+- /bin/sh -xe sasview/build_tools/travis_build.sh
+- export LC_ALL=en_US.UTF-8
+- export LANG=en_US.UTF-8
+notifications:
+  slack:
+    secure: TlsEpZiMLmOOgnmdG0I/oB4tq3bbQYeBBQi6S5qLlkYE9EjUTbbfg7oz0JYUsQ56FAsdFR8zswpBsX7PebZerzrq0ZmvfHSiJhOFIdBfY5Nb7bmLW8/9pUNWV57ON/8Gw2fE5ytc7FgvCGR64yb2QISI/150SIUwvdL5HXTxRWI=

src/sas/sasgui/guiframe/media/data_formats_help.rst

@@ -4 +4 @@
 .. 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
+.. WG Bouwman, DUT, updated during CodeCamp-VI in Apr 2017 the SESANS data format
 
 .. _Formats:
@@ -82 +83 @@
 The file format has a list of name-value pairs at the top of the file which detail the general experimental parameters necessary for fitting and analyzing data. This list should contain all the information necessary for the file to be 'portable' between users.
 
-Following the header is a 6 column list of instrument experimental variables:
+Following the header is a 8 (only the first 4 are really needed) column list of instrument experimental variables:
 
 - Spin echo length (z, in Angstroms)
+- depolarization (:math:`log(P/P_0)/(lambda^2 * thickness)`, in Angstrom^-1 cm^-1)
+- depolarization error in the same unit) (measurement error)
 - Spin echo length error (:math:`\Delta`\ z, in Angstroms) (experimental resolution)
-- Neutron wavelength (:math:`\lambda`, in Angstroms) (essential for ToF instruments)
+- Neutron wavelength (:math:`\lambda`, in Angstroms)
 - Neutron wavelength error (:math:`\Delta \lambda`, in Angstroms)
 - Normalized polarization (:math:`P/P_0`, unitless)
@@ -93 +96 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 07Oct2016
+.. note::  This help document was last changed by Wim Bouwman, 05Apr2017

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -359 +359 @@
                 if self.slicer.__class__.__name__ != "BoxSum":
                     wx_id = ids.next()
-                    slicerpop.Append(wx_id, '&Edit Slicer Parameters')
+                    name = '&Edit Slicer Parameters and Batch Slicing'
+                    slicerpop.Append(wx_id, name)
                     wx.EVT_MENU(self, wx_id, self._onEditSlicer)
             slicerpop.AppendSeparator()
@@ -530 +531 @@
 
         """
-        ## Clear current slicer
+        # Clear current slicer
         if not self.slicer == None:
             self.slicer.clear()
-        ## Create a new slicer
+        # Create a new slicer
         self.slicer_z += 1
         self.slicer = slicer(self, self.subplot, zorder=self.slicer_z)
         self.subplot.set_ylim(self.data2D.ymin, self.data2D.ymax)
         self.subplot.set_xlim(self.data2D.xmin, self.data2D.xmax)
-        ## Draw slicer
+        # Draw slicer
         self.update()
         self.slicer.update()
@@ -570 +571 @@
         npt = math.floor(npt)
         from sas.sascalc.dataloader.manipulations import CircularAverage
-        ## compute the maximum radius of data2D
+        # compute the maximum radius of data2D
         self.qmax = max(math.fabs(self.data2D.xmax),
                         math.fabs(self.data2D.xmin))
@@ -576 +577 @@
                         math.fabs(self.data2D.ymin))
         self.radius = math.sqrt(math.pow(self.qmax, 2) + math.pow(self.ymax, 2))
-        ##Compute beam width
+        # Compute beam width
         bin_width = (self.qmax + self.qmax) / npt
-        ## Create data1D circular average of data2D
+        # Create data1D circular average of data2D
         Circle = CircularAverage(r_min=0, r_max=self.radius,
                                  bin_width=bin_width)
@@ -597 +598 @@
         new_plot.name = "Circ avg " + self.data2D.name
         new_plot.source = self.data2D.source
-        #new_plot.info = self.data2D.info
+        # new_plot.info = self.data2D.info
         new_plot.interactive = True
         new_plot.detector = self.data2D.detector
 
-        ## If the data file does not tell us what the axes are, just assume...
+        # If the data file does not tell us what the axes are, just assume...
         new_plot.xaxis("\\rm{Q}", "A^{-1}")
         if hasattr(self.data2D, "scale") and \
@@ -613 +614 @@
         new_plot.id = "Circ avg " + self.data2D.name
         new_plot.is_data = True
-        self.parent.update_theory(data_id=self.data2D.id, \
-                                       theory=new_plot)
+        self.parent.update_theory(data_id=self.data2D.id, theory=new_plot)
         wx.PostEvent(self.parent,
                      NewPlotEvent(plot=new_plot, title=new_plot.name))
@@ -627 +627 @@
 
         """
-        if self.slicer != None:
-            from SlicerParameters import SlicerParameterPanel
+        if self.slicer is not None:
+            from parameters_panel_slicer import SlicerParameterPanel
             dialog = SlicerParameterPanel(self, -1, "Slicer Parameters")
             dialog.set_slicer(self.slicer.__class__.__name__,
@@ -666 +666 @@
         params = self.slicer.get_params()
         ## Create a new panel to display results of summation of Data2D
-        from slicerpanel import SlicerPanel
+        from parameters_panel_boxsum import SlicerPanel
         win = MDIFrame(self.parent, None, 'None', (100, 200))
         new_panel = SlicerPanel(parent=win, id=-1,
@@ -717 +717 @@
         Clear the slicer on the plot
         """
-        if not self.slicer == None:
+        if self.slicer is not None:
             self.slicer.clear()
             self.subplot.figure.canvas.draw()
@@ -733 +733 @@
         """
         event_id = str(evt.GetId())
-        if self.parent != None:
+        if self.parent is not None:
             self._default_save_location = self.parent._default_save_location
         default_name = self.plots[self.graph.selected_plottable].label
@@ -756 +756 @@
         if default_name.count('.') > 0:
             default_name = default_name.split('.')[0]
-        #default_name += "_out"
-        if self.parent != None:
+        if self.parent is not None:
             self.parent.show_data2d(data, default_name)
 
     def modifyGraphAppearance(self, e):
-        self.graphApp = graphAppearance(self, 'Modify graph appearance', legend=False)
+        self.graphApp = graphAppearance(self, 'Modify graph appearance',
+                                        legend=False)
         self.graphApp.setDefaults(self.grid_on, self.legend_on,
                                   self.xaxis_label, self.yaxis_label,