Skip to content

tidy: Safer Sample Names #216

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 3 commits into from
Jan 30, 2026
Merged

tidy: Safer Sample Names #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a580d8
after Tomas comment make sample name avodiing space
KSkwarczynski Jan 29, 2026
9ce5440
forgot about covariance valdiations
KSkwarczynski Jan 29, 2026
7f944b9
forgot about this
KSkwarczynski Jan 29, 2026
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/CovarianceValidations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ int main(int argc, char *argv[])
xsec->SetParameters(ParProp);
xsec->AcceptStep();
///// Test Params from DetId /////
const std::vector<std::string> AffectedSamples = {"Tutorial Beam", "Tutorial ATM", "tutorial beam", "blarb" "ATM"};
const std::vector<std::string> AffectedSamples = {"Tutorial_Beam", "Tutorial_ATM", "tutorial_beam", "blarb" "ATM"};
for (size_t id = 0; id < AffectedSamples.size(); ++id)
{
for (int s = 0; s < kSystTypes; ++s)
Expand Down
2 changes: 1 addition & 1 deletion CIValidations/PredictiveValidations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ int main(int argc, char *argv[])
throw MaCh3Exception(__FILE__, __LINE__);
}

std::vector<std::string> SampleNames1D = {"Tutorial", "Tutorial ATM", "ND_NC1pi0"};
std::vector<std::string> SampleNames1D = {"Tutorial_Beam", "Tutorial_ATM", "ND_NC1pi0"};
for (const auto& sampleName : SampleNames1D) {
TDirectory* sampleDir = static_cast<TDirectory*>(predictiveDir->Get(sampleName.c_str()));
if (!sampleDir) {
Expand Down
52 changes: 28 additions & 24 deletions CIValidations/SigmaVarValidation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,36 +25,40 @@ int main(int argc, char *argv[])
auto file = std::unique_ptr<TFile>(TFile::Open("SigmaVar_Test.root", "UPDATE"));
std::vector<std::string> Names = {"Norm_Param_0", "Norm_Param_1", "Norm_Param_2", "BinnedSplineParam1", "BinnedSplineParam2", "BinnedSplineParam3", "BinnedSplineParam4", "BinnedSplineParam5", "EResLep", "EResTot"};
std::ofstream outFile("SigmaVar.txt");

std::vector<std::string> SampleNames = {"Tutorial_Beam"};
for (size_t i = 0; i < Names.size(); ++i) {
std::string dirPath = "SigmaVar/" + Names[i] + "/Tutorial/";
TDirectory* dir = file->GetDirectory(dirPath.c_str());
for (size_t iSam = 0; iSam < SampleNames.size(); ++iSam) {
std::string dirPath = "SigmaVar/" + Names[i] + "/" + SampleNames[iSam] + "/";
TDirectory* dir = file->GetDirectory(dirPath.c_str());

if (!dir) {
std::cerr << "Missing directory: " << dirPath << std::endl;
return 1;
}
if (!dir) {
std::cerr << "Missing directory: " << dirPath << std::endl;
return 1;
}

TList* keys = dir->GetListOfKeys();
if (!keys) {
std::cerr << "No keys found in: " << dirPath << std::endl;
continue;
}
TList* keys = dir->GetListOfKeys();
if (!keys) {
std::cerr << "No keys found in: " << dirPath << std::endl;
continue;
}

for (int i = 0; i < keys->GetSize(); ++i) {
TKey* key = dynamic_cast<TKey*>(keys->At(i));
if (!key) continue;
for (int i = 0; i < keys->GetSize(); ++i) {
TKey* key = dynamic_cast<TKey*>(keys->At(i));
if (!key) continue;

TObject* obj = key->ReadObj();
TH1* hist = dynamic_cast<TH1*>(obj);
if (!hist) continue;
TObject* obj = key->ReadObj();
TH1* hist = dynamic_cast<TH1*>(obj);
if (!hist) continue;

for (int j = 1; j <= hist->GetNbinsX(); ++j) {
double binContent = hist->GetBinContent(j);
outFile << "Dial " << Names[i]
<< " hist = " << hist->GetTitle()
<< " bin = " << j
<< " content = " << std::fixed << std::setprecision(6)
<< std::fabs(binContent) << std::endl;
for (int j = 1; j <= hist->GetNbinsX(); ++j) {
double binContent = hist->GetBinContent(j);
outFile << "Dial " << Names[i]
<< " hist = " << hist->GetTitle()
<< " bin = " << j
<< " content = " << std::fixed << std::setprecision(6)
<< std::fabs(binContent) << std::endl;
}
}
}
}
Expand Down
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 @@ -65,7 +65,7 @@ void SplineBinnedValidations(std::ostream& outFile){
std::vector<std::string> spline_filepaths = {"TutorialConfigs/MC/BinnedSplinesTutorialInputs2D.root"};
std::vector<std::string> SplineVarNames = {"TrueNeutrinoEnergy", "TrueNeutrinoEnergy"};
for(int i = 0; i < SampleTittles.size(); i++) {
SplineHandler->AddSample("Tutorial Blarb", SampleTittles[i], spline_filepaths, SplineVarNames);
SplineHandler->AddSample("Tutorial_Blarb", SampleTittles[i], spline_filepaths, SplineVarNames);
}
SplineHandler->CountNumberOfLoadedSplines(false, 1);
SplineHandler->TransferToMonolith();
Expand Down
30 changes: 15 additions & 15 deletions CIValidations/TestOutputs/CovarianceOut.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Likelihood Xsec=266.956
Found 3 for Tutorial Beam Params of type Norm
Found 5 for Tutorial Beam Params of type Spline
Found 2 for Tutorial Beam Params of type Functional
Found 0 for Tutorial Beam Params of type Oscillation
Found 3 for Tutorial Beam From GetNormParsFromSampleName
Found 3 for Tutorial ATM Params of type Norm
Found 5 for Tutorial ATM Params of type Spline
Found 2 for Tutorial ATM Params of type Functional
Found 0 for Tutorial ATM Params of type Oscillation
Found 3 for Tutorial ATM From GetNormParsFromSampleName
Found 3 for tutorial beam Params of type Norm
Found 5 for tutorial beam Params of type Spline
Found 2 for tutorial beam Params of type Functional
Found 0 for tutorial beam Params of type Oscillation
Found 3 for tutorial beam From GetNormParsFromSampleName
Found 3 for Tutorial_Beam Params of type Norm
Found 5 for Tutorial_Beam Params of type Spline
Found 2 for Tutorial_Beam Params of type Functional
Found 0 for Tutorial_Beam Params of type Oscillation
Found 3 for Tutorial_Beam From GetNormParsFromSampleName
Found 3 for Tutorial_ATM Params of type Norm
Found 5 for Tutorial_ATM Params of type Spline
Found 2 for Tutorial_ATM Params of type Functional
Found 0 for Tutorial_ATM Params of type Oscillation
Found 3 for Tutorial_ATM From GetNormParsFromSampleName
Found 3 for tutorial_beam Params of type Norm
Found 5 for tutorial_beam Params of type Spline
Found 2 for tutorial_beam Params of type Functional
Found 0 for tutorial_beam Params of type Oscillation
Found 3 for tutorial_beam From GetNormParsFromSampleName
Found 0 for blarbATM Params of type Norm
Found 0 for blarbATM Params of type Spline
Found 0 for blarbATM Params of type Functional
Expand Down
Loading