From 588acc3894dafeb20141c57102b24843fbb82bd6 Mon Sep 17 00:00:00 2001
From: Marko Petric <marko.petric@cern.ch>
Date: Thu, 25 Jul 2019 13:11:44 +0200
Subject: [PATCH] replace xrange with six.range
---
DDCore/python/lcdd.py | 3 ++-
DDG4/python/DDSim/Helper/Action.py | 3 ++-
DDG4/python/DDSim/Helper/Filter.py | 3 ++-
.../python/GaudiPluginService/cpluginsvc.py | 1 +
examples/AlignDet/drivers/Shelf.py | 1 +
examples/CLICSiD/scripts/CLICRandom.py | 11 ++++++-----
examples/ClientTests/scripts/MultiCollections.py | 3 ++-
.../ClientTests/scripts/MultiSegmentCollections.py | 3 ++-
examples/DDCMS/scripts/CMSTrackerSim.py | 3 ++-
examples/LHeD/scripts/LHeDRandom.py | 11 ++++++-----
10 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/DDCore/python/lcdd.py b/DDCore/python/lcdd.py
index 0f62786d2..b7d110ad0 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 c4348f099..bc4ac3123 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 51de3c1ec..587c2e959 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 9728147bf..451ffee15 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 1a28f53a9..849d80f3e 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 9676ddef8..dfa6b15e5 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 34be915e9..07a0e7351 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 f1a2ff9a1..eec0718d1 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 632f7fb93..ff0d50e5d 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 d0f282487..8b5a44bb9 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)
--
GitLab