astrodatagui: FlareSummaryPlotGUI: add x label and properly sum sources
This commit is contained in:
@@ -132,6 +132,7 @@ class FlareSummaryPlotGUI(QWidget):
|
|||||||
self.figureAxis.scatter(x[Unknownfilter], data[Unknownfilter]["pdcsapPeaksCount"], marker="x", color="gray", label="Unknown PDCSAP Count")
|
self.figureAxis.scatter(x[Unknownfilter], data[Unknownfilter]["pdcsapPeaksCount"], marker="x", color="gray", label="Unknown PDCSAP Count")
|
||||||
|
|
||||||
self.figureAxis.set_ylabel("Flare count")
|
self.figureAxis.set_ylabel("Flare count")
|
||||||
|
self.figureAxis.set_xlabel("File Number")
|
||||||
self.figureAxis.legend()
|
self.figureAxis.legend()
|
||||||
self.figure.canvas.draw_idle()
|
self.figure.canvas.draw_idle()
|
||||||
|
|
||||||
@@ -146,11 +147,8 @@ class FlareSummaryPlotGUI(QWidget):
|
|||||||
'pdcsapPeaks',
|
'pdcsapPeaks',
|
||||||
'sapFits',
|
'sapFits',
|
||||||
'sapPeaks'])
|
'sapPeaks'])
|
||||||
data = data.groupby(["StarName", "Source", "SpType"],
|
|
||||||
as_index=False).agg({"sapPeaksCount": "sum",
|
showSourceFilter = np.full(len(data), False)
|
||||||
"pdcsapPeaksCount": "sum"})
|
|
||||||
x = np.arange(start=1, stop=len(data)+1, step=1, dtype=int)
|
|
||||||
showSourceFilter = np.full(np.shape(x), False)
|
|
||||||
|
|
||||||
if(self.cbKepler.isChecked()):
|
if(self.cbKepler.isChecked()):
|
||||||
showKepler = data["Source"] == "Kepler"
|
showKepler = data["Source"] == "Kepler"
|
||||||
@@ -162,6 +160,11 @@ class FlareSummaryPlotGUI(QWidget):
|
|||||||
showTESS = data["Source"] == "TESS"
|
showTESS = data["Source"] == "TESS"
|
||||||
showSourceFilter |= showTESS
|
showSourceFilter |= showTESS
|
||||||
|
|
||||||
|
data = data[showSourceFilter].groupby(["StarName", "SpType"],
|
||||||
|
as_index=False).agg({"sapPeaksCount": "sum",
|
||||||
|
"pdcsapPeaksCount": "sum"})
|
||||||
|
x = np.arange(start=1, stop=len(data)+1, step=1, dtype=int)
|
||||||
|
|
||||||
if(self.cbSpTypeL.isChecked()):
|
if(self.cbSpTypeL.isChecked()):
|
||||||
Lfilter = data["SpType"].str.startswith("L")
|
Lfilter = data["SpType"].str.startswith("L")
|
||||||
Lfilter &= showSourceFilter
|
Lfilter &= showSourceFilter
|
||||||
@@ -208,5 +211,6 @@ class FlareSummaryPlotGUI(QWidget):
|
|||||||
self.figureAxis.scatter(x[Unknownfilter], data[Unknownfilter]["pdcsapPeaksCount"], marker="x", color="gray", label="Unknown PDCSAP Count")
|
self.figureAxis.scatter(x[Unknownfilter], data[Unknownfilter]["pdcsapPeaksCount"], marker="x", color="gray", label="Unknown PDCSAP Count")
|
||||||
|
|
||||||
self.figureAxis.set_ylabel("Flare count")
|
self.figureAxis.set_ylabel("Flare count")
|
||||||
|
self.figureAxis.set_xlabel("Star Number")
|
||||||
self.figureAxis.legend()
|
self.figureAxis.legend()
|
||||||
self.figure.canvas.draw_idle()
|
self.figure.canvas.draw_idle()
|
||||||
Reference in New Issue
Block a user