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

This commit is contained in:
Marcel Paffrath 2016-05-11 12:02:43 +02:00
commit 8a79addb4e
2 changed files with 3 additions and 3 deletions

View File

@ -11,6 +11,7 @@ EVENT_DATA/LOCAL #datapath# %data path
/DATA/Insheim/STAT_INFO #invdir# %full path to inventory or dataless-seed file /DATA/Insheim/STAT_INFO #invdir# %full path to inventory or dataless-seed file
PILOT #datastructure#%choose data structure PILOT #datastructure#%choose data structure
0 #iplot# %flag for plotting: 0 none, 1 partly, >1 everything 0 #iplot# %flag for plotting: 0 none, 1 partly, >1 everything
True #apverbose# %choose 'True' or 'False' for terminal output
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
#NLLoc settings# #NLLoc settings#
/home/ludger/NLLOC #nllocbin# %path to NLLoc executable /home/ludger/NLLOC #nllocbin# %path to NLLoc executable

View File

@ -31,6 +31,7 @@ def autopickevent(data, param):
wdttolerance = param.get('wdttolerance') wdttolerance = param.get('wdttolerance')
mdttolerance = param.get('mdttolerance') mdttolerance = param.get('mdttolerance')
iplot = param.get('iplot') iplot = param.get('iplot')
apverbose = param.get('apverbose')
for n in range(len(data)): for n in range(len(data)):
station = data[n].stats.station station = data[n].stats.station
if station not in stations: if station not in stations:
@ -40,7 +41,7 @@ def autopickevent(data, param):
for station in stations: for station in stations:
topick = data.select(station=station) topick = data.select(station=station)
all_onsets[station] = autopickstation(topick, param) all_onsets[station] = autopickstation(topick, param, verbose=apverbose)
# quality control # quality control
# median check and jackknife on P-onset times # median check and jackknife on P-onset times
@ -366,7 +367,6 @@ def autopickstation(wfstream, pickparam, verbose=False):
round(min([mpickP + sstop, Lwf]))] round(min([mpickP + sstop, Lwf]))]
if algoS == 'ARH': if algoS == 'ARH':
if verbose: print(edat, ndat)
# re-create stream object including both horizontal components # re-create stream object including both horizontal components
hdat = edat.copy() hdat = edat.copy()
hdat += ndat hdat += ndat
@ -383,7 +383,6 @@ def autopickstation(wfstream, pickparam, verbose=False):
h_copy[0].data = trH1_filt.data h_copy[0].data = trH1_filt.data
h_copy[1].data = trH2_filt.data h_copy[1].data = trH2_filt.data
elif algoS == 'AR3': elif algoS == 'AR3':
if verbose: print(zdat, edat, ndat)
# re-create stream object including all components # re-create stream object including all components
hdat = zdat.copy() hdat = zdat.copy()
hdat += edat hdat += edat