Skip to content

Commit 29902e3

Browse files
authored
Merge pull request #46525 from Dr15Jones/fixL1TGlobalUtil
use vector::reserve in L1TGlobalUtil
2 parents e5268b1 + 47c9bc0 commit 29902e3

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

L1Trigger/L1TGlobal/src/L1TGlobalUtil.cc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,8 +338,10 @@ void l1t::L1TGlobalUtil::loadPrescalesAndMasks() {
338338
//std::cout << "NumPrescaleSets= " << NumPrescaleSets << std::endl;
339339
if (NumPrescaleSets > 0) {
340340
// Fill default prescale set
341+
prescale_vec.reserve(NumPrescaleSets);
341342
for (int iSet = 0; iSet < NumPrescaleSets; iSet++) {
342-
prescale_vec.push_back(std::vector<double>());
343+
prescale_vec.emplace_back();
344+
prescale_vec.back().reserve(m_numberPhysTriggers);
343345
for (unsigned int iBit = 0; iBit < m_numberPhysTriggers; ++iBit) {
344346
int inputDefaultPrescale = 1;
345347
prescale_vec[iSet].push_back(inputDefaultPrescale);
@@ -379,8 +381,10 @@ void l1t::L1TGlobalUtil::loadPrescalesAndMasks() {
379381

380382
m_PreScaleColumn = 0;
381383

384+
prescale_vec.reserve(1);
382385
for (int col = 0; col < 1; col++) {
383-
prescale_vec.push_back(std::vector<double>());
386+
prescale_vec.emplace_back();
387+
prescale_vec.back().reserve(m_numberPhysTriggers);
384388
for (unsigned int iBit = 0; iBit < m_numberPhysTriggers; ++iBit) {
385389
int inputDefaultPrescale = 0;
386390
prescale_vec[col].push_back(inputDefaultPrescale);
@@ -390,9 +394,9 @@ void l1t::L1TGlobalUtil::loadPrescalesAndMasks() {
390394

391395
inputPrescaleFile.close();
392396

393-
m_initialPrescaleFactorsAlgoTrig = prescale_vec;
397+
m_initialPrescaleFactorsAlgoTrig = std::move(prescale_vec);
394398
// setting of bx masks from an input file not enabled; do not see a use case at the moment
395-
std::map<int, std::vector<int> > m_initialTriggerMaskAlgoTrig;
399+
//std::map<int, std::vector<int> > m_initialTriggerMaskAlgoTrig;
396400
}
397401

398402
void l1t::L1TGlobalUtil::eventSetupConsumes(edm::ConsumesCollector& iC, UseEventSetupIn useEventSetupIn) {

0 commit comments

Comments
 (0)