Skip to content
Snippets Groups Projects
Commit 1bf7f738 authored by Takashi Yamanaka's avatar Takashi Yamanaka
Browse files

Merge branch 'muon-datahandle-migration' into 'master' 

Migration of MuonTrackFinderTools to use datahandles.

See merge request !1013
parents ec5812e2 78fd7839
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 113 additions and 84 deletions
MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.cxx
+ 42
− 23
View file @ 1bf7f738
...@@ -65,11 +65,7 @@ namespace Muon { ...@@ -65,11 +65,7 @@ namespace Muon {
m_pullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator"), m_pullCalculator("Trk::ResidualPullCalculator/ResidualPullCalculator"),
m_idHelperTool("Muon::MuonIdHelperTool/MuonIdHelperTool"), m_idHelperTool("Muon::MuonIdHelperTool/MuonIdHelperTool"),
m_helperTool("Muon::MuonEDMHelperTool/MuonEDMHelperTool"), m_helperTool("Muon::MuonEDMHelperTool/MuonEDMHelperTool"),
m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"), m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool")
m_mdtPrdContainer(0),
m_cscPrdContainer(0),
m_tgcPrdContainer(0),
m_rpcPrdContainer(0)
{ {
declareInterface<IMuonHoleRecoveryTool>(this); declareInterface<IMuonHoleRecoveryTool>(this);
declareInterface<MuonChamberHoleRecoveryTool>(this); declareInterface<MuonChamberHoleRecoveryTool>(this);
...@@ -166,6 +162,10 @@ namespace Muon { ...@@ -166,6 +162,10 @@ namespace Muon {
return StatusCode::FAILURE; return StatusCode::FAILURE;
} }
ATH_CHECK(m_key_mdt.initialize());
ATH_CHECK(m_key_csc.initialize());
ATH_CHECK(m_key_tgc.initialize());
ATH_CHECK(m_key_rpc.initialize());
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
} }
...@@ -1206,15 +1206,20 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr ...@@ -1206,15 +1206,20 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr
const MdtPrepDataCollection* MuonChamberHoleRecoveryTool::findMdtPrdCollection( const Identifier& chId ) const { const MdtPrepDataCollection* MuonChamberHoleRecoveryTool::findMdtPrdCollection( const Identifier& chId ) const {
if (evtStore()->retrieve(m_mdtPrdContainer,m_key_mdt).isFailure()) { SG::ReadHandle<Muon::MdtPrepDataContainer> h_mdtPrdCont(m_key_mdt);
ATH_MSG_WARNING("Cannot retrieve mdtPrepDataContainer " << m_key_mdt ); const Muon::MdtPrepDataContainer *mdtPrdContainer;
if (h_mdtPrdCont.isValid()) {
mdtPrdContainer = h_mdtPrdCont.cptr();
}
else{
ATH_MSG_WARNING("Cannot retrieve mdtPrepDataContainer " << m_key_mdt.key() );
return 0; return 0;
} }
IdentifierHash hash_id; IdentifierHash hash_id;
m_idHelperTool->mdtIdHelper().get_module_hash(chId,hash_id ); m_idHelperTool->mdtIdHelper().get_module_hash(chId,hash_id );
MdtPrepDataContainer::const_iterator colIt = m_mdtPrdContainer->indexFind(hash_id); MdtPrepDataContainer::const_iterator colIt = mdtPrdContainer->indexFind(hash_id);
if( colIt == m_mdtPrdContainer->end() ){ if( colIt == mdtPrdContainer->end() ){
ATH_MSG_DEBUG(" MdtPrepDataCollection for: " << m_idHelperTool->toStringChamber(chId) ATH_MSG_DEBUG(" MdtPrepDataCollection for: " << m_idHelperTool->toStringChamber(chId)
<< " not found in container " ); << " not found in container " );
return 0; return 0;
...@@ -1224,15 +1229,20 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr ...@@ -1224,15 +1229,20 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr
const CscPrepDataCollection* MuonChamberHoleRecoveryTool::findCscPrdCollection( const Identifier& detElId ) const { const CscPrepDataCollection* MuonChamberHoleRecoveryTool::findCscPrdCollection( const Identifier& detElId ) const {
if (evtStore()->retrieve(m_cscPrdContainer,m_key_csc).isFailure()) { SG::ReadHandle<Muon::CscPrepDataContainer> h_cscPrdCont(m_key_csc);
ATH_MSG_WARNING("Cannot retrieve cscPrepDataContainer " << m_key_csc ); const Muon::CscPrepDataContainer *cscPrdContainer;
if (h_cscPrdCont.isValid()) {
cscPrdContainer = h_cscPrdCont.cptr();
}
else{
ATH_MSG_WARNING("Cannot retrieve cscPrepDataContainer " << m_key_csc.key() );
return 0; return 0;
} }
IdentifierHash hash_id; IdentifierHash hash_id;
m_idHelperTool->cscIdHelper().get_module_hash(detElId,hash_id ); m_idHelperTool->cscIdHelper().get_module_hash(detElId,hash_id );
CscPrepDataContainer::const_iterator colIt = m_cscPrdContainer->indexFind(hash_id); CscPrepDataContainer::const_iterator colIt = cscPrdContainer->indexFind(hash_id);
if( colIt == m_cscPrdContainer->end() ){ if( colIt == cscPrdContainer->end() ){
ATH_MSG_DEBUG(" CscPrepDataCollection for: " << m_idHelperTool->toStringChamber(detElId) ATH_MSG_DEBUG(" CscPrepDataCollection for: " << m_idHelperTool->toStringChamber(detElId)
<< " not found in container " ); << " not found in container " );
return 0; return 0;
...@@ -1241,16 +1251,21 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr ...@@ -1241,16 +1251,21 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr
} }
const TgcPrepDataCollection* MuonChamberHoleRecoveryTool::findTgcPrdCollection( const Identifier& detElId ) const { const TgcPrepDataCollection* MuonChamberHoleRecoveryTool::findTgcPrdCollection( const Identifier& detElId ) const {
if (evtStore()->retrieve(m_tgcPrdContainer,m_key_tgc).isFailure()) { SG::ReadHandle<Muon::TgcPrepDataContainer> h_tgcPrdCont(m_key_tgc);
ATH_MSG_WARNING("Cannot retrieve tgcPrepDataContainer " << m_key_tgc ); const Muon::TgcPrepDataContainer *tgcPrdContainer;
if (h_tgcPrdCont.isValid()) {
tgcPrdContainer = h_tgcPrdCont.cptr();
}
else{
ATH_MSG_WARNING("Cannot retrieve tgcPrepDataContainer " << m_key_tgc.key() );
return 0; return 0;
} }
IdentifierHash hash_id; IdentifierHash hash_id;
m_idHelperTool->tgcIdHelper().get_module_hash(detElId,hash_id ); m_idHelperTool->tgcIdHelper().get_module_hash(detElId,hash_id );
TgcPrepDataContainer::const_iterator colIt = m_tgcPrdContainer->indexFind(hash_id); TgcPrepDataContainer::const_iterator colIt = tgcPrdContainer->indexFind(hash_id);
if( colIt == m_tgcPrdContainer->end() ){ if( colIt == tgcPrdContainer->end() ){
ATH_MSG_DEBUG(" TgcPrepDataCollection for: " << m_idHelperTool->toStringChamber(detElId) ATH_MSG_DEBUG(" TgcPrepDataCollection for: " << m_idHelperTool->toStringChamber(detElId)
<< " not found in container " ); << " not found in container " );
return 0; return 0;
...@@ -1260,15 +1275,19 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr ...@@ -1260,15 +1275,19 @@ MuonChamberHoleRecoveryTool::insertMdtsWithHoleSearch( std::vector<const Trk::Tr
const RpcPrepDataCollection* MuonChamberHoleRecoveryTool::findRpcPrdCollection( const Identifier& detElId ) const { const RpcPrepDataCollection* MuonChamberHoleRecoveryTool::findRpcPrdCollection( const Identifier& detElId ) const {
SG::ReadHandle<Muon::RpcPrepDataContainer> h_rpcPrdCont(m_key_rpc);
if(evtStore()->retrieve(m_rpcPrdContainer,m_key_rpc).isFailure()) { const Muon::RpcPrepDataContainer *rpcPrdContainer;
ATH_MSG_WARNING("Cannot retrieve rpcPrepDataContainer " << m_key_rpc ); if(h_rpcPrdCont.isValid()) {
rpcPrdContainer = h_rpcPrdCont.cptr();
}
else{
ATH_MSG_WARNING("Cannot retrieve rpcPrepDataContainer " << m_key_rpc.key() );
return 0; return 0;
} }
IdentifierHash hash_id; IdentifierHash hash_id;
m_idHelperTool->rpcIdHelper().get_module_hash(detElId,hash_id ); m_idHelperTool->rpcIdHelper().get_module_hash(detElId,hash_id );
RpcPrepDataContainer::const_iterator colIt = m_rpcPrdContainer->indexFind(hash_id); RpcPrepDataContainer::const_iterator colIt = rpcPrdContainer->indexFind(hash_id);
if( colIt == m_rpcPrdContainer->end() ){ if( colIt == rpcPrdContainer->end() ){
ATH_MSG_DEBUG(" RpcPrepDataCollection for: " << m_idHelperTool->toStringChamber(detElId) << " not found in container " ); ATH_MSG_DEBUG(" RpcPrepDataCollection for: " << m_idHelperTool->toStringChamber(detElId) << " not found in container " );
return 0; return 0;
} }
......
MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonChamberHoleRecoveryTool.h
+ 5
− 9
View file @ 1bf7f738
...@@ -180,15 +180,11 @@ namespace Muon { ...@@ -180,15 +180,11 @@ namespace Muon {
const MuonGM::MuonDetectorManager* m_detMgr; const MuonGM::MuonDetectorManager* m_detMgr;
std::string m_key_mdt; //!< storegate location of the MdtPrepData SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_key_mdt; //!< storegate location of the MdtPrepData
std::string m_key_csc; //!< storegate location of the CscPrepData SG::ReadHandleKey<Muon::CscPrepDataContainer> m_key_csc; //!< storegate location of the CscPrepData
std::string m_key_tgc; //!< storegate location of the TgcPrepData SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_key_tgc; //!< storegate location of the TgcPrepData
std::string m_key_rpc; //!< storegate location of the RpcPrepData SG::ReadHandleKey<Muon::RpcPrepDataContainer> m_key_rpc; //!< storegate location of the RpcPrepData
mutable const Muon::MdtPrepDataContainer* m_mdtPrdContainer; //!< pointer to the MdtPrepData container
mutable const Muon::CscPrepDataContainer* m_cscPrdContainer; //!< pointer to the CscPrepData container
mutable const Muon::TgcPrepDataContainer* m_tgcPrdContainer; //!< pointer to the TgcPrepData container
mutable const Muon::RpcPrepDataContainer* m_rpcPrdContainer; //!< pointer to the RpcPrepData container
bool m_addMeasurements; bool m_addMeasurements;
double m_associationPullCutEta; double m_associationPullCutEta;
......
MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSeededSegmentFinder.cxx
+ 62
− 41
View file @ 1bf7f738
...@@ -48,11 +48,7 @@ namespace Muon { ...@@ -48,11 +48,7 @@ namespace Muon {
m_mdtRotCreator("Muon::MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator"), m_mdtRotCreator("Muon::MdtDriftCircleOnTrackCreator/MdtDriftCircleOnTrackCreator"),
m_magFieldProperties(Trk::NoField), m_magFieldProperties(Trk::NoField),
m_idHelper("Muon::MuonIdHelperTool/MuonIdHelperTool"), m_idHelper("Muon::MuonIdHelperTool/MuonIdHelperTool"),
m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool"), m_printer("Muon::MuonEDMPrinterTool/MuonEDMPrinterTool")
m_mdtPrdContainer(0),
m_rpcPrdContainer(0),
m_tgcPrdContainer(0),
m_cscPrdContainer(0)
{ {
declareInterface<IMuonSeededSegmentFinder>(this); declareInterface<IMuonSeededSegmentFinder>(this);
...@@ -108,6 +104,11 @@ namespace Muon { ...@@ -108,6 +104,11 @@ namespace Muon {
ATH_MSG_ERROR("Could not retrieve "<<m_idHelper<<". Exiting."); ATH_MSG_ERROR("Could not retrieve "<<m_idHelper<<". Exiting.");
return StatusCode::FAILURE; return StatusCode::FAILURE;
} }
ATH_CHECK(m_key_mdt.initialize());
ATH_CHECK(m_key_csc.initialize());
ATH_CHECK(m_key_rpc.initialize());
ATH_CHECK(m_key_tgc.initialize());
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
} }
...@@ -228,8 +229,13 @@ namespace Muon { ...@@ -228,8 +229,13 @@ namespace Muon {
std::vector<const MdtPrepData*> MuonSeededSegmentFinder::extractPrds( const std::set<IdentifierHash>& chIdHs ) const { std::vector<const MdtPrepData*> MuonSeededSegmentFinder::extractPrds( const std::set<IdentifierHash>& chIdHs ) const {
if (evtStore()->retrieve(m_mdtPrdContainer,m_key_mdt).isFailure()) { SG::ReadHandle<Muon::MdtPrepDataContainer> h_mdtPrdCont(m_key_mdt);
ATH_MSG_WARNING("Cannot retrieve mdtPrepDataContainer " << m_key_mdt); const Muon::MdtPrepDataContainer *mdtPrdContainer;
if (h_mdtPrdCont.isValid()) {
mdtPrdContainer = h_mdtPrdCont.cptr();
}
else{
ATH_MSG_WARNING("Cannot retrieve mdtPrepDataContainer " << m_key_mdt.key());
return std::vector<const MdtPrepData*>(); return std::vector<const MdtPrepData*>();
} }
...@@ -240,8 +246,8 @@ namespace Muon { ...@@ -240,8 +246,8 @@ namespace Muon {
std::set<IdentifierHash>::const_iterator chit = chIdHs.begin(); std::set<IdentifierHash>::const_iterator chit = chIdHs.begin();
std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end(); std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end();
for( ;chit!=chit_end;++chit ){ for( ;chit!=chit_end;++chit ){
MdtPrepDataContainer::const_iterator colIt = m_mdtPrdContainer->indexFind(*chit); MdtPrepDataContainer::const_iterator colIt = mdtPrdContainer->indexFind(*chit);
if( colIt == m_mdtPrdContainer->end() ){ if( colIt == mdtPrdContainer->end() ){
//ATH_MSG_DEBUG(" MdtPrepDataCollection for: " //ATH_MSG_DEBUG(" MdtPrepDataCollection for: "
// << m_idHelper->toStringChamber(*chit) << " not found in container "); // << m_idHelper->toStringChamber(*chit) << " not found in container ");
continue; continue;
...@@ -257,19 +263,23 @@ namespace Muon { ...@@ -257,19 +263,23 @@ namespace Muon {
void MuonSeededSegmentFinder::extractMdtPrdCols( const std::set<IdentifierHash>& chIdHs, void MuonSeededSegmentFinder::extractMdtPrdCols( const std::set<IdentifierHash>& chIdHs,
std::vector<const MdtPrepDataCollection*>& target ) const { std::vector<const MdtPrepDataCollection*>& target ) const {
if( evtStore()->contains<Muon::MdtPrepDataContainer>(m_key_mdt) ) { SG::ReadHandle<Muon::MdtPrepDataContainer> h_mdtPrdCont(m_key_mdt);
if (evtStore()->retrieve(m_mdtPrdContainer,m_key_mdt).isFailure()) { const Muon::MdtPrepDataContainer *mdtPrdContainer;
ATH_MSG_WARNING("Cannot retrieve mdtPrepDataContainer " << m_key_mdt); if (h_mdtPrdCont.isValid()) {
return; mdtPrdContainer = h_mdtPrdCont.cptr();
} }
}else return; else{
ATH_MSG_WARNING("Cannot retrieve mdtPrepDataContainer " << m_key_mdt.key());
return;
}
// loop over chambers and get collections // loop over chambers and get collections
std::set<IdentifierHash>::const_iterator chit = chIdHs.begin(); std::set<IdentifierHash>::const_iterator chit = chIdHs.begin();
std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end(); std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end();
for( ;chit!=chit_end;++chit ){ for( ;chit!=chit_end;++chit ){
MdtPrepDataContainer::const_iterator colIt = m_mdtPrdContainer->indexFind(*chit); MdtPrepDataContainer::const_iterator colIt = mdtPrdContainer->indexFind(*chit);
if( colIt == m_mdtPrdContainer->end() || (*colIt)->empty() ){ if( colIt == mdtPrdContainer->end() || (*colIt)->empty() ){
continue; continue;
} }
ATH_MSG_DEBUG(" Adding for: " ATH_MSG_DEBUG(" Adding for: "
...@@ -284,20 +294,23 @@ namespace Muon { ...@@ -284,20 +294,23 @@ namespace Muon {
void MuonSeededSegmentFinder::extractRpcPrdCols( const std::set<IdentifierHash>& chIdHs, void MuonSeededSegmentFinder::extractRpcPrdCols( const std::set<IdentifierHash>& chIdHs,
std::vector<const RpcPrepDataCollection*>& target ) const { std::vector<const RpcPrepDataCollection*>& target ) const {
if( evtStore()->contains<Muon::RpcPrepDataContainer>(m_key_rpc) ) { SG::ReadHandle<Muon::RpcPrepDataContainer> h_rpcPrdCont(m_key_rpc);
if (evtStore()->retrieve(m_rpcPrdContainer,m_key_rpc).isFailure()) { const Muon::RpcPrepDataContainer *rpcPrdContainer;
ATH_MSG_WARNING("Cannot retrieve rpcPrepDataContainer " << m_key_rpc); if (h_rpcPrdCont.isValid()){
return; rpcPrdContainer = h_rpcPrdCont.cptr();
} }
}else return; else{
ATH_MSG_WARNING("Cannot retrieve rpcPrepDataContainer " << m_key_rpc.key());
return;
}
// loop over chambers and get collections // loop over chambers and get collections
std::set<IdentifierHash>::const_iterator chit = chIdHs.begin(); std::set<IdentifierHash>::const_iterator chit = chIdHs.begin();
std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end(); std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end();
for( ;chit!=chit_end;++chit ){ for( ;chit!=chit_end;++chit ){
RpcPrepDataContainer::const_iterator colIt = m_rpcPrdContainer->indexFind(*chit); RpcPrepDataContainer::const_iterator colIt = rpcPrdContainer->indexFind(*chit);
if( colIt == m_rpcPrdContainer->end() || (*colIt)->empty() ){ if( colIt == rpcPrdContainer->end() || (*colIt)->empty() ){
//ATH_MSG_DEBUG(" RpcPrepDataCollection for: " //ATH_MSG_DEBUG(" RpcPrepDataCollection for: "
// << m_idHelper->toStringChamber(*chit) << " not found in container "); // << m_idHelper->toStringChamber(*chit) << " not found in container ");
continue; continue;
...@@ -314,19 +327,23 @@ namespace Muon { ...@@ -314,19 +327,23 @@ namespace Muon {
void MuonSeededSegmentFinder::extractTgcPrdCols( const std::set<IdentifierHash>& chIdHs, void MuonSeededSegmentFinder::extractTgcPrdCols( const std::set<IdentifierHash>& chIdHs,
std::vector<const TgcPrepDataCollection*>& target ) const { std::vector<const TgcPrepDataCollection*>& target ) const {
if( evtStore()->contains<Muon::TgcPrepDataContainer>(m_key_tgc) ) { SG::ReadHandle<Muon::TgcPrepDataContainer> h_tgcPrdCont(m_key_tgc);
if (evtStore()->retrieve(m_tgcPrdContainer,m_key_tgc).isFailure()) { const Muon::TgcPrepDataContainer *tgcPrdContainer;
ATH_MSG_WARNING("Cannot retrieve tgcPrepDataContainer " << m_key_tgc); if(h_tgcPrdCont.isValid()) {
return; tgcPrdContainer = h_tgcPrdCont.cptr();
} }
}else return; else{
ATH_MSG_WARNING("Cannot retrieve tgcPrepDataContainer " << m_key_tgc.key());
return;
}
// loop over chambers and get collections // loop over chambers and get collections
std::set<IdentifierHash>::const_iterator chit = chIdHs.begin(); std::set<IdentifierHash>::const_iterator chit = chIdHs.begin();
std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end(); std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end();
for( ;chit!=chit_end;++chit ){ for( ;chit!=chit_end;++chit ){
TgcPrepDataContainer::const_iterator colIt = m_tgcPrdContainer->indexFind(*chit); TgcPrepDataContainer::const_iterator colIt = tgcPrdContainer->indexFind(*chit);
if( colIt == m_tgcPrdContainer->end() || (*colIt)->empty() ){ if( colIt == tgcPrdContainer->end() || (*colIt)->empty() ){
//ATH_MSG_DEBUG(" TgcPrepDataCollection for: " //ATH_MSG_DEBUG(" TgcPrepDataCollection for: "
// << m_idHelper->toStringChamber(*chit) << " not found in container "); // << m_idHelper->toStringChamber(*chit) << " not found in container ");
continue; continue;
...@@ -343,19 +360,23 @@ namespace Muon { ...@@ -343,19 +360,23 @@ namespace Muon {
void MuonSeededSegmentFinder::extractCscPrdCols( const std::set<IdentifierHash>& chIdHs, void MuonSeededSegmentFinder::extractCscPrdCols( const std::set<IdentifierHash>& chIdHs,
std::vector<const CscPrepDataCollection*>& target ) const { std::vector<const CscPrepDataCollection*>& target ) const {
if( evtStore()->contains<Muon::CscPrepDataContainer>(m_key_csc) ) { SG::ReadHandle<Muon::CscPrepDataContainer> h_cscPrdCont(m_key_csc);
if ( evtStore()->retrieve(m_cscPrdContainer,m_key_csc).isFailure()) { const Muon::CscPrepDataContainer *cscPrdContainer;
ATH_MSG_WARNING("Cannot retrieve cscPrepDataContainer " << m_key_csc); if(h_cscPrdCont.isValid()) {
return; cscPrdContainer = h_cscPrdCont.cptr();
} }
}else return; else{
ATH_MSG_WARNING("Cannot retrieve cscPrepDataContainer " << m_key_csc.key());
return;
}
// loop over chambers and get collections // loop over chambers and get collections
std::set<IdentifierHash>::const_iterator chit = chIdHs.begin(); std::set<IdentifierHash>::const_iterator chit = chIdHs.begin();
std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end(); std::set<IdentifierHash>::const_iterator chit_end = chIdHs.end();
for( ;chit!=chit_end;++chit ){ for( ;chit!=chit_end;++chit ){
CscPrepDataContainer::const_iterator colIt = m_cscPrdContainer->indexFind(*chit); CscPrepDataContainer::const_iterator colIt = cscPrdContainer->indexFind(*chit);
if( colIt == m_cscPrdContainer->end() || (*colIt)->empty() ){ if( colIt == cscPrdContainer->end() || (*colIt)->empty() ){
//ATH_MSG_DEBUG(" CscPrepDataCollection for: " //ATH_MSG_DEBUG(" CscPrepDataCollection for: "
// << m_idHelper->toStringChamber(*chit) << " not found in container "); // << m_idHelper->toStringChamber(*chit) << " not found in container ");
continue; continue;
......
MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackFinderTools/src/MuonSeededSegmentFinder.h
+ 4
− 11
View file @ 1bf7f738
...@@ -121,17 +121,10 @@ namespace Muon { ...@@ -121,17 +121,10 @@ namespace Muon {
ToolHandle<Muon::MuonIdHelperTool> m_idHelper; //!< IdHelper tool ToolHandle<Muon::MuonIdHelperTool> m_idHelper; //!< IdHelper tool
ToolHandle<Muon::MuonEDMPrinterTool> m_printer; //!< EDM printer tool ToolHandle<Muon::MuonEDMPrinterTool> m_printer; //!< EDM printer tool
std::string m_key_mdt; //!< storegate location of the MdtPrepData SG::ReadHandleKey<Muon::MdtPrepDataContainer> m_key_mdt; //!< storegate location of the MdtPrepData
mutable const Muon::MdtPrepDataContainer* m_mdtPrdContainer; //!< pointer to the MdtPrepData container SG::ReadHandleKey<Muon::RpcPrepDataContainer> m_key_rpc; //!< storegate location of the RpcPrepData
SG::ReadHandleKey<Muon::TgcPrepDataContainer> m_key_tgc; //!< storegate location of the TgcPrepData
std::string m_key_rpc; //!< storegate location of the RpcPrepData SG::ReadHandleKey<Muon::CscPrepDataContainer> m_key_csc; //!< storegate location of the CscPrepData
mutable const Muon::RpcPrepDataContainer* m_rpcPrdContainer; //!< pointer to the RpcPrepData container
std::string m_key_tgc; //!< storegate location of the TgcPrepData
mutable const Muon::TgcPrepDataContainer* m_tgcPrdContainer; //!< pointer to the TgcPrepData container
std::string m_key_csc; //!< storegate location of the CscPrepData
mutable const Muon::CscPrepDataContainer* m_cscPrdContainer; //!< pointer to the CscPrepData container
double m_adcCut; double m_adcCut;
double m_maxSigma; double m_maxSigma;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment