CalcAllFlaresThread: switch to executor.map

main/astrodatagui/CalcAllFlaresThread.py

@@ -5,42 +5,28 @@ import lightkurve as lk
 import pandas as pd
 from ..flaredetector.flaredetector import calculateFlareFitsForLightcurve
 
-def getFlareCount(filesDictList):
+def getFlareCount(filesDict):
-    sapPeaksL = []
+    lc = lk.read(filesDict["FilePath"])
-    sapPeaksCountL = []
+    lc.flux = lc["sap_flux"]
-    sapFitsL = []
+    lc.flux_err = lc["sap_flux_err"]
-    pdcsapPeaksL = []
+    sapPeaks, sapFits = calculateFlareFitsForLightcurve(lc.flatten())
-    pdcsapPeaksCountL = []
+    lc.flux = lc["pdcsap_flux"]
-    pdcsapFitsL = []
+    lc.flux_err = lc["pdcsap_flux_err"]
-    for ind in filesDictList.index:
+    pdcsapPeaks, pdcsapFits = calculateFlareFitsForLightcurve(lc.flatten())
-        lc = lk.read(filesDictList["FilePath"][ind])
-        lc.flux = lc["sap_flux"]
-        lc.flux_err = lc["sap_flux_err"]
-        sapPeaks, sapFits = calculateFlareFitsForLightcurve(lc.flatten())
-        lc.flux = lc["pdcsap_flux"]
-        lc.flux_err = lc["pdcsap_flux_err"]
-        pdcsapPeaks, pdcsapFits = calculateFlareFitsForLightcurve(lc.flatten())
 
-        sapPeaksL.append(sapPeaks)
+    filesDict["sapPeaks"] = sapPeaks
-        sapPeaksCountL.append(len(sapPeaks))
+    filesDict["sapPeaksCount"] = len(sapPeaks)
-        sapFitsL.append(sapFits)
+    filesDict["sapFits"] = sapFits
-        pdcsapPeaksL.append(pdcsapPeaks)
+    filesDict["pdcsapPeaks"] = pdcsapPeaks
-        pdcsapPeaksCountL.append(len(pdcsapPeaks))
+    filesDict["pdcsapPeaksCount"] = len(pdcsapPeaks)
-        pdcsapFitsL.append(pdcsapFits)
+    filesDict["pdcsapFits"] = pdcsapFits
-        del lc
+    del lc
 
-    filesDictList["sapPeaks"] = sapPeaksL
+    return filesDict
-    filesDictList["sapPeaksCount"] = sapPeaksCountL
-    filesDictList["sapFits"] = sapFitsL
-    filesDictList["pdcsapPeaks"] = pdcsapPeaksL
-    filesDictList["pdcsapPeaksCount"] = pdcsapPeaksCountL
-    filesDictList["pdcsapFits"] = pdcsapFitsL
-
-    return filesDictList
 
 class CalcAllFlaresThread(QThread):
     progress = pyqtSignal(int)
-    finished = pyqtSignal(list)
+    finished = pyqtSignal(pd.DataFrame)
 
     def __init__(self, allFlaresDictList):
         super().__init__()
@@ -51,11 +37,7 @@ class CalcAllFlaresThread(QThread):
         cpuCount = multiprocessing.cpu_count()
         splitList = [self.allFlaresDictList[i:i + cpuCount] for i in range(0, len(self.allFlaresDictList), cpuCount)]
         executor = concurrent.futures.ProcessPoolExecutor(cpuCount)
-        futures = [executor.submit(getFlareCount, starDictPartList) for starDictPartList in splitList]
-        concurrent.futures.wait(futures)
-        ret = pd.DataFrame()
-        for future in futures:
-            retFrame = future.result()
-            ret = pd.concat([ret, retFrame], ingore_index=True)
 
-        self.finished.emit(ret)
+        resFrame = pd.DataFrame(executor.map(getFlareCount, self.allFlaresDictList.to_dict(orient="records")))
+
+        self.finished.emit(resFrame)