use BField.allToroidOn where possible

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"),

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++