SGCMarkus/flaredetector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

astrodatagui: FlaredetectorWidget: properly set flux error too

Browse Source
This commit is contained in:
SGCMarkus
2024-05-27 17:30:45 +02:00
parent 43e23853fc
commit 157f7b6fa3
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/astrodatagui/ui/FlaredetectorWidget.py
+13
View File
@@ -48,6 +48,7 @@ class FlaredetectorWidget(QtWidgets.QWidget):
self.mainLayout.addWidget(self.periodogramInfoGroupBox) self.mainLayout.addWidget(self.periodogramInfoGroupBox)
self.fluxType = "sap_flux" self.fluxType = "sap_flux"
self.fluxErrType = "sap_flux_err"
self.NormalizeState = {"Enabled": False, "Scale": "unscaled"} self.NormalizeState = {"Enabled": False, "Scale": "unscaled"}
self.RemoveOutliersState = {"Enabled": False, "Sigma": 5.0} self.RemoveOutliersState = {"Enabled": False, "Sigma": 5.0}
self.RemoveNansState = {"Enabled": False} self.RemoveNansState = {"Enabled": False}
@@ -90,7 +91,16 @@ class FlaredetectorWidget(QtWidgets.QWidget):
if(fluxType not in ["sap_flux", "pdcsap_flux"]): if(fluxType not in ["sap_flux", "pdcsap_flux"]):
print(f"FluxType not supported: {fluxType}, setting default sap_flux") print(f"FluxType not supported: {fluxType}, setting default sap_flux")
fluxType = "sap_flux" fluxType = "sap_flux"
fluxErrType = "sap_flux_err"
match fluxType:
case "sap_flux":
fluxErrType = "sap_flux_err"
case "pdcsap_flux":
fluxErrType = "pdcsap_flux_err"
self.fluxType = fluxType self.fluxType = fluxType
self.fluxErrType = fluxErrType
self.updatePlot() self.updatePlot()
def setNormalizeState(self, enabled: bool, scale: str): def setNormalizeState(self, enabled: bool, scale: str):
@@ -173,11 +183,13 @@ class FlaredetectorWidget(QtWidgets.QWidget):
def normalizeStichedLightCurve(self, lc): def normalizeStichedLightCurve(self, lc):
lc.flux = lc[self.fluxType] lc.flux = lc[self.fluxType]
lc.flux_err = lc[self.fluxErrType]
return lc.normalize(unit=self.NormalizeState["Scale"]) return lc.normalize(unit=self.NormalizeState["Scale"])
def updateFit(self): def updateFit(self):
lc = self.currentLC lc = self.currentLC
lc.flux = lc[self.fluxType] lc.flux = lc[self.fluxType]
lc.flux_err = lc[self.fluxErrType]
self.currentFlattenLC = lc.flatten(window_length=self.FlattenState["WindowLength"], self.currentFlattenLC = lc.flatten(window_length=self.FlattenState["WindowLength"],
polyorder=self.FlattenState["PolynomialOrder"]) polyorder=self.FlattenState["PolynomialOrder"])
self.peaks, self.fits = calculateFlareFitsForLightcurve(self.currentFlattenLC, num=100) self.peaks, self.fits = calculateFlareFitsForLightcurve(self.currentFlattenLC, num=100)
@@ -186,6 +198,7 @@ class FlaredetectorWidget(QtWidgets.QWidget):
lc = self.currentLC lc = self.currentLC
label = f"{self.currentMainName}" label = f"{self.currentMainName}"
lc.flux = lc[self.fluxType] lc.flux = lc[self.fluxType]
lc.flux_err = lc[self.fluxErrType]
if(self.NormalizeState["Enabled"]): if(self.NormalizeState["Enabled"]):
if(self.currentLCCollection is None): if(self.currentLCCollection is None):