removed stashed changes
This commit is contained in:
parent
57a9444478
commit
61c7e9f417
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user