astrodatagui: CalcAllFlaresThread: add folded phase data to output
This commit is contained in:
@@ -18,7 +18,14 @@ def getFlareCount(filesDict):
|
|||||||
sapFoldedLC = lc.fold(period=sapPeakPeriod, epoch_time=sapEpochTime)
|
sapFoldedLC = lc.fold(period=sapPeakPeriod, epoch_time=sapEpochTime)
|
||||||
sapPhase, sapSineFit, sapFitType = getFoldedBestFit(sapFoldedLC)
|
sapPhase, sapSineFit, sapFitType = getFoldedBestFit(sapFoldedLC)
|
||||||
sapMinima, sapMaxima = getFoldedFitPeakValley(sapSineFit)
|
sapMinima, sapMaxima = getFoldedFitPeakValley(sapSineFit)
|
||||||
sapminPhasesBoundsIndices, sapmaxPhasesBoundsIndices = getPhaseRangesNearPeak((sapMinima, sapMaxima), sapPhase)
|
sapminPhasesBounds, sapmaxPhasesBounds = getPhaseRangesNearPeak((sapMinima, sapMaxima), sapPhase, returnPhaseValue=True)
|
||||||
|
sapFoldedPeaks = []
|
||||||
|
sapFoldedPeaksPhasePair = []
|
||||||
|
for peak in sapPeaks:
|
||||||
|
cycle, foldedIndex = convertStarndardIndexToFoldedIndex(sapFoldedLC, peak["StandardIndex"])
|
||||||
|
sapFoldedPeaks.append({"Cycle: ": cycle, "Index": foldedIndex})
|
||||||
|
sapFoldedPeaksPhasePair.append({"Phase": sapFoldedLC.phase[sapFoldedLC.cycle == cycle][foldedIndex], "Peak": peak})
|
||||||
|
|
||||||
lc.flux = lc["pdcsap_flux"]
|
lc.flux = lc["pdcsap_flux"]
|
||||||
lc.flux_err = lc["pdcsap_flux_err"]
|
lc.flux_err = lc["pdcsap_flux_err"]
|
||||||
pdcsapPeaks, pdcsapFits = calculateFlareFitsForLightcurve(lc.flatten())
|
pdcsapPeaks, pdcsapFits = calculateFlareFitsForLightcurve(lc.flatten())
|
||||||
@@ -29,28 +36,44 @@ def getFlareCount(filesDict):
|
|||||||
pdcsapFoldedLC = lc.fold(period=pdcsapPeakPeriod, epoch_time=pdcsapEpochTime)
|
pdcsapFoldedLC = lc.fold(period=pdcsapPeakPeriod, epoch_time=pdcsapEpochTime)
|
||||||
pdcsapPhase, pdcsapSineFit, pdcsapFitType = getFoldedBestFit(pdcsapFoldedLC)
|
pdcsapPhase, pdcsapSineFit, pdcsapFitType = getFoldedBestFit(pdcsapFoldedLC)
|
||||||
pdcsapMinima, pdcsapMaxima = getFoldedFitPeakValley(pdcsapSineFit)
|
pdcsapMinima, pdcsapMaxima = getFoldedFitPeakValley(pdcsapSineFit)
|
||||||
pdcsapminPhasesBoundsIndices, pdcsapmaxPhasesBoundsIndices = getPhaseRangesNearPeak((pdcsapMinima, pdcsapMaxima), pdcsapPhase)
|
pdcsapminPhasesBounds, pdcsapmaxPhasesBounds = getPhaseRangesNearPeak((pdcsapMinima, pdcsapMaxima), pdcsapPhase, returnPhaseValue=True)
|
||||||
|
pdcsapFoldedPeaks = []
|
||||||
|
pdcsapFoldedPeaksPhasePair = []
|
||||||
|
for peak in sapPeaks:
|
||||||
|
cycle, foldedIndex = convertStarndardIndexToFoldedIndex(pdcsapFoldedLC, peak["StandardIndex"])
|
||||||
|
pdcsapFoldedPeaks.append({"Cycle: ": cycle, "Index": foldedIndex})
|
||||||
|
pdcsapFoldedPeaksPhasePair.append({"Phase": pdcsapFoldedLC.phase[pdcsapFoldedLC.cycle == cycle][foldedIndex], "Peak": peak})
|
||||||
|
|
||||||
filesDict["sapPeaks"] = sapPeaks
|
filesDict["sapPeaks"] = sapPeaks
|
||||||
filesDict["sapPeaksCount"] = len(sapPeaks)
|
filesDict["sapPeaksCount"] = len(sapPeaks)
|
||||||
filesDict["sapFits"] = sapFits
|
filesDict["sapFits"] = sapFits
|
||||||
filesDict["sapValidTimespans"] = sapTds
|
filesDict["sapValidTimespans"] = sapTds
|
||||||
filesDict["sapValidSeconds"] = sapValSec
|
filesDict["sapValidSeconds"] = sapValSec
|
||||||
|
filesDict["sapFoldedCycle"] = sapFoldedLC.cycle
|
||||||
|
#filesDict["sapFoldedPhase"] = sapFoldedLC.phase.value
|
||||||
|
#filesDict["sapFoldedFitPhase"] = sapPhase
|
||||||
|
filesDict["sapFoldedFitPhaseStarEnd"] = (sapFoldedLC.phase.value[0], sapFoldedLC.phase.value[-1])
|
||||||
|
filesDict["sapFoldedPeaksPhasePair"] = sapFoldedPeaksPhasePair
|
||||||
filesDict["sapPeriod"] = sapPeakPeriod.value
|
filesDict["sapPeriod"] = sapPeakPeriod.value
|
||||||
filesDict["sapPeriodMinima"] = sapMinima
|
filesDict["sapPeriodMinima"] = sapMinima
|
||||||
filesDict["sapPeriodMinimaBoundaries"] = sapminPhasesBoundsIndices
|
filesDict["sapPeriodMinimaBoundaries"] = sapminPhasesBounds
|
||||||
filesDict["sapPeriodMaxima"] = sapMaxima
|
filesDict["sapPeriodMaxima"] = sapMaxima
|
||||||
filesDict["sapPeriodMaximaBoundaries"] = sapmaxPhasesBoundsIndices
|
filesDict["sapPeriodMaximaBoundaries"] = sapmaxPhasesBounds
|
||||||
filesDict["pdcsapPeaks"] = pdcsapPeaks
|
filesDict["pdcsapPeaks"] = pdcsapPeaks
|
||||||
filesDict["pdcsapPeaksCount"] = len(pdcsapPeaks)
|
filesDict["pdcsapPeaksCount"] = len(pdcsapPeaks)
|
||||||
filesDict["pdcsapFits"] = pdcsapFits
|
filesDict["pdcsapFits"] = pdcsapFits
|
||||||
filesDict["pdcsapValidTimespans"] = pdcsapTds
|
filesDict["pdcsapValidTimespans"] = pdcsapTds
|
||||||
filesDict["pdcsapValidSeconds"] = pdcsapValSec
|
filesDict["pdcsapValidSeconds"] = pdcsapValSec
|
||||||
|
filesDict["pdcsapFoldedCycle"] = sapFoldedLC.cycle
|
||||||
|
#filesDict["pdcsapFoldedPhase"] = sapFoldedLC.phase.value
|
||||||
|
#filesDict["pdcsapFoldedFitPhase"] = pdcsapPhase
|
||||||
|
filesDict["pdcsapFoldedFitPhaseStarEnd"] = (pdcsapFoldedLC.phase.value[0], pdcsapFoldedLC.phase.value[-1])
|
||||||
|
filesDict["pdcsapFoldedPeaksPhasePair"] = pdcsapFoldedPeaksPhasePair
|
||||||
filesDict["pdcsapPeriod"] = pdcsapPeakPeriod.value
|
filesDict["pdcsapPeriod"] = pdcsapPeakPeriod.value
|
||||||
filesDict["pdcsapPeriodMinima"] = pdcsapMinima
|
filesDict["pdcsapPeriodMinima"] = pdcsapMinima
|
||||||
filesDict["pdcsapPeriodMinimaBoundaries"] = pdcsapminPhasesBoundsIndices
|
filesDict["pdcsapPeriodMinimaBoundaries"] = pdcsapminPhasesBounds
|
||||||
filesDict["pdcsapPeriodMaxima"] = pdcsapMaxima
|
filesDict["pdcsapPeriodMaxima"] = pdcsapMaxima
|
||||||
filesDict["pdcsapPeriodMaximaBoundaries"] = pdcsapmaxPhasesBoundsIndices
|
filesDict["pdcsapPeriodMaximaBoundaries"] = pdcsapmaxPhasesBounds
|
||||||
del lc
|
del lc
|
||||||
return filesDict
|
return filesDict
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user