Skip to content

breaking: Stop Hardcdoding NSplines and RetPointer float/double #838 #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KSkwarczynski merged 1 commit into from
Mar 23, 2026
Merged

breaking: Stop Hardcdoding NSplines and RetPointer float/double #838 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CIValidations/SplineValidations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}
}
Expand Down Expand Up @@ -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]);
Expand Down
22 changes: 11 additions & 11 deletions SamplesTutorial/SampleHandlerTutorial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<double> ReturnKinematicVector(KinematicParticleVecs KinVec, int iEvent);
std::vector<double> ReturnKinematicVector(int KinematicVector, int iEvent) override;
std::vector<double> 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<TutorialMCInfo> TutorialSamples;
std::vector<TutorialMCPlottingInfo> TutorialPlottingSamples;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion SplinesTutorial/BinnedSplinesTutorial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ BinnedSplineTutorial::BinnedSplineTutorial(ParameterHandlerGeneric *parameter_ha
BinnedSplineTutorial::~BinnedSplineTutorial() {
}

std::vector<std::string> BinnedSplineTutorial::GetTokensFromSplineName(std::string FullSplineName) {
std::vector<std::string> BinnedSplineTutorial::GetTokensFromSplineName(const std::string& FullSplineName) {
std::vector<std::string> ReturnVec(TokenOrdering::kNTokens);

TObjArray *tokens = TString(FullSplineName).Tokenize(".");
Expand Down
2 changes: 1 addition & 1 deletion SplinesTutorial/BinnedSplinesTutorial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ class BinnedSplineTutorial : public BinnedSplineHandler
BinnedSplineTutorial(ParameterHandlerGeneric *parameter_handler, MaCh3Modes *Modes);
virtual ~BinnedSplineTutorial();

std::vector<std::string> GetTokensFromSplineName(std::string FullSplineName) override;
std::vector<std::string> GetTokensFromSplineName(const std::string& FullSplineName) override final;
};
Loading