Skip to content

Commit

Permalink
Avoid copies of std::map and std::vector in HBHEDarkening construction
Browse files Browse the repository at this point in the history
  • Loading branch information
makortel committed Aug 9, 2023
1 parent 63ed0a8 commit 4ef6285
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CalibCalorimetry/HcalPlugins/src/HBHEDarkeningEP.cc
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ HBHEDarkeningEP::ReturnType HBHEDarkeningEP::produce(const HBHEDarkeningRecord&
return std::make_unique<HBHEDarkening>(pset_.getParameter<int>("ieta_shift"),
pset_.getParameter<double>("drdA"),
pset_.getParameter<double>("drdB"),
dosemaps,
years);
std::move(dosemaps),
std::move(years));
}

DEFINE_FWK_EVENTSETUP_SOURCE(HBHEDarkeningEP);
4 changes: 2 additions & 2 deletions CondFormats/HcalObjects/interface/HBHEDarkening.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ class HBHEDarkening {
HBHEDarkening(int ieta_shift,
float drdA,
float drdB,
const std::map<int, std::vector<std::vector<float>>>& dosemaps,
const std::vector<LumiYear>& years);
std::map<int, std::vector<std::vector<float>>> dosemaps,
std::vector<LumiYear> years);
~HBHEDarkening() {}

//public accessors
Expand Down
6 changes: 3 additions & 3 deletions CondFormats/HcalObjects/src/HBHEDarkening.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
HBHEDarkening::HBHEDarkening(int ieta_shift,
float drdA,
float drdB,
const std::map<int, std::vector<std::vector<float>>>& dosemaps,
const std::vector<LumiYear>& years)
: ieta_shift_(ieta_shift), drdA_(drdA), drdB_(drdB), dosemaps_(dosemaps), years_(years) {
std::map<int, std::vector<std::vector<float>>> dosemaps,
std::vector<LumiYear> years)
: ieta_shift_(ieta_shift), drdA_(drdA), drdB_(drdB), dosemaps_(std::move(dosemaps)), years_(std::move(years)) {
//finish initializing years
std::sort(years_.begin(), years_.end());
//sum up int lumi
Expand Down

0 comments on commit 4ef6285

Please sign in to comment.