Skip to content

Commit

Permalink
Merge pull request #34060 from mrodozov/fix-clang-warning-onlinedb-si…
Browse files Browse the repository at this point in the history
…strip

Fix clang warning in OnlineDB/SiStripO2O
  • Loading branch information
cmsbuild committed Jun 29, 2021
2 parents 194eb7b + 28235d9 commit 97a97d3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions OnlineDB/SiStripO2O/plugins/SiStripPayloadHandler.cc
Expand Up @@ -51,7 +51,6 @@ class SiStripPayloadHandler : public edm::EDAnalyzer {

std::string p_type;
std::string p_cfgstr;
edm::Service<SiStripCondObjBuilderFromDb> condObjBuilder;
};

template <typename SiStripPayload>
Expand All @@ -63,8 +62,9 @@ SiStripPayloadHandler<SiStripPayload>::SiStripPayloadHandler(const edm::Paramete
m_localCondDbFile(iConfig.getParameter<std::string>("condDbFile")),
m_targetTag(iConfig.getParameter<std::string>("targetTag")),
m_since(iConfig.getParameter<uint32_t>("since")),
p_type(cond::demangledName(typeid(SiStripPayload))),
p_cfgstr(condObjBuilder->getConfigString(typeid(SiStripPayload))) {
p_type(cond::demangledName(typeid(SiStripPayload))) {
edm::Service<SiStripCondObjBuilderFromDb> condObjBuilder;
p_cfgstr = condObjBuilder->getConfigString(typeid(SiStripPayload));
if (iConfig.exists("configMapDatabase"))
m_configMapDb = iConfig.getParameter<std::string>("configMapDatabase");
if (iConfig.exists("cfgMapDbFile"))
Expand Down Expand Up @@ -108,6 +108,7 @@ void SiStripPayloadHandler<SiStripPayload>::analyze(const edm::Event& evt, const
edm::LogInfo("SiStripPayloadHandler") << "[SiStripPayloadHandler::" << __func__ << "] "
<< "NO mapping payload hash found. Will run the long O2O. ";
SiStripPayload* obj = nullptr;
edm::Service<SiStripCondObjBuilderFromDb> condObjBuilder;
if (typeid(SiStripPayload) == typeid(SiStripApvGain)) {
// special treatment for ApvGain : provide last payload in DB
condObjBuilder->setLastIovGain(condDbSession.fetchPayload<SiStripApvGain>(last_hash));
Expand Down

0 comments on commit 97a97d3

Please sign in to comment.