Skip to content

synchronise to sbnanaobj/StandardRecord/SREnums.h #128

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
kjplows merged 4 commits into from
Aug 11, 2025
Merged

synchronise to sbnanaobj/StandardRecord/SREnums.h #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
607b703
synchronise to sbnanaobj/StandardRecord/SREnums.h
kjplows Apr 10, 2025
d4c299e
updated capitalisations
kjplows Apr 10, 2025
da36771
fix more capitalisation
kjplows Apr 10, 2025
828ead5
Merge branch 'develop' into bugfix/kplows_synchronise_ReweightType
kjplows Aug 11, 2025
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
14 changes: 7 additions & 7 deletions sbnobj/Common/SBNEventWeight/EventWeightParameterSet.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ void EventWeightParameterSet::Configure(std::string name, ReweightType rwtype, s
fRWType = rwtype;
fNuniverses = nuni;

if (fRWType == kMultisim) {
if (fRWType == kMultiSim) {
fNuniverses = nuni;
}
else if (fRWType == kPMNSigma) {
fNuniverses = 2;
}
else if (fRWType == kMultisigma) {
else if (fRWType == kMultiSigma) {
fNuniverses = nuni;
}
else if (fRWType == kFixed) {
Expand All @@ -37,9 +37,9 @@ void EventWeightParameterSet::Configure(std::string name, ReweightType rwtype, s

void EventWeightParameterSet::Configure(std::string name, std::string rwtype_string, size_t nuni) {

if (rwtype_string == "multisim") Configure(name, kMultisim, nuni);
if (rwtype_string == "multisim") Configure(name, kMultiSim, nuni);
else if (rwtype_string == "pmNsigma") Configure(name, kPMNSigma);
else if (rwtype_string == "multisigma") Configure(name, kMultisigma, nuni);
else if (rwtype_string == "multisigma") Configure(name, kMultiSigma, nuni);
else if (rwtype_string == "fixed") Configure(name, kFixed);
else {
std::cerr << "EventWeightParameterSet: Unknown reweight type " << rwtype_string << std::endl;
Expand All @@ -61,7 +61,7 @@ void EventWeightParameterSet::AddParameter(
}

void EventWeightParameterSet::Sample(CLHEP::HepRandomEngine& engine) {
if (fRWType == kDefault) {
if (fRWType == kDefaultRWType) {
std::cerr << "EventWeightParameterSet: Must be configured before sampling." << std::endl;
assert(false);
}
Expand All @@ -71,7 +71,7 @@ void EventWeightParameterSet::Sample(CLHEP::HepRandomEngine& engine) {
for (auto& it : fParameterMap) {
const EventWeightParameter& p = it.first;

if (fRWType == kMultisim) {
if (fRWType == kMultiSim) {
for (size_t i=0; i<fNuniverses; i++) {
float r = p.fWidth*CLHEP::RandGaussQ::shoot(&engine, p.fMean, 1);
it.second.push_back(r);
Expand All @@ -83,7 +83,7 @@ void EventWeightParameterSet::Sample(CLHEP::HepRandomEngine& engine) {
it.second.push_back(p.fMean - p.fWidth);
}

else if (fRWType == kMultisigma) {
else if (fRWType == kMultiSigma) {

for(size_t j=0; j<p.fWidths.size(); j++){
it.second.push_back(p.fMean + p.fWidths.at(j));
Expand Down
8 changes: 4 additions & 4 deletions sbnobj/Common/SBNEventWeight/EventWeightParameterSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ class EventWeightParameterSet {
//==== ReweightType_t in sbnanaobj/StandardRecord/SREnums.h should be synchronized to this
typedef enum rwtype
{
kDefault = -1,
kMultisim = 0,
kDefaultRWType = -1,
kMultiSim = 0,
kPMNSigma = 1,
kFixed = 2,
kMultisigma = 3,
kMultiSigma = 3,
} ReweightType;

/** Default constructor. */
EventWeightParameterSet() : fCovarianceMatrix(nullptr), fRWType(kDefault) {}
EventWeightParameterSet() : fCovarianceMatrix(nullptr), fRWType(kDefaultRWType) {}

/** Equality operator, testing equality of all members. */
inline friend bool operator==(const EventWeightParameterSet& lhs,
Expand Down