From 67fec40eb95c1e557bb1a594941db06cd95f909b Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Wed, 20 Mar 2019 13:45:58 +0100
Subject: [PATCH] TrigUpgradeTest: Cleanup CMakeLists.txt dependencies
- Remove unneeded dependencies
- Remove non-component library
- Delete tauMenuDefs.py.bkup file
---
.../TrigUpgradeTest/CMakeLists.txt | 38 +--
.../python/tauMenuDefs.py.bkup | 250 ------------------
2 files changed, 10 insertions(+), 278 deletions(-)
delete mode 100644 Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 27a0c889194..98bae9d7e5b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -6,35 +6,26 @@
atlas_subdir( TrigUpgradeTest )
# Declare the package's dependencies:
-atlas_depends_on_subdirs( PUBLIC
- TestPolicy
- AtlasPolicy
+atlas_depends_on_subdirs( PRIVATE
GaudiKernel
- PRIVATE
Control/AthenaBaseComps
Trigger/TrigSteer/DecisionHandling
Trigger/TrigEvent/TrigSteeringEvent
- Control/AthViews
)
-find_package( Boost COMPONENTS filesystem thread system )
-find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
-
-atlas_add_library( TrigUpgradeTestLib
- src/*.cxx
- PUBLIC_HEADERS TrigUpgradeTest
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES} ${ROOT_LIBRARIES}
- GaudiKernel AthenaBaseComps TrigSteeringEvent DecisionHandlingLib )
-
atlas_add_component( TrigUpgradeTest
+ src/*.cxx
src/components/*.cxx
- INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
- LINK_LIBRARIES ${Boost_LIBRARIES}
- ${ROOT_LIBRARIES} GaudiKernel
- AthenaBaseComps TrigUpgradeTestLib AthViews )
+ LINK_LIBRARIES AthenaBaseComps TrigSteeringEvent DecisionHandlingLib
+ )
+# Install files from the package:
+atlas_install_joboptions( share/*.py )
+atlas_install_data( share/*.ref share/*.conf )
+atlas_install_python_modules( python/*.py )
+atlas_install_scripts( test/exec*.sh test/test*.sh )
+# Unit tests:
atlas_add_test( ViewSchedule1 SCRIPT test/test_view_schedule.sh
ENVIRONMENT THREADS=1 )
atlas_add_test( ViewSchedule2 SCRIPT test/test_view_schedule.sh
@@ -42,10 +33,6 @@ atlas_add_test( ViewSchedule2 SCRIPT test/test_view_schedule.sh
atlas_add_test( ViewSchedule64 SCRIPT test/test_view_schedule.sh
ENVIRONMENT THREADS=64 )
-# out until we find a way to properly invoke tests from other packages
-# atlas_add_test( creatingEVTest SCRIPT forward.sh ViewAlgsTest/test/creatingEVTest.sh )
-
-
atlas_add_test( merge
SCRIPT test/test_merge.sh
PROPERTIES TIMEOUT 1000
@@ -243,8 +230,3 @@ atlas_add_test( met_menu
EXTRA_PATTERNS "-s TrigSignatureMoniMT.*HLT_.*"
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_met_menu
)
-
-atlas_install_joboptions( share/*.py )
-atlas_install_data( share/*.ref share/*.conf )
-atlas_install_python_modules( python/*.py )
-atlas_install_scripts( test/exec*.sh test/test*.sh )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup b/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup
deleted file mode 100644
index 27710e80e1c..00000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/tauMenuDefs.py.bkup
+++ /dev/null
@@ -1,250 +0,0 @@
-#
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-#
-
-from AthenaCommon.Include import include
-from AthenaCommon.Constants import VERBOSE,DEBUG
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-import AthenaCommon.CfgMgr as CfgMgr
-
-
-from InDetRecExample.InDetJobProperties import InDetFlags
-InDetFlags.doCaloSeededBrem = False
-InDetFlags.InDet25nsec = True
-InDetFlags.doPrimaryVertex3DFinding = False
-InDetFlags.doPrintConfigurables = False
-InDetFlags.doResolveBackTracks = True
-InDetFlags.doSiSPSeededTrackFinder = True
-InDetFlags.doTRTPhaseCalculation = True
-InDetFlags.doTRTSeededTrackFinder = True
-InDetFlags.doTruth = False
-InDetFlags.init()
-
-# PixelLorentzAngleSvc and SCTLorentzAngleSvc
-include("InDetRecExample/InDetRecConditionsAccess.py")
-from InDetRecExample.InDetKeys import InDetKeys
-
-# menu components
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
-
-# ===============================================================================================
-# L2 Calo
-# ===============================================================================================
-
-# from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
-# theFastCaloAlgo=T2CaloEgamma_ReFastAlgo("FastCaloAlgo" )
-# theFastCaloAlgo.OutputLevel=VERBOSE
-# theFastCaloAlgo.ClustersName="L2CaloClusters"
-# svcMgr.ToolSvc.TrigDataAccess.ApplyOffsetCorrection=False
-
-# ================
-# CellMaker
-# ================
-
-from TrigCaloRec.TrigCaloRecConfig import TrigCaloCellMakerMT_tau
-cellMaker = TrigCaloCellMakerMT_tau("CaloCellMakerTau")
-cellMaker.OutputLevel=DEBUG
-
-from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
-clusMaker = TrigCaloClusterMakerMT_topo("CaloClusMakerTopo")
-clusMaker.OutputLevel=VERBOSE
-
-from TrigTauRec.TrigTauRecConfig import (TrigTauRecMerged_Tau2012,
- TrigTauRecMerged_TauCaloOnly,
- TrigTauRecMerged_TauCaloOnlyMVA,
- TrigTauRecMerged_TauFTK,
- TrigTauRecMerged_TauPrecision,
- TrigTauRecMerged_TauPreselection,
- TrigTauRecMerged_TauPrecisionMVA)
-
-
-from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq
-from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
-
-fastCaloViewsMaker = EventViewCreatorAlgorithm("fastCaloViewsMakerTau", OutputLevel=VERBOSE)
-fastCaloViewsMaker.ViewFallThrough = True
-fastCaloViewsMaker.RoIsLink = "initialRoI" # -||-
-fastCaloViewsMaker.InViewRoIs = "TAUCaloRoIs" # contract with the fastCalo
-fastCaloViewsMaker.Views = "TAUCaloViews"
-fastCaloViewsMaker.ViewNodeName = "fastCaloInViewAlgsTau"
-cellMaker.RoIs = fastCaloViewsMaker.InViewRoIs
-
-
-#fastCaloAthSequence = seqAND("fastCaloAthSequenceTau",[fastCaloViewsMaker, fastCaloInViewAlgs])
-
-# are these needed?
-CaloViewVerify = CfgMgr.AthViews__ViewDataVerifier("FastCaloViewDataVerifier")
-CaloViewVerify.DataObjects = [('TrigRoiDescriptorCollection' , 'StoreGateSvc+fastCaloViewsMaker_InViewRoIs_out')]
-
-from TrigTauHypo.TrigTauHypoConf import TrigTauCaloRoiUpdaterMT
-CaloRoiUpdater = TrigTauCaloRoiUpdaterMT("CaloRoiUpdater")
-CaloRoiUpdater.OutputLevel = DEBUG
-CaloRoiUpdater.RoIInputKey = "TAUCaloRoIs"
-CaloRoiUpdater.RoIOutputKey = "RoiForTau" # Default for Fast Tracking Algs
-
-l2TauViewsMaker = EventViewCreatorAlgorithm("l2TauViewsMaker", OutputLevel=DEBUG)
-l2TauViewsMaker.RoIsLink = "roi" # -||-
-l2TauViewsMaker.InViewRoIs = "RoiForCalo" # contract with the fastCalo
-l2TauViewsMaker.Views = "TAUCaloViews"
-l2TauViewsMaker.ViewFallThrough = True
-
-fastCaloInViewAlgs = seqAND("fastCaloInViewAlgsTau", [cellMaker,clusMaker,CaloRoiUpdater])
-
-#for viewAlg in ViewAlgs:
-# if viewAlg.properties().has_key("RoIs"):
-# viewAlg.RoIs = l2TauViewsMaker.InViewRoIs
-# if viewAlg.properties().has_key("roiCollectionName"):
-# viewAlg.roiCollectionName = TauElectronViewsMaker.InViewRoIs
-#CaloRoiUpdater.caloclusters = l2TauViewsMaker.InViewRoIs
-
-#fastCaloAthSequence = seqAND("fastCaloAthSequenceRoIUpdater", [ CaloRoiUpdater ])
-fastCaloAthSequence = seqAND("fastCaloAthSequenceTau",[fastCaloViewsMaker, fastCaloInViewAlgs])
-
-#l2TauViewsMaker.ViewNodeName = "tauInViewAlgs"
-
-#Copying code from here
-#from TrigEgammaHypo.TrigL2ElectronFexMTConfig import L2ElectronFex_1
-#theElectronFex= L2ElectronFex_1()
-#theElectronFex.TrigEMClusterName = theFastCaloAlgo.ClustersName
-#theElectronFex.TrackParticlesName = TrackParticlesName
-#theElectronFex.ElectronsName="Electrons"
-#theElectronFex.OutputLevel=VERBOSE
-
-
-#l2ElectronViewsMaker = EventViewCreatorAlgorithm("l2ElectronViewsMaker", OutputLevel=DEBUG)
-#l2ElectronViewsMaker.RoIsLink = "roi" # -||-
-#l2ElectronViewsMaker.InViewRoIs = "EMIDRoIs" # contract with the fastCalo
-#l2ElectronViewsMaker.Views = "EMElectronViews"
-#l2ElectronViewsMaker.ViewFallThrough = True
-
-
-#for viewAlg in viewAlgs:
-# if viewAlg.properties().has_key("RoIs"):
-# viewAlg.RoIs = l2ElectronViewsMaker.InViewRoIs
-# if viewAlg.properties().has_key("roiCollectionName"):
-# viewAlg.roiCollectionName = l2ElectronViewsMaker.InViewRoIs
-#theElectronFex.RoIs = l2ElectronViewsMaker.InViewRoIs
-
-#electronInViewAlgs = parOR("electronInViewAlgs", viewAlgs + [ theElectronFex ])
-
-#l2ElectronViewsMaker.ViewNodeName = "electronInViewAlgs"
-#to here
-
-
-
-
-
-
-#from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoAlg
-#from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
-
-
-#def genCaloHypoToolTau( name, conf ):
-# return HLTTest__TestHypoTool("name")
-
-#def tauCaloSequence():
-# return MenuSequence( Sequence = fastCaloAthSequence,
-# Maker = fastCaloViewsMaker,
-# Hypo = HLTTest__TestHypoAlg("L2TauCaloHypoAlg", Input=""),
-# HypoToolGen = genCaloHypoToolTau )
-
-#Keep these lines for the future
-from TrigTauHypo.TrigTauHypoConf import TrigL2TauCaloHypoAlgMT
-fastCaloHypo = TrigL2TauCaloHypoAlgMT("L2TauCaloHypo")
-fastCaloHypo.OutputLevel = DEBUG
-
-
-from TrigTauHypo.TrigL2TauHypoTool import TrigL2TauHypoToolFromName
-#from TrigTauHypo.TrigTauHypoBase import
-#from TrigTauHypo.L2TauHypoTool import TrigL2TauHypoTool
-#from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
-
-#def genCaloHypoToolTau( name, conf ):
-# return HLTTest__TestHypoTool("name")
-
-#from TrigTauHypo.TrigL2CaloHypoTool import TrigL2CaloHypoToolFromName
-
-#Will use this later
-def tauCaloSequence():
- return MenuSequence( Sequence = fastCaloAthSequence,
- Maker = fastCaloViewsMaker,
- Hypo = fastCaloHypo,
- HypoToolGen = TrigL2TauHypoToolFromName )
-
-
-# #########################################
-# # second step: tracking.....
-# #########################################
-# #
-
-
-# from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs
-
-
-# (viewAlgs, eventAlgs) = makeInDetAlgs()
-# from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
-
-# theFTF = TrigFastTrackFinder_eGamma()
-# theFTF.isRoI_Seeded = True
-# viewAlgs.append(theFTF)
-
-
-# # A simple algorithm to confirm that data has been inherited from parent view
-# # Required to satisfy data dependencies
-# ViewVerify = CfgMgr.AthViews__ViewDataVerifier("electronViewDataVerifier")
-# ViewVerify.DataObjects = [('xAOD::TrigEMClusterContainer','StoreGateSvc+L2CaloClusters')]
-# ViewVerify.OutputLevel = DEBUG
-# viewAlgs.append(ViewVerify)
-
-# TrackParticlesName = ""
-# for viewAlg in viewAlgs:
-# if viewAlg.name() == "InDetTrigTrackParticleCreatorAlg":
-# TrackParticlesName = viewAlg.TrackParticlesName
-
-
-# from TrigEgammaHypo.TrigL2ElectronFexMTConfig import L2ElectronFex_1
-# theElectronFex= L2ElectronFex_1()
-# theElectronFex.TrigEMClusterName = theFastCaloAlgo.ClustersName
-# theElectronFex.TrackParticlesName = TrackParticlesName
-# theElectronFex.ElectronsName="Electrons"
-# theElectronFex.OutputLevel=VERBOSE
-
-
-# l2ElectronViewsMaker = EventViewCreatorAlgorithm("l2ElectronViewsMaker", OutputLevel=DEBUG)
-# l2ElectronViewsMaker.RoIsLink = "roi" # -||-
-# l2ElectronViewsMaker.InViewRoIs = "EMIDRoIs" # contract with the fastCalo
-# l2ElectronViewsMaker.Views = "EMElectronViews"
-# l2ElectronViewsMaker.ViewFallThrough = True
-
-
-# for viewAlg in viewAlgs:
-# if viewAlg.properties().has_key("RoIs"):
-# viewAlg.RoIs = l2ElectronViewsMaker.InViewRoIs
-# if viewAlg.properties().has_key("roiCollectionName"):
-# viewAlg.roiCollectionName = l2ElectronViewsMaker.InViewRoIs
-# theElectronFex.RoIs = l2ElectronViewsMaker.InViewRoIs
-
-# electronInViewAlgs = parOR("electronInViewAlgs", viewAlgs + [ theElectronFex ])
-
-# l2ElectronViewsMaker.ViewNodeName = "electronInViewAlgs"
-
-
-# from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronHypoAlgMT
-# theElectronHypo = TrigL2ElectronHypoAlgMT()
-# theElectronHypo.Electrons = theElectronFex.ElectronsName
-# theElectronHypo.RunInView=True
-# theElectronHypo.OutputLevel = VERBOSE
-
-# # this needs to be added:
-# #electronDecisionsDumper = DumpDecisions("electronDecisionsDumper", OutputLevel=DEBUG, Decisions = theElectronHypo.Output )
-
-# electronAthSequence = seqAND("electronAthSequence", eventAlgs + [l2ElectronViewsMaker, electronInViewAlgs ] )
-
-# from TrigEgammaHypo.TrigL2ElectronHypoTool import TrigL2ElectronHypoToolFromName
-
-# def electronSequence():
-# return MenuSequence( Maker = l2ElectronViewsMaker,
-# Sequence = electronAthSequence,
-# Hypo = theElectronHypo,
-# HypoToolGen = TrigL2ElectronHypoToolFromName )
-
--
GitLab