Index: .gitignore
===================================================================
--- .gitignore	(revision c155a16ca3fb1da7057f151c62510d780700b9e8)
+++ .gitignore	(revision aaad4c950340dd661ea6ea88902bb2c1a895de57)
@@ -58,4 +58,5 @@
 /test/sasdataloader/test/isis_1_1_write_test.xml
 /test/sasdataloader/test/write_test.xml
+test*log
 
 # autogenerated scripts
Index: .travis.yml
===================================================================
--- .travis.yml	(revision 4636f5795f612185f98f35b02e7ea25990089a28)
+++ .travis.yml	(revision bb1cb3864185c7a8fd1d37303ec729a049faaa07)
@@ -1,81 +1,54 @@
-# 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=
Index: src/sas/sasgui/guiframe/media/data_formats_help.rst
===================================================================
--- src/sas/sasgui/guiframe/media/data_formats_help.rst	(revision 48b8f6d68e3c55ef89958eb0b7b56b22ea3d63d0)
+++ src/sas/sasgui/guiframe/media/data_formats_help.rst	(revision 98c44f371117c50474cf421ea0e45b19c0d87d9e)
@@ -4,4 +4,5 @@
 .. 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,9 +83,11 @@
 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,3 +96,3 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-.. note::  This help document was last changed by Steve King, 07Oct2016
+.. note::  This help document was last changed by Wim Bouwman, 05Apr2017
Index: test/logging.ini
===================================================================
--- test/logging.ini	(revision ebb0a550889ea4bc16f190cdc9a4d6642ceaaabc)
+++ test/logging.ini	(revision aaad4c950340dd661ea6ea88902bb2c1a895de57)
@@ -29,5 +29,5 @@
 level=INFO
 formatter=detailed
-args=(os.path.join(os.path.expanduser("~"),'.sasview/tests.log'),"w")
+args=('tests.log','w')
 
 ###############################################################################
Index: test/run_one.py
===================================================================
--- test/run_one.py	(revision 64ca561b6b264f63b4d7d09a6582f1f3330ae720)
+++ test/run_one.py	(revision aaad4c950340dd661ea6ea88902bb2c1a895de57)
@@ -15,4 +15,7 @@
     logging.config.fileConfig(LOGGER_CONFIG_FILE, disable_existing_loggers=False)
 
+if len(sys.argv) < 2:
+    logger.error("Use %s <filename to test>",sys.argv[0])
+    sys.exit(-1)
 
 run_py = joinpath(dirname(dirname(abspath(__file__))), 'run.py')
Index: test/sasdataloader/test/testLoad.py
===================================================================
--- test/sasdataloader/test/testLoad.py	(revision 463e7ffce130ae386f93cd18b87a1120743e88b5)
+++ test/sasdataloader/test/testLoad.py	(revision aaad4c950340dd661ea6ea88902bb2c1a895de57)
@@ -19,5 +19,5 @@
     HAS_IMAGE = True
 except:
-    print "IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE"
+    logger.info("IMAGE TESTS WILL NOT BE PERFORMED: MISSING PIL MODULE")
     
 import os.path
Index: test/utest_sasview.py
===================================================================
--- test/utest_sasview.py	(revision ebb0a550889ea4bc16f190cdc9a4d6642ceaaabc)
+++ test/utest_sasview.py	(revision aaad4c950340dd661ea6ea88902bb2c1a895de57)
@@ -8,5 +8,4 @@
 import logging.config
 LOGGER_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'logging.ini')
-print LOGGER_CONFIG_FILE
 logging.config.fileConfig(LOGGER_CONFIG_FILE)
 logger = logging.getLogger(__name__)
@@ -50,4 +49,5 @@
             continue
         
+
         # Go through modules looking for unit tests
         module_dir = os.path.join(test_root, d, "test")
