Merge branch 'master-py3' into 'master'

Minor edits for (future) Python 3 compatibility

See merge request faser/calypso!73

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()

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

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()

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()

DetectorDescription/GeoModel/FaserGeoModel/python/SetGeometryVersion.py

 # 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])

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()

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()

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()

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()

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()

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

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

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

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()
 #

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()

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()

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