Merge branch 'tagevent_cleanup' into 'master'

EventTag: Cleanup of TAG making packages

See merge request atlas/athena!38463

PhysicsAnalysis/EventTag/EventSelection/CMakeLists.txt

-################################################################################
-# Package: EventSelection
-################################################################################
-
-# Declare the package name:
-atlas_subdir( EventSelection )
-
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-

PhysicsAnalysis/EventTag/EventSelection/doc/packagedoc.h

-/*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-/**
-@page EventSelection_page EventSelection
-
-@section EventSelection_introductionEventSelection Introduction
-This package contains some jobOs for TAG building.
-
-@section EventSelection_packagecontentEventSelection Package Contents
-EventSelection contains the following jobOs
-
-- AODtoTAG_topOptions.py : produce TAG from AOD
-- EventSplitTest_topOptions.py : produce TAG collections together with AOD streams
-
-
-
-@section EventSelection_How to use MakeSimpleCollection.py, MakeEventTagCollection.py and EventTagCollectionDeepCopy.py
-
-Details are found at the following link:
-
-https://uimon.cern.ch/twiki/bin/view/Atlas/CollectionCreationHowTo
-
-*/

PhysicsAnalysis/EventTag/EventSelection/share/DiElectronTagSelection_jobOptions.py

-include.block ( "EventSelection/DiElectronTagSelection_jobOptions.py" )
-
-DiElectron = "NLooseElectron>1 && abs(LooseElectronPt1)>7000 && abs(LooseElectronPt2)>7000"
-

PhysicsAnalysis/EventTag/EventSelection/share/DiJetTagSelection_jobOptions.py

-include.block ( "EventSelection/DiJetTagSelection_jobOptions.py" )
-
-DiJet = "NJet>1 && JetPt1>20000 && JetPt2>15000"
-

PhysicsAnalysis/EventTag/EventSelection/share/DiMuonTagSelection_jobOptions.py

-include.block ( "EventSelection/DiMuonTagSelection_jobOptions.py" )
-
-DiMuon = "NLooseMuon>1 && abs(LooseMuonPt1)>7000 && abs(LooseMuonPt2)>7000"
-

PhysicsAnalysis/EventTag/EventSelection/share/FourJetTagSelection_jobOptions.py

-include.block ( "EventSelection/DiMuonTagSelection_jobOptions.py" )
-
-FourJet = "NJet>3 && JetPt1>20000 && JetPt2>20000 && JetPt3>15000 && JetPt4>15000"
-

PhysicsAnalysis/EventTag/EventSelection/share/FullyHadronicTtbarTagSelection_jobOptions.py

-include.block ( "EventSelection/FullyHadronicTtbarTagSelection_jobOptions.py" )
-
-include ( "EventSelection/FourJetTagSelection_jobOptions.py" )
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 4-jet channel
-FourJetChannel = FourJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#fully-hadronic ttbar channel
-FullyHadronicTtbar = "("+FourJetChannel+")"
-

PhysicsAnalysis/EventTag/EventSelection/share/FullyLeptonicTtbarTagSelection_jobOptions.py

-include.block ( "EventSelection/FullyLeptonicTtbarTagSelection_jobOptions.py" )
-
-include ( "EventSelection/DiElectronTagSelection_jobOptions.py" )
-include ( "EventSelection/DiMuonTagSelection_jobOptions.py" )
-include ( "EventSelection/DiJetTagSelection_jobOptions.py" )
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 2-electron/2-jet channel
-DiElectronChannel = DiElectron + "&&" + DiJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#define the 2-muon/2-jet channel
-DiMuonChannel = DiMuon + "&&" + DiJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#fully-leptonic ttbar channel
-FullyLeptonicTtbar = "("+DiElectronChannel+")" + "||" + "("+DiMuonChannel+")"
-

PhysicsAnalysis/EventTag/EventSelection/share/MissingEtTagSelection_jobOptions.py

-include.block ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-MissingET = "MissingET>20000"
-

PhysicsAnalysis/EventTag/EventSelection/share/SemiLeptonicTtbarTagSelection_jobOptions.py

-include.block ( "EventSelection/SemiLeptonicTtbarTagSelection_jobOptions.py" )
-
-include ( "EventSelection/SingleElectronTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleMuonTagSelection_jobOptions.py" )
-include ( "EventSelection/ThreeJetTagSelection_jobOptions.py" )
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 1-electron/3-jet channel
-ElectronChannel = SingleElectron + "&&" + ThreeJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#define the 1-muon/3-jet channel
-MuonChannel = SingleMuon + "&&" + ThreeJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#semi-leptonic ttbar channel
-SemiLeptonicTtbar = "("+ElectronChannel+")" + "||" + "("+MuonChannel+")"
-

