From af824867fb1f8193f16d0fb8856204cdb9482217 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Mon, 15 Apr 2024 15:58:10 +0200 Subject: [PATCH] flaredetector: split peaks/fits for calculateFlareFitsForLightcurve --- main/flaredetector/flaredetector.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main/flaredetector/flaredetector.py b/main/flaredetector/flaredetector.py index d0434e6..bf87446 100644 --- a/main/flaredetector/flaredetector.py +++ b/main/flaredetector/flaredetector.py @@ -27,15 +27,16 @@ def calculateFitForFlare(lightcurve, peakIndex): def calculateFlareFitsForLightcurve(lightcurve, num=100, distance=1, height=0.05): maxIndices = findMaxIndices(lightcurve, num, distance=distance, height=height) + peaks = [] fits = [] for index in maxIndices: Peak, flareFitDataPoints, fit = calculateFitForFlare(lightcurve, index) - fits.append({"FlarePeak": Peak, - "FlarePeakTime": lightcurve.time[index], - "FlareFit": fit, + peaks.append({"FlarePeak": Peak, + "FlarePeakTime": lightcurve.time[index]}) + fits.append({"FlareFit": fit, "FlareFitTime": lightcurve.time[flareFitDataPoints]}) - return fits + return peaks, fits def getFlareRange(flux, peakIndex): minInd = -np.inf