From ba4f51a92fbc0e6533b8038d3f8b9ef3f104c31a Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 17 Apr 2019 15:42:19 +0200
Subject: [PATCH] AthenaRootComps: Initial python3 port.
Initial python3 port. Not yet trying to get everything working; only what's
needed for basic athena/configuration jobs.
---
Database/AthenaRoot/AthenaRootComps/python/Configurables.py | 4 ++--
.../AthenaRootComps/python/OutputStreamAthenaRoot.py | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Database/AthenaRoot/AthenaRootComps/python/Configurables.py b/Database/AthenaRoot/AthenaRootComps/python/Configurables.py
index ebc25426311..81fd6a9bbeb 100644
--- a/Database/AthenaRoot/AthenaRootComps/python/Configurables.py
+++ b/Database/AthenaRoot/AthenaRootComps/python/Configurables.py
@@ -1,11 +1,11 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
# @file: Configurables.py
# @purpose: customized Configurable classes for AthenaRootComps
# @author: Sebastien Binet <binet@cern.ch>
### ---------------------------------------------------------------------------
-from OutputStreamAthenaRoot import createNtupleOutputStream
+from AthenaRootComps.OutputStreamAthenaRoot import createNtupleOutputStream
### ---------------------------------------------------------------------------
## import the automatically generated Configurables
diff --git a/Database/AthenaRoot/AthenaRootComps/python/OutputStreamAthenaRoot.py b/Database/AthenaRoot/AthenaRootComps/python/OutputStreamAthenaRoot.py
index 702f13c45ab..2ca1112f58d 100644
--- a/Database/AthenaRoot/AthenaRootComps/python/OutputStreamAthenaRoot.py
+++ b/Database/AthenaRoot/AthenaRootComps/python/OutputStreamAthenaRoot.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
## @file OutputStreamAthenaRoot.py
## @brief Helper methods to create output streams
@@ -6,10 +6,12 @@
## $Id: OutputStreamAthenaRoot.py 723505 2016-02-11 22:29:40Z gemmeren $
###############################################################
+from __future__ import print_function
+
import AthenaCommon.CfgMgr as CfgMgr
from AthenaCommon.AppMgr import theApp
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from AthenaRootCompsConf import Athena__RootOutputStreamTool as AthenaRootOutputStreamTool
+from AthenaRootComps.AthenaRootCompsConf import Athena__RootOutputStreamTool as AthenaRootOutputStreamTool
def createNtupleOutputStream(streamName, fileName, tupleName="physics", asAlg = False):
if asAlg:
--
GitLab