Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add RPC 4th endcap stations #37945

Merged
merged 2 commits into from
May 15, 2022
Merged

Add RPC 4th endcap stations #37945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5383e30
Add RPC 4th endcap stations
mileva May 13, 2022
1337b63
style format
mileva May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RecoLocalMuon/RPCRecHit/plugins/CSCObjectMap.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ 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
if ((station == 2 || station == 3) && ring == 3) { //Adding Ring 3 of RPC to the CSC Ring 2
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;
}
CSCStationIndex ind(region, cscstation, cscring, cscchamber);
Expand Down
6 changes: 3 additions & 3 deletions RecoLocalMuon/RPCRecHit/plugins/CSCSegtoRPC.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ std::unique_ptr<RPCRecHitCollection> 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();
Expand Down Expand Up @@ -121,7 +121,7 @@ std::unique_ptr<RPCRecHitCollection> 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());

Expand Down