PhysicsAnalysis/EventTag/EventSelection/share/SimpleTopSelection_jobOptions.py

-####################################################
-#Author - Ketevi A. Assamagan
-
-#DetDescrVersion="ATLAS-XXX-..."
-
-doHist = False
-doCBNT = False
-doWriteTAG = False
-doWriteESD = False
-doESD = False
-readAOD = True
-doAOD = False
-doWriteAOD = True
-# read the TAG as input to the job
-readTAG = True
-
-# Number of Events
-EvtMax = 500000
-
-# Use the TAG that you just produce to select the events
-# define also the selection criteria
-PoolTAGInput = ["TAG.pool.root"]
-
-#The pre-defined simple Bselections
-include ( "EventSelection/SemiLeptonicTtbarTagSelection_jobOptions.py" )
-include ( "EventSelection/FullyLeptonicTtbarTagSelection_jobOptions.py" )
-include ( "EventSelection/FullyHadronicTtbarTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleTopTagSelection_jobOptions.py" )
-
-PoolInputQuery=SemiLeptonicTtbar + "||" + FullyLeptonicTtbar + "||" + FullyHadronicTtbar + "||" + SingleTop
-
-#Create a new RDO, ESD and AOD that contain only selected events
-PoolAODOutput = "AOD.TagSel.root"
-
-# main reconstruction job jobOptions
-include ("RecExCommon/RecExCommon_topOptions.py")
-#######################################################
-

PhysicsAnalysis/EventTag/EventSelection/share/SingleElectronTagSelection_jobOptions.py

-include.block ( "EventSelection/SingleElectronTagSelection_jobOptions.py" )
-
-SingleElectron = "NLooseElectron>0 && abs(LooseElectronPt1)>7000"
-

PhysicsAnalysis/EventTag/EventSelection/share/SingleJetTagSelection_jobOptions.py

-include.block ( "EventSelection/SingleJetTagSelection_jobOptions.py" )
-
-SingleJet = "NJet>0 && JetPt1>15000"
-

PhysicsAnalysis/EventTag/EventSelection/share/SingleMuonTagSelection_jobOptions.py

-include.block ( "EventSelection/SingleMuonTagSelection_jobOptions.py" )
-
-SingleMuon = "NLooseMuon>0 && abs(LooseMuonPt1)>6000"
-

PhysicsAnalysis/EventTag/EventSelection/share/SingleTopTagSelection_jobOptions.py

-include.block ( "EventSelection/SingleTopTagSelection_jobOptions.py" )
-
-include ( "EventSelection/SingleElectronTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleMuonTagSelection_jobOptions.py" )
-include ( "EventSelection/SingleJetTagSelection_jobOptions.py" )
-
-include ( "EventSelection/MissingEtTagSelection_jobOptions.py" )
-
-#define the 1-electron/3-jet channel
-ElectronJet = SingleElectron + "&&" + SingleJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-#define the 1-muon/3-jet channel
-MuonJet = SingleMuon + "&&" + SingleJet + "&&" + MissingET + "&&" + "NBJet>0"
-
-SingleTop = "("+ElectronJet+")" + "||" + "("+MuonJet+")"
-

PhysicsAnalysis/EventTag/EventSelection/share/ThreeJetTagSelection_jobOptions.py

-include.block ( "EventSelection/ThreeJetTagSelection_jobOptions.py" )
-
-ThreeJet = "NJet>2 && JetPt1>20000 && JetPt2>15000 && JetPt3>15000"
-

PhysicsAnalysis/EventTag/EventTagAthenaPOOL/CMakeLists.txt

-################################################################################
-# Package: EventTagAthenaPOOL
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EventTagAthenaPOOL )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PRIVATE
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          Database/AthenaPOOL/AthenaPoolUtilities
-                          PhysicsAnalysis/EventTag/EventTagTPCnv
-                          PhysicsAnalysis/EventTag/TagEvent )
-
 # Component(s) in the package:
 atlas_add_poolcnv_library( EventTagAthenaPOOLPoolCnv
                            src/*.cxx
                            FILES TagEvent/RawInfoSummaryForTag.h
-                           LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities EventTagTPCnv TagEvent )
-
+                           LINK_LIBRARIES AthenaPoolCnvSvcLib EventTagTPCnv TagEvent )

PhysicsAnalysis/EventTag/EventTagRawAlgs/CMakeLists.txt

-################################################################################
-# Package: EventTagRawAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EventTagRawAlgs )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaBaseComps
-                          Control/AthenaKernel
-                          GaudiKernel
-                          Tracking/TrkEvent/TrkSegment
-                          PRIVATE
-                          Calorimeter/CaloEvent
-                          Commission/CommissionEvent
-                          Control/StoreGate
-                          Event/xAOD/xAODCaloEvent
-                          InnerDetector/InDetRawEvent/InDetBCM_RawData
-                          InnerDetector/InDetRecEvent/InDetPrepRawData
-                          LArCalorimeter/LArRecEvent
-                          PhysicsAnalysis/EventTag/TagEvent
-                          TileCalorimeter/TileEvent
-                          TileCalorimeter/TileIdentifier
-                          Tracking/TrkEvent/TrkSpacePoint
-                          Tracking/TrkEvent/TrkTrack
-                          Tracking/TrkEvent/TrkTrackSummary
-                          MagneticField/MagFieldElements
-                          MagneticField/MagFieldConditions
-			  )
-
-# External dependencies:
-find_package( CLHEP )
-
 # Component(s) in the package:
 atlas_add_component( EventTagRawAlgs
                      src/*.cxx
                      src/components/*.cxx
-                     INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS}
-                     LINK_LIBRARIES ${CLHEP_LIBRARIES} AthenaBaseComps AthenaKernel GaudiKernel TrkSegment CaloEvent CommissionEvent StoreGateLib SGtests xAODCaloEvent InDetBCM_RawData InDetPrepRawData LArRecEvent TagEvent TileEvent TileIdentifier TrkSpacePoint TrkTrack TrkTrackSummary MagFieldElements MagFieldConditions )
+                     LINK_LIBRARIES AthenaBaseComps AthenaKernel GaudiKernel TrkSegment CaloEvent CommissionEvent StoreGateLib xAODCaloEvent InDetBCM_RawData InDetPrepRawData LArRecEvent TagEvent TileEvent TileIdentifier TrkSpacePoint TrkTrack TrkTrackSummary MagFieldConditions )
 
 # Install files from the package:
 atlas_install_joboptions( share/*.py )

PhysicsAnalysis/EventTag/EventTagTPCnv/CMakeLists.txt

-################################################################################
-# Package: EventTagTPCnv
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( EventTagTPCnv )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Database/AthenaPOOL/AthenaPoolCnvSvc
-                          PhysicsAnalysis/EventTag/TagEvent
-                          PRIVATE
-                          Control/AthenaKernel )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_tpcnv_library( EventTagTPCnv
                          src/*.cxx
                          PUBLIC_HEADERS EventTagTPCnv
-                         PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                         LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TagEvent AthenaKernel )
+                         LINK_LIBRARIES AthenaPoolCnvSvcLib TagEvent
+                         PRIVATE_LINK_LIBRARIES AthenaKernel )
 
 atlas_add_dictionary( EventTagTPCnvDict
                       EventTagTPCnv/EventTagTPCnvDict.h
                       EventTagTPCnv/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaPoolCnvSvcLib TagEvent AthenaKernel EventTagTPCnv )
-
+                      LINK_LIBRARIES EventTagTPCnv )

PhysicsAnalysis/EventTag/TagEvent/CMakeLists.txt

-################################################################################
-# Package: TagEvent
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # Declare the package name:
 atlas_subdir( TagEvent )
 
-# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
-                          Control/AthenaKernel
-                          Database/AthenaPOOL/AthenaPoolUtilities )
-
-# External dependencies:
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
 # Component(s) in the package:
 atlas_add_library( TagEvent
-                   src/*.cxx
+                   TagEvent/*.h
+                   INTERFACE
                    PUBLIC_HEADERS TagEvent
-                   PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                   LINK_LIBRARIES AthenaKernel AthenaPoolUtilities
-                   PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
+                   LINK_LIBRARIES AthenaKernel )
 
 atlas_add_dictionary( TagEventDict
                       TagEvent/TagEventDict.h
                       TagEvent/selection.xml
-                      INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaKernel AthenaPoolUtilities TagEvent )
-
+                      LINK_LIBRARIES TagEvent )