diff --git a/DDCore/python/lcdd.py b/DDCore/python/lcdd.py index 0f62786d2d058a4cd21d3ce2b15c394ab2a47152..b7d110ad0748e69d29e86d15b1cafa87435668b2 100644 --- a/DDCore/python/lcdd.py +++ b/DDCore/python/lcdd.py @@ -15,7 +15,8 @@ from os import path, listdir from functools import partial import SystemOfUnits import math -import logging +import logging +from six.moves import range from ROOT import SetOwnership, dd4hep, TGeoMixture, TGeoMedium, gGeoManager, TNamed logging.basicConfig(format='%(levelname)s: %(message)s') diff --git a/DDG4/python/DDSim/Helper/Action.py b/DDG4/python/DDSim/Helper/Action.py index c4348f099a95e01c3a5bd58b64f9d5b58a16c913..bc4ac31237beca183ebd017d8118557ed6321f55 100644 --- a/DDG4/python/DDSim/Helper/Action.py +++ b/DDG4/python/DDSim/Helper/Action.py @@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals from DDSim.Helper.ConfigHelper import ConfigHelper +from six.moves import range class Action( ConfigHelper ): """Action holding sensitive detector actions @@ -67,7 +68,7 @@ class Action( ConfigHelper ): vals = val if len(vals)%2 != 0: raise RuntimeError("Not enough parameters for mapActions") - for index in xrange(0,len(vals),2): + for index in range(0,len(vals),2): self._mapActions[vals[index]] = vals[index+1] def clearMapActions( self ): diff --git a/DDG4/python/DDSim/Helper/Filter.py b/DDG4/python/DDSim/Helper/Filter.py index 51de3c1ecb25d0e71d8decc5321385f5f01d96c9..587c2e959866ef16ecf9d27e45f53db814f398a6 100644 --- a/DDG4/python/DDSim/Helper/Filter.py +++ b/DDG4/python/DDSim/Helper/Filter.py @@ -9,6 +9,7 @@ from __future__ import absolute_import, unicode_literals from DDSim.Helper.ConfigHelper import ConfigHelper from g4units import keV import logging +from six.moves import range logging.basicConfig(format='%(levelname)s: %(message)s') logger = logging.getLogger(__name__) @@ -88,7 +89,7 @@ class Filter( ConfigHelper ): vals = val if len(vals)%2 != 0: raise RuntimeError("Not enough parameters for mapDetFilter") - for index in xrange(0,len(vals),2): + for index in range(0,len(vals),2): self._mapDetFilter[vals[index]] = vals[index+1] def resetFilter( self ): diff --git a/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py b/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py index 9728147bf6a11417073e64c40e4fcbbc5bccac08..451ffee156e0da4ef8037bf06ab91d08fb6e6073 100644 --- a/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py +++ b/GaudiPluginService/python/GaudiPluginService/cpluginsvc.py @@ -1,5 +1,6 @@ # cpluginsvc is a ctypes-based wrapper for the C-exposed API of GaudiPluginService from __future__ import absolute_import, unicode_literals, print_function +from six.moves import range __doc__ = ''' cpluginsvc is a ctypes-based wrapper for the C-API of the GaudiPluginService. diff --git a/examples/AlignDet/drivers/Shelf.py b/examples/AlignDet/drivers/Shelf.py index 1a28f53a90ca0ce62c045af12fa4895c8f996832..849d80f3e85802ad9d20d10751f92dab4cd7bf8c 100644 --- a/examples/AlignDet/drivers/Shelf.py +++ b/examples/AlignDet/drivers/Shelf.py @@ -1,4 +1,5 @@ from __future__ import absolute_import, unicode_literals +from six.moves import range def detector_Shelf(description, det): diff --git a/examples/CLICSiD/scripts/CLICRandom.py b/examples/CLICSiD/scripts/CLICRandom.py index 9676ddef82d733c8c7259cf7dd4ac6b93bce8296..dfa6b15e5bc76d8f84048443f4757e8f195d8d74 100644 --- a/examples/CLICSiD/scripts/CLICRandom.py +++ b/examples/CLICSiD/scripts/CLICRandom.py @@ -10,6 +10,7 @@ from ROOT import TRandom from ROOT import gRandom import logging +from six.moves import range logging.basicConfig(format='%(levelname)s: %(message)s') logger = logging.getLogger(__name__) @@ -45,23 +46,23 @@ if __name__ == "__main__": rndm.setSeed(1234) rndm.showStatus() - for i in xrange(10): + for i in range(10): logger.info("%s -- 0 gRandome.Rndm() -- Shoot random[[%d]= %f",rndm.name(),i,gRandom.Rndm()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 1 gRandome.Rndm() -- Shoot random[[%d]= %f",rndm.name(),i,gRandom.Rndm()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 2 Geant4Random(CLHEP) -- Shoot random[[%d]= %f",rndm.name(),i,rndm.rndm_clhep()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 3 Geant4Random(CLHEP) -- Shoot random[[%d]= %f",rndm.name(),i,rndm.rndm_clhep()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 4 HepRandomEngine(CLHEP) -- Shoot random[%d]= %f",rndm.name(),i,rndm.engine().flat()) sid.test_run(have_geo=False) diff --git a/examples/ClientTests/scripts/MultiCollections.py b/examples/ClientTests/scripts/MultiCollections.py index 34be915e9a99d235b5260b0560b8862641441401..07a0e735180541b3518fae5dff16679b447c6f9b 100644 --- a/examples/ClientTests/scripts/MultiCollections.py +++ b/examples/ClientTests/scripts/MultiCollections.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * +from six.moves import range # # """ @@ -19,7 +20,7 @@ def run(): geometry = "file:"+install_dir+"/examples/ClientTests/compact/MultiCollections.xml" kernel.setOutputLevel(str('Geant4Converter'),Output.DEBUG) kernel.setOutputLevel(str('Gun'),Output.INFO) - for i in xrange(len(sys.argv)): + for i in range(len(sys.argv)): if sys.argv[i]=='-compact': geometry = sys.argv[i+1] elif sys.argv[i]=='-input': diff --git a/examples/ClientTests/scripts/MultiSegmentCollections.py b/examples/ClientTests/scripts/MultiSegmentCollections.py index f1a2ff9a1a3a80dc5af7cbee8af5e2153fe6f4f0..eec0718d162dbd5d314a4d0f5202a21f64b867b5 100644 --- a/examples/ClientTests/scripts/MultiSegmentCollections.py +++ b/examples/ClientTests/scripts/MultiSegmentCollections.py @@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * +from six.moves import range # # """ @@ -19,7 +20,7 @@ def run(): geometry = "file:"+install_dir+"/examples/ClientTests/compact/MultiSegmentCollections.xml" kernel.setOutputLevel(str('Geant4Converter'),Output.DEBUG) kernel.setOutputLevel(str('Gun'),Output.INFO) - for i in xrange(len(sys.argv)): + for i in range(len(sys.argv)): if sys.argv[i]=='-compact': geometry = sys.argv[i+1] elif sys.argv[i]=='-input': diff --git a/examples/DDCMS/scripts/CMSTrackerSim.py b/examples/DDCMS/scripts/CMSTrackerSim.py index 632f7fb9378f9c7a6085fd740ae766d6cbfa4f5c..ff0d50e5d20d247c6966fa692b85bfc91cdd5d33 100644 --- a/examples/DDCMS/scripts/CMSTrackerSim.py +++ b/examples/DDCMS/scripts/CMSTrackerSim.py @@ -3,6 +3,7 @@ import os, sys, time, DDG4 from DDG4 import OutputLevel as Output from SystemOfUnits import * import logging +from six.moves import range logging.basicConfig(format='%(levelname)s: %(message)s') logger = logging.getLogger(__name__) @@ -30,7 +31,7 @@ def run(): geant4.setupCshUI() batch = False test = False - for i in xrange(len(sys.argv)): + for i in range(len(sys.argv)): arg = sys.argv[i].lower() if arg == 'batch': batch = True diff --git a/examples/LHeD/scripts/LHeDRandom.py b/examples/LHeD/scripts/LHeDRandom.py index d0f28248771609a2f792b4241ae2c66a90bdf320..8b5a44bb9732b5474666ab167b5db64bb0c586e3 100644 --- a/examples/LHeD/scripts/LHeDRandom.py +++ b/examples/LHeD/scripts/LHeDRandom.py @@ -9,6 +9,7 @@ from __future__ import absolute_import, unicode_literals from ROOT import TRandom from ROOT import gRandom import logging +from six.moves import range logging.basicConfig(format='%(levelname)s: %(message)s') logger = logging.getLogger(__name__) @@ -43,23 +44,23 @@ if __name__ == "__main__": rndm.setSeed(1234) rndm.showStatus() - for i in xrange(10): + for i in range(10): logger.info("%s -- 0 gRandome.Rndm() -- Shoot random[[%d]= %f",rndm.name(),i,gRandom.Rndm()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 1 gRandome.Rndm() -- Shoot random[[%d]= %f",rndm.name(),i,gRandom.Rndm()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 2 Geant4Random(CLHEP) -- Shoot random[[%d]= %f",rndm.name(),i,rndm.rndm_clhep()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 3 Geant4Random(CLHEP) -- Shoot random[[%d]= %f",rndm.name(),i,rndm.rndm_clhep()) rndm.setSeed(1234) - for i in xrange(10): + for i in range(10): logger.info("%s -- 4 HepRandomEngine(CLHEP) -- Shoot random[%d]= %f",rndm.name(),i,rndm.engine().flat()) lhed.test_run(have_geo=False)