Skip to content
Snippets Groups Projects
Commit 85b3e93a authored by Patrick Scholer's avatar Patrick Scholer Committed by Frank Winklmeier
Browse files

Zebra shifts v1 

Zebra shifts v1
parent d9490199
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 605 additions and 10 deletions
MuonSpectrometer/MuonCablings/MuonCablingData/src/MicroMega_CablingMap.cxx
+ 1
− 1
View file @ 85b3e93a
......@@ -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;
......
MuonSpectrometer/MuonCablings/MuonMM_Cabling/src/MuonMM_CablingAlg.h
+ 1
− 1
View file @ 85b3e93a
......@@ -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"};
......
MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCablingConfig.py
+ 8
− 3
View file @ 85b3e93a
......@@ -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"
MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
+ 6
− 0
View file @ 85b3e93a
......@@ -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
......
Tools/PROCTools/data/q449_AOD_digest.ref
+ 2
− 2
View file @ 85b3e93a
......@@ -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
......
Tools/WorkflowTestRunner/python/References.py
+ 1
− 1
View file @ 85b3e93a
......@@ -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",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment