Skip to content
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

Jump to bottom

Do not use integer as keyword in weightsQIE11 PSet #32067

Merged
merged 6 commits into from Nov 13, 2020
Merged

Do not use integer as keyword in weightsQIE11 PSet #32067

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4abfe23
do not use integer as keyword in weightsQIE11 PSet
Nov 9, 2020
00aba17
do string manipulation during loading of weights
Nov 9, 2020
7ab883b
change weightsQIE11 to tracked parameter
Nov 9, 2020
665c124
deprecate map in favor of array of arrays
Nov 10, 2020
9877930
address comment from Silvio
Nov 10, 2020
1f286f9
small fix for when using non-default filters
Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion SimCalorimetry/HcalTrigPrimAlgos/interface/HcalTriggerPrimitiveAlgo.h
View file
Open in desktop
Expand Up @@ -124,7 +124,7 @@ class HcalTriggerPrimitiveAlgo {
double theThreshold;
bool peakfind_;
std::vector<double> weights_;
std::map<int, std::vector<double>> weightsQIE11_;
std::map<unsigned int, std::vector<double>> weightsQIE11_;
JHiltbrand marked this conversation as resolved.
Show resolved Hide resolved
int latency_;
uint32_t FG_threshold_;
std::vector<uint32_t> FG_HF_thresholds_;
Expand Down
3 changes: 2 additions & 1 deletion SimCalorimetry/HcalTrigPrimAlgos/src/HcalTriggerPrimitiveAlgo.cc
View file
Open in desktop
Expand Up @@ -858,7 +858,8 @@ void HcalTriggerPrimitiveAlgo::setWeightsQIE11(const edm::ParameterSet& weightsQ
// Names are just abs(ieta) for HBHE
std::vector<std::string> ietaStrs = weightsQIE11.getParameterNames();
for (auto& ietaStr : ietaStrs) {
weightsQIE11_[std::stoi(ietaStr)] = weightsQIE11.getUntrackedParameter<std::vector<double>>(ietaStr);
// Strip off "ieta" part of key and just use integer value in map
weightsQIE11_[std::stoi(ietaStr.substr(4))] = weightsQIE11.getUntrackedParameter<std::vector<double>>(ietaStr);
JHiltbrand marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down
56 changes: 28 additions & 28 deletions SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cfi.py
View file
Open in desktop
Expand Up @@ -17,34 +17,34 @@
peakFilter = cms.bool(True),
weights = cms.vdouble(1.0, 1.0), ##hardware algo
weightsQIE11 = cms.untracked.PSet(**dict([
("1", cms.untracked.vdouble(1.0, 1.0)),
("2", cms.untracked.vdouble(1.0, 1.0)),
("3", cms.untracked.vdouble(1.0, 1.0)),
("4", cms.untracked.vdouble(1.0, 1.0)),
("5", cms.untracked.vdouble(1.0, 1.0)),
("6", cms.untracked.vdouble(1.0, 1.0)),
("7", cms.untracked.vdouble(1.0, 1.0)),
("8", cms.untracked.vdouble(1.0, 1.0)),
("9", cms.untracked.vdouble(1.0, 1.0)),
("10", cms.untracked.vdouble(1.0, 1.0)),
("11", cms.untracked.vdouble(1.0, 1.0)),
("12", cms.untracked.vdouble(1.0, 1.0)),
("13", cms.untracked.vdouble(1.0, 1.0)),
("14", cms.untracked.vdouble(1.0, 1.0)),
("15", cms.untracked.vdouble(1.0, 1.0)),
("16", cms.untracked.vdouble(1.0, 1.0)),
("17", cms.untracked.vdouble(1.0, 1.0)),
("18", cms.untracked.vdouble(1.0, 1.0)),
("19", cms.untracked.vdouble(1.0, 1.0)),
("20", cms.untracked.vdouble(1.0, 1.0)),
("21", cms.untracked.vdouble(1.0, 1.0)),
("22", cms.untracked.vdouble(1.0, 1.0)),
("23", cms.untracked.vdouble(1.0, 1.0)),
("24", cms.untracked.vdouble(1.0, 1.0)),
("25", cms.untracked.vdouble(1.0, 1.0)),
("26", cms.untracked.vdouble(1.0, 1.0)),
("27", cms.untracked.vdouble(1.0, 1.0)),
("28", cms.untracked.vdouble(1.0, 1.0))
("ieta1", cms.untracked.vdouble(1.0, 1.0)),
("ieta2", cms.untracked.vdouble(1.0, 1.0)),
("ieta3", cms.untracked.vdouble(1.0, 1.0)),
("ieta4", cms.untracked.vdouble(1.0, 1.0)),
("ieta5", cms.untracked.vdouble(1.0, 1.0)),
("ieta6", cms.untracked.vdouble(1.0, 1.0)),
("ieta7", cms.untracked.vdouble(1.0, 1.0)),
("ieta8", cms.untracked.vdouble(1.0, 1.0)),
("ieta9", cms.untracked.vdouble(1.0, 1.0)),
("ieta10", cms.untracked.vdouble(1.0, 1.0)),
("ieta11", cms.untracked.vdouble(1.0, 1.0)),
("ieta12", cms.untracked.vdouble(1.0, 1.0)),
("ieta13", cms.untracked.vdouble(1.0, 1.0)),
("ieta14", cms.untracked.vdouble(1.0, 1.0)),
("ieta15", cms.untracked.vdouble(1.0, 1.0)),
("ieta16", cms.untracked.vdouble(1.0, 1.0)),
("ieta17", cms.untracked.vdouble(1.0, 1.0)),
("ieta18", cms.untracked.vdouble(1.0, 1.0)),
("ieta19", cms.untracked.vdouble(1.0, 1.0)),
("ieta20", cms.untracked.vdouble(1.0, 1.0)),
("ieta21", cms.untracked.vdouble(1.0, 1.0)),
("ieta22", cms.untracked.vdouble(1.0, 1.0)),
("ieta23", cms.untracked.vdouble(1.0, 1.0)),
("ieta24", cms.untracked.vdouble(1.0, 1.0)),
("ieta25", cms.untracked.vdouble(1.0, 1.0)),
("ieta26", cms.untracked.vdouble(1.0, 1.0)),
("ieta27", cms.untracked.vdouble(1.0, 1.0)),
("ieta28", cms.untracked.vdouble(1.0, 1.0))
])
JHiltbrand marked this conversation as resolved.
Show resolved Hide resolved
),

Expand Down