Skip to content
Snippets Groups Projects
Commit 46e744da authored by John Derek Chapman's avatar John Derek Chapman
Browse files

Merge branch 'cherry-pick-e0537fc6-21.3' into '21.3'

Sweeping !31355 from master to 21.3.
MuonRPC_Cabling: fix to work with BIS78

See merge request !31386
parents 61ec93b9 20ab85f4
16 merge requests!46457Draft: Adding the tools to run over data,!46454Draft: Adding the tools to be able to run over data,!44869Draft: Update to candidate store,!4217921.9-first_steps-InDetTrackingGeometryXML,!39162Draft: Insert BCM' support,!38765Bis78 cabling,!36893Fix size of RPC active region in BIS78 and strip material,!3645821.9: Improving material map description (ATLITKSW-127),!36293WIP pixel updates,!34993KF-input adding jXERHO to the AOD outputs,!34864LH rings in front ot HR rigs,!34763Fix L1_4jJ15.0ETA25 item definition (ATR-21261),!33996WIP: Correct MM zpositions,!3291021.3 salva s0,!31887Merge 21.3.19 into 21.9,!31386Sweeping !31355 from master to 21.3. MuonRPC_Cabling: fix to work with BIS78
......@@ -92,7 +92,7 @@ class CablingRPC : public CablingRPCBase
const static std::map<std::string, std::string>* p_trigroads;
static bool s_RPCMapfromCool;
unsigned int m_absZindexInThelayerOfThisChamber[8][2][9][8][2][4];
unsigned int m_absZindexInThelayerOfThisChamber[9][2][9][8][2][4];
static void delete_instance(void);
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
......@@ -1804,6 +1804,7 @@ unsigned long int CablingRPC::strip_code_fromOffId (std::string stationName, int
cabStat=2; // special case of single RPC Chambers at the same R or dbr2
}
}
if (stationName.substr(0,3)=="BIS" && logicSector>31) logicSector+=1; // BIS78 are in doubPhi==1
if (logicSector<0 || logicSector>63)
{
......@@ -1846,6 +1847,7 @@ unsigned int CablingRPC::computeZIndexInCablingStation(std::string stationName,
else if (stationName=="BOF") iStat=5; // BOF
else if (stationName=="BOG") iStat=6; // BOG
else if (stationName=="BME") iStat=7; // BME
else if (stationName=="BIS") iStat=8; // BIS
else
{
std::cout<<"ERROR - no iStat set; StationName ="<<stationName<<std::endl;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment