custom config loading from easyleedconfig on path

changelog

@@ -1,15 +1,23 @@
 Changelog
 ==========
 
+Version 2.3.4
+-------------
+
+(Jan Lachnitt):
+- preserve order and numbering of spots everywhere
+- load config from current directory
+
 Version 2.3.3
 -------------
 
 (Jan Lachnitt):
 - fix to open/save with Qt4
 - fix for 16-bit images
 - more robust default regex for energy in filename
-- preserve order and numbering of spots everywhere
-- load config from current directory
+
+(AM):
+- bug fixes to plotting and parameter import/export
 
 Version 2.3.2
 -------------

doc/source/userdoc.rst

@@ -54,7 +54,7 @@ You can change the regular expression that is used for parsing energies from fil
 Custom configuration
 --------------------
 
-Most of the default parameters of the algorithm as well as many UI tweaks are controlled via a config file. Copy `easyleed/default-config.py` to `config.py` and edit this file (it takes precedence over the former file) for customization.
+Most of the default parameters of the algorithm as well as many UI tweaks are controlled via a config file. Copy `easyleed/default-config.py` to a file named `easyleedconfig.py` on your PYTHONPATH and edit this file for customization. 
 
 Qt Wrapper
 ----------

source/easyleed/__init__.py

@@ -20,21 +20,14 @@
 
 """
 
-__version__ = "2.3.3"
+__version__ = "2.3.4"
 __author__ = "Andreas Mayer, Hanna Salopaasi, Nicola Ferralis"
 
 # import packages
-# order of loading is important and should not be changed
-import sys
-sys.path.append('.')
 try:
-    import config
+    import easyleedconfig as config
 except:
-    sys.path.append('..')
-    try:
-        import config
-    except:
-        from . import defaultconfig as config
+    from . import defaultconfig as config
 
 import logging
 logging.basicConfig(filename=config.loggingFilename, level=config.loggingLevel)

source/setup.py

@@ -6,7 +6,7 @@
     requires=['numpy', 'matplotlib', 'scipy', 'pillow', 'pyqt4'],
 #    scripts=['easyleed.pyw'],
     entry_points={'gui_scripts' : ['easyleed = easyleed.__main__:main']},
-    version='2.3.3',
+    version='2.3.4',
     description='Automated extraction of intensity-energy spectra from low-energy electron diffraction patterns',
     long_description= """
 EasyLEED facilitates data analysis of images obtained by low-energy electron diffraction, a common technique in surface science. It aims to automate the process of extracting intensity-energy spectra from a series of diffraction patterns acquired at different beam energies. At its core a tracking algorithm exploiting the specifics of the underlying physics (see `paper <http://dx.doi.org/10.1016/j.cpc.2012.02.019>`_) allows to link the position of the diffraction maxima between subsequent images.
@@ -16,7 +16,7 @@
     author='Andreas Mayer, Hanna Salopaasi, Nicola Ferralis',
     author_email='[email protected]',
     url='https://andim.github.io/easyleed/',
-    download_url='https://github.com/andim/easyleed/archive/2.3.3.tar.gz',
+    download_url='https://github.com/andim/easyleed/archive/2.3.4.tar.gz',
     keywords=['LEED', 'surface science', 'image analysis', 'I(E) spectra', 'spot tracking'],
     license='GPLv2',
     platforms='any',