From 9cd3661f794b0dd535b18e224791d9fe4bce2dce Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Wed, 30 Oct 2024 11:00:57 +0100 Subject: [PATCH 1/2] viewer code review --- inc/TRestGeant4EventViewer.h | 10 +++++----- macros/REST_Geant4_ViewEvent.C | 1 + src/TRestGeant4EventViewer.cxx | 25 ++++++++++++------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/inc/TRestGeant4EventViewer.h b/inc/TRestGeant4EventViewer.h index 0e45384..1c2425c 100644 --- a/inc/TRestGeant4EventViewer.h +++ b/inc/TRestGeant4EventViewer.h @@ -33,12 +33,12 @@ class TRestGeant4EventViewer : public TRestEveEventViewer { void DeleteCurrentEvent(); void AddEvent(TRestEvent* event); - void NextTrackVertex(Int_t trkID, TVector3 to); - void AddTrack(Int_t trkID, Int_t parentID, TVector3 from, TString name); - void AddParentTrack(Int_t trkID, TVector3 from, TString name); + void NextTrackVertex(Int_t trkID, const TVector3& to); + void AddTrack(Int_t trkID, Int_t parentID, const TVector3& from, const TString& name); + void AddParentTrack(Int_t trkID, const TVector3& from, const TString& name); - void AddText(TString text, TVector3 at); - void AddMarker(Int_t trkID, TVector3 at, TString name); + void AddText(const TString& text, const TVector3& at); + void AddMarker(Int_t trkID, const TVector3& at, const TString& name); // Constructor TRestGeant4EventViewer(); diff --git a/macros/REST_Geant4_ViewEvent.C b/macros/REST_Geant4_ViewEvent.C index 388708c..f4e2241 100644 --- a/macros/REST_Geant4_ViewEvent.C +++ b/macros/REST_Geant4_ViewEvent.C @@ -1,5 +1,6 @@ #include "TRestBrowser.h" #include "TRestTask.h" +#include "TRestGeant4Event.h" #ifndef RestTask_ViewG4Events #define RestTask_ViewG4Events diff --git a/src/TRestGeant4EventViewer.cxx b/src/TRestGeant4EventViewer.cxx index 6365c04..7d0503b 100644 --- a/src/TRestGeant4EventViewer.cxx +++ b/src/TRestGeant4EventViewer.cxx @@ -9,7 +9,7 @@ /// /// nov 2015: First concept /// Viewer class for a TRestGeant4Event -/// Javier Galan/JuanAn Garcia +/// Javier Galan / JuanAn Garcia / Luis Obis ///_______________________________________________________________________________ #include "TRestGeant4EventViewer.h" @@ -22,9 +22,7 @@ ClassImp(TRestGeant4EventViewer); TRestGeant4EventViewer::TRestGeant4EventViewer() { Initialize(); } -TRestGeant4EventViewer::~TRestGeant4EventViewer() { - // TRestGeant4EventViewer destructor -} +TRestGeant4EventViewer::~TRestGeant4EventViewer() = default; void TRestGeant4EventViewer::Initialize() { fG4Event = new TRestGeant4Event(); @@ -232,8 +230,8 @@ void TRestGeant4EventViewer::AddEvent(TRestEvent* event) { Update(); } -void TRestGeant4EventViewer::AddText(TString text, TVector3 at) { - TEveText* evText = new TEveText(text); +void TRestGeant4EventViewer::AddText(const TString& text, const TVector3& at) { + auto evText = new TEveText(text); evText->SetName("Event title"); evText->SetFontSize(12); evText->RefMainTrans().SetPos((at.X() + 15) * fGeomScale, (at.Y() + 15) * fGeomScale, @@ -242,8 +240,8 @@ void TRestGeant4EventViewer::AddText(TString text, TVector3 at) { gEve->AddElement(evText); } -void TRestGeant4EventViewer::AddMarker(Int_t trkID, TVector3 at, TString name) { - TEvePointSet* marker = new TEvePointSet(1); +void TRestGeant4EventViewer::AddMarker(Int_t trkID, const TVector3& at, const TString& name) { + auto marker = new TEvePointSet(1); marker->SetName(name); marker->SetMarkerColor(kMagenta); marker->SetMarkerStyle(3); @@ -252,12 +250,13 @@ void TRestGeant4EventViewer::AddMarker(Int_t trkID, TVector3 at, TString name) { fHitConnectors[trkID]->AddElement(marker); } -void TRestGeant4EventViewer::NextTrackVertex(Int_t trkID, TVector3 to) { +void TRestGeant4EventViewer::NextTrackVertex(Int_t trkID, const TVector3& to) { fHitConnectors[trkID]->SetNextPoint(to.X() * fGeomScale, to.Y() * fGeomScale, to.Z() * fGeomScale); } -void TRestGeant4EventViewer::AddTrack(Int_t trkID, Int_t parentID, TVector3 from, TString name) { - TEveLine* evLine = new TEveLine(); +void TRestGeant4EventViewer::AddTrack(Int_t trkID, Int_t parentID, const TVector3& from, + const TString& name) { + auto evLine = new TEveLine(); evLine->SetName(name); fHitConnectors.push_back(evLine); @@ -281,8 +280,8 @@ void TRestGeant4EventViewer::AddTrack(Int_t trkID, Int_t parentID, TVector3 from } } -void TRestGeant4EventViewer::AddParentTrack(Int_t trkID, TVector3 from, TString name) { - TEveLine* evLine = new TEveLine(); +void TRestGeant4EventViewer::AddParentTrack(Int_t trkID, const TVector3& from, const TString& name) { + auto evLine = new TEveLine(); evLine->SetName(name); fHitConnectors.push_back(evLine); From 51bfe1e1cd6d68b9cceee09598bd24a43c9a9682 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2024 10:03:29 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- macros/REST_Geant4_ViewEvent.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros/REST_Geant4_ViewEvent.C b/macros/REST_Geant4_ViewEvent.C index f4e2241..ee8505c 100644 --- a/macros/REST_Geant4_ViewEvent.C +++ b/macros/REST_Geant4_ViewEvent.C @@ -1,6 +1,6 @@ #include "TRestBrowser.h" -#include "TRestTask.h" #include "TRestGeant4Event.h" +#include "TRestTask.h" #ifndef RestTask_ViewG4Events #define RestTask_ViewG4Events