From 2eac8f26ce38d02d2ef3df0c4bb8af096ccaa1b8 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Fri, 6 Mar 2020 14:49:23 +0100
Subject: [PATCH] D3PDMakerReader: Python 3 fixes
Updates for python 3 compatibility.
---
.../D3PDMakerReader/python/Helpers.py | 20 +++++++++----------
.../D3PDMakerReader/python/MultiReaderAlg.py | 4 ++--
.../D3PDMakerReader/python/ReaderAlg.py | 4 ++--
.../D3PDMaker/D3PDMakerReader/test/test.py | 17 ++++++++--------
4 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/Helpers.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/Helpers.py
index 26db441354fa..6aea36c133b5 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/Helpers.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/Helpers.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# $Id: Helpers.py 600807 2014-06-08 15:26:51Z krasznaa $
#
@@ -297,10 +297,10 @@ def makeRootCorePackageSkeleton( directory, name ):
# Create the directory structure:
import os
- os.mkdir( directory + "/" + name, 0755 )
- os.mkdir( directory + "/" + name + "/" + name, 0755 )
- os.mkdir( directory + "/" + name + "/Root", 0755 )
- os.mkdir( directory + "/" + name + "/cmt", 0755 )
+ os.mkdir( directory + "/" + name, 0o755 )
+ os.mkdir( directory + "/" + name + "/" + name, 0o755 )
+ os.mkdir( directory + "/" + name + "/Root", 0o755 )
+ os.mkdir( directory + "/" + name + "/cmt", 0o755 )
# Create the RootCore Makefile:
makefile = open( directory + "/" + name + "/cmt/Makefile.RootCore", "w" )
@@ -364,10 +364,10 @@ def makeSFramePackageSkeleton( directory, name ):
# Create the directory structure:
import os
- os.mkdir( directory + "/" + name, 0755 )
- os.mkdir( directory + "/" + name + "/include", 0755 )
- os.mkdir( directory + "/" + name + "/src", 0755 )
- os.mkdir( directory + "/" + name + "/proof", 0755 )
+ os.mkdir( directory + "/" + name, 0o755 )
+ os.mkdir( directory + "/" + name + "/include", 0o755 )
+ os.mkdir( directory + "/" + name + "/src", 0o755 )
+ os.mkdir( directory + "/" + name + "/proof", 0o755 )
# Create the SFrame Makefile:
makefile = open( directory + "/" + name + "/Makefile", "w" )
@@ -402,7 +402,7 @@ def makeSFramePackageSkeleton( directory, name ):
build.write( "fi\n\n" )
build.write( "make default\n" )
build.close()
- os.chmod( directory + "/" + name + "/proof/BUILD.sh", 0755 )
+ os.chmod( directory + "/" + name + "/proof/BUILD.sh", 0o755 )
# Signal that the function was successful:
return 0
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/MultiReaderAlg.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/MultiReaderAlg.py
index 67c63456e8ca..2c9949f623a9 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/MultiReaderAlg.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/MultiReaderAlg.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# $Id: MultiReaderAlg.py 452707 2011-08-08 11:45:42Z krasznaa $
@@ -126,7 +126,7 @@ class MultiReaderAlg( D3PD__MultiReaderAlg ):
collection getter registry for this tree.
"""
- if conf.properties().has_key( 'CollectionGetterRegistry' ):
+ if 'CollectionGetterRegistry' in conf.properties():
conf.CollectionGetterRegistry = self._registry
for c in conf.getAllChildren():
self._setRegistry( c )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/ReaderAlg.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/ReaderAlg.py
index 2f393eec420c..6299e48b7454 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/ReaderAlg.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/python/ReaderAlg.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# $Id: ReaderAlg.py 348546 2011-03-01 15:09:56Z krasznaa $
@@ -111,7 +111,7 @@ class ReaderAlg( D3PD__ReaderAlg ):
collection getter registry for this tree.
"""
- if conf.properties().has_key( 'CollectionGetterRegistry' ):
+ if 'CollectionGetterRegistry' in conf.properties():
conf.CollectionGetterRegistry = self._registry
for c in conf.getAllChildren():
self._setRegistry( c )
diff --git a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/test/test.py b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/test/test.py
index 779e7e92334c..3ca672d6e06f 100644
--- a/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/test/test.py
+++ b/PhysicsAnalysis/D3PDMaker/D3PDMakerReader/test/test.py
@@ -1,14 +1,15 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+from __future__ import print_function
def eventInfo( nt ):
- print ""
- print "Run: %i, Event: %i" % ( nt.eventinfo.RunNumber(), nt.eventinfo.EventNumber() )
- print "Number of electrons: %i" % nt.el.n()
- print " Their pT: " + str( [ nt.el[ i ].pt() for i in range( nt.el.n() ) ] )
- print "Number of muons: %i" % nt.mu_staco.n()
- print " Their eta: " + str( [ eta for eta in nt.mu_staco.eta() ] )
- print ""
+ print ("")
+ print ("Run: %i, Event: %i" % ( nt.eventinfo.RunNumber(), nt.eventinfo.EventNumber() ))
+ print ("Number of electrons: %i" % nt.el.n())
+ print (" Their pT: " + str( [ nt.el[ i ].pt() for i in range( nt.el.n() ) ] ))
+ print ("Number of muons: %i" % nt.mu_staco.n())
+ print (" Their eta: " + str( [ eta for eta in nt.mu_staco.eta() ] ))
+ print ("")
return
import ROOT
--
GitLab