diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h index 7fd51026e2bdee8f2f7ae595c192fefd389e7be5..00121b9cba747db54e284eb7804334ae1a835707 100644 --- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h +++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/ZdcByteStream/ZdcPpmSubBlock.h @@ -34,6 +34,7 @@ class ZdcPpmSubBlock : public ZdcSubBlock { ~ZdcPpmSubBlock(); /// Clear all data + // cppcheck-suppress duplInheritedMember void clear(); /// Store PPM header diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx index 77cd2678c4d4bade76cd601aa427eb777c2d4c9f..02556856ad94e32a23a38a209fe554980c221668 100644 --- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx +++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamReadV1V2Tool.cxx @@ -1170,18 +1170,15 @@ ZdcDigitsCollection* ZdcByteStreamReadV1V2Tool::convertTT2ZD(xAOD::TriggerTowerC typedef std::map<uint32_t,ZdcDigits*> hashmapType; hashmapType digits_map; Identifier chan_id; - - xAOD::TriggerTowerContainer::iterator tt_itr = ttCollection->begin(); - xAOD::TriggerTowerContainer::iterator tt_end = ttCollection->end(); - - for (;tt_itr != tt_end;tt_itr++) + + for (const xAOD::TriggerTower* tt : *ttCollection) { //std::cout << "dumping TT" << std::endl; - //std::cout << ZdcToString(*(*tt_itr) ) << std::endl; + //std::cout << ZdcToString(*tt ) << std::endl; - //uint32_t coolId = (*tt_itr).coolId(); - //uint32_t coolId = (*tt_itr)->auxdata<uint32_t>("coolId"); - uint32_t coolId = (*tt_itr)->coolId(); + //uint32_t coolId = tt->coolId(); + //uint32_t coolId = tt->auxdata<uint32_t>("coolId"); + uint32_t coolId = tt->coolId(); uint32_t pin = (coolId>>8) & 0xf; uint32_t asic = coolId & 0xf; uint32_t slinkChannel = asic*16 + pin; @@ -1208,10 +1205,10 @@ ZdcDigitsCollection* ZdcByteStreamReadV1V2Tool::convertTT2ZD(xAOD::TriggerTowerC if (iter != digits_map.end()) { ATH_MSG_DEBUG("new auxdata for " << chan_id); - if (gain==0&&delay==0) (*iter).second->set_digits_gain0_delay0( (*tt_itr)->adc() ); - if (gain==1&&delay==0) (*iter).second->set_digits_gain1_delay0( (*tt_itr)->adc() ); - if (gain==0&&delay==1) (*iter).second->set_digits_gain0_delay1( (*tt_itr)->adc() ); - if (gain==1&&delay==1) (*iter).second->set_digits_gain1_delay1( (*tt_itr)->adc() ); + if (gain==0&&delay==0) (*iter).second->set_digits_gain0_delay0( tt->adc() ); + if (gain==1&&delay==0) (*iter).second->set_digits_gain1_delay0( tt->adc() ); + if (gain==0&&delay==1) (*iter).second->set_digits_gain0_delay1( tt->adc() ); + if (gain==1&&delay==1) (*iter).second->set_digits_gain1_delay1( tt->adc() ); } } @@ -1234,7 +1231,7 @@ ZdcDigitsCollection* ZdcByteStreamReadV1V2Tool::convertTT2ZD(xAOD::TriggerTowerC ((*iter).second)->print(); */ zdcCollection->push_back((*iter).second); - iter++; + ++iter; } return zdcCollection; diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx index 756ac9f9f94938308f037848310ed0139ec7a613..8f77b1cab0b7d2ea49c47a37fee34605baa05617 100644 --- a/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx +++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream/src/ZdcByteStreamTool.cxx @@ -561,7 +561,7 @@ StatusCode ZdcByteStreamTool::convert( const IROBDataProviderSvc::VROBFRAG& robF while (iter != iter_end) { ttCollection->push_back((*iter).second); - iter++; + ++iter; } msg(MSG::DEBUG) << "-->ZDC: Collection has " << ttCollection->size() << " elements " << endmsg;