treewide: add minimal lightcurve support
This commit is contained in:
@@ -1,18 +1,18 @@
|
||||
from PyQt5.QtCore import pyqtSignal, QThread
|
||||
import multiprocessing
|
||||
import concurrent.futures
|
||||
import lightkurve as lk
|
||||
from ..util.MinimalLightCurve import read
|
||||
import pandas as pd
|
||||
from ..flaredetector.flaredetector import calculateFlareFitsForLightcurve
|
||||
|
||||
def getFlareCount(filesDict):
|
||||
lc = lk.read(filesDict["FilePath"])
|
||||
lc = read(filesDict["FilePath"])
|
||||
lc.flux = lc["sap_flux"]
|
||||
lc.flux_err = lc["sap_flux_err"]
|
||||
sapPeaks, sapFits = calculateFlareFitsForLightcurve(lc.flatten())
|
||||
sapPeaks, sapFits = calculateFlareFitsForLightcurve(lc.flatten(), minimalLC=True)
|
||||
lc.flux = lc["pdcsap_flux"]
|
||||
lc.flux_err = lc["pdcsap_flux_err"]
|
||||
pdcsapPeaks, pdcsapFits = calculateFlareFitsForLightcurve(lc.flatten())
|
||||
pdcsapPeaks, pdcsapFits = calculateFlareFitsForLightcurve(lc.flatten(), minimalLC=True)
|
||||
|
||||
filesDict["sapPeaks"] = sapPeaks
|
||||
filesDict["sapPeaksCount"] = len(sapPeaks)
|
||||
@@ -21,7 +21,8 @@ def getFlareCount(filesDict):
|
||||
filesDict["pdcsapPeaksCount"] = len(pdcsapPeaks)
|
||||
filesDict["pdcsapFits"] = pdcsapFits
|
||||
del lc
|
||||
|
||||
if(filesDict["StarName"] == "CD-51 13128" and filesDict["Sequence"] == 1):
|
||||
print(filesDict)
|
||||
return filesDict
|
||||
|
||||
class CalcAllFlaresThread(QThread):
|
||||
@@ -35,7 +36,6 @@ class CalcAllFlaresThread(QThread):
|
||||
#@pyqtSlot()
|
||||
def run(self):
|
||||
cpuCount = multiprocessing.cpu_count()
|
||||
splitList = [self.allFlaresDictList[i:i + cpuCount] for i in range(0, len(self.allFlaresDictList), cpuCount)]
|
||||
executor = concurrent.futures.ProcessPoolExecutor(cpuCount)
|
||||
|
||||
resFrame = pd.DataFrame(executor.map(getFlareCount, self.allFlaresDictList.to_dict(orient="records")))
|
||||
|
||||
Reference in New Issue
Block a user