[bugfix] huge bug in slope calculation

This commit is contained in:
Marcel Paffrath 2017-08-10 12:25:03 +02:00
parent 8a80af78cf
commit 2cc05329f9

View File

@ -241,7 +241,7 @@ class AICPicker(AutoPicker):
# find maximum within slope determination window # find maximum within slope determination window
# 'cause slope should be calculated up to first local minimum only! # 'cause slope should be calculated up to first local minimum only!
imax = np.argmax(self.Data[0].data[islope]) imax = np.argmax(self.Data[0].data[islope])
iislope = islope[0][0:imax] iislope = islope[0][0:imax+1]
if len(iislope) <= 2: if len(iislope) <= 2:
# calculate slope from initial onset to maximum of AIC function # calculate slope from initial onset to maximum of AIC function
print("AICPicker: Not enough data samples left for slope calculation!") print("AICPicker: Not enough data samples left for slope calculation!")
@ -269,7 +269,7 @@ class AICPicker(AutoPicker):
raw_input() raw_input()
plt.close(fig) plt.close(fig)
return return
iislope = islope[0][0:imax] iislope = islope[0][0:imax+1]
dataslope = self.Data[0].data[iislope] dataslope = self.Data[0].data[iislope]
# 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)
@ -278,7 +278,7 @@ class AICPicker(AutoPicker):
if datafit[0] >= datafit[len(datafit) - 1]: if datafit[0] >= datafit[len(datafit) - 1]:
print('AICPicker: Negative slope, bad onset skipped!') print('AICPicker: Negative slope, bad onset skipped!')
return return
self.slope = 1 / tslope * (datafit[len(dataslope) - 1] - datafit[0]) self.slope = 1 / len(dataslope) * (datafit[len(dataslope) - 1] - datafit[0])
else: else:
self.SNR = None self.SNR = None