diff --git a/main/astrodatagui/FlareSummaryPlotGUI.py b/main/astrodatagui/FlareSummaryPlotGUI.py index 50c4e7a..05b3707 100644 --- a/main/astrodatagui/FlareSummaryPlotGUI.py +++ b/main/astrodatagui/FlareSummaryPlotGUI.py @@ -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.set_ylabel("Flare count") + self.figureAxis.set_xlabel("File Number") self.figureAxis.legend() self.figure.canvas.draw_idle() @@ -146,11 +147,8 @@ class FlareSummaryPlotGUI(QWidget): 'pdcsapPeaks', 'sapFits', 'sapPeaks']) - data = data.groupby(["StarName", "Source", "SpType"], - as_index=False).agg({"sapPeaksCount": "sum", - "pdcsapPeaksCount": "sum"}) - x = np.arange(start=1, stop=len(data)+1, step=1, dtype=int) - showSourceFilter = np.full(np.shape(x), False) + + showSourceFilter = np.full(len(data), False) if(self.cbKepler.isChecked()): showKepler = data["Source"] == "Kepler" @@ -162,6 +160,11 @@ class FlareSummaryPlotGUI(QWidget): showTESS = data["Source"] == "TESS" 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()): Lfilter = data["SpType"].str.startswith("L") 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.set_ylabel("Flare count") + self.figureAxis.set_xlabel("Star Number") self.figureAxis.legend() self.figure.canvas.draw_idle() \ No newline at end of file