From f713ee7347d6c69c0c5f463a7cb72ee8a8852344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20K=C3=B6hler?= <nicolas.koehler@cern.ch>
Date: Tue, 28 Apr 2020 18:59:52 +0200
Subject: [PATCH] use BField.allToroidOn where possible
---
MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py | 4 ++--
.../MuonReconstruction/MuonRecExample/python/MooreTools.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index 5634ab676351..7b0351c1aab2 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -186,10 +186,10 @@ def MuonSegmentMatchingToolCfg(flags, name="MuonSegmentMatchingTool", **kwargs):
kwargs.setdefault( "doThetaMatching", flags.Muon.useSegmentMatching)
kwargs.setdefault( "doPhiMatching", False )
+ kwargs.setdefault( "ToroidOn", True ) # Was "not jobproperties.BField.allToroidOn()" but do not have access to Field here.
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
# m_overlapResolvingTool("Muon::MuonSegmentInOverlapResolvingTool/MuonSegmentInOverlapResolvingTool"),
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py
index 76e57528c652..dc60454c09e7 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py
@@ -288,10 +288,10 @@ class MuonSegmentMatchingTool(CfgMgr.Muon__MuonSegmentMatchingTool):
def __init__(self,name='MuonSegmentMatchingTool',**kwargs):
kwargs.setdefault( "doThetaMatching", muonStandaloneFlags.useSegmentMatching() )
kwargs.setdefault( "doPhiMatching", False )
+ kwargs.setdefault( "ToroidOn", jobproperties.BField.allToroidOn() )
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++
--
GitLab