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

QtPyLoT.py

@@ -74,7 +74,7 @@ from pylot.core.util.connection import checkurl
 from pylot.core.util.dataprocessing import read_metadata, restitute_data
 from pylot.core.util.utils import fnConstructor, getLogin, \
     full_range, readFilterInformation, trim_station_components, check4gaps, make_pen, pick_color_plt, \
-    pick_linestyle_plt, identifyPhase, loopIdentifyPhase
+    pick_linestyle_plt, identifyPhase, loopIdentifyPhase, remove_underscores
 from pylot.core.util.event import Event
 from pylot.core.io.location import create_creation_info, create_event
 from pylot.core.util.widgets import FilterOptionsDialog, NewEventDlg, \
@@ -1370,6 +1370,8 @@ class MainWindow(QMainWindow):
         self.fnames = self.getWFFnames_from_eventbox()
         self.data.setWFData(self.fnames)
         wfdat = self.data.getWFData()  # all available streams
+        # remove possible underscores in station names
+        wfdat = remove_underscores(wfdat)
         check4gaps(wfdat)
         # trim station components to same start value
         trim_station_components(wfdat, trim_start=True, trim_end=False)

pylot/core/pick/utils.py

@@ -744,7 +744,7 @@ def checksignallength(X, pick, TSNR, minsiglength, nfac, minpercent, iplot=0, fi
     else:
         x1 = X[0].data
         ilen = len(x1)
-        rms = np.sqrt(np.power(2, x1))
+        rms = abs(x1)
 
     t = np.arange(0, ilen / X[0].stats.sampling_rate,
                   X[0].stats.delta)