diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx index 765c4e0ad97598c58b223a2b7efb8268a465290a..b6729922b876576555cdd3657a4f034275741305 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RPCStandaloneTracksMon.cxx @@ -1494,7 +1494,7 @@ StatusCode RPCStandaloneTracksMon::fillHistograms() for(int idp = 1; idp != 2 + 1; idp++ ){ bool isValid=false; - Identifier rpcId = m_idHelperSvc->rpcIdHelper().channelID(iname, ieta, iphi, ir, iz, idp, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid + Identifier rpcId = m_idHelperSvc->rpcIdHelper().channelID(iname, ieta, iphi, ir, iz, idp, 1, 1, 1, true, &isValid, true); // last 6 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid, bool noPrint if (!isValid) continue; const MuonGM::RpcReadoutElement* rpc = MuonDetMgr->getRpcReadoutElement(rpcId); @@ -3316,7 +3316,7 @@ StatusCode RPCStandaloneTracksMon::bookHistogramsRecurrent( ) // need to pay attention to BME case - not yet considered here .... bool isValid=false; - Identifier rpcId = m_idHelperSvc->rpcIdHelper().channelID(iname, (ieta-8), int(i_sec/2)+1, ir+1, idbz+1, idbphi, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid + Identifier rpcId = m_idHelperSvc->rpcIdHelper().channelID(iname, (ieta-8), int(i_sec/2)+1, ir+1, idbz+1, idbphi, 1, 1, 1, true, &isValid, true); // last 6 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid, bool noPrint if (!isValid) continue; const MuonGM::RpcReadoutElement* rpc = MuonDetMgr->getRpcReadoutElement(rpcId); if (rpc) { diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcGlobalUtilities.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcGlobalUtilities.cxx index 4cc7333a36bd7d023bf4e341cc10683af02bd7c0..c865c16dc3227f6b19df82433a94de0e9feb9b04 100644 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcGlobalUtilities.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcGlobalUtilities.cxx @@ -140,9 +140,8 @@ std::vector<int> RpcStripShift(const MuonGM::MuonDetectorManager* muonMgr, cons } for(int idbz=1; idbz!= 4; idbz++){ - bool isValid=false; - Identifier rpcId = rpcIdHelper.channelID(krpcstationName, ieta, irpcstationPhi, krpcdoubletR, idbz, 1, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid - if (!isValid) continue; + Identifier rpcId = rpcIdHelper.channelID(krpcstationName, ieta, irpcstationPhi, krpcdoubletR, idbz, 1, 1, 1, 1); // last 4 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip + if (!rpcId.is_valid()) continue; const MuonGM::RpcReadoutElement* rpc = muonMgr->getRpcReadoutElement(rpcId); if(rpc){ @@ -335,9 +334,8 @@ std::vector<int> RpcStripShift(const MuonGM::MuonDetectorManager* muonMgr, cons } for(int iz = 1; iz != lastdoubletZ+1; iz++ ){ - bool isValid=false; - Identifier rpcId = rpcIdHelper.channelID(iname, keta, iphi, ir, iz, 1, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid - if (!isValid) continue; + Identifier rpcId = rpcIdHelper.channelID(iname, keta, iphi, ir, iz, 1, 1, 1, 1); // last 4 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip + if (!rpcId.is_valid()) continue; const MuonGM::RpcReadoutElement* rpc = muonMgr->getRpcReadoutElement(rpcId); if(!rpc)continue; diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx index ada909e5afb92dd56b5d1799d8bd0533f871d310..2c4a6d96dfb9adeff3223b657a07e8c539106fd6 100755 --- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx +++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/src/RpcLv1RawDataValAlg.cxx @@ -1827,7 +1827,7 @@ void RpcLv1RawDataValAlg::bookRPCCoolHistograms( std::vector<std::string>::const if(isec==12&&std::abs(ieta-8)==6&&ir==2)irc=1; isValid=false; - rpcId = m_idHelperSvc->rpcIdHelper().channelID(kName, ieta-8, istatPhi+1, irc, iz+1, idblPhi+1, 1, 1, 1, true, &isValid); // last 5 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid + rpcId = m_idHelperSvc->rpcIdHelper().channelID(kName, ieta-8, istatPhi+1, irc, iz+1, idblPhi+1, 1, 1, 1, true, &isValid, true); // last 6 arguments are: int doubletPhi, int gasGap, int measuresPhi, int strip, bool check, bool* isValid, bool noPrint if (!isValid) continue; const MuonGM::RpcReadoutElement* rpc = MuonDetMgr->getRpcReadoutElement(rpcId); if(!rpc) continue;