Skip to content

breaking: Spline tokens no assume dimensionality #290

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
Aug 19, 2026
Merged

breaking: Spline tokens no assume dimensionality #290

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
2 changes: 1 addition & 1 deletion CIValidations/SplineValidations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void SplineBinnedValidations(std::ostream& outFile){
constexpr int ModeIndex = 0;
std::vector<double> TrueEnu = {0.2, 0.4, 0.6, 0.8, 1.0};
for (size_t iEnu = 0; iEnu < TrueEnu.size(); ++iEnu) {
auto EventSplines = SplineHandler->GetEventSplines("FHC_1Re", OscIndex, ModeIndex, TrueEnu[iEnu], TrueEnu[iEnu], 0.);
auto EventSplines = SplineHandler->GetEventSplines("FHC_1Re", OscIndex, ModeIndex, {TrueEnu[iEnu], TrueEnu[iEnu], 0.});

for(size_t spline = 0; spline < EventSplines.size(); spline++) {
//Event Splines indexed as: sample name, oscillation channel, syst, mode, etrue, var1, var2 (var2 is a dummy 0 for 1D splines)
Expand Down
17 changes: 8 additions & 9 deletions SplinesTutorial/BinnedSplinesTutorial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,25 @@ BinnedSplineTutorial::~BinnedSplineTutorial() {
}

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

TObjArray *tokens = TString(FullSplineName).Tokenize(".");
/*
A little hacky but lets us grab both old + new splines
*/
if(tokens->GetEntries()!=7){

/// A little hacky but lets us grab both old + new splines
if(tokens->GetEntries() != 7){
delete tokens;
tokens = TString(FullSplineName).Tokenize("_");
}

ReturnVec[TokenOrdering::kSystToken] = (static_cast<TObjString*>(tokens->At(1)))->GetString();
ReturnVec[TokenOrdering::kModeToken] = (static_cast<TObjString*>(tokens->At(2)))->GetString();
// Skip 3 because it's "sp"
ReturnVec[TokenOrdering::kVar1BinToken] = (static_cast<TObjString*>(tokens->At(4)))->GetString();
ReturnVec[TokenOrdering::kVar2BinToken] = (static_cast<TObjString*>(tokens->At(5)))->GetString();
ReturnVec[TokenOrdering::kVar3BinToken] = "0";
ReturnVec[TokenOrdering::kVarBinToken + 0] = (static_cast<TObjString*>(tokens->At(4)))->GetString();
ReturnVec[TokenOrdering::kVarBinToken + 1] = (static_cast<TObjString*>(tokens->At(5)))->GetString();
ReturnVec[TokenOrdering::kVarBinToken + 2] = "0";

if (tokens->GetEntries() == 7) {
ReturnVec[TokenOrdering::kVar3BinToken] = (static_cast<TObjString*>(tokens->At(6)))->GetString();
ReturnVec[TokenOrdering::kVarBinToken + 2] = (static_cast<TObjString*>(tokens->At(6)))->GetString();
}
tokens->Delete();
delete tokens;
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(const std::string& FullSplineName) override final;
std::vector<std::string> GetTokensFromSplineName(const std::string& FullSplineName) final;
};
Loading