Merge branch 'develop' of ariadne.geophysik.ruhr-uni-bochum.de:/data/git/pylot into develop

PyLoT.py

@@ -43,7 +43,7 @@ from PySide.QtGui import QMainWindow, QInputDialog, QIcon, QFileDialog, \
     QActionGroup, QListWidget, QListView, QAbstractItemView, \
     QTreeView, QComboBox, QTabWidget, QPushButton, QGridLayout
 import numpy as np
-from obspy import UTCDateTime
+from obspy import UTCDateTime, read_events
 from obspy.core.event import Magnitude, Origin
 from obspy.core.util import AttribDict
 
@@ -1088,7 +1088,7 @@ class MainWindow(QMainWindow):
             self.createNewProject()
         ed = getExistingDirectories(self, 'Select event directories...')
         if ed.exec_():
-            eventlist = ed.selectedFiles()
+            eventlist = [event for event in ed.selectedFiles() if not event.endswith('EVENTS-INFO')]
             basepath = eventlist[0].split(os.path.basename(eventlist[0]))[0]
             # small hack: if a file "eventlist.txt" is found in the basepath use only those events specified inside
             eventlist_file = os.path.join(basepath, 'eventlist.txt')