diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py index 6cd6b1a4b13f1fde239e07b045f8a369e8ece794..6593f728e690d0bcebc4e78cce41a69777ac14fa 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py +++ b/DetectorDescription/GeoModel/FaserGeoModel/python/DipoleGMConfig.py @@ -52,7 +52,7 @@ if __name__ == "__main__": #acc.getService("StoreGateSvc").Dump=True acc.getService("ConditionStore").Dump=True acc.printConfig(withDetails=True) - f=open('DipoleGMCfg2.pkl','w') + f=open('DipoleGMCfg2.pkl','wb') acc.store(f) f.close() ConfigFlags.dump() diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py index bda958b6032c93adbb4ed95b16893a1a212bc138..907eae5be64cfde5ca5acf60135790af49de7040 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py +++ b/DetectorDescription/GeoModel/FaserGeoModel/python/GeoModelConfig.py @@ -52,6 +52,6 @@ if __name__ == "__main__": ConfigFlags.lock() acc = GeoModelCfg( ConfigFlags ) - acc.store( file( "test.pkl", "w" ), useBootStrapFile = False ) + acc.store( open("test.pkl", "wb"), useBootStrapFile = False ) print("All OK") diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py index 8bc39143de1ec761894becacf54d514d63adbcac..cc8e5051b8888f4f7cf297d82894a2310738d089 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py +++ b/DetectorDescription/GeoModel/FaserGeoModel/python/SCTGMConfig.py @@ -43,7 +43,7 @@ if __name__ == "__main__": #acc.getService("StoreGateSvc").Dump=True acc.getService("ConditionStore").Dump=True acc.printConfig(withDetails=True) - f=open('TrackerGMCfg2.pkl','w') + f=open('TrackerGMCfg2.pkl','wb') acc.store(f) f.close() ConfigFlags.dump() diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py index 8e62384aaa7113fbd4a978e6b07f059cedfb7afd..abc23011d977fa1af78418817a2fbd2d376a5f85 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py +++ b/DetectorDescription/GeoModel/FaserGeoModel/python/ScintGMConfig.py @@ -52,7 +52,7 @@ if __name__ == "__main__": #acc.getService("StoreGateSvc").Dump=True acc.getService("ConditionStore").Dump=True acc.printConfig(withDetails=True) - f=open('ScintGMCfg2.pkl','w') + f=open('ScintGMCfg2.pkl','wb') acc.store(f) f.close() ConfigFlags.dump() diff --git a/DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py b/DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py index aeb522cc7bc9893780216b701607718a17786bf0..5f8b4ebd6c289a0c2849e15223cbcd888335cfba 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py +++ b/DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py @@ -1,4 +1,5 @@ # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +from __future__ import print_function from AthenaCommon.JobProperties import jobproperties #from AthenaCommon.DetFlags import DetFlags @@ -20,5 +21,5 @@ relversion = rel_metadata['release'].split('.') if len(relversion) < 3: relversion = rel_metadata['base release'].split('.') -print "SetGeometryVersion.py obtained major release version %s" % relversion[0] +print("SetGeometryVersion.py obtained major release version ", relversion[0]) GeoModelSvc.SupportedGeometry = int(relversion[0]) diff --git a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py index 6d48c59c1b82a8a70edfef8aaa82fb5fa8b54026..5563398da5584c739c2fe9e4c43e9403b83ec5d5 100644 --- a/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py +++ b/DetectorDescription/GeoModel/FaserGeoModel/test/FaserGeometryConfig_EVNT_test.py @@ -48,7 +48,7 @@ if __name__ == "__main__": acc.foreach_component("*ClassID*").OutputLevel = INFO acc.printConfig(withDetails=True) - f=open('FaserGeoModelCfg_EVNT.pkl','w') + f=open('FaserGeoModelCfg_EVNT.pkl','wb') acc.store(f) f.close() ConfigFlags.dump() diff --git a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py index aa5462ea795cb5410ad33e95d85b35d04b362962..eea0f453e9a7b34561f8c2c8936cdf659aa27c51 100644 --- a/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py +++ b/MagneticField/MagFieldServices/python/MagFieldServicesConfig.py @@ -117,6 +117,6 @@ if __name__=="__main__": - f=open("MagneticFieldSvc.pkl","w") + f=open("MagneticFieldSvc.pkl","wb") cfg.store(f) f.close() diff --git a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py index f25dc8fa2873cc7b4d6ea6f5c490c6e4248386e7..24a1ad2103a6ece6a5bf94119b33ebc5da0dfcf1 100644 --- a/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py +++ b/Scintillator/ScintDetDescr/PreshowerGeoModel/test/PreshowerGMConfig_test.py @@ -20,6 +20,6 @@ if __name__ == "__main__": from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from PreshowerGeoModel.PreshowerGeoModelConfig import PreshowerGeometryCfg acc = PreshowerGeometryCfg(ConfigFlags) - f=open('PreshowerGeometryCfg.pkl','w') + f=open('PreshowerGeometryCfg.pkl','wb') acc.store(f) f.close() diff --git a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py index c07c7af4ec0c8841ff3341c0d041772e3feb5493..1a1a016ce71404b9805172633fff3ceb71c6963a 100644 --- a/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py +++ b/Scintillator/ScintDetDescr/TriggerGeoModel/test/TriggerGMConfig_test.py @@ -20,6 +20,6 @@ if __name__ == "__main__": from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from TriggerGeoModel.TriggerGeoModelConfig import TriggerGeometryCfg acc = TriggerGeometryCfg(ConfigFlags) - f=open('TriggerGeometryCfg.pkl','w') + f=open('TriggerGeometryCfg.pkl','wb') acc.store(f) f.close() diff --git a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py index ce28152d5448dd38089ef287e163fd37d80b0e9b..a585cdec1df9c3320686b1ab43fd09180102011f 100644 --- a/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py +++ b/Scintillator/ScintDetDescr/VetoGeoModel/test/VetoGMConfig_test.py @@ -20,6 +20,6 @@ if __name__ == "__main__": from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from VetoGeoModel.VetoGeoModelConfig import VetoGeometryCfg acc = VetoGeometryCfg(ConfigFlags) - f=open('VetoGeometryCfg.pkl','w') + f=open('VetoGeometryCfg.pkl','wb') acc.store(f) f.close() diff --git a/Scintillator/ScintG4/PreshowerG4_SD/test/PreshowerG4_SDToolConfig_test.py b/Scintillator/ScintG4/PreshowerG4_SD/test/PreshowerG4_SDToolConfig_test.py index 9f586ed169b7c13b81ad48490833d3df29f51123..e94aa49b8d695cd76a592af9124490944d6243a2 100644 --- a/Scintillator/ScintG4/PreshowerG4_SD/test/PreshowerG4_SDToolConfig_test.py +++ b/Scintillator/ScintG4/PreshowerG4_SD/test/PreshowerG4_SDToolConfig_test.py @@ -44,11 +44,11 @@ if __name__ == '__main__': cfg.printConfig(withDetails=True, summariseProps = True) ConfigFlags.dump() - f=open("test.pkl","w") + f=open("test.pkl","wb") cfg.store(f) f.close() - print cfg._publicTools - print "-----------------finished----------------------" + print(cfg._publicTools) + print("-----------------finished----------------------") diff --git a/Scintillator/ScintG4/TriggerG4_SD/test/TriggerG4_SDToolConfig_test.py b/Scintillator/ScintG4/TriggerG4_SD/test/TriggerG4_SDToolConfig_test.py index 5c482eee3f6d12f12785089888f3761f4b1d62ee..f983a561bbd1c6100c0e3093b95b6a23ec13170a 100644 --- a/Scintillator/ScintG4/TriggerG4_SD/test/TriggerG4_SDToolConfig_test.py +++ b/Scintillator/ScintG4/TriggerG4_SD/test/TriggerG4_SDToolConfig_test.py @@ -44,11 +44,11 @@ if __name__ == '__main__': cfg.printConfig(withDetails=True, summariseProps = True) ConfigFlags.dump() - f=open("test.pkl","w") + f=open("test.pkl","wb") cfg.store(f) f.close() - print cfg._publicTools - print "-----------------finished----------------------" + print (cfg._publicTools) + print ("-----------------finished----------------------") diff --git a/Scintillator/ScintG4/VetoG4_SD/test/VetoG4_SDToolConfig_test.py b/Scintillator/ScintG4/VetoG4_SD/test/VetoG4_SDToolConfig_test.py index 2eb4d3cb44b020550b17dfcf4fa095b2d845a251..5d361203682e2cc8df5559f3752e397c5ff1e688 100644 --- a/Scintillator/ScintG4/VetoG4_SD/test/VetoG4_SDToolConfig_test.py +++ b/Scintillator/ScintG4/VetoG4_SD/test/VetoG4_SDToolConfig_test.py @@ -44,11 +44,11 @@ if __name__ == '__main__': cfg.printConfig(withDetails=True, summariseProps = True) ConfigFlags.dump() - f=open("test.pkl","w") + f=open("test.pkl","wb") cfg.store(f) f.close() - print cfg._publicTools - print "-----------------finished----------------------" + print (cfg._publicTools) + print ("-----------------finished----------------------") diff --git a/Simulation/G4Faser/G4FaserAlg/test/runG4.py b/Simulation/G4Faser/G4FaserAlg/test/runG4.py index 23db5b96d98c132f0f6040c7f0183420f2dcd6e0..3719fabd69495ad96f9b3232901b4b7e94d98f42 100644 --- a/Simulation/G4Faser/G4FaserAlg/test/runG4.py +++ b/Simulation/G4Faser/G4FaserAlg/test/runG4.py @@ -128,7 +128,7 @@ if __name__ == "__main__": # acc.getService("StoreGateSvc").Dump=True # acc.getService("ConditionStore").Dump=True # acc.printConfig() - f=open('FaserG4AppCfg_EVNT.pkl','w') + f=open('FaserG4AppCfg_EVNT.pkl','wb') acc.store(f) f.close() # diff --git a/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py b/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py index 251319ec6e099f4f5643a23cd8aa0f80c7978419..a20abc7e90dffbde4996b6b3b2c6ac05aafbb3ae 100755 --- a/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py +++ b/Tracker/TrackerDetDescr/DipoleGeoModel/test/DipoleGMConfig_test.py @@ -18,6 +18,6 @@ if __name__ == "__main__": from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from DipoleGeoModel.DipoleGeoModelConfig import DipoleGeometryCfg acc = DipoleGeometryCfg(ConfigFlags) - f=open('DipoleGeometryCfg.pkl','w') + f=open('DipoleGeometryCfg.pkl','wb') acc.store(f) f.close() diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py index 15ccb863d06e922d2ecaa16547053aec1f1c273d..cd8a4d6204d7d0a83298531cbe449e7309be55d3 100755 --- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py +++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/test/FaserSCT_GMConfig_test.py @@ -18,6 +18,6 @@ if __name__ == "__main__": from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from FaserSCT_GeoModel.FaserSCT_GeoModelConfig import FaserSCT_GeometryCfg acc = FaserSCT_GeometryCfg(ConfigFlags) - f=open('FaserSCT_GeometryCfg.pkl','w') + f=open('FaserSCT_GeometryCfg.pkl','wb') acc.store(f) f.close() diff --git a/Tracker/TrackerG4/FaserSCT_G4_SD/test/FaserSCT_G4_SDToolConfig_test.py b/Tracker/TrackerG4/FaserSCT_G4_SD/test/FaserSCT_G4_SDToolConfig_test.py index 8107803fba622d3ce39d4858417a587ecba8e116..394d3416bba3bd933159d8f54746e428275c2a15 100644 --- a/Tracker/TrackerG4/FaserSCT_G4_SD/test/FaserSCT_G4_SDToolConfig_test.py +++ b/Tracker/TrackerG4/FaserSCT_G4_SD/test/FaserSCT_G4_SDToolConfig_test.py @@ -44,11 +44,11 @@ if __name__ == '__main__': cfg.printConfig(withDetails=True, summariseProps = True) ConfigFlags.dump() - f=open("test.pkl","w") + f=open("test.pkl","wb") cfg.store(f) f.close() - print cfg._publicTools - print "-----------------finished----------------------" + print(cfg._publicTools) + print("-----------------finished----------------------")