From b994b68853892b65ee4496f9038a16c768d0ac95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADez?= <77273709+DavidDiezIb@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:05:19 +0100 Subject: [PATCH 1/4] Issues with GetEnergy and GetSecondMaxEnergyTrack in simulations(XYZ) Added the posbility of extracting the energy X or Y for XYZ tracks as well (simulation tracks). --- src/TRestTrackEvent.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TRestTrackEvent.cxx b/src/TRestTrackEvent.cxx index 915aadd..28af764 100644 --- a/src/TRestTrackEvent.cxx +++ b/src/TRestTrackEvent.cxx @@ -183,12 +183,12 @@ TRestTrack* TRestTrackEvent::GetSecondMaxEnergyTrack(TString option) { Double_t en = t->GetEnergy(); - if (option == "X" && t->isXZ()) { + if (option == "X" && (t->isXZ() || t->isXYZ)) { if (en > maxEnergy) { maxEnergy = t->GetEnergy(); track = tck; } - } else if (option == "Y" && t->isYZ()) { + } else if (option == "Y" && (t->isYZ() || t->isXYZ)) { if (t->GetEnergy() > maxEnergy) { maxEnergy = t->GetEnergy(); track = tck; @@ -226,10 +226,10 @@ Double_t TRestTrackEvent::GetEnergy(TString option) { if (option == "") en += t->GetEnergy(); - else if (option == "X" && t->isXZ()) + else if (option == "X" && (t->isXZ() || t->isXYZ)) en += t->GetEnergy(); - else if (option == "Y" && t->isYZ()) + else if (option == "Y" && (t->isYZ() || t->isXYZ)) en += t->GetEnergy(); else if (option == "XYZ" && t->isXYZ()) From 68d53bc00eefa934847305d1f55724ead4a225b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADez?= <77273709+DavidDiezIb@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:23:13 +0100 Subject: [PATCH 2/4] SecondMaxTrackEnergy for XYZ tracks --- src/TRestTrackAnalysisProcess.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/TRestTrackAnalysisProcess.cxx b/src/TRestTrackAnalysisProcess.cxx index 62aa774..0cf36fa 100644 --- a/src/TRestTrackAnalysisProcess.cxx +++ b/src/TRestTrackAnalysisProcess.cxx @@ -1037,6 +1037,8 @@ TRestEvent* TRestTrackAnalysisProcess::ProcessEvent(TRestEvent* inputEvent) { } Double_t trackSecondMaxEnergy = tckSecondMaxEnergy_X + tckSecondMaxEnergy_Y; + if (fInputTrackEvent->GetSecondMaxEnergyTrack("XYZ") != nullptr) { + trackSecondMaxEnergy = fInputTrackEvent->GetSecondMaxEnergyTrack("XYZ")->GetEnergy();} SetObservableValue((string) "SecondMaxTrackEnergy", trackSecondMaxEnergy); SetObservableValue((string) "SecondMaxTrackSigmaX", tckSecondMaxXYZ_SigmaX); From 258938eebea43b822fcaf779e6ab0b1210841ba8 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:26:17 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/TRestTrackAnalysisProcess.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/TRestTrackAnalysisProcess.cxx b/src/TRestTrackAnalysisProcess.cxx index 0cf36fa..c3b7818 100644 --- a/src/TRestTrackAnalysisProcess.cxx +++ b/src/TRestTrackAnalysisProcess.cxx @@ -1038,7 +1038,8 @@ TRestEvent* TRestTrackAnalysisProcess::ProcessEvent(TRestEvent* inputEvent) { Double_t trackSecondMaxEnergy = tckSecondMaxEnergy_X + tckSecondMaxEnergy_Y; if (fInputTrackEvent->GetSecondMaxEnergyTrack("XYZ") != nullptr) { - trackSecondMaxEnergy = fInputTrackEvent->GetSecondMaxEnergyTrack("XYZ")->GetEnergy();} + trackSecondMaxEnergy = fInputTrackEvent->GetSecondMaxEnergyTrack("XYZ")->GetEnergy(); + } SetObservableValue((string) "SecondMaxTrackEnergy", trackSecondMaxEnergy); SetObservableValue((string) "SecondMaxTrackSigmaX", tckSecondMaxXYZ_SigmaX); From a3d8ed542c8e9fdebfd8552f6caea8e02da74dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20D=C3=ADez?= <77273709+DavidDiezIb@users.noreply.github.com> Date: Wed, 21 Feb 2024 11:39:41 +0100 Subject: [PATCH 4/4] Fix bugs --- src/TRestTrackEvent.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TRestTrackEvent.cxx b/src/TRestTrackEvent.cxx index 28af764..028f2d4 100644 --- a/src/TRestTrackEvent.cxx +++ b/src/TRestTrackEvent.cxx @@ -183,12 +183,12 @@ TRestTrack* TRestTrackEvent::GetSecondMaxEnergyTrack(TString option) { Double_t en = t->GetEnergy(); - if (option == "X" && (t->isXZ() || t->isXYZ)) { + if (option == "X" && (t->isXZ() || t->isXYZ())) { if (en > maxEnergy) { maxEnergy = t->GetEnergy(); track = tck; } - } else if (option == "Y" && (t->isYZ() || t->isXYZ)) { + } else if (option == "Y" && (t->isYZ() || t->isXYZ())) { if (t->GetEnergy() > maxEnergy) { maxEnergy = t->GetEnergy(); track = tck; @@ -226,10 +226,10 @@ Double_t TRestTrackEvent::GetEnergy(TString option) { if (option == "") en += t->GetEnergy(); - else if (option == "X" && (t->isXZ() || t->isXYZ)) + else if (option == "X" && (t->isXZ() || t->isXYZ())) en += t->GetEnergy(); - else if (option == "Y" && (t->isYZ() || t->isXYZ)) + else if (option == "Y" && (t->isYZ() || t->isXYZ())) en += t->GetEnergy(); else if (option == "XYZ" && t->isXYZ())