From 702782c97a3a1a98c1bbecb83c2954d2dd5a8744 Mon Sep 17 00:00:00 2001
From: Peter van Gemmeren <gemmeren@anl.gov>
Date: Thu, 25 Jan 2018 17:20:58 -0600
Subject: [PATCH] Remove backward compatibility hack allowing to get
MetaDataSve from EventSelectorAthenaPool
Former-commit-id: 5d00c37d37f3bb95b2e64ab929a0f200811d66af
---
.../share/IOVDbTestAlgReadCoolFromMetaData.py | 2 +-
.../share/LumiMetaDataTool_jobOptions.py | 2 +-
.../share/GoodRunsListsUser_DQLumiExample.py | 2 +-
.../share/LumiBlock_LumiCalc_GRL_dumper.py | 2 +-
.../python/RedirectMetaDataSvc.py | 13 -------------
.../python/__init__.py | 15 ---------------
.../python/CutFlowHelpers.py | 4 ++--
.../share/SignalOutputItemList_jobOptions.py | 19 ++-----------------
.../share/EMONHelloWorldOptions.py | 2 +-
.../share/FilterTemplate.py | 1 -
.../share/myTopOptions_runReco.py | 2 +-
.../share/myTopOptions_runRecoRAW.py | 2 +-
.../share/jobOptions_useGRL.py | 2 +-
.../share/runJPsiMonitoring_data.py | 2 +-
.../share/runJPsiMonitoring_data_grid.py | 2 +-
.../share/trt_eff_jobOptions.auto.py | 2 +-
.../LArAffectedRegion_write_topExample.py | 2 +-
.../LArCafJobs/python/LArCafJobsConfig.py | 3 +--
.../share/LumiBlock_LumiCalc.py | 2 +-
.../share/LumiBlock_LumiCalc_GRL.py | 2 +-
.../share/LumiBlock_jobOptions_data.py | 2 +-
.../share/AnalysisSkeleton_topOptions_NEW.py | 2 +-
.../DPDUtils/share/AODtoDPDZeeFilter.py | 10 ----------
.../DPDUtils/share/AODtoDPD_PhotonFilter.py | 3 ---
.../DPDUtils/share/ESDtoDPD_PhotonFilter.py | 3 ---
.../python/MultipleNTUPStreamManager.py | 6 ------
.../share/RecExCommon_topOptions.py | 2 +-
.../python/DigitizationWriteMetaData.py | 10 ----------
.../share/jobOptions_PhysValMon.py | 2 +-
.../share/skeleton.FilterHit.py | 8 --------
.../digitization/postInclude.ReadFromEvgen.py | 10 ++--------
.../TrigConfigSvc/python/TriggerConfig.py | 2 +-
.../share/L1CaloPprMonitoring_jobOptions.py | 2 +-
...1CaloMonitoring_forRecExCommission_Run1.py | 2 +-
...1CaloMonitoring_forRecExCommission_Run2.py | 2 +-
...T1CaloMonitoring_forRecExCommission_cpu.py | 2 +-
...ergingEventLoopMgr_TriggerBSandRDOtoRDO.py | 2 +-
37 files changed, 31 insertions(+), 122 deletions(-)
delete mode 100755 Database/AthenaPOOL/EventSelectorAthenaPool/python/RedirectMetaDataSvc.py
mode change 100755 => 100644 Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py
mode change 100755 => 100644 HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
mode change 100755 => 100644 InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py
mode change 100755 => 100644 PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py
mode change 100755 => 100644 Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
diff --git a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
index 9f5b664e168..51194796060 100644
--- a/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
+++ b/AtlasTest/DatabaseTest/IOVDbTestAlg/share/IOVDbTestAlgReadCoolFromMetaData.py
@@ -39,7 +39,7 @@ from IOVDbMetaDataTools.IOVDbMetaDataToolsConf import IOVDbMetaDataTool
ToolSvc += IOVDbMetaDataTool( "IOVDbMetaDataTool" )
# IOVDbMetaDataTool.OutputLevel = DEBUG
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataContainer = "MetaDataHdr"
svcMgr.MetaDataSvc.MetaDataTools += [ "IOVDbMetaDataTool" ]
diff --git a/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py b/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py
index cf2fa25b80c..1104205ccb6 100644
--- a/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py
+++ b/AtlasTest/DatabaseTest/TagCollectionTest/share/LumiMetaDataTool_jobOptions.py
@@ -28,7 +28,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
LumiBlockMetaDataTool.calcLumi = True # False by default
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py b/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py
index c926b28dd6a..8c74f2c5190 100644
--- a/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py
+++ b/DataQuality/GoodRunsListsUser/share/GoodRunsListsUser_DQLumiExample.py
@@ -4,7 +4,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
LumiBlockMetaDataTool.calcLumi = True # False by default
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py b/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py
index 9f4827b6cc8..c524e1df49b 100644
--- a/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py
+++ b/DataQuality/GoodRunsListsUser/share/LumiBlock_LumiCalc_GRL_dumper.py
@@ -4,7 +4,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
LumiBlockMetaDataTool.calcLumi = True # False by default
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/python/RedirectMetaDataSvc.py b/Database/AthenaPOOL/EventSelectorAthenaPool/python/RedirectMetaDataSvc.py
deleted file mode 100755
index 5b0fc2d75c8..00000000000
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/python/RedirectMetaDataSvc.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-## @file RedirectMetaDataSvc.py
-# @brief temporary backward compatibility hack
-# @details This hack allows to keep backward compatibility for statements like
-# @code
-# from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
-# @endcode
-
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import *
-import AthenaServices.AthenaServicesConf
-MetaDataSvc = AthenaServices.AthenaServicesConf.MetaDataSvc
-#FIXME print a warning when MetaDataSvc is used
diff --git a/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py b/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py
old mode 100755
new mode 100644
index fcdd7c52952..74583d364ec
--- a/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py
+++ b/Database/AthenaPOOL/EventSelectorAthenaPool/python/__init__.py
@@ -1,17 +1,2 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-## @file: EventSelectorAthenaPool/python/__init__.py
-# @author: Peter van Gemmeren (gemmeren@anl.gov) (copied from WL in StoreGate)
-
-__version__ = '1.0.0'
-__author__ = 'Peter van Gemmeren (gemmeren@anl.gov)'
-
-__all__ = [ 'Bindings' ]
-
-# FIXME replace the autogenerated configurable repository with a hand-hacked one.
-# FIXME This allows to keep backward compatibility for statements like
-# from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
-
-import sys
-import EventSelectorAthenaPool.RedirectMetaDataSvc
-sys.modules[ "EventSelectorAthenaPool.EventSelectorAthenaPoolConf" ] = sys.modules[ "EventSelectorAthenaPool.RedirectMetaDataSvc" ]
diff --git a/Event/EventBookkeeperTools/python/CutFlowHelpers.py b/Event/EventBookkeeperTools/python/CutFlowHelpers.py
index 18afb4fdf39..8c7a8b36117 100644
--- a/Event/EventBookkeeperTools/python/CutFlowHelpers.py
+++ b/Event/EventBookkeeperTools/python/CutFlowHelpers.py
@@ -68,7 +68,7 @@ def CreateCutFlowSvc( svcName="CutFlowSvc", athFile=None, seq=None, addAlgInPlac
# Make sure MetaDataSvc is ready
if not hasattr(svcMgr,'MetaDataSvc'):
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
# Add BookkeeperTools
@@ -159,7 +159,7 @@ def CreateBookkeeperTool( name="CutBookkeepers" ):
# Make sure MetaDataSvc is ready
if not hasattr(svcMgr,'MetaDataSvc'):
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
# Add BookkeeperTools
diff --git a/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py b/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py
index d7e366f8127..d9f86881e31 100644
--- a/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py
+++ b/Event/EventOverlay/EventOverlayJobTransforms/share/SignalOutputItemList_jobOptions.py
@@ -112,22 +112,7 @@ if DetFlags.overlay.LVL1_on():
"DataVector<LVL1::JEMEtSums>#*",
"LVL1::CMMRoI#*"]
-#options for writing the MetaData into the output file
-MetaDataStore=ServiceMgr.MetaDataStore
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-StreamRDO_MC_FH = AthenaPoolOutputStream( "StreamRDO_MC_FH" )
-from AthenaCommon.AthenaCommonFlags import jobproperties
-StreamRDO_MC_FH.OutputFile = "ROOTTREE:"+SignalCollection
-StreamRDO_MC_FH.Store = MetaDataStore
-StreamRDO_MC_FH.WriteOnExecute = False
-StreamRDO_MC_FH.WriteOnFinalize = True
# Write all IOV meta data containers
-StreamRDO_MC_FH.ItemList += [ "IOVMetaDataContainer#*" ]
-StreamRDO_MC_FH.ItemList += [ "LumiBlockCollection#*" ]
-
-from OutputStreamAthenaPool.OutputStreamAthenaPoolConf import AthenaPoolOutputStreamTool
-StreamRDO_MC_FHTool = AthenaPoolOutputStreamTool("StreamRDO_MC_FHTool")
-StreamRDO_MC_FHTool.OutputCollection = "MetaDataHdr";
-StreamRDO_MC_FHTool.PoolContainerPrefix = "MetaData"
-StreamRDO_MC_FH.WritingTool = StreamRDO_MC_FHTool
+StreamRDO_MC.MetadataItemList += [ "IOVMetaDataContainer#*" ]
+StreamRDO_MC.MetadataItemList += [ "LumiBlockCollection#*" ]
diff --git a/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py b/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
old mode 100755
new mode 100644
index 94300afaaaf..d10de9385cc
--- a/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
+++ b/HLT/Event/ByteStreamEmonSvc/share/EMONHelloWorldOptions.py
@@ -118,7 +118,7 @@ theApp.ExtSvc += [ "ByteStreamCnvSvc"]
# It looks as if one needs this now online ?
if False:
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
# Add in MetaData Stores
from StoreGate.StoreGateConf import StoreGateSvc
diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py
index f669c6c189b..135bf3bb56c 100644
--- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py
+++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/FilterTemplate.py
@@ -47,7 +47,6 @@ if 'zRange' in jobConfig:
FilterUtils.filterSeq += FilterUtils.ZFilter(jobConfig['zRange'])
topSequence.StreamAOD.OutputFile = jobConfig['outputfile']
-#topSequence.StreamAOD_FH.OutputFile = jobConfig['outputfile']
# Reduce verbosity
theApp.setOutputLevel = jobConfig['outputlevel']
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
index cae154921c5..8ba81279206 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runReco.py
@@ -244,7 +244,7 @@ if addLumiBlockTools :
LumiBlockMetaDataTool.OutputLevel = INFO
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
index a731e61dddc..8b27b0e3491 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/myTopOptions_runRecoRAW.py
@@ -218,7 +218,7 @@ if goodRunList!='' and 'goodRunListArray' in dir() and goodRunListArray!='':
LumiBlockMetaDataTool.OutputLevel = INFO
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py
index 2f007381973..1ca8448062a 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/jobOptions_useGRL.py
@@ -6,7 +6,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
LumiBlockMetaDataTool.calcLumi = True # False by default
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
index 9fa692a77b1..e631cfc846d 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
@@ -111,7 +111,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
LumiBlockMetaDataTool.calcLumi = True # False by default
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
index 38c99ce343f..e8a2b27baa0 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
@@ -111,7 +111,7 @@ ToolSvc += LumiBlockMetaDataTool( "LumiBlockMetaDataTool" )
LumiBlockMetaDataTool.calcLumi = True # False by default
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py
old mode 100755
new mode 100644
index 66447c8f475..77334363b09
--- a/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py
+++ b/InnerDetector/InDetRecTools/TRT_TrackHoleSearch/share/trt_eff_jobOptions.auto.py
@@ -51,7 +51,7 @@ if do_grl and sample == 'data':
ToolSvc += theLumiBlockMetaDataTool
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
theMetaDataSvc = MetaDataSvc( "MetaDataSvc" )
theMetaDataSvc.MetaDataTools += [ theLumiBlockMetaDataTool ]
svcMgr += theMetaDataSvc
diff --git a/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py b/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py
index c80e40ece13..b6a113c550f 100644
--- a/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py
+++ b/LArCalorimeter/LArAffectedRegion/share/LArAffectedRegion_write_topExample.py
@@ -124,7 +124,7 @@ theApp.EvtSel = "EventSelector"
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
StreamESD=AthenaPoolOutputStream("StreamESD",athenaCommonFlags.PoolESDOutput(),True)
StreamESD.ForceRead = True
-# Put MetaData in ESD stream via StreamESD_FH.
+# Put MetaData in ESD stream
StreamESD.MetadataItemList += [ "LumiBlockCollection#*" ]
include ("EventAthenaPool/EventAthenaPoolItemList_joboptions.py")
diff --git a/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py b/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py
index ae9548c90ef..bdb086dcea6 100644
--- a/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py
+++ b/LArCalorimeter/LArCafJobs/python/LArCafJobsConfig.py
@@ -52,8 +52,7 @@ class DefaultShapeDumper(LArShapeDumper) :
if doStream :
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
StreamLArSamples = AthenaPoolOutputStream('StreamLArSamples', 'LArSamples.root', True)
- topSequence.StreamLArSamples.ItemList += ['LArSamplesContainer#Samples']
- topSequence.StreamLArSamples_FH.ItemList += ['LArSamplesContainer#Samples']
+ topSequence.StreamLArSamples.MetadataItemList += ['LArSamplesContainer#Samples']
StreamLArSamples.WriteOnExecute = False
StreamLArSamples.WriteOnFinalize = True
else :
diff --git a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py
index fc6a3c50065..c62e8e6eef5 100644
--- a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py
+++ b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc.py
@@ -7,7 +7,7 @@ LumiBlockMetaDataTool.applyDQCuts = False
LumiBlockMetaDataTool.OutputLevel = INFO
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py
index 201541d1212..6551ead1336 100644
--- a/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py
+++ b/LumiBlock/LumiBlockComps/share/LumiBlock_LumiCalc_GRL.py
@@ -7,7 +7,7 @@ LumiBlockMetaDataTool.applyDQCuts = True
LumiBlockMetaDataTool.OutputLevel = INFO
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py b/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py
index c3a1e91bde2..6cecb8ca02c 100644
--- a/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py
+++ b/LumiBlock/LumiBlockComps/share/LumiBlock_jobOptions_data.py
@@ -19,7 +19,7 @@ LumiBlockMetaDataTool.applyDQCuts = True
LumiBlockMetaDataTool.OutputLevel = INFO
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py
old mode 100755
new mode 100644
index 1e282cd54ec..c115e1d863c
--- a/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py
+++ b/PhysicsAnalysis/AnalysisCommon/UserAnalysis/share/AnalysisSkeleton_topOptions_NEW.py
@@ -49,7 +49,7 @@ LumiBlockMetaDataTool.applyDQCuts = True
LumiBlockMetaDataTool.OutputLevel = INFO
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py b/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py
index aa4b5e01887..0438941929f 100644
--- a/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py
+++ b/PhysicsAnalysis/DPDUtils/share/AODtoDPDZeeFilter.py
@@ -103,13 +103,3 @@ StreamDPD.AddItem ('TruthParticleContainer#SpclMC')
StreamDPD.AddItem ('McEventCollection#GEN_AOD')
StreamDPD.ForceRead=TRUE; #force read of output data objs
-
-
-#Write everything in the AOD
-#StreamDPD.Stream.TakeItemsFromInput=True
-#StreamDPD.Stream_FH.TakeItemsFromInput=True
-
-
-
-
-
diff --git a/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py b/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py
index 8c100a612e8..89f9dff1156 100644
--- a/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py
+++ b/PhysicsAnalysis/DPDUtils/share/AODtoDPD_PhotonFilter.py
@@ -103,6 +103,3 @@ StreamDPD.AcceptAlgs(["DPDPhotonFilter"])
#Write everything in the AOD
StreamDPD.Stream.TakeItemsFromInput=True
-StreamDPD.Stream_FH.TakeItemsFromInput=True
-
-
diff --git a/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py b/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py
index 07671c6861f..f28b0cb93b8 100644
--- a/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py
+++ b/PhysicsAnalysis/DPDUtils/share/ESDtoDPD_PhotonFilter.py
@@ -167,6 +167,3 @@ StreamDPD.AcceptAlgs(["DPDPhotonFilter"])
#Write everything in the new AOD/ESD
StreamDPD.Stream.TakeItemsFromInput=True
-StreamDPD.Stream_FH.TakeItemsFromInput=True
-
-
diff --git a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py
index 951d5a50544..93566181e2a 100644
--- a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py
+++ b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/python/MultipleNTUPStreamManager.py
@@ -48,16 +48,12 @@ class AugmentedNTUPStream( AugmentedStreamBase ):
return self.Stream.ItemList
def AddMetaDataItem(self, item):
- #self._AddValidItemToList(item, self.Stream_FH.ItemList)
return
def RemoveMetaDataItem(self, item):
- #self._RemoveValidItemFromList(item, self.Stream_FH.ItemList)
- #return
pass
def GetMetaDataItems(self):
- #return self.Stream_FH.ItemList
pass
#########################################
@@ -77,8 +73,6 @@ class AugmentedNTUPStream( AugmentedStreamBase ):
print self.GetPrescale()
print "ItemList:"
print self.Stream.ItemList
- #print "MetaData ItemList:"
- #print self.Stream_FH.ItemList
return
#############################################################
class MultipleNTUPStreamManager:
diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
old mode 100755
new mode 100644
index e60566d9c83..f447960d935
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -1004,7 +1004,7 @@ if globalflags.InputFormat()=='bytestream':
# FIXME : metadata store definition is in ReadAthenaPool_jobOptions.py
# copy it there for BS Reading for 13..0.X
# Add in MetaDataSvc
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
# Add in MetaData Stores
from StoreGate.StoreGateConf import StoreGateSvc
diff --git a/Simulation/Digitization/python/DigitizationWriteMetaData.py b/Simulation/Digitization/python/DigitizationWriteMetaData.py
index 513b038d87d..0cf229f825d 100644
--- a/Simulation/Digitization/python/DigitizationWriteMetaData.py
+++ b/Simulation/Digitization/python/DigitizationWriteMetaData.py
@@ -2,16 +2,6 @@
from AthenaCommon.Logging import logging
logDigitizationWriteMetadata = logging.getLogger( 'DigitizationWriteMetadata' )
-#-------------------------------------------------
-# Setup MetaData Stream
-#-------------------------------------------------
-#if not hasattr(ServiceMgr, 'MetaDataStore'):
-### In future should probably do a check here
-
-#from AthenaServices.AthenaServicesConf import AthenaOutputStream
-#StreamRDO_FH = AthenaOutputStream( "StreamRDO_FH" )
-#StreamRDO_FH.ItemList += [ "IOVMetaDataContainer#*" ]
-
myRunNumber = 0
myEndRunNumber = 2147483647 # the max run number
diff --git a/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py b/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py
index 5d33b129d26..ad88b7cbfb0 100644
--- a/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py
+++ b/Simulation/ISF/ISF_Example/share/jobOptions_PhysValMon.py
@@ -69,7 +69,7 @@ if TriggerOn == 1:
#ServiceMgr.TagInfoMgr.AddGeoModelTags = False
from IOVDbMetaDataTools.IOVDbMetaDataToolsConf import IOVDbMetaDataTool
ToolSvc += IOVDbMetaDataTool( "IOVDbMetaDataTool" )
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
ServiceMgr += MetaDataSvc( "MetaDataSvc" )
ServiceMgr.MetaDataSvc.MetaDataContainer = "MetaDataHdr"
ServiceMgr.MetaDataSvc.MetaDataTools += [ "IOVDbMetaDataTool" ]
diff --git a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
index 640f0dff16f..234d718e3cd 100644
--- a/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
+++ b/Simulation/SimuJobTransforms/share/skeleton.FilterHit.py
@@ -246,14 +246,6 @@ if hasattr(runArgs,'TruthReductionScheme'):
topSequence += McEventCollectionFilter
-if releaseIsOlderThan(17,6):
- #--------------------------------------------------------------
- # Copy InFile MetaData using MetaDataTools
- #-------------------------------------------------------------
- from AthenaServices.AthenaServicesConf import AthenaOutputStream
- Stream1_FH = AthenaOutputStream( "StreamHITS_FH" )
- Stream1_FH.ItemList += [ "IOVMetaDataContainer#*" ]
-
#--------------------------------------------------------------
# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
#-------------------------------------------------------------
diff --git a/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py b/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py
index c28b867c156..d3a7f442742 100644
--- a/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py
+++ b/Simulation/SimulationJobOptions/share/digitization/postInclude.ReadFromEvgen.py
@@ -39,10 +39,7 @@ if hasattr(MergeMcEventCollection, 'MergeMcEventCollTool'):
else:
MergeMcEventCollection.TruthCollKey = "GEN_EVENT"
-try:
- itemlist = StreamRDO_FH.ItemList
-except:
- itemlist = StreamRDO.MetaDataItemList
+itemlist = StreamRDO.MetaDataItemList
if itemlist.count( "IOVMetaDataContainer#*" ):
print 'ZLM found it!'
@@ -54,9 +51,6 @@ print 'ZLM container thingy:',itemlist
itemlist += [ "IOVMetaDataContainer#_Digitization_Parameters" ]
-try:
- print StreamRDO_FH.ItemList
-except:
- print StreamRDO.MetaDataItemList
+print StreamRDO.MetaDataItemList
diff --git a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py b/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py
index 2c760097da7..16be1649ece 100644
--- a/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py
+++ b/Trigger/TrigConfiguration/TrigConfigSvc/python/TriggerConfig.py
@@ -186,7 +186,7 @@ def _setupConfig():
if not hasattr( svcMgr, 'MetaDataSvc' ):
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataContainer = "MetaDataHdr"
svcMgr.MetaDataSvc.MetaDataTools += [ "IOVDbMetaDataTool" ]
diff --git a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py
index 0d4b6ca8526..6988af541f3 100644
--- a/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py
+++ b/Trigger/TrigT1/TrigT1CaloCalibUtils/share/L1CaloPprMonitoring_jobOptions.py
@@ -41,7 +41,7 @@ if useGRL == False:
LumiBlockMetaDataTool.OutputLevel = DEBUG
# add ToolSvc.LumiBlockMetaDataTool to MetaDataSvc
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.LumiBlockMetaDataTool ]
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
index 5736a4a9845..d9056189ad1 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
@@ -59,7 +59,7 @@ if l1caloRawMon:
dbpath = "/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite"
import os.path
if os.path.isfile(dbpath):
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
#svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=../share/calibJuly.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=" + dbpath + ";dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
index 4020e382742..ac0decd129c 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
@@ -70,7 +70,7 @@ if l1caloRawMon:
#dbpath = "/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite"
#import os.path
#if os.path.isfile(dbpath):
- #from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ #from AthenaServices.AthenaServicesConf import MetaDataSvc
#svcMgr += MetaDataSvc("MetaDataSvc")
#svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
index 6da4457b3d7..0988d00b0b8 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
@@ -118,7 +118,7 @@ if l1caloRawMon:
dbpath = "/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite"
import os.path
if os.path.isfile(dbpath):
- from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+ from AthenaServices.AthenaServicesConf import MetaDataSvc
svcMgr += MetaDataSvc( "MetaDataSvc" )
#svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=../share/calibJuly.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
svcMgr.IOVDbSvc.Folders += ["<dbConnection>sqlite://;schema=/afs/cern.ch/user/l/l1ccalib/w0/DaemonData/reference/calibJuly.sqlite;dbname=L1CALO</dbConnection>/TRIGGER/L1Calo/V1/References/FineTimeReferences"]
diff --git a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
index 4a8a19d91c9..fb4e927b557 100644
--- a/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
+++ b/Trigger/TriggerSimulation/TrigSimTransforms/share/MergingEventLoopMgr_TriggerBSandRDOtoRDO.py
@@ -21,7 +21,7 @@ from AthenaServices.AthenaServicesConf import AthenaSealSvc
from AthenaPoolServices.AthenaRootStreamerSvcConf import AthenaRootStreamerSvc
from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import EventSelectorAthenaPool
from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import AthenaPoolAddressProviderSvc
-from EventSelectorAthenaPool.EventSelectorAthenaPoolConf import MetaDataSvc
+from AthenaServices.AthenaServicesConf import MetaDataSvc
#-------------------------------------------------------------------------------
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
--
GitLab