From 4516a467059cd6fcb2561ebb2ceb40b48ec1cf5d Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Mon, 25 Nov 2019 17:51:38 +0100
Subject: [PATCH] Python3 syntax fixes for MuonConfig package
---
MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py | 2 +-
MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py | 4 ++--
MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py | 2 +-
MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
index 042959397504..231cb6a7462e 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
@@ -148,7 +148,7 @@ if __name__ == '__main__':
result = CSCCablingConfigCfg(ConfigFlags)
acc.merge( result )
- f=open('MuonCabling.pkl','w')
+ f=open('MuonCabling.pkl','wb')
acc.store(f)
f.close()
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
index 94b6ab70c6b5..10871f2d07d1 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRdoDecodeConfig.py
@@ -268,7 +268,7 @@ def muonRdoDecodeTestData( forTrigger = False ):
# Store config as pickle
log.info('Save Config')
- with open(pklName,'w') as f:
+ with open(pklName,'wb') as f:
cfg.store(f)
f.close()
return cfg
@@ -320,7 +320,7 @@ def muonRdoDecodeTestMC():
# Store config as pickle
log.info('Save Config')
- with open('MuonRdoDecode.pkl','w') as f:
+ with open('MuonRdoDecode.pkl','wb') as f:
cfg.store(f)
f.close()
return cfg
diff --git a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
index 1a7413c6091b..2a8ac34ab024 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonRecToolsConfig.py
@@ -31,7 +31,7 @@ def MuonTrackToSegmentToolCfg(flags,name="MuonTrackToSegmentTool", **kwargs):
def MuonSeededSegmentFinderCfg(flags,name="MuonSeededSegmentFinder", **kwargs):
from MuonTrackFinderTools.MuonTrackFinderToolsConf import Muon__MuonSeededSegmentFinder
- from MuonSegmentFindingConfig import DCMathSegmentMakerCfg, MdtMathSegmentFinder # FIXME - should really shift this to RecTools then.
+ from MuonConfig.MuonSegmentFindingConfig import DCMathSegmentMakerCfg, MdtMathSegmentFinder # FIXME - should really shift this to RecTools then.
result = ComponentAccumulator()
mdt_segment_finder = MdtMathSegmentFinder(flags, name="MCTBMdtMathSegmentFinder", UseChamberTheta = False, AssociationRoadWidth = 1.5)
diff --git a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
index f650bdc0a4e0..8d528bdabfe5 100644
--- a/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
+++ b/MuonSpectrometer/MuonConfig/python/MuonTrackBuildingConfig.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from MuonRecToolsConfig import MCTBFitterCfg, MuonSTEP_PropagatorCfg, MuonTrackCleanerCfg, MuonSegmentMomentumFromFieldCfg, MuonSeededSegmentFinderCfg
+from MuonConfig.MuonRecToolsConfig import MCTBFitterCfg, MuonSTEP_PropagatorCfg, MuonTrackCleanerCfg, MuonSegmentMomentumFromFieldCfg, MuonSeededSegmentFinderCfg
from MuonConfig.MuonSegmentFindingConfig import MuonSegmentFittingToolCfg
def MooTrackFitterCfg(flags, name = 'MooTrackFitter', **kwargs):
@@ -83,7 +83,7 @@ def MooTrackBuilderCfg(flags, name="MooTrackBuilderTemplate", **kwargs):
from MuonTrackSteeringTools.MuonTrackSteeringToolsConf import Muon__MooTrackBuilder
from TrkExSTEP_Propagator.TrkExSTEP_PropagatorConf import Trk__STEP_Propagator
from MuonConfig.MuonRIO_OnTrackCreatorConfig import MdtDriftCircleOnTrackCreatorCfg, TriggerChamberClusterOnTrackCreatorCfg
- from MuonRecToolsConfig import MuonTrackToSegmentToolCfg
+ from MuonConfig.MuonRecToolsConfig import MuonTrackToSegmentToolCfg
from MagFieldServices.MagFieldServicesConfig import MagneticFieldSvcCfg
# Based on this: https://gitlab.cern.ch/atlas/athena/blob/release/22.0.3/MuonSpectrometer/MuonReconstruction/MuonRecExample/python/MooreTools.py#L221
--
GitLab