From dd740904c5a2f4b97cc63b747a851c8d3dd838a3 Mon Sep 17 00:00:00 2001
From: Tadej Novak <tadej.novak@cern.ch>
Date: Fri, 11 Oct 2019 08:06:56 +0200
Subject: [PATCH] Remove some commented-out bookkeeping clients
---
.../AthenaPoolExample_RMetaJobOptions.py | 5 -----
.../AthenaPoolExample_WMetaJobOptions.py | 11 ----------
.../python/MultipleStreamManager.py | 20 -------------------
.../share/NTUPtoNTUP_topOptions.py | 12 +----------
4 files changed, 1 insertion(+), 47 deletions(-)
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMetaJobOptions.py b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMetaJobOptions.py
index ed75292161e..21767cdaec8 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMetaJobOptions.py
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMetaJobOptions.py
@@ -37,11 +37,6 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaPoolExampleAlgorithms.AthenaPoolExampleAlgorithmsConf import AthPoolEx__ReadMeta
svcMgr.MetaDataSvc.MetaDataTools += [ "AthPoolEx::ReadMeta" ]
-"""
-from EventBookkeeperTools.EventBookkeeperToolsConf import EventBookkeeperMetaDataTool
-svcMgr.MetaDataSvc.MetaDataTools += [ "EventBookkeeperMetaDataTool" ]
-"""
-
svcMgr.EventSelector.InputCollections = [ "SimplePoolFile5.root" ]
#PoolSvc.ReadCatalog = [ "mysqlcatalog_mysql://CollTester:CtAl_204@atlasdbdev.cern.ch:3306/CollectionTest" ]
diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMetaJobOptions.py b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMetaJobOptions.py
index 7be5ec90e82..3eb8caad1d7 100755
--- a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMetaJobOptions.py
+++ b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_WMetaJobOptions.py
@@ -40,17 +40,6 @@ from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
Stream1 = AthenaPoolOutputStream( "Stream1", "ROOTTREE:SimplePoolFile5.root" )
Stream1.ItemList += [ "ExampleHitContainer#MyHits" ]
Stream1.MetadataItemList += [ "ExampleHitContainer#PedestalWriteData" ]
-"""
-Stream1.MetadataItemList += [ "EventBookkeeperCollection#EventBookkeepers" ]
-
-from EventBookkeeperTools.BookkeepingInfoWriter import EventBookkeepersWriter
-EBWriter1 = EventBookkeepersWriter()
-EBWriter1.setDoMC( False )
-EBWriter1.setCycle( 0 )
-
-EBWriter1.OutputCollectionName = "EventBookkeepers"
-topSequence += EBWriter1
-"""
#--------------------------------------------------------------
# Private Application Configuration options
diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
index 0905050256d..907e3f5c585 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/MultipleStreamManager.py
@@ -728,26 +728,6 @@ class MultipleStreamManager:
Stream.AddItem("SkimDecisionCollection#"+sdw.SkimDecisionsContainerName)
return
- def CreateEventBookkeepersWriterForAllFilters(self,doMCTruth=False,cycle_number=0):
- from EventBookkeeperTools.BookkeepingInfoWriter import EventBookkeepersWriter
- ebw=EventBookkeepersWriter()
- ebw.setDoMC( doMCTruth )
- ebw.setCycle(cycle_number)
-
- #Loop over all streams and add all associated algorithms to ebw
- for Stream in self.StreamList:
- for a in Stream.GetRequireAlgs():
- ebw.addRequireAlg(a,StreamName=Stream.Name)
- for a in Stream.GetAcceptAlgs():
- ebw.addAcceptAlg(a,StreamName=Stream.Name)
- for a in Stream.GetVetoAlgs():
- ebw.addVetoAlg(a,StreamName=Stream.Name)
- for a in Stream.GetOtherAlgsToBookkeep():
- ebw.addOtherAlg(a,StreamName=Stream.Name)
-
- return ebw
-
-
############################################################################
# Create one instance of MultipleStreamManager (MSMgr) if not already done.
diff --git a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/share/NTUPtoNTUP_topOptions.py b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/share/NTUPtoNTUP_topOptions.py
index 14f0e9959f1..eb2774b92d2 100644
--- a/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/share/NTUPtoNTUP_topOptions.py
+++ b/PhysicsAnalysis/NTUPtoNTUP/NTUPtoNTUPCore/share/NTUPtoNTUP_topOptions.py
@@ -20,17 +20,7 @@ try:
except Exception:
treatException("Could not set EventSelector.SkipEvents")
-
-#### Schedule EventCounterAlg
-#from EventBookkeeperTools.EventCounterAlg import EventCounterAlg
-#topSequence+=EventCounterAlg("AllExecutedEvents")
-#
-####EventBookkeepers
-#if not hasattr(ServiceMgr,"CutFlowSvc"):
-# from EventBookkeeperTools.EventBookkeeperToolsConf import CutFlowSvc
-# ServiceMgr+=CutFlowSvc()
-# theApp.CreateSvc+=['CutFlowSvc']
-# pass
+# TODO: event bookkeeping?
### NTUP->NTUP
ntupFlags=jobproperties.NTUPtoNTUPProdFlags
--
GitLab