From 15114b3cb01a8cc00401f1324fdfab300facce2a Mon Sep 17 00:00:00 2001 From: Kamil Skwarczynski Date: Mon, 23 Mar 2026 09:02:14 +0000 Subject: [PATCH] Stop hardcdoding number of splines in gpu and RetPointer is float/double --- CIValidations/SplineValidations.cpp | 6 +++--- SamplesTutorial/SampleHandlerTutorial.h | 22 +++++++++++----------- SplinesTutorial/BinnedSplinesTutorial.cpp | 2 +- SplinesTutorial/BinnedSplinesTutorial.h | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CIValidations/SplineValidations.cpp b/CIValidations/SplineValidations.cpp index 95188c5f..9d135e0d 100755 --- a/CIValidations/SplineValidations.cpp +++ b/CIValidations/SplineValidations.cpp @@ -43,7 +43,7 @@ void SplineMonolithValidations(std::ostream& outFile) { Splines->SynchroniseMemTransfer(); for(unsigned int i = 0; i < Nevents; i++) { - const auto* weightPtr = Splines->retPointer(i); + const auto* weightPtr = Splines->RetPointer(i); outFile << "Event " << i << " weight = " << *weightPtr << std::endl; } @@ -61,7 +61,7 @@ void SplineMonolithValidations(std::ostream& outFile) { //KS: If using CPU this does nothing, if on GPU need to make sure we finished copying memory from SplinesFlat->SynchroniseMemTransfer(); for(unsigned int i = 0; i < Nevents; i++) { - const auto* weightPtr = SplinesFlat->retPointer(i); + const auto* weightPtr = SplinesFlat->RetPointer(i); outFile << "(Flat) Event " << i << " weight = " << *weightPtr << std::endl; } } @@ -97,7 +97,7 @@ void SplineBinnedValidations(std::ostream& outFile){ xsec_spline_pointers.resize(EventSplines.size()); for(size_t spline = 0; spline < xsec_spline_pointers.size(); spline++) { //Event Splines indexed as: sample name, oscillation channel, syst, mode, etrue, var1, var2 (var2 is a dummy 0 for 1D splines) - xsec_spline_pointers[spline] = SplineHandler->retPointer(EventSplines[spline][0], EventSplines[spline][1], + xsec_spline_pointers[spline] = SplineHandler->RetPointer(EventSplines[spline][0], EventSplines[spline][1], EventSplines[spline][2], EventSplines[spline][3], EventSplines[spline][4], EventSplines[spline][5], EventSplines[spline][6]); diff --git a/SamplesTutorial/SampleHandlerTutorial.h b/SamplesTutorial/SampleHandlerTutorial.h index 954edf2c..3016d1ad 100755 --- a/SamplesTutorial/SampleHandlerTutorial.h +++ b/SamplesTutorial/SampleHandlerTutorial.h @@ -22,27 +22,27 @@ class SampleHandlerTutorial : public SampleHandlerFD void Init() override; ///@brief Setup our spline file, this calls InitialseSplineObject() under the hood - void SetupSplines() override; + void SetupSplines() override final; - void AddAdditionalWeightPointers() override; + void AddAdditionalWeightPointers() override final; - int SetupExperimentMC() override; + int SetupExperimentMC() override final; - void CleanMemoryBeforeFit() override; + void CleanMemoryBeforeFit() override final; double ReturnKinematicParameter(KinematicTypes KinPar, int iEvent); - double ReturnKinematicParameter(int KinematicVariable, int iEvent) override; + double ReturnKinematicParameter(int KinematicVariable, int iEvent) override final; // === JM ReturnKinematicVector declarations for particle-level parameters === std::vector ReturnKinematicVector(KinematicParticleVecs KinVec, int iEvent); - std::vector ReturnKinematicVector(int KinematicVector, int iEvent) override; + std::vector ReturnKinematicVector(int KinematicVector, int iEvent) override final; // =========================================================================== const double* GetPointerToKinematicParameter(KinematicTypes KinPar, int iEvent); - const double* GetPointerToKinematicParameter(double KinematicVariable, int iEvent) override; + const double* GetPointerToKinematicParameter(double KinematicVariable, int iEvent) override final; - void SetupMC() override; - void CalcWeightFunc(int iEvent) override {return; (void)iEvent;} + void SetupMC() override final; + void CalcWeightFunc(int iEvent) override final {return; (void)iEvent;} std::vector TutorialSamples; std::vector TutorialPlottingSamples; @@ -82,8 +82,8 @@ class SampleHandlerTutorial : public SampleHandlerFD // === HH: Functional parameters === enum FuncParEnum {kDebugNothing, kDebugShift, kEResLep, kEResTot}; - void RegisterFunctionalParameters() override; - void ResetShifts(const int iEvent) override; + void RegisterFunctionalParameters() override final; + void ResetShifts(const int iEvent) override final; void DebugShift(const double* par, std::size_t iEvent); void EResLep(const double* par, std::size_t iEvent); diff --git a/SplinesTutorial/BinnedSplinesTutorial.cpp b/SplinesTutorial/BinnedSplinesTutorial.cpp index 50ae6c6b..32658dbe 100644 --- a/SplinesTutorial/BinnedSplinesTutorial.cpp +++ b/SplinesTutorial/BinnedSplinesTutorial.cpp @@ -8,7 +8,7 @@ BinnedSplineTutorial::BinnedSplineTutorial(ParameterHandlerGeneric *parameter_ha BinnedSplineTutorial::~BinnedSplineTutorial() { } -std::vector BinnedSplineTutorial::GetTokensFromSplineName(std::string FullSplineName) { +std::vector BinnedSplineTutorial::GetTokensFromSplineName(const std::string& FullSplineName) { std::vector ReturnVec(TokenOrdering::kNTokens); TObjArray *tokens = TString(FullSplineName).Tokenize("."); diff --git a/SplinesTutorial/BinnedSplinesTutorial.h b/SplinesTutorial/BinnedSplinesTutorial.h index 0b8888dd..22a64be7 100644 --- a/SplinesTutorial/BinnedSplinesTutorial.h +++ b/SplinesTutorial/BinnedSplinesTutorial.h @@ -10,5 +10,5 @@ class BinnedSplineTutorial : public BinnedSplineHandler BinnedSplineTutorial(ParameterHandlerGeneric *parameter_handler, MaCh3Modes *Modes); virtual ~BinnedSplineTutorial(); - std::vector GetTokensFromSplineName(std::string FullSplineName) override; + std::vector GetTokensFromSplineName(const std::string& FullSplineName) override final; };