Skip to content

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

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

Open
rdiurba wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b81692c
Fixed neutron counting that accidentally used A instead of A-Z
Jun 5, 2026
97ddec1
Merge branch 'NuSystematics:develop' into develop
rdiurba Jun 23, 2026
03ed599
initial commit of FSI nucl AND energy reweighting in a single dial
Jun 23, 2026
ecd3314
New full FSIMult dial with visE and better handling of quasideuteron …
Jul 6, 2026
1b48fa5
Merge branch 'develop' into develop
rdiurba Jul 7, 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
23 changes: 15 additions & 8 deletions src/nusystematics/responsecalculators/FSIReweightCalculator.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include "systematicstools/utility/ROOTUtility.hh"
#include "systematicstools/utility/exceptions.hh"
#include "systematicstools/utility/string_parsers.hh"

#include "fhiclcpp/ParameterSet.h"

Expand Down Expand Up @@ -96,13 +95,12 @@ namespace nusyst {
if(weight_nom==0.){
return 1.;
}

if(weight_alt==0.){
weight_alt=0.001;
}
double weight = ( weight_nom * (1.-parameter_value) + weight_alt * parameter_value ) / weight_nom;
//cout<<"weight "<<weight<<endl;
if(weight<0.001){
//cout<<"weight_nom==0."<<endl;
return 0.001;
}

return weight;

}
Expand Down Expand Up @@ -136,13 +134,22 @@ inline double FSIReweightCalculator::GetFSIReweight_2par(double KEini_0, double

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", "");

for (fhicl::ParameterSet const &val_config :
ps.get<std::vector<fhicl::ParameterSet>>("inputs")) {
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

// if it does not start with "/", find it under ${NUSYSTEMATICS_FQ_DIR}/data/
if(input_file.find("/")!=0){
std::string tmp_NUSYSTEMATICS_ROOT = std::getenv("nusystematics_ROOT");
if(tmp_NUSYSTEMATICS_ROOT==""){
throw invalid_FSI_FILEPATH() << "[ERROR]: ${nusystematics_ROOT} not set but put relative path:" << input_file;
}
input_file = tmp_NUSYSTEMATICS_ROOT+"/data/"+input_file;
}

if(hName=="hist_nom_protonPlus"){
hist_nom_protonPlus = GetHistogram<TH2D>(input_file, input_hist);
Expand Down
22 changes: 15 additions & 7 deletions src/nusystematics/responsecalculators/FSIReweightCalculatorMult.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include "systematicstools/utility/ROOTUtility.hh"
#include "systematicstools/utility/exceptions.hh"
#include "systematicstools/utility/string_parsers.hh"

#include "fhiclcpp/ParameterSet.h"

Expand Down Expand Up @@ -110,9 +109,9 @@ namespace nusyst {

double weight = ( weight_nom * (1.-parameter_value) + weight_alt * parameter_value ) / weight_nom;
//cout<<"weight "<<weight<<endl;
if(weight<0.001){
if(weight<0.01){
//cout<<"weight_nom==0."<<endl;
return 0.001;
return 0.01;
}
return weight;

Expand Down Expand Up @@ -159,9 +158,9 @@ inline double FSIReweightCalculatorMult::GetFSIReweightMultDiff(double KEini, do

double weight = ( weight_nom * (1.-parameter_value) + weight_alt * parameter_value ) / weight_nom;
//cout<<"weight "<<weight<<endl;
if(weight<0.001){
if(weight<0.01){
//cout<<"weight_nom==0."<<endl;
return 0.001;
return 0.01;
}

return weight;
Expand All @@ -170,13 +169,22 @@ inline double FSIReweightCalculatorMult::GetFSIReweightMultDiff(double KEini, do

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", "");

for (fhicl::ParameterSet const &val_config :
ps.get<std::vector<fhicl::ParameterSet>>("inputs")) {
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

// if it does not start with "/", find it under ${NUSYSTEMATICS_FQ_DIR}/data/
if(input_file.find("/")!=0){
std::string tmp_NUSYSTEMATICS_ROOT = std::getenv("nusystematics_ROOT");
if(tmp_NUSYSTEMATICS_ROOT==""){
throw invalid_FSIMult_FILEPATH() << "[ERROR]: ${nusystematics_ROOT} not set but put relative path:" << input_file;
}
input_file = tmp_NUSYSTEMATICS_ROOT+"/data/"+input_file;
}

if(hName=="hist_nom_protonPlus"){
hist_nom_protonPlus = GetHistogram<TH2D>(input_file, input_hist);
Expand Down
Loading