Skip to content
Snippets Groups Projects
Commit e0537fc6 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'MuonRPCcabling_bis78' into 'master'

MuonRPC_Cabling: fix to work with BIS78

See merge request atlas/athena!31355
parents 2bf6ffcf be373335
No related branches found
No related tags found
No related merge requests found
...@@ -92,7 +92,7 @@ class CablingRPC : public CablingRPCBase ...@@ -92,7 +92,7 @@ class CablingRPC : public CablingRPCBase
const static std::map<std::string, std::string>* s_trigroads; const static std::map<std::string, std::string>* s_trigroads;
static bool s_RPCMapfromCool; 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); static void delete_instance(void);
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -1802,6 +1802,7 @@ unsigned long int CablingRPC::strip_code_fromOffId (std::string stationName, int ...@@ -1802,6 +1802,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 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) if (logicSector<0 || logicSector>63)
{ {
...@@ -1844,6 +1845,7 @@ unsigned int CablingRPC::computeZIndexInCablingStation(std::string stationName, ...@@ -1844,6 +1845,7 @@ unsigned int CablingRPC::computeZIndexInCablingStation(std::string stationName,
else if (stationName=="BOF") iStat=5; // BOF else if (stationName=="BOF") iStat=5; // BOF
else if (stationName=="BOG") iStat=6; // BOG else if (stationName=="BOG") iStat=6; // BOG
else if (stationName=="BME") iStat=7; // BME else if (stationName=="BME") iStat=7; // BME
else if (stationName=="BIS") iStat=8; // BIS
else else
{ {
std::cout<<"ERROR - no iStat set; StationName ="<<stationName<<std::endl; 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