From f0f624626e8535ad9ff7e47347c67597719689bf Mon Sep 17 00:00:00 2001
From: Savanna Marie Shaw <savanna.marie.shaw@cern.ch>
Date: Fri, 4 Dec 2020 11:52:34 +0100
Subject: [PATCH] Update configuration of MuidErrorOptimisation tool in new JO
Updating the MuiErrorOptimisationTool configuration to actually configure the optimisation tool, and enabling the error optimisation in the trigger. Setting the alignment errors off for the refit tool for the moment as nothing is producing the alignment error data.
---
.../python/MuonCombinedRecToolsConfig.py | 9 +++++++--
.../TriggerJobOpts/python/TriggerConfigFlags.py | 1 -
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
index cb2137050e04..43ca55ae2ff3 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
+++ b/Reconstruction/MuonIdentification/MuonCombinedConfig/python/MuonCombinedRecToolsConfig.py
@@ -576,8 +576,11 @@ def MuidSegmentRegionRecoveryToolCfg(flags, name ='MuidSegmentRegionRecoveryTool
def MuidErrorOptimisationToolCfg(flags, name='MuidErrorOptimisationToolFit', **kwargs ):
- result = MuonCombinedTrackSummaryToolCfg(flags)
+ from MuonConfig.MuonRecToolsConfig import MuonTrackSummaryHelperToolCfg
+ result = MuonTrackSummaryHelperToolCfg(flags)
kwargs.setdefault("TrackSummaryTool", result.popPrivateTools() )
+ tool = CompFactory.Muon.MuonErrorOptimisationTool(name, **kwargs)
+ result.setPrivateTools(tool)
return result
def MuonAlignmentUncertToolThetaCfg(flags,name ="MuonAlignmentUncertToolTheta", **kwargs):
@@ -690,7 +693,9 @@ def CombinedMuonTrackBuilderCfg(flags, name='CombinedMuonTrackBuilder', **kwargs
if flags.Muon.enableErrorTuning and 'MuonErrorOptimizer' not in kwargs:
# use alignment effects on track for all algorithms
- useAlignErrs = True
+ # FIXME - useAlignErrs set to false until MuonAlignmentErrorDBAlg config is available
+ useAlignErrs = False
+
# FIXME - handle this.
# if conddb.dbdata == 'COMP200' or conddb.dbmc == 'COMP200' or 'HLT' in globalflags.ConditionsTag() or conddb.isOnline or TriggerFlags.MuonSlice.doTrigMuonConfig:
# useAlignErrs = False
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index db719bd2be26..a5e64912d277 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -298,7 +298,6 @@ def createTriggerFlags():
from MuonConfig.MuonConfigFlags import createMuonConfigFlags
muonflags = createMuonConfigFlags()
muonflags.Muon.useTGCPriorNextBC=True
- muonflags.Muon.enableErrorTuning=False
muonflags.Muon.MuonTrigger=True
muonflags.Muon.SAMuonTrigger=True
return muonflags
--
GitLab