Skip to content
Snippets Groups Projects
Commit 169a1624 authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch '22.0-cppcheck-PixelConditionsAlgorithms' into 'master'

22.0-cppcheck-PixelConditionsAlgorithms

See merge request !45311
parents c95e48d3 dbec0761
5 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!51674Fixing hotSpotInHIST for Run3 HIST,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!4531122.0-cppcheck-PixelConditionsAlgorithms
......@@ -90,7 +90,7 @@ StatusCode PixelDetectorElementCondAlg::execute(const EventContext& ctx) const
oldEl->getCommonItems(),
readCdo);
oldToNewMap[oldEl] = *newEl;
newEl++;
++newEl;
}
// Set neighbours and other side
......@@ -110,7 +110,7 @@ StatusCode PixelDetectorElementCondAlg::execute(const EventContext& ctx) const
if (layer) {
newEl->surface().associateLayer(*layer);
}
oldIt++;
++oldIt;
}
// Apply alignment using readCdo passed to SiDetectorElement
......
......@@ -152,7 +152,7 @@ Identifier PixelCablingCondData::find_entry_DCSoffline(const std::string& DCSnam
std::string PixelCablingCondData::find_entry_offlineDCS(const Identifier offlineId) const {
std::unordered_map<std::string, Identifier>::const_iterator iter = m_idMapDCSoff.begin();
for (; iter != m_idMapDCSoff.end(); iter++) {
for (; iter != m_idMapDCSoff.end(); ++iter) {
if (iter->second == offlineId)
return iter->first;
}
......
......@@ -113,6 +113,7 @@ uint64_t PixelConditionsSummaryTool::getBSErrorWord(const IdentifierHash& module
const auto *idcCachePtr = getCacheEntry(ctx)->IDCCache;
if (idcCachePtr==nullptr) {
ATH_MSG_ERROR("PixelConditionsSummaryTool No cache! " );
return 0;
}
uint64_t word = (uint64_t)idcCachePtr->retrieve(index);
return word<m_missingErrorInfo ? word : 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment