diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py index f3a3627d62f46442fe4f2d9bdd3176d305beef86..1656ff7cd0abb4603511e4995e4efe73129ca313 100644 --- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py +++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_model.py @@ -30,12 +30,24 @@ class HomeRunInfoWidgetModel(object): else: return "Log not found" - def get_counts_in_MeV(self): + def get_total_counts(self): workspace = self._data.loaded_workspace total = 0 for i in range(workspace.getNumberHistograms()): total += sum(workspace.dataY(i)) - return total / mev_conversion_factor + + return total + + def get_counts_in_MeV(self, counts): + return counts / mev_conversion_factor + + def get_counts_per_good_frame(self, counts): + good_frames = self.get_log_value("goodfrm") + + return counts/good_frames + + def get_counts_per_good_frame_per_detector(self, counts): + return self.get_counts_per_good_frame(counts)/self._data.num_detectors() def get_average_temperature(self): # TODO : This implementation does not match the one in the C++ code diff --git a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py index 2c9aa8a2fa2f18b3a51555efb6fc49bb20a7ea94..b72873f27e4b789c71ab879e328ea0f272b44972 100644 --- a/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py +++ b/scripts/Muon/GUI/Common/home_runinfo_widget/home_runinfo_widget_presenter.py @@ -22,14 +22,18 @@ class HomeRunInfoWidgetPresenter(HomeTabSubWidget): self._view.clear() run = self._model.get_run_number() instrument = self._model.get_instrument_name() + counts = self.model.get_total_counts() self._view.add_text_line("Instrument : " + str(instrument)) self._view.add_text_line("Run : " + run) self._view.add_text_line(self.create_text_line("Title ", "run_title")) self._view.add_text_line("Comment : " + str(self._model.get_workspace_comment())) self._view.add_text_line(self.create_text_line("Start ", "run_start")) self._view.add_text_line(self.create_text_line("End ", "run_end")) + self._view.add_text_line("Counts (MeV) : " + str(self._model.get_counts_in_MeV(counts))) self._view.add_text_line(self.create_text_line("Good Frames ", "goodfrm")) - self._view.add_text_line("Counts (MeV) : " + str(self._model.get_counts_in_MeV())) + self._view.add_text_line("Counts per Good Frame : " + str(self._model.get_counts_per_good_frame(counts))) + self._view.add_text_line("Counts per Good Frame per det : " + + str(self._model.get_counts_per_good_frame_per_detector(counts))) self._view.add_text_line("Average Temperature (K) : "+str(self._model.get_average_temperature())) self._view.add_text_line(self.create_text_line("Sample Temperature (K) ", "sample_temp")) self._view.add_text_line(self.create_text_line("Sample Magnetic Field (G)", "sample_magn_field"))