From ae14ee1bf5d86eccd9837f75acdbba0b5109a293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20K=C3=B6hler?= <nicolas.koehler@cern.ch>
Date: Tue, 28 Apr 2020 16:27:47 +0200
Subject: [PATCH] remove phased-out property settings
---
MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py | 3 ---
MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py | 1 +
.../MuonReconstruction/MuonRecExample/python/MooreTools.py | 1 +
.../MuonRecExample/python/MuonRecExampleConfigDb.py | 4 ++--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
index 7b3f58cd29e6..0558addd273a 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
@@ -84,9 +84,6 @@ def MuonSegmentMomentumFromFieldCfg(flags, name="MuonSegmentMomentumFromField",
muon_prop = acc.getPrimary()
result.merge(acc)
kwargs.setdefault("PropagatorTool", muon_prop)
-
- kwargs.setdefault("HasCSC", flags.Detector.GeometryCSC)
- kwargs.setdefault("HasSTgc", flags.Detector.GeometrysTGC)
muon_seg_mom_from_field = MuonSegmentMomentumFromField(name=name, **kwargs)
result.setPrivateTools(muon_seg_mom_from_field)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index bab91aac709c..5634ab676351 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -188,6 +188,7 @@ def MuonSegmentMatchingToolCfg(flags, name="MuonSegmentMatchingTool", **kwargs):
kwargs.setdefault( "doPhiMatching", False )
if flags.Beam.Type == 'cosmics':
kwargs.setdefault("OverlapMatchAveragePhiHitPullCut", 200.)
+ kwargs.setdefault( "ToroidOn", False )
# There are two tools which this depends on which aren't properties and which weren't defined in old configuration
# Ignore for now, but FIXME one day
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py
index cc388d67f2a9..76e57528c652 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py
@@ -291,6 +291,7 @@ class MuonSegmentMatchingTool(CfgMgr.Muon__MuonSegmentMatchingTool):
if beamFlags.beamType() == 'cosmics':
# switch off cut of phi hit pulls
kwargs.setdefault("OverlapMatchAveragePhiHitPullCut", 200. )
+ kwargs.setdefault( "ToroidOn", False )
super(MuonSegmentMatchingTool,self).__init__(name,**kwargs)
# add missing dependency in C++
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
index 198e44c885d7..fca36cb87904 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MuonRecExampleConfigDb.py
@@ -62,7 +62,7 @@ addTool("MuonRecExample.MuonRecTools.MuonStraightLineExtrapolator", "MuonStraigh
addTool("Trk::KalmanUpdator", "MuonMeasUpdator")
-addService("Muon::MuonIdHelperSvc", "MuonIdHelperSvc", HasCSC=MuonGeometryFlags.hasCSC(), HasSTgc=(CommonGeometryFlags.Run() in ["RUN3", "RUN4"]), HasMM=(CommonGeometryFlags.Run() in ["RUN3", "RUN4"]))
+addService("Muon::MuonIdHelperSvc", "MuonIdHelperSvc", HasCSC=MuonGeometryFlags.hasCSC(), HasSTgc=MuonGeometryFlags.hasSTGC(), HasMM=MuonGeometryFlags.hasMM())
addTool("Muon::MuonIdHelperTool", "MuonIdHelperTool")
addTool("Muon::MuonTrackTruthTool", "MuonTrackTruthTool")
@@ -85,7 +85,7 @@ addTool( "MuonRecExample.MuonRecTools.MuonChi2TrackFitter", "MuonChi2TrackFitter
addTool( "MuonRecExample.MuonRecTools.MuonChi2TrackFitter", "MuonChi2SLTrackFitter", StraightLine=True )
addTool( "MuonRecExample.MuonRecTools.MuonSegmentMomentum", "MuonSegmentMomentum" )
-addTool( "MuonRecExample.MuonRecTools.MuonSegmentMomentumFromField", "MuonSegmentMomentumFromField", HasCSC=MuonGeometryFlags.hasCSC(), HasSTgc=(CommonGeometryFlags.Run() in ["RUN3", "RUN4"]))
+addTool( "MuonRecExample.MuonRecTools.MuonSegmentMomentumFromField", "MuonSegmentMomentumFromField")
addTool( "MuonRecExample.MuonRecTools.MuonPhiHitSelector", "MuonPhiHitSelector" )
--
GitLab