From 1b4b5c5a02e86a104dd48ebe0ec14bc508fdf7bc Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Tue, 26 Nov 2019 15:45:56 +0100
Subject: [PATCH] Rename OutputStreamAthenaPool.OutputStreamAthenaPool module
 to OutputStreamAthenaPool.CreateOutputStreams

Having a module with the same name as the package name causes problems with syntax like:

```from OutputStreamAthenaPool.OutputStreamAthenaPoolConf import ...```

in python 2.7, so the module has been renamed to `CreateOutputStreams` and all references in the code
have been adapted.
---
 Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py  | 4 ++--
 .../CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py           | 4 ++--
 .../CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py      | 4 ++--
 .../CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py      | 4 ++--
 .../AthExThinning/share/WriteThinnedData_jobOptions.py      | 2 +-
 .../DataModelRunTests/share/AuxDataTestRead_jo.py           | 2 +-
 .../DataModelRunTests/share/AuxDataTestTypelessRead_jo.py   | 2 +-
 .../DataModelRunTests/share/AuxDataTestWrite_jo.py          | 2 +-
 .../DataModelRunTests/share/DataModelTestRead_jo.py         | 2 +-
 .../DataModelRunTests/share/DataModelTestWrite_jo.py        | 2 +-
 .../AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py   | 4 ++--
 .../share/AthenaPoolExample_WCondJobOptions.py              | 2 +-
 .../{OutputStreamAthenaPool.py => CreateOutputStreams.py}   | 0
 Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py    | 2 +-
 .../EmbeddedTrackGenerator/share/EmbeddedGeneratorCommon.py | 2 +-
 .../RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py | 4 ++--
 .../RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py  | 2 +-
 .../share/RecJobTransformTests_CaloHiveExOpts.py            | 4 ++--
 .../share/RecJobTransformTests_PFlowHiveExOpts.py           | 4 ++--
 Reconstruction/eflowRec/share/PFlowHiveExOpts.py            | 4 ++--
 Reconstruction/tauRec/share/run_tau_standalone.py           | 4 ++--
 .../TrigDecisionMaker/python/TrigDecisionMakerConfig.py     | 6 +++---
 .../share/pureSteering_jobOptionsWithPoolOutput.py          | 2 +-
 .../TrigUpgradeTest/share/photon.withViews.py               | 2 +-
 Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py      | 2 +-
 .../share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py       | 2 +-
 26 files changed, 37 insertions(+), 37 deletions(-)
 rename Database/AthenaPOOL/OutputStreamAthenaPool/python/{OutputStreamAthenaPool.py => CreateOutputStreams.py} (100%)

diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
index 823989a62c3..a2c8c39bee5 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.AlgSequence import AlgSequence
@@ -122,7 +122,7 @@ include( "CaloRec/CaloTopoCluster_jobOptions.py" )
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py
index 10edd30faac..71c181da300 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_SerialOnly.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.AlgSequence import AlgSequence
@@ -96,7 +96,7 @@ include( "CaloRec/CaloTopoCluster_jobOptions.py" )
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py
index f123beb1a01..e6fe68c6c4d 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/CaloHiveExOpts_alt.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 
@@ -238,7 +238,7 @@ if useJets:
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py b/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py
index bf364f05c5e..b1c675b6852 100644
--- a/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py
+++ b/Calorimeter/CaloExample/CaloHiveEx/share/old/CaloHiveExOpts.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 
@@ -212,7 +212,7 @@ if useJets:
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Control/AthenaExamples/AthExThinning/share/WriteThinnedData_jobOptions.py b/Control/AthenaExamples/AthExThinning/share/WriteThinnedData_jobOptions.py
index 49813db8682..445f9d1a013 100644
--- a/Control/AthenaExamples/AthExThinning/share/WriteThinnedData_jobOptions.py
+++ b/Control/AthenaExamples/AthExThinning/share/WriteThinnedData_jobOptions.py
@@ -61,7 +61,7 @@ topSequence += WriteThinnedData(
 # POOL Persistency
 #--------------------------------------------------------------
 import AthenaPoolCnvSvc.WriteAthenaPool as wap
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 
 if 'OUTPUT' not in dir():
    OUTPUT = "thinned.%s" % INPUT[0]
diff --git a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py
index 6c100e7d0af..a35e89759bf 100755
--- a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestRead_jo.py
@@ -67,7 +67,7 @@ topSequence += DMTest__AuxDataTestDecor ('AuxDataTestDecor1',
                                          Offset = 100)
 
 # Stream's output file
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 Stream1 = createOutputStream( "Stream1", asAlg = True, noTag = True )
 Stream1.OutputFile =   "auxdata2.root"
 Stream1.ItemList   += fullItemList # List of DO's to write out
diff --git a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py
index d7f9f5e7505..0057f872185 100644
--- a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestTypelessRead_jo.py
@@ -44,7 +44,7 @@ fullItemList+=["DMTest::BAuxVec#copy_bauxvec"]
 fullItemList+=["DMTest::BAuxStandalone#copy_b"]
 
 # Stream's output file
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "auxdata3.root"
 # List of DO's to write out
diff --git a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py
index 5cd7c5c8f17..aae03d58802 100755
--- a/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/AuxDataTestWrite_jo.py
@@ -52,7 +52,7 @@ fullItemList+=["DMTest::BAuxVec#bauxvec"]
 fullItemList+=["DMTest::BAuxStandalone#b"]
 
 # Stream's output file
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "auxdata.root"
 # List of DO's to write out
diff --git a/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py b/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py
index 55968bf7792..151ce91db35 100755
--- a/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/DataModelTestRead_jo.py
@@ -53,7 +53,7 @@ fullItemList+=["DMTest::ELVec#elvec"]
 fullItemList+=["DMTest::ELVec#elv_remap"]
 
 # Stream's output file
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "SimplePoolFile2.root"
 # List of DO's to write out
diff --git a/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py b/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py
index 895b34533b7..cba2f860f26 100755
--- a/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py
+++ b/Control/DataModelTest/DataModelRunTests/share/DataModelTestWrite_jo.py
@@ -55,7 +55,7 @@ fullItemList+=["DMTest::ELVec#elvec"]
 fullItemList+=["DMTest::ELVec#elv_remap"]
 
 # Stream's output file
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 Stream1 = createOutputStream( "Stream1", noTag = True )
 Stream1.OutputFile =   "SimplePoolFile.root"
 # List of DO's to write out
diff --git a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
index 9b3b086c186..e484ee2ef16 100644
--- a/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.py
+++ b/Database/AthenaPOOL/AthenaPoolCnvSvc/python/WriteAthenaPool.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 WriteAthenaPool_jobOptions.py
 ## @brief AthenaPool job options file for writing event objects.
@@ -16,7 +16,7 @@
 #==============================================================
 
 ## import the default class to create output streams
-from OutputStreamAthenaPool.OutputStreamAthenaPool import AthenaPoolOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import AthenaPoolOutputStream
 
 ## export the default class to create output streams
 __all__ = [ 'AthenaPoolOutputStream' ]
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCondJobOptions.py b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCondJobOptions.py
index 6d7e19be648..76c5dcc92ce 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCondJobOptions.py
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WCondJobOptions.py
@@ -46,7 +46,7 @@ svcMgr.PoolSvc.WriteCatalog = "file:Catalog1.xml"
 #---   Secondary Write portion  ----- Don't change it !!!
 #--------------------------------------------------------------
 # Load the OutputStream
-from OutputStreamAthenaPool.OutputStreamAthenaPool import AthenaPoolOutputConditionStream
+from OutputStreamAthenaPool.CreateOutputStreams import AthenaPoolOutputConditionStream
 Stream1 = AthenaPoolOutputConditionStream( "Stream1", "SimplePoolFile4.root" )
 Stream1.ObjectList += [ "ExampleHitContainer#PedestalWriteData" ]
 
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamAthenaPool.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
similarity index 100%
rename from Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamAthenaPool.py
rename to Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
diff --git a/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py b/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py
index 2b9979a55e0..2ea25b20341 100644
--- a/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py
+++ b/Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py
@@ -57,7 +57,7 @@ alg.cut2 = 12
 topSequence += alg
 
 # output options
-from OutputStreamAthenaPool.OutputStreamAthenaPool import AthenaPoolOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import AthenaPoolOutputStream
 Stream1 = AthenaPoolOutputStream('Stream1', 'OutputAOD.root', asAlg=True)
 Stream1.ItemList = ['xAOD::EventInfo#*', 'xAOD::EventAuxInfo#*']
 Stream1.MetadataItemList += ['xAOD::CutBookkeeperContainer#CutBookkeepers', 'xAOD::CutBookkeeperAuxContainer#CutBookkeepersAux.']
diff --git a/Generators/EmbeddedTrackGenerator/share/EmbeddedGeneratorCommon.py b/Generators/EmbeddedTrackGenerator/share/EmbeddedGeneratorCommon.py
index 2f8884d9be4..fd306098f9d 100644
--- a/Generators/EmbeddedTrackGenerator/share/EmbeddedGeneratorCommon.py
+++ b/Generators/EmbeddedTrackGenerator/share/EmbeddedGeneratorCommon.py
@@ -35,7 +35,7 @@ sg2 = StoreGateSvc("InputData_Event_SG")
 #================================================================
 # Output
 
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 outStream = createOutputStream( "EmbeddedGeneratorOut" )
 outStream.Store = ServiceMgr.StoreGateSvc
 outStream.OutputFile  = OutputFile
diff --git a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
index 91c32691b8d..4fc8cbf19ef 100644
--- a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
+++ b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_egamma_fromESD.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.AlgSequence import AlgSequence
@@ -163,7 +163,7 @@ include( "egammaRec/egammaRec_jobOptions.py" )
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py
index 2be990badba..5f80dca0ab2 100644
--- a/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py
+++ b/Reconstruction/RecExample/RecExRecoTest/share/RecExRecoTest_ART_refit_fromESD.py
@@ -163,7 +163,7 @@ topSequence += MyReFitTrack
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
index efca8db21ad..287a1249f5f 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
+++ b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_CaloHiveExOpts.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.AlgSequence import AlgSequence
@@ -129,7 +129,7 @@ include( "CaloRec/CaloTopoCluster_jobOptions.py" )
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
index 5fc9fb17d94..1bf9061ef82 100644
--- a/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
+++ b/Reconstruction/RecExample/RecJobTransformTests/share/RecJobTransformTests_PFlowHiveExOpts.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 # Runs calorimeter clustering reconstruction - this part is taken from CaloHiveExOpts.py
 # Additional configuration runs particle flow MT algorithms and sets up items needed for track to calorimeter extrapolation
@@ -177,7 +177,7 @@ topSequence += PFClusterSelector
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Reconstruction/eflowRec/share/PFlowHiveExOpts.py b/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
index 4d6acd69dda..47a9665ef27 100644
--- a/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
+++ b/Reconstruction/eflowRec/share/PFlowHiveExOpts.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 # Runs calorimeter clustering reconstruction - this part is taken from CaloHiveExOpts.py
 # Additional configuration runs particle flow MT algorithms and sets up items needed for track to calorimeter extrapolation
@@ -149,7 +149,7 @@ include("eflowRec/PFlowMTConfig.py")
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 include ("CaloRecEx/CaloRecOutputItemList_jobOptions.py")
diff --git a/Reconstruction/tauRec/share/run_tau_standalone.py b/Reconstruction/tauRec/share/run_tau_standalone.py
index cbf3c54a23b..e1893d8c36e 100644
--- a/Reconstruction/tauRec/share/run_tau_standalone.py
+++ b/Reconstruction/tauRec/share/run_tau_standalone.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 # job options to run tau reco on an ESD file  
  
@@ -139,7 +139,7 @@ jobproperties.CaloCellFlags.doLArDeadOTXCorr=False
 
 import AthenaPoolCnvSvc.WriteAthenaPool
 logRecoOutputItemList_jobOptions = logging.getLogger( 'py:RecoOutputItemList_jobOptions' )
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 print StreamESD.ItemList
diff --git a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
index 8be4b3024fe..7686550ecb7 100644
--- a/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.py
+++ b/Trigger/TrigAnalysis/TrigDecisionMaker/python/TrigDecisionMakerConfig.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
 
 from TrigDecisionMaker.TrigDecisionMakerConf import TrigDec__TrigDecisionMaker
 from TrigDecisionMaker.TrigDecisionMakerConf import TrigDec__TrigDecisionMakerMT
@@ -41,7 +41,7 @@ class TrigDecisionStream ( object) :
         from AthenaCommon.AppMgr import ServiceMgr as svcMgr
         svcMgr.PoolSvc.WriteCatalog = catalog
 
-        # revert later from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+        # revert later from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
         # revert later self.stream = createOutputStream( streamName )
 
         from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
@@ -75,7 +75,7 @@ class TrigConditionStream ( object) :
         svcMgr += PoolSvc()
         svcMgr.PoolSvc.WriteCatalog = catalog
 
-        from OutputStreamAthenaPool.OutputStreamAthenaPool import AthenaPoolOutputConditionStream
+        from OutputStreamAthenaPool.CreateOutputStreams import AthenaPoolOutputConditionStream
         self.stream = AthenaPoolOutputConditionStream( streamName )
 
         from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
diff --git a/Trigger/TrigSteer/TrigSteering/share/pureSteering_jobOptionsWithPoolOutput.py b/Trigger/TrigSteer/TrigSteering/share/pureSteering_jobOptionsWithPoolOutput.py
index 19e74cda12e..1671c5da6d5 100755
--- a/Trigger/TrigSteer/TrigSteering/share/pureSteering_jobOptionsWithPoolOutput.py
+++ b/Trigger/TrigSteer/TrigSteering/share/pureSteering_jobOptionsWithPoolOutput.py
@@ -111,7 +111,7 @@ import AthenaPoolCnvSvc.WriteAthenaPool
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 svcMgr.PoolSvc.WriteCatalog = "xmlcatalog_file:Catalogue1.xml"
 
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 stream = createOutputStream( "Stream1" )
 
 #from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
index dc4eb41fe90..f0b0bb7d0e9 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
@@ -132,7 +132,7 @@ from TrigUpgradeTest.TestUtils import MenuTest
 mon.HLTTriggerMenu = [ x.split(":")[1] for x in  MenuTest.CTPToChainMapping ]
 
 import AthenaPoolCnvSvc.WriteAthenaPool
-from OutputStreamAthenaPool.OutputStreamAthenaPool import  createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import  createOutputStream
 StreamESD=createOutputStream("StreamESD","myESD.pool.root",True)
 topSequence.remove( StreamESD )
 
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py b/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py
index 4a2e041d1a4..82bd3b52edd 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/decodeBS.py
@@ -40,7 +40,7 @@ decodingSeq += deserialiser
 topSequence += decodingSeq
 
 # Create OutputStream for ESD writing
-from OutputStreamAthenaPool.OutputStreamAthenaPool import createOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import createOutputStream
 StreamESD = createOutputStream("StreamESD","ESD.pool.root",True)
 topSequence.remove( StreamESD )
 outSequence.remove( StreamESD )
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
index 0d04ed67702..a5e3aedd2d0 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
@@ -186,7 +186,7 @@ svcMgr.AthenaSealSvc.CheckDictionary = True
 #svcMgr.AthenaSealSvc.CheckDictAtInit = True
 
 
-from OutputStreamAthenaPool.OutputStreamAthenaPool import AthenaPoolOutputStream
+from OutputStreamAthenaPool.CreateOutputStreams import AthenaPoolOutputStream
 ostream = AthenaPoolOutputStream("StreamRDO", athenaCommonFlags.PoolRDOOutput(), True)
 
 ostream.TakeItemsFromInput = True
-- 
GitLab