Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Conflicts: autoPyLoT.py
2015-11-05 08:47:06 +01:00
parent 3fa4a31978 223902f2d4
commit f738160a8b
8 changed files with 208 additions and 83 deletions
--- a/pylot/core/pick/autopick.py
+++ b/pylot/core/pick/autopick.py
@@ -335,7 +335,8 @@ def autopickstation(wfstream, pickparam):
                               "no zero crossings derived!")
                        print ("Cannot calculate source spectrum!")
                    else:
-                        calcwin = (zc[3] - zc[0]) * z_copy[0].stats.delta
+                        index = min([3, len(zc) - 1])
+                        calcwin = (zc[index] - zc[0]) * z_copy[0].stats.delta
                    # calculate source spectrum and get w0 and fc
                    specpara = DCfc(z_copy, mpickP, calcwin, iplot)
                    w0 = specpara.getw0()