diff --git a/main/flaredetector/util.py b/main/flaredetector/util.py index 7a207e8..4e2a5b4 100644 --- a/main/flaredetector/util.py +++ b/main/flaredetector/util.py @@ -159,7 +159,7 @@ def findNearestIndexOfValue(array, value): idx = (np.abs(array - value)).argmin() return idx -def getPhaseRangesNearPeak(maxArgs, phase): +def getPhaseRangesNearPeak(maxArgs, phase, returnPhaseValue=False): minPhases = phase[maxArgs[0]] maxPhases = phase[maxArgs[1]] totalPhase = abs(phase[0]) + abs(phase[-1]) @@ -195,14 +195,14 @@ def getPhaseRangesNearPeak(maxArgs, phase): for minPhaseBounds in minPhasesBounds: minPhaseBoundsIndices = [] for l in minPhaseBounds: - minPhaseBoundsIndices.append([findNearestIndexOfValue(phase, lv) for lv in l]) + minPhaseBoundsIndices.append([phase[findNearestIndexOfValue(phase, lv)] if returnPhaseValue else findNearestIndexOfValue(phase, lv) for lv in l]) minPhasesBoundsIndices.append(minPhaseBoundsIndices) maxPhasesBoundsIndices = [] for maxPhaseBounds in maxPhasesBounds: maxPhaseBoundsIndices = [] for l in maxPhaseBounds: - maxPhaseBoundsIndices.append([findNearestIndexOfValue(phase, lv) for lv in l]) + maxPhaseBoundsIndices.append([phase[findNearestIndexOfValue(phase, lv)] if returnPhaseValue else findNearestIndexOfValue(phase, lv) for lv in l]) maxPhasesBoundsIndices.append(maxPhaseBoundsIndices) return minPhasesBoundsIndices, maxPhasesBoundsIndices