marcel/pylot
3
0
Fork 0
Code Issues 17 Pull Requests 1 Releases Wiki Activity

removed stashed changes

Browse Source
This commit is contained in:
Marcel Paffrath 2015-09-17 11:07:22 +02:00
parent 57a9444478
commit 61c7e9f417
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pylot/core/pick/utils.py
View File

@ -43,13 +43,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None):
LPick = None LPick = None
EPick = None EPick = None
PickError = None PickError = None
<<<<<<< Updated upstream
print ("earllatepicker: Get earliest and latest possible pick relative to most likely pick ...")
=======
# MP MP ++ output suppressed
#print 'earllatepicker: Get earliest and latest possible pick relative to most likely pick ...' #print 'earllatepicker: Get earliest and latest possible pick relative to most likely pick ...'
# MP MP --
>>>>>>> Stashed changes
x = X[0].data x = X[0].data
t = np.arange(0, X[0].stats.npts / X[0].stats.sampling_rate, t = np.arange(0, X[0].stats.npts / X[0].stats.sampling_rate,