From 5383e30692d0350d6f3620aa5757efa0eb88e715 Mon Sep 17 00:00:00 2001 From: Roumyana Date: Fri, 13 May 2022 19:15:34 +0200 Subject: [PATCH 1/2] Add RPC 4th endcap stations --- RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc | 2 +- RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc b/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc index 20b56db1eb24e..5f7d27549abb9 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc @@ -24,7 +24,7 @@ CSCObjectMap::CSCObjectMap(RPCGeometry const& rpcGeo) { RPCGeomServ rpcsrv(rpcId); int rpcsegment = rpcsrv.segment(); int cscchamber = rpcsegment; //FIX THIS ACCORDING TO RPCGeomServ::segment()Definition - if ((station == 2 || station == 3) && ring == 3) { //Adding Ring 3 of RPC to the CSC Ring 2 + if ((station == 2 || station == 3 || station == 4) && ring == 3) { //Adding Ring 3 of RPC to the CSC Ring 2 cscring = 2; } CSCStationIndex ind(region, cscstation, cscring, cscchamber); diff --git a/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc b/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc index 27e32c4d7408c..5ad89fda52890 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc @@ -55,11 +55,11 @@ std::unique_ptr CSCSegtoRPC::thePoints(const CSCSegmentColl if (debug) std::cout << "CSC \t \t Number of segments in this CSC = " << CSCSegmentsCounter[CSCId] << std::endl; if (debug) - std::cout << "CSC \t \t Is the only one in this CSC? is not ind the ring 1 or station 4? Are there more than 2 " + std::cout << "CSC \t \t Is the only one in this CSC? is not ind the ring 1? Are there more than 2 " "segments in the event?" << std::endl; - if (CSCSegmentsCounter[CSCId] == 1 && CSCId.station() != 4 && CSCId.ring() != 1 && allCSCSegments->size() >= 2) { + if (CSCSegmentsCounter[CSCId] == 1 && CSCId.ring() != 1 && allCSCSegments->size() >= 2) { if (debug) std::cout << "CSC \t \t yes" << std::endl; int cscEndCap = CSCId.endcap(); @@ -121,7 +121,7 @@ std::unique_ptr CSCSegtoRPC::thePoints(const CSCSegmentColl if (debug) std::cout << "CSC \t \t Printing The Id" << TheId << std::endl; - if (rpcRing != 1 && rpcStation != 4) { //They don't exist! + if (rpcRing != 1) { //They don't exist in Run3! assert(!rollsForThisCSC.empty()); From 1337b63cbf0677329056cab1c161a7f63d824151 Mon Sep 17 00:00:00 2001 From: Roumyana Date: Fri, 13 May 2022 19:50:18 +0200 Subject: [PATCH 2/2] style format --- RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc b/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc index 5f7d27549abb9..2434162613364 100644 --- a/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc +++ b/RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc @@ -23,7 +23,7 @@ CSCObjectMap::CSCObjectMap(RPCGeometry const& rpcGeo) { int cscstation = station; RPCGeomServ rpcsrv(rpcId); int rpcsegment = rpcsrv.segment(); - int cscchamber = rpcsegment; //FIX THIS ACCORDING TO RPCGeomServ::segment()Definition + int cscchamber = rpcsegment; //FIX THIS ACCORDING TO RPCGeomServ::segment()Definition if ((station == 2 || station == 3 || station == 4) && ring == 3) { //Adding Ring 3 of RPC to the CSC Ring 2 cscring = 2; }