diff --git a/MuonSpectrometer/MuonCablings/MuonCablingData/src/MicroMega_CablingMap.cxx b/MuonSpectrometer/MuonCablings/MuonCablingData/src/MicroMega_CablingMap.cxx index ffeaef837c70310472044c335875b1100008fa95..dedb611d09aac92fa31367d714066d9f7c83ba8a 100644 --- a/MuonSpectrometer/MuonCablings/MuonCablingData/src/MicroMega_CablingMap.cxx +++ b/MuonSpectrometer/MuonCablings/MuonCablingData/src/MicroMega_CablingMap.cxx @@ -73,7 +73,7 @@ bool MicroMega_CablingMap::addConnector(const Identifier& gapID, << " is already partially covered " << connector << endmsg; return false; } - msg << MSG::ALWAYS << "Add new zebra connector " << connector << " to " + msg << MSG::DEBUG << "Add new zebra connector " << connector << " to " << m_idHelperSvc->toString(gapID) << "." << endmsg; correctionSet.insert(connector); return true; diff --git a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/python/zebraShift.py b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/python/zebraShift.py index 5ae69362d64d1c626606ae285ae6a452112169d4..94d30b731d91a3f05dc5726f00ecab5fc695a13c 100644 --- a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/python/zebraShift.py +++ b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/python/zebraShift.py @@ -101,8 +101,592 @@ def addMMFE8(side, sector, layer, mmfe8, shift): if __name__ == "__main__": # for now we generate some dummy shifts for testing outList = [] - outList.append(addMMFE8("A",1,1,0,1)) - outList.append(addZebra("C",6, 3, 24, 1)) + outList.append(addZebra("A",3,1,13,-1)) + outList.append(addZebra("A",3,1,12,-1)) + outList.append(addZebra("A",6,1,5,-1)) + outList.append(addZebra("A",7,1,3,1)) + outList.append(addZebra("A",7,1,2,1)) + outList.append(addZebra("A",10,1,23,-1)) + outList.append(addZebra("A",10,1,22,-1)) + outList.append(addZebra("A",11,1,3,1)) + outList.append(addZebra("A",11,1,2,1)) + outList.append(addZebra("A",12,1,15,-1)) + outList.append(addZebra("A",12,1,14,-1)) + outList.append(addZebra("A",14,1,23,-1)) + outList.append(addZebra("A",14,1,22,-1)) + outList.append(addZebra("A",14,1,15,1)) + outList.append(addZebra("A",14,1,14,1)) + outList.append(addZebra("A",14,1,5,1)) + outList.append(addZebra("A",14,1,4,1)) + outList.append(addZebra("A",16,1,17,1)) + outList.append(addZebra("A",16,1,16,1)) + outList.append(addZebra("A",4,2,11,-1)) + outList.append(addZebra("A",4,2,10,-1)) + outList.append(addZebra("A",6,2,5,-1)) + outList.append(addZebra("A",6,2,4,-1)) + outList.append(addZebra("A",10,2,25,1)) + outList.append(addZebra("A",10,2,24,1)) + outList.append(addZebra("A",13,2,1,1)) + outList.append(addZebra("A",13,2,0,1)) + outList.append(addZebra("A",14,2,9,1)) + outList.append(addZebra("A",14,2,8,1)) + outList.append(addZebra("A",2,3,3,1)) + outList.append(addZebra("A",2,3,2,1)) + outList.append(addZebra("A",3,3,19,1)) + outList.append(addZebra("A",3,3,15,2)) + outList.append(addZebra("A",3,3,14,2)) + outList.append(addZebra("A",3,3,1,1)) + outList.append(addZebra("A",3,3,0,1)) + outList.append(addZebra("A",5,3,11,1)) + outList.append(addZebra("A",5,3,10,1)) + outList.append(addZebra("A",6,3,15,1)) + outList.append(addZebra("A",6,3,14,1)) + outList.append(addZebra("A",6,3,9,-1)) + outList.append(addZebra("A",6,3,8,-1)) + outList.append(addZebra("A",7,3,17,-1)) + outList.append(addZebra("A",7,3,16,-1)) + outList.append(addZebra("A",7,3,15,1)) + outList.append(addZebra("A",7,3,14,1)) + outList.append(addZebra("A",7,3,7,1)) + outList.append(addZebra("A",7,3,6,1)) + outList.append(addZebra("A",7,3,3,1)) + outList.append(addZebra("A",7,3,2,1)) + outList.append(addZebra("A",11,3,7,1)) + outList.append(addZebra("A",11,3,6,1)) + outList.append(addZebra("A",14,3,13,1)) + outList.append(addZebra("A",14,3,12,1)) + outList.append(addZebra("A",14,3,11,-1)) + outList.append(addZebra("A",14,3,10,-1)) + outList.append(addZebra("A",2,4,15,-1)) + outList.append(addZebra("A",2,4,14,-1)) + outList.append(addZebra("A",2,4,11,1)) + outList.append(addZebra("A",2,4,10,1)) + outList.append(addZebra("A",3,4,15,1)) + outList.append(addZebra("A",3,4,14,1)) + outList.append(addZebra("A",3,4,5,1)) + outList.append(addZebra("A",3,4,4,1)) + outList.append(addZebra("A",4,4,11,1)) + outList.append(addZebra("A",4,4,10,1)) + outList.append(addZebra("A",5,4,27,-1)) + outList.append(addZebra("A",5,4,26,-1)) + outList.append(addZebra("A",5,4,25,-1)) + outList.append(addZebra("A",5,4,24,-1)) + outList.append(addZebra("A",5,4,17,-1)) + outList.append(addZebra("A",5,4,16,-1)) + outList.append(addZebra("A",5,4,1,-1)) + outList.append(addZebra("A",5,4,0,-1)) + outList.append(addZebra("A",8,4,29,1)) + outList.append(addZebra("A",8,4,28,1)) + outList.append(addZebra("A",14,4,19,-1)) + outList.append(addZebra("A",14,4,18,-1)) + outList.append(addZebra("A",14,4,17,1)) + outList.append(addZebra("A",14,4,16,1)) + outList.append(addZebra("A",14,4,13,-2)) + outList.append(addZebra("A",14,4,12,-2)) + outList.append(addZebra("A",14,4,11,1)) + outList.append(addZebra("A",14,4,10,1)) + outList.append(addZebra("A",14,4,9,-1)) + outList.append(addZebra("A",14,4,8,-1)) + outList.append(addZebra("A",14,4,7,-1)) + outList.append(addZebra("A",14,4,6,-1)) + outList.append(addZebra("A",16,4,9,-1)) + outList.append(addZebra("A",16,4,8,-1)) + outList.append(addZebra("A",16,4,7,1)) + outList.append(addZebra("A",16,4,6,1)) + outList.append(addZebra("A",16,4,3,1)) + outList.append(addZebra("A",16,4,2,1)) + outList.append(addZebra("A",2,5,19,1)) + outList.append(addZebra("A",2,5,18,1)) + outList.append(addZebra("A",2,5,15,1)) + outList.append(addZebra("A",2,5,14,1)) + outList.append(addZebra("A",2,5,11,1)) + outList.append(addZebra("A",2,5,10,1)) + outList.append(addZebra("A",2,5,3,1)) + outList.append(addZebra("A",2,5,2,1)) + outList.append(addZebra("A",4,5,13,1)) + outList.append(addZebra("A",4,5,12,1)) + outList.append(addZebra("A",4,5,11,1)) + outList.append(addZebra("A",4,5,10,1)) + outList.append(addZebra("A",7,5,27,1)) + outList.append(addZebra("A",7,5,26,1)) + outList.append(addZebra("A",7,5,25,1)) + outList.append(addZebra("A",7,5,24,1)) + outList.append(addZebra("A",8,5,15,1)) + outList.append(addZebra("A",8,5,14,1)) + outList.append(addZebra("A",9,5,27,1)) + outList.append(addZebra("A",9,5,26,1)) + outList.append(addZebra("A",9,5,23,-1)) + outList.append(addZebra("A",9,5,22,-1)) + outList.append(addZebra("A",10,5,15,-1)) + outList.append(addZebra("A",10,5,14,-1)) + outList.append(addZebra("A",13,5,19,1)) + outList.append(addZebra("A",13,5,18,1)) + outList.append(addZebra("A",14,5,15,1)) + outList.append(addZebra("A",14,5,14,1)) + outList.append(addZebra("A",16,5,17,1)) + outList.append(addZebra("A",16,5,16,1)) + outList.append(addZebra("A",1,6,15,2)) + outList.append(addZebra("A",1,6,14,2)) + outList.append(addZebra("A",1,6,7,1)) + outList.append(addZebra("A",1,6,6,1)) + outList.append(addZebra("A",2,6,19,-1)) + outList.append(addZebra("A",2,6,18,-1)) + outList.append(addZebra("A",2,6,15,1)) + outList.append(addZebra("A",2,6,14,1)) + outList.append(addZebra("A",2,6,11,1)) + outList.append(addZebra("A",2,6,10,1)) + outList.append(addZebra("A",3,6,17,-1)) + outList.append(addZebra("A",3,6,16,-1)) + outList.append(addZebra("A",3,6,9,-1)) + outList.append(addZebra("A",3,6,8,-1)) + outList.append(addZebra("A",5,6,19,1)) + outList.append(addZebra("A",5,6,18,1)) + outList.append(addZebra("A",5,6,9,-1)) + outList.append(addZebra("A",5,6,8,-1)) + outList.append(addZebra("A",6,6,15,-1)) + outList.append(addZebra("A",6,6,14,-1)) + outList.append(addZebra("A",6,6,11,1)) + outList.append(addZebra("A",6,6,10,1)) + outList.append(addZebra("A",6,6,9,-1)) + outList.append(addZebra("A",6,6,8,-1)) + outList.append(addZebra("A",6,6,5,-1)) + outList.append(addZebra("A",6,6,4,-1)) + outList.append(addZebra("A",8,6,15,1)) + outList.append(addZebra("A",8,6,14,1)) + outList.append(addZebra("A",8,6,13,-1)) + outList.append(addZebra("A",8,6,12,-1)) + outList.append(addZebra("A",8,6,11,1)) + outList.append(addZebra("A",8,6,10,1)) + outList.append(addZebra("A",8,6,9,1)) + outList.append(addZebra("A",8,6,8,1)) + outList.append(addZebra("A",8,6,5,-1)) + outList.append(addZebra("A",8,6,4,-1)) + outList.append(addZebra("A",8,6,1,1)) + outList.append(addZebra("A",8,6,0,1)) + outList.append(addZebra("A",9,6,19,1)) + outList.append(addZebra("A",9,6,18,1)) + outList.append(addZebra("A",10,6,5,-1)) + outList.append(addZebra("A",10,6,4,-1)) + outList.append(addZebra("A",12,6,17,-1)) + outList.append(addZebra("A",12,6,16,-1)) + outList.append(addZebra("A",12,6,13,-1)) + outList.append(addZebra("A",12,6,12,-1)) + outList.append(addZebra("A",12,6,1,-1)) + outList.append(addZebra("A",12,6,0,-1)) + outList.append(addZebra("A",13,6,9,-1)) + outList.append(addZebra("A",13,6,8,-1)) + outList.append(addZebra("A",14,6,19,3)) + outList.append(addZebra("A",14,6,18,3)) + outList.append(addZebra("A",14,6,17,2)) + outList.append(addZebra("A",14,6,16,2)) + outList.append(addZebra("A",14,6,13,1)) + outList.append(addZebra("A",14,6,12,1)) + outList.append(addZebra("A",14,6,11,1)) + outList.append(addZebra("A",14,6,10,1)) + outList.append(addZebra("A",14,6,9,1)) + outList.append(addZebra("A",14,6,8,1)) + outList.append(addZebra("A",14,6,7,1)) + outList.append(addZebra("A",14,6,6,1)) + outList.append(addZebra("A",14,6,5,2)) + outList.append(addZebra("A",14,6,4,2)) + outList.append(addZebra("A",14,6,3,1)) + outList.append(addZebra("A",14,6,2,1)) + outList.append(addZebra("A",14,6,1,1)) + outList.append(addZebra("A",14,6,0,1)) + outList.append(addZebra("A",1,7,16,-1)) + outList.append(addZebra("A",1,7,12,-1)) + outList.append(addZebra("A",1,7,11,1)) + outList.append(addZebra("A",1,7,10,1)) + outList.append(addZebra("A",1,7,3,1)) + outList.append(addZebra("A",2,7,23,1)) + outList.append(addZebra("A",2,7,22,1)) + outList.append(addZebra("A",15,7,19,-1)) + outList.append(addZebra("A",15,7,18,-1)) + outList.append(addZebra("A",5,8,21,1)) + outList.append(addZebra("A",5,8,20,1)) + outList.append(addZebra("A",5,8,15,1)) + outList.append(addZebra("A",5,8,14,1)) + outList.append(addZebra("A",6,8,3,1)) + outList.append(addZebra("A",6,8,2,1)) + outList.append(addZebra("A",7,8,8,-1)) + outList.append(addZebra("A",9,8,7,1)) + outList.append(addZebra("A",9,8,6,1)) + outList.append(addZebra("A",9,8,3,1)) + outList.append(addZebra("A",9,8,2,1)) + outList.append(addZebra("A",11,8,23,1)) + outList.append(addZebra("A",11,8,22,1)) + outList.append(addZebra("A",12,8,7,-1)) + outList.append(addZebra("A",12,8,6,-1)) + outList.append(addZebra("A",12,8,5,1)) + outList.append(addZebra("A",12,8,4,1)) + outList.append(addZebra("A",14,8,15,1)) + outList.append(addZebra("A",14,8,14,1)) + outList.append(addZebra("A",14,8,3,1)) + outList.append(addZebra("A",16,8,13,-1)) + outList.append(addZebra("A",16,8,12,-1)) + outList.append(addZebra("C",1,1,11,1)) + outList.append(addZebra("C",1,1,10,1)) + outList.append(addZebra("C",2,1,15,1)) + outList.append(addZebra("C",2,1,14,1)) + outList.append(addZebra("C",2,1,13,1)) + outList.append(addZebra("C",2,1,12,1)) + outList.append(addZebra("C",2,1,9,-1)) + outList.append(addZebra("C",2,1,8,-1)) + outList.append(addZebra("C",2,1,7,1)) + outList.append(addZebra("C",2,1,6,1)) + outList.append(addZebra("C",3,1,17,-1)) + outList.append(addZebra("C",3,1,16,-1)) + outList.append(addZebra("C",4,1,13,-1)) + outList.append(addZebra("C",4,1,12,-1)) + outList.append(addZebra("C",9,1,7,1)) + outList.append(addZebra("C",9,1,6,1)) + outList.append(addZebra("C",10,1,19,-1)) + outList.append(addZebra("C",10,1,18,-1)) + outList.append(addZebra("C",10,1,17,-1)) + outList.append(addZebra("C",10,1,16,-1)) + outList.append(addZebra("C",12,1,17,-1)) + outList.append(addZebra("C",12,1,16,-1)) + outList.append(addZebra("C",12,1,15,1)) + outList.append(addZebra("C",12,1,14,1)) + outList.append(addZebra("C",14,1,7,1)) + outList.append(addZebra("C",14,1,6,1)) + outList.append(addZebra("C",15,1,11,1)) + outList.append(addZebra("C",15,1,10,1)) + outList.append(addZebra("C",15,1,7,1)) + outList.append(addZebra("C",15,1,6,1)) + outList.append(addZebra("C",2,2,25,-1)) + outList.append(addZebra("C",2,2,24,-1)) + outList.append(addZebra("C",2,2,11,1)) + outList.append(addZebra("C",2,2,10,1)) + outList.append(addZebra("C",3,2,9,-1)) + outList.append(addZebra("C",3,2,8,-1)) + outList.append(addZebra("C",6,2,9,-1)) + outList.append(addZebra("C",6,2,8,-1)) + outList.append(addZebra("C",8,2,17,-1)) + outList.append(addZebra("C",8,2,16,-1)) + outList.append(addZebra("C",8,2,9,-1)) + outList.append(addZebra("C",8,2,8,-1)) + outList.append(addZebra("C",9,2,11,1)) + outList.append(addZebra("C",9,2,4,-1)) + outList.append(addZebra("C",10,2,15,1)) + outList.append(addZebra("C",10,2,14,2)) + outList.append(addZebra("C",10,2,3,1)) + outList.append(addZebra("C",10,2,2,1)) + outList.append(addZebra("C",11,2,17,-1)) + outList.append(addZebra("C",11,2,16,-1)) + outList.append(addZebra("C",11,2,13,-1)) + outList.append(addZebra("C",11,2,12,-1)) + outList.append(addZebra("C",13,2,23,1)) + outList.append(addZebra("C",13,2,22,1)) + outList.append(addZebra("C",13,2,13,-1)) + outList.append(addZebra("C",13,2,12,-1)) + outList.append(addZebra("C",13,2,4,-1)) + outList.append(addZebra("C",15,2,7,1)) + outList.append(addZebra("C",15,2,6,1)) + outList.append(addZebra("C",15,2,3,1)) + outList.append(addZebra("C",15,2,2,1)) + outList.append(addZebra("C",16,2,19,1)) + outList.append(addZebra("C",16,2,18,1)) + outList.append(addZebra("C",16,2,15,1)) + outList.append(addZebra("C",16,2,14,1)) + outList.append(addZebra("C",16,2,11,1)) + outList.append(addZebra("C",16,2,10,1)) + outList.append(addZebra("C",16,2,9,-1)) + outList.append(addZebra("C",16,2,8,-1)) + outList.append(addZebra("C",16,2,3,1)) + outList.append(addZebra("C",16,2,2,1)) + outList.append(addZebra("C",1,3,4,-1)) + outList.append(addZebra("C",2,3,11,-1)) + outList.append(addZebra("C",2,3,10,-1)) + outList.append(addZebra("C",2,3,5,-1)) + outList.append(addZebra("C",2,3,4,-1)) + outList.append(addZebra("C",4,3,1,-1)) + outList.append(addZebra("C",4,3,0,-1)) + outList.append(addZebra("C",5,3,7,1)) + outList.append(addZebra("C",5,3,6,1)) + outList.append(addZebra("C",6,3,23,-1)) + outList.append(addZebra("C",6,3,22,-1)) + outList.append(addZebra("C",9,3,23,-1)) + outList.append(addZebra("C",9,3,22,-1)) + outList.append(addZebra("C",9,3,19,2)) + outList.append(addZebra("C",9,3,18,2)) + outList.append(addZebra("C",9,3,7,1)) + outList.append(addZebra("C",9,3,6,1)) + outList.append(addZebra("C",9,3,3,1)) + outList.append(addZebra("C",9,3,2,1)) + outList.append(addZebra("C",10,3,28,-1)) + outList.append(addZebra("C",10,3,9,1)) + outList.append(addZebra("C",10,3,8,1)) + outList.append(addZebra("C",11,3,7,1)) + outList.append(addZebra("C",13,3,25,1)) + outList.append(addZebra("C",13,3,24,1)) + outList.append(addZebra("C",14,3,17,-1)) + outList.append(addZebra("C",14,3,16,-1)) + outList.append(addZebra("C",15,3,12,-1)) + outList.append(addZebra("C",16,3,3,1)) + outList.append(addZebra("C",16,3,2,1)) + outList.append(addZebra("C",1,4,15,1)) + outList.append(addZebra("C",1,4,1,-1)) + outList.append(addZebra("C",1,4,0,-1)) + outList.append(addZebra("C",2,4,11,1)) + outList.append(addZebra("C",2,4,10,1)) + outList.append(addZebra("C",2,4,7,1)) + outList.append(addZebra("C",3,4,11,1)) + outList.append(addZebra("C",3,4,10,1)) + outList.append(addZebra("C",4,4,11,1)) + outList.append(addZebra("C",7,4,21,1)) + outList.append(addZebra("C",7,4,20,1)) + outList.append(addZebra("C",7,4,13,-1)) + outList.append(addZebra("C",7,4,12,-1)) + outList.append(addZebra("C",7,4,11,-1)) + outList.append(addZebra("C",7,4,10,-1)) + outList.append(addZebra("C",7,4,9,-1)) + outList.append(addZebra("C",7,4,8,-1)) + outList.append(addZebra("C",7,4,7,1)) + outList.append(addZebra("C",7,4,6,1)) + outList.append(addZebra("C",12,4,15,1)) + outList.append(addZebra("C",12,4,14,1)) + outList.append(addZebra("C",12,4,13,1)) + outList.append(addZebra("C",12,4,12,1)) + outList.append(addZebra("C",12,4,9,-1)) + outList.append(addZebra("C",12,4,8,-1)) + outList.append(addZebra("C",13,4,19,1)) + outList.append(addZebra("C",13,4,18,1)) + outList.append(addZebra("C",13,4,15,2)) + outList.append(addZebra("C",13,4,14,2)) + outList.append(addZebra("C",13,4,11,1)) + outList.append(addZebra("C",13,4,10,1)) + outList.append(addZebra("C",13,4,7,1)) + outList.append(addZebra("C",13,4,6,1)) + outList.append(addZebra("C",13,4,3,1)) + outList.append(addZebra("C",13,4,2,1)) + outList.append(addZebra("C",14,4,11,1)) + outList.append(addZebra("C",14,4,10,1)) + outList.append(addZebra("C",14,4,9,-1)) + outList.append(addZebra("C",14,4,8,-1)) + outList.append(addZebra("C",16,4,19,1)) + outList.append(addZebra("C",16,4,18,1)) + outList.append(addZebra("C",16,4,15,1)) + outList.append(addZebra("C",16,4,14,1)) + outList.append(addZebra("C",16,4,12,-1)) + outList.append(addZebra("C",16,4,7,1)) + outList.append(addZebra("C",16,4,6,1)) + outList.append(addZebra("C",16,4,5,-1)) + outList.append(addZebra("C",16,4,4,-1)) + outList.append(addZebra("C",16,4,0,1)) + outList.append(addZebra("C",2,5,15,1)) + outList.append(addZebra("C",2,5,14,1)) + outList.append(addZebra("C",2,5,9,-1)) + outList.append(addZebra("C",2,5,8,-1)) + outList.append(addZebra("C",2,5,7,1)) + outList.append(addZebra("C",2,5,6,1)) + outList.append(addZebra("C",2,5,3,1)) + outList.append(addZebra("C",2,5,2,1)) + outList.append(addZebra("C",3,5,8,-1)) + outList.append(addZebra("C",3,5,3,-1)) + outList.append(addZebra("C",3,5,2,-1)) + outList.append(addZebra("C",4,5,11,-1)) + outList.append(addZebra("C",4,5,10,-1)) + outList.append(addZebra("C",4,5,5,1)) + outList.append(addZebra("C",4,5,4,1)) + outList.append(addZebra("C",6,5,3,1)) + outList.append(addZebra("C",6,5,2,1)) + outList.append(addZebra("C",7,5,15,-1)) + outList.append(addZebra("C",7,5,14,-1)) + outList.append(addZebra("C",7,5,11,-1)) + outList.append(addZebra("C",7,5,10,-1)) + outList.append(addZebra("C",7,5,7,-1)) + outList.append(addZebra("C",7,5,6,-1)) + outList.append(addZebra("C",7,5,3,-1)) + outList.append(addZebra("C",7,5,2,-1)) + outList.append(addZebra("C",8,5,19,1)) + outList.append(addZebra("C",8,5,18,1)) + outList.append(addZebra("C",8,5,5,-1)) + outList.append(addZebra("C",8,5,4,-1)) + outList.append(addZebra("C",8,5,3,2)) + outList.append(addZebra("C",8,5,2,2)) + outList.append(addZebra("C",10,5,7,1)) + outList.append(addZebra("C",10,5,6,1)) + outList.append(addZebra("C",10,5,3,1)) + outList.append(addZebra("C",10,5,2,1)) + outList.append(addZebra("C",11,5,9,-1)) + outList.append(addZebra("C",11,5,8,-1)) + outList.append(addZebra("C",11,5,1,-1)) + outList.append(addZebra("C",11,5,0,-1)) + outList.append(addZebra("C",12,5,16,-1)) + outList.append(addZebra("C",12,5,7,1)) + outList.append(addZebra("C",12,5,6,1)) + outList.append(addZebra("C",12,5,3,-1)) + outList.append(addZebra("C",12,5,2,-1)) + outList.append(addZebra("C",12,5,1,-1)) + outList.append(addZebra("C",12,5,0,-1)) + outList.append(addZebra("C",13,5,11,1)) + outList.append(addZebra("C",13,5,10,1)) + outList.append(addZebra("C",16,5,14,1)) + outList.append(addZebra("C",16,5,5,1)) + outList.append(addZebra("C",16,5,4,1)) + outList.append(addZebra("C",1,6,15,-1)) + outList.append(addZebra("C",1,6,14,-1)) + outList.append(addZebra("C",2,6,9,-1)) + outList.append(addZebra("C",2,6,8,-1)) + outList.append(addZebra("C",2,6,7,-1)) + outList.append(addZebra("C",2,6,6,-1)) + outList.append(addZebra("C",2,6,5,-1)) + outList.append(addZebra("C",2,6,4,-1)) + outList.append(addZebra("C",3,6,19,1)) + outList.append(addZebra("C",3,6,18,1)) + outList.append(addZebra("C",3,6,15,1)) + outList.append(addZebra("C",3,6,14,1)) + outList.append(addZebra("C",5,6,25,-1)) + outList.append(addZebra("C",5,6,24,-1)) + outList.append(addZebra("C",6,6,5,-2)) + outList.append(addZebra("C",6,6,4,-2)) + outList.append(addZebra("C",6,6,3,1)) + outList.append(addZebra("C",6,6,1,-1)) + outList.append(addZebra("C",6,6,0,-1)) + outList.append(addZebra("C",7,6,23,2)) + outList.append(addZebra("C",7,6,22,2)) + outList.append(addZebra("C",7,6,11,2)) + outList.append(addZebra("C",7,6,10,2)) + outList.append(addZebra("C",8,6,25,-1)) + outList.append(addZebra("C",8,6,24,-1)) + outList.append(addZebra("C",8,6,7,1)) + outList.append(addZebra("C",8,6,6,1)) + outList.append(addZebra("C",9,6,15,-1)) + outList.append(addZebra("C",9,6,14,-1)) + outList.append(addZebra("C",10,6,13,-1)) + outList.append(addZebra("C",10,6,12,-1)) + outList.append(addZebra("C",10,6,5,-1)) + outList.append(addZebra("C",10,6,4,-1)) + outList.append(addZebra("C",10,6,1,-1)) + outList.append(addZebra("C",10,6,0,-1)) + outList.append(addZebra("C",11,6,12,-1)) + outList.append(addZebra("C",11,6,7,1)) + outList.append(addZebra("C",11,6,6,1)) + outList.append(addZebra("C",12,6,21,-1)) + outList.append(addZebra("C",12,6,20,-1)) + outList.append(addZebra("C",12,6,7,1)) + outList.append(addZebra("C",13,6,17,-1)) + outList.append(addZebra("C",15,6,19,1)) + outList.append(addZebra("C",15,6,18,1)) + outList.append(addZebra("C",16,6,16,-1)) + outList.append(addZebra("C",16,6,13,-1)) + outList.append(addZebra("C",16,6,12,-1)) + outList.append(addZebra("C",2,7,12,-1)) + outList.append(addZebra("C",2,7,7,1)) + outList.append(addZebra("C",2,7,6,1)) + outList.append(addZebra("C",2,7,3,1)) + outList.append(addZebra("C",2,7,2,1)) + outList.append(addZebra("C",3,7,3,-1)) + outList.append(addZebra("C",3,7,2,-1)) + outList.append(addZebra("C",6,7,7,1)) + outList.append(addZebra("C",6,7,6,1)) + outList.append(addZebra("C",7,7,23,1)) + outList.append(addZebra("C",7,7,22,1)) + outList.append(addZebra("C",7,7,21,1)) + outList.append(addZebra("C",7,7,20,1)) + outList.append(addZebra("C",7,7,1,-1)) + outList.append(addZebra("C",7,7,0,-1)) + outList.append(addZebra("C",8,7,17,-1)) + outList.append(addZebra("C",8,7,16,-1)) + outList.append(addZebra("C",8,7,15,1)) + outList.append(addZebra("C",8,7,14,1)) + outList.append(addZebra("C",8,7,11,1)) + outList.append(addZebra("C",8,7,10,1)) + outList.append(addZebra("C",8,7,1,-3)) + outList.append(addZebra("C",8,7,0,-3)) + outList.append(addZebra("C",9,7,21,1)) + outList.append(addZebra("C",10,7,13,1)) + outList.append(addZebra("C",10,7,12,1)) + outList.append(addZebra("C",11,7,19,1)) + outList.append(addZebra("C",11,7,18,1)) + outList.append(addZebra("C",12,7,7,-1)) + outList.append(addZebra("C",12,7,6,-1)) + outList.append(addZebra("C",13,7,19,1)) + outList.append(addZebra("C",13,7,18,1)) + outList.append(addZebra("C",13,7,3,1)) + outList.append(addZebra("C",14,7,1,-1)) + outList.append(addZebra("C",14,7,0,-1)) + outList.append(addZebra("C",15,7,1,-1)) + outList.append(addZebra("C",15,7,0,-1)) + outList.append(addZebra("C",16,7,15,1)) + outList.append(addZebra("C",16,7,14,1)) + outList.append(addZebra("C",16,7,13,-1)) + outList.append(addZebra("C",16,7,12,-1)) + outList.append(addZebra("C",16,7,1,1)) + outList.append(addZebra("C",16,7,0,1)) + outList.append(addZebra("C",2,8,7,1)) + outList.append(addZebra("C",2,8,6,1)) + outList.append(addZebra("C",2,8,4,-1)) + outList.append(addZebra("C",2,8,3,1)) + outList.append(addZebra("C",2,8,2,1)) + outList.append(addZebra("C",4,8,21,-1)) + outList.append(addZebra("C",4,8,15,1)) + outList.append(addZebra("C",6,8,12,-1)) + outList.append(addZebra("C",6,8,5,-1)) + outList.append(addZebra("C",6,8,4,-1)) + outList.append(addZebra("C",6,8,1,-1)) + outList.append(addZebra("C",6,8,0,-1)) + outList.append(addZebra("C",7,8,22,-1)) + outList.append(addZebra("C",7,8,21,-2)) + outList.append(addZebra("C",7,8,20,-2)) + outList.append(addZebra("C",7,8,7,1)) + outList.append(addZebra("C",7,8,6,1)) + outList.append(addZebra("C",8,8,19,1)) + outList.append(addZebra("C",8,8,18,1)) + outList.append(addZebra("C",8,8,17,-1)) + outList.append(addZebra("C",8,8,16,-1)) + outList.append(addZebra("C",9,8,19,1)) + outList.append(addZebra("C",9,8,18,1)) + outList.append(addZebra("C",9,8,17,-1)) + outList.append(addZebra("C",9,8,16,-1)) + outList.append(addZebra("C",9,8,7,1)) + outList.append(addZebra("C",9,8,6,1)) + outList.append(addZebra("C",10,8,11,1)) + outList.append(addZebra("C",10,8,10,1)) + outList.append(addZebra("C",10,8,5,-1)) + outList.append(addZebra("C",10,8,4,-1)) + outList.append(addZebra("C",10,8,3,-1)) + outList.append(addZebra("C",11,8,19,1)) + outList.append(addZebra("C",11,8,18,1)) + outList.append(addZebra("C",11,8,11,1)) + outList.append(addZebra("C",11,8,10,1)) + outList.append(addZebra("C",11,8,7,1)) + outList.append(addZebra("C",12,8,19,-1)) + outList.append(addZebra("C",12,8,18,-1)) + outList.append(addZebra("C",12,8,17,-1)) + outList.append(addZebra("C",12,8,16,-1)) + outList.append(addZebra("C",12,8,8,-1)) + outList.append(addZebra("C",12,8,3,1)) + outList.append(addZebra("C",12,8,2,1)) + outList.append(addZebra("C",12,8,0,-1)) + outList.append(addZebra("C",13,8,19,1)) + outList.append(addZebra("C",13,8,18,1)) + outList.append(addZebra("C",13,8,7,1)) + outList.append(addZebra("C",13,8,6,1)) + outList.append(addZebra("C",13,8,3,1)) + outList.append(addZebra("C",13,8,2,1)) + outList.append(addZebra("C",14,8,25,-1)) + outList.append(addZebra("C",14,8,24,-1)) + outList.append(addZebra("C",14,8,17,-1)) + outList.append(addZebra("C",14,8,16,-1)) + outList.append(addZebra("C",14,8,9,-1)) + outList.append(addZebra("C",14,8,8,-1)) + outList.append(addZebra("C",14,8,5,-1)) + outList.append(addZebra("C",14,8,4,-1)) + outList.append(addZebra("C",15,8,7,1)) + outList.append(addZebra("C",15,8,6,1)) + outList.append(addZebra("C",15,8,3,1)) + outList.append(addZebra("C",15,8,2,1)) + outList.append(addZebra("C",15,8,1,-1)) + outList.append(addZebra("C",15,8,0,-1)) + outList.append(addZebra("C",16,8,15,1)) + outList.append(addZebra("C",16,8,14,1)) + outList.append(addZebra("C",16,8,7,1)) + outList.append(addZebra("C",16,8,6,1)) + outList.append(addZebra("C",16,8,3,1)) + outList.append(addZebra("C",16,8,2,1)) + with open("MMGZebraShift.json","w") as f: json.dump(outList,f) diff --git a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h index c7c071207f2e2f1f634a5e1d75f6573e944ac6b8..cc05c223a850f9b0bd9949c267df72d892cfdf26 100644 --- a/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h +++ b/MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h @@ -30,7 +30,7 @@ class MuonMM_CablingAlg : public AthReentrantAlgorithm { ServiceHandle<Muon::IMuonIdHelperSvc> m_idHelperSvc{ this, "MuonIdHelperSvc", "Muon::MuonIdHelperSvc/MuonIdHelperSvc"}; SG::ReadCondHandleKey<CondAttrListCollection> m_readCablingKey{ - this, "CablingFolder", /* "/MDT/MM/CABLING" */ "", "Key of input conditions folder for MM cabling map"}; + this, "CablingFolder", "/MDT/MM/CABLING", "Key of input conditions folder for MM cabling map"}; SG::WriteCondHandleKey<MicroMega_CablingMap> m_writeKey{ this, "WriteKey", "MicroMegaCabling", "Key of output MM cabling map"}; diff --git a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCablingConfig.py b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCablingConfig.py index 5184f118ca7ac51f3c63f1f3f66955f89b32df91..489290be4d9cbaa22879a25bf756d3c08745300e 100644 --- a/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCablingConfig.py +++ b/MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCablingConfig.py @@ -21,7 +21,7 @@ if DetFlags.MDT_on(): from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags condSequence.MuonMDT_CablingAlg.isRun3 = CommonGeometryFlags.Run not in ["RUN1","RUN2"] -if DetFlags.MM_on(): +if DetFlags.MM_on() and globalflags.DataSource() == 'data': # the MM cabling correction is only needed for data from MuonMM_Cabling.MuonMM_CablingConf import MuonMM_CablingAlg condSequence += MuonMM_CablingAlg("MuonMM_CablingAlg") @@ -150,7 +150,12 @@ if DetFlags.readRDOBS.MM_on() or DetFlags.readRDOPool.MM_on() or DetFlags.readR from IOVDbSvc.CondDB import conddb IOVDbSvc = ServiceMgr.IOVDbSvc if globalflags.DataSource()=='data': - # here we should add the cool folders containing the cabling map of the NSW - pass + from AthenaCommon.AthenaCommonFlags import athenaCommonFlags + if athenaCommonFlags.isOnline(): + conddb.addFolder("MDT_ONL","/MDT/Onl/MM/CABLING",className="CondAttrListCollection", tag="MmCabling-FrontEndShifts-v1") + condSequence.MuonMM_CablingAlg.CablingFolder="/MDT/MM/CABLING" + else: + conddb.addFolder("MDT_OFL","/MDT/MM/CABLING",className="CondAttrListCollection", tag="MmCabling-FrontEndShifts-v1") + condSequence.MuonMM_CablingAlg.CablingFolder="/MDT/MM/CABLING" diff --git a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py index 59fe60b03a129dee4881017d5ece3ab7cc091d43..7679347716bc01095870f246bce842710d34e196 100644 --- a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py +++ b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py @@ -151,6 +151,12 @@ def MicroMegaCablingCfg(flags, name = "MuonMM_CablingAlg", **kwargs): #### Only setup the MM Cabling algorithm for data if flags.Input.isMC or not flags.Detector.GeometryMM: return result + + from IOVDbSvc.IOVDbSvcConfig import addFolders + cablingFolder = "/MDT/MM/CABLING" if not flags.Common.isOnline else "/MDT/Onl/MM/CABLING" + kwargs.setdefault("CablingFolder",cablingFolder) + result.merge(addFolders(flags,[kwargs["CablingFolder"]], detDb=("MDT_OFL" if not flags.Common.isOnline else "MDT_ONL"), className="CondAttrListCollection", tag="MmCabling-FrontEndShifts-v1")) + the_alg = CompFactory.MuonMM_CablingAlg(name, **kwargs) result.addCondAlgo(the_alg, primary = True) return result diff --git a/Tools/PROCTools/data/q449_AOD_digest.ref b/Tools/PROCTools/data/q449_AOD_digest.ref index 118da575fd239e0b192fce9bbb7a6d7bb568218d..a21af45f9f00f15d8c61cc31b700cce738f6b387 100644 --- a/Tools/PROCTools/data/q449_AOD_digest.ref +++ b/Tools/PROCTools/data/q449_AOD_digest.ref @@ -26,7 +26,7 @@ 431493 1096128475 167 251 30 5 0 1 0 1 11 0 11 431493 1096128958 301 363 83 8 0 14 0 14 22 0 22 431493 1096129516 301 434 33 4 1 2 0 2 12 0 12 - 431493 1096130319 317 516 75 6 0 11 0 11 15 0 15 + 431493 1096130319 317 516 75 6 1 11 0 11 15 0 15 431493 1096130794 338 449 113 8 1 15 0 15 20 0 20 431493 1096131620 403 575 133 10 1 14 0 14 27 0 27 431493 1096131904 322 439 78 8 0 12 0 12 9 0 9 @@ -81,7 +81,7 @@ 431493 1096178859 347 362 44 6 1 7 0 7 13 0 13 431493 1096180059 374 437 22 3 1 2 0 2 22 0 22 431493 1096181059 224 262 33 4 1 6 0 6 10 0 10 - 431493 1096181128 362 557 82 8 1 6 0 6 14 0 14 + 431493 1096181128 362 557 82 8 2 6 0 6 14 0 14 431493 1096182354 306 314 53 5 1 13 0 13 16 0 16 431493 1096182555 237 356 57 7 0 6 0 6 9 0 9 431493 1096183473 214 254 45 4 0 12 0 12 9 0 9 diff --git a/Tools/WorkflowTestRunner/python/References.py b/Tools/WorkflowTestRunner/python/References.py index 92d03b566e6c61ab35bfcb13d0977cce0d9b268f..31f379db0051fff691e903abfad83e3a6585682c 100644 --- a/Tools/WorkflowTestRunner/python/References.py +++ b/Tools/WorkflowTestRunner/python/References.py @@ -26,7 +26,7 @@ references_map = { "q442": "v41", "q443": "v31", "q445": "v53", - "q449": "v57", + "q449": "v58", # Derivations "data_PHYS_Run2": "v15", "data_PHYS_Run3": "v14",