Merge branch 'develop' of ariadne:/data/git/pylot into develop

This commit is contained in:
Marcel Paffrath 2017-05-31 13:46:37 +02:00
commit eb5cf08d58

View File

@ -242,13 +242,6 @@ class AICPicker(AutoPicker):
return return
islope = islope[0][0:imax] islope = islope[0][0:imax]
if len(islope) < 2:
# get local maximum of AIC function to calculate properly slope
islope = np.where((self.Tcf <= min([self.Pick + tslope, len(self.Data[0].data)])) \
& (self.Tcf >= self.Pick))
imax = np.argmax(aicsmooth[islope])
islope = islope[0][0:imax]
dataslope = self.Data[0].data[islope] dataslope = self.Data[0].data[islope]
# calculate slope as polynomal fit of order 1 # calculate slope as polynomal fit of order 1
xslope = np.arange(0, len(dataslope), 1) xslope = np.arange(0, len(dataslope), 1)