Skip to content

Fixed neutron counting that accidentally used A instead of A-Z - #46

Open
rdiurba wants to merge 5 commits into
NuSystematics:developfrom
rdiurba:develop
Open

rdiurba wants to merge 5 commits into
NuSystematics:developfrom
rdiurba:develop

Conversation

@rdiurba

@rdiurba rdiurba commented Jun 5, 2026

Copy link
Copy Markdown

Fixed bug that likely broke unitarity.

@jedori0228 jedori0228 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found few places where the merging with develop was done in an opposite way and undo the changes made in develop. That part should be reverted so we keep the structure of develop.

inline void FSIReweightCalculator::LoadInputHistograms(fhicl::ParameterSet const &ps) {

std::string const &default_root_file = systtools::expand_env_vars( ps.get<std::string>("input_file", "") );
std::string const &default_root_file = ps.get<std::string>("input_file", "");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

systtools::expand_env_vars should be used to get file path. I think we can "undo" what are done on this function.

std::string hName = val_config.get<std::string>("name");
std::string input_hist = val_config.get<std::string>("input_hist");
std::string input_file = systtools::expand_env_vars( val_config.get<std::string>("input_file", default_root_file) ); // If specified per hist, replace it
std::string input_file = val_config.get<std::string>("input_file", default_root_file); // If specified per hist, replace it

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above, we can "undo" what are done on this function.

inline void FSIReweightCalculatorMult::LoadInputHistograms(fhicl::ParameterSet const &ps) {

std::string const &default_root_file = systtools::expand_env_vars( ps.get<std::string>("input_file", "") );
std::string const &default_root_file = ps.get<std::string>("input_file", "");

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above.

std::string hName = val_config.get<std::string>("name");
std::string input_hist = val_config.get<std::string>("input_hist");
std::string input_file = systtools::expand_env_vars( val_config.get<std::string>("input_file", default_root_file) ); // If specified per hist, replace it
std::string input_file = val_config.get<std::string>("input_file", default_root_file); // If specified per hist, replace it

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as above.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes here must be un-done

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are the difference between FSIReweightCalculatorMult.hh and FSIReweightMultCalculator.hh?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants