From fcfa19ca1dfa627f539e0b876f9947194c059c31 Mon Sep 17 00:00:00 2001 From: JPorron Date: Wed, 10 Apr 2024 09:46:20 +0200 Subject: [PATCH 1/2] Correct observable definitions --- src/TRestTrack2DAnalysisProcess.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/TRestTrack2DAnalysisProcess.cxx b/src/TRestTrack2DAnalysisProcess.cxx index a194731..1017bdb 100644 --- a/src/TRestTrack2DAnalysisProcess.cxx +++ b/src/TRestTrack2DAnalysisProcess.cxx @@ -439,10 +439,10 @@ TRestEvent* TRestTrack2DAnalysisProcess::ProcessEvent(TRestEvent* inputEvent) { SetObservableValue("MaxTrack_YZ_MeanZ", YZ_MeanZ[energiesY[0].first]); SetObservableValue("MaxTrack_YZ_SkewZ", YZ_SkewZ[energiesY[0].first]); - SetObservableValue("MaxTrack_XZ_YZ_SigmaXYBalance", XZ_YZ_SigmaXYBalance[energiesY[0].first]); - SetObservableValue("MaxTrack_XZ_YZ_SigmaZBalance", XZ_YZ_SigmaZBalance[energiesY[0].first]); - SetObservableValue("MaxTrack_XZ_YZ_GaussSigmaXYBalance", XZ_YZ_GaussSigmaXYBalance[energiesY[0].first]); - SetObservableValue("MaxTrack_XZ_YZ_GaussSigmaZBalance", XZ_YZ_GaussSigmaZBalance[energiesY[0].first]); + SetObservableValue("MaxTrack_XZ_YZ_SigmaXYBalance", XZ_YZ_SigmaXYBalance[0]); + SetObservableValue("MaxTrack_XZ_YZ_SigmaZBalance", XZ_YZ_SigmaZBalance[0]); + SetObservableValue("MaxTrack_XZ_YZ_GaussSigmaXYBalance", XZ_YZ_GaussSigmaXYBalance[0]); + SetObservableValue("MaxTrack_XZ_YZ_GaussSigmaZBalance", XZ_YZ_GaussSigmaZBalance[0]); SetObservableValue("MaxTrack_XZ_YZ_Energy", energiesX[0].second + energiesY[0].second); SetObservableValue("MaxTrack_XZ_YZ_MaxTrackEnergyPercentage", @@ -475,12 +475,12 @@ TRestEvent* TRestTrack2DAnalysisProcess::ProcessEvent(TRestEvent* inputEvent) { SetObservableValue("SecondMaxTrack_YZ_MeanZ", YZ_MeanZ[energiesY[1].first]); SetObservableValue("SecondMaxTrack_YZ_SkewZ", YZ_SkewZ[energiesY[1].first]); - SetObservableValue("SecondMaxTrack_XZ_YZ_SigmaXYBalance", XZ_YZ_SigmaXYBalance[energiesY[1].first]); - SetObservableValue("SecondMaxTrack_XZ_YZ_SigmaZBalance", XZ_YZ_SigmaZBalance[energiesY[1].first]); + SetObservableValue("SecondMaxTrack_XZ_YZ_SigmaXYBalance", XZ_YZ_SigmaXYBalance[1]); + SetObservableValue("SecondMaxTrack_XZ_YZ_SigmaZBalance", XZ_YZ_SigmaZBalance[1]); SetObservableValue("SecondMaxTrack_XZ_YZ_GaussSigmaXYBalance", - XZ_YZ_GaussSigmaXYBalance[energiesY[1].first]); + XZ_YZ_GaussSigmaXYBalance[1]); SetObservableValue("SecondMaxTrack_XZ_YZ_GaussSigmaZBalance", - XZ_YZ_GaussSigmaZBalance[energiesY[1].first]); + XZ_YZ_GaussSigmaZBalance[1]); if (fTrackEvent->GetNumberOfTracks() > 1) { SetObservableValue("SecondMaxTrack_XZ_YZ_Energy", energiesX[1].second + energiesY[1].second); From 549a6c05ffcb99eead4f22f16fde209cdcb27e94 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 10 Apr 2024 08:21:56 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/TRestTrack2DAnalysisProcess.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/TRestTrack2DAnalysisProcess.cxx b/src/TRestTrack2DAnalysisProcess.cxx index 1017bdb..90855a7 100644 --- a/src/TRestTrack2DAnalysisProcess.cxx +++ b/src/TRestTrack2DAnalysisProcess.cxx @@ -477,10 +477,8 @@ TRestEvent* TRestTrack2DAnalysisProcess::ProcessEvent(TRestEvent* inputEvent) { SetObservableValue("SecondMaxTrack_XZ_YZ_SigmaXYBalance", XZ_YZ_SigmaXYBalance[1]); SetObservableValue("SecondMaxTrack_XZ_YZ_SigmaZBalance", XZ_YZ_SigmaZBalance[1]); - SetObservableValue("SecondMaxTrack_XZ_YZ_GaussSigmaXYBalance", - XZ_YZ_GaussSigmaXYBalance[1]); - SetObservableValue("SecondMaxTrack_XZ_YZ_GaussSigmaZBalance", - XZ_YZ_GaussSigmaZBalance[1]); + SetObservableValue("SecondMaxTrack_XZ_YZ_GaussSigmaXYBalance", XZ_YZ_GaussSigmaXYBalance[1]); + SetObservableValue("SecondMaxTrack_XZ_YZ_GaussSigmaZBalance", XZ_YZ_GaussSigmaZBalance[1]); if (fTrackEvent->GetNumberOfTracks() > 1) { SetObservableValue("SecondMaxTrack_XZ_YZ_Energy", energiesX[1].second + energiesY[1].second);