diff --git a/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMetaJobOptions.py b/Database/AthenaPOOL/AthenaPoolExample/AthenaPoolExampleAlgorithms/share/AthenaPoolExample_RMetaJobOptions.py index ed75292161e807f83d8dd11ab2fbbf7d94661f83..21767cdaec81808e28d0fb90cdad19d5076d3af3 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 7be5ec90e822ee997c4a5affdaaabbf094636266..3eb8caad1d74f5698c6f6f33d534e92e070e24fc 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 0905050256d4170f654e85094ec015ba4bc228b0..907e3f5c58562544dce53e8545762145af88b25c 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 14f0e9959f117c65a43d12e2466b676e82202151..eb2774b92d2278e45511d51569b553ef03965af5 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