From 2185a2f811d5dc48fe1bc801f3310316337a1da9 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Tue, 10 Nov 2020 11:19:32 +0100
Subject: [PATCH] AnalysisTriggerAlgs: cmake and package cleanup
Cleanup cmake configuration and delete two unused job options.
---
.../AnalysisTriggerAlgs/CMakeLists.txt | 23 +----------
.../share/AnalysisTrigger_jobOptions.py | 6 ---
.../share/Data09MuCTPIFix_jobOfragment.py | 40 -------------------
3 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100644 PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/AnalysisTrigger_jobOptions.py
delete mode 100644 PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/Data09MuCTPIFix_jobOfragment.py
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
index 6c63c612d25..f5bb2bb6a63 100644
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/CMakeLists.txt
@@ -1,29 +1,8 @@
-################################################################################
-# Package: AnalysisTriggerAlgs
-################################################################################
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AnalysisTriggerAlgs )
-# Declare the package's dependencies:
-atlas_depends_on_subdirs(
- PRIVATE
- Control/AthenaBaseComps
- Control/AthenaKernel
- Control/StoreGate
- Event/EventInfo
- Event/xAOD/xAODTrigL1Calo
- Event/xAOD/xAODTrigger
- Event/xAOD/xAODTriggerCnv
- GaudiKernel
- PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
- Trigger/TrigConfiguration/TrigConfInterfaces
- Trigger/TrigConfiguration/TrigConfL1Data
- Trigger/TrigT1/TrigT1CaloEvent
- Trigger/TrigT1/TrigT1CaloToolInterfaces
- Trigger/TrigT1/TrigT1Interfaces
- Trigger/TrigT1/TrigT1Result )
-
# External dependencies:
find_package( CLHEP )
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/AnalysisTrigger_jobOptions.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/AnalysisTrigger_jobOptions.py
deleted file mode 100644
index 91d3785e806..00000000000
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/AnalysisTrigger_jobOptions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from AnalysisTriggerAlgs.AnalysisTriggerAlgsConfig import RoIBResultToAOD
-topSequence += RoIBResultToAOD("RoIBResultToAOD")
diff --git a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/Data09MuCTPIFix_jobOfragment.py b/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/Data09MuCTPIFix_jobOfragment.py
deleted file mode 100644
index d0ef7dd2376..00000000000
--- a/PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/share/Data09MuCTPIFix_jobOfragment.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: Data09MuCTPIFix_jobOfragment.py 275499 2010-01-27 18:25:00Z krasznaa $
-#
-# JobOptions fragment fixing the LVL1_ROI object in the ESD files for the
-# problem in the MuCTPI. (Present for all 2009 collision data.)
-#
-
-# Create a new logger, saving the old one if it already exists with this name:
-if "logger" in dir(): orig_logger = logger
-from AthenaCommon.Logging import logging
-logger = logging.getLogger( "Data09MuCTPIFix" )
-
-# Set up the trigger configuration:
-from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
-TriggerConfigGetter( "ReadPool" )
-logger.info( "Set up the trigger configuration service" )
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-#
-# Fix the RoIBResult object based on the MuCTPI_RDO:
-#
-from AnalysisTriggerAlgs.AnalysisTriggerAlgsConf import MuCTPI_RDOToRoIBResult
-theJob += MuCTPI_RDOToRoIBResult()
-theJob.MuCTPI_RDOToRoIBResult.RoIBOutputKey = "CorrectRoIBResult"
-logger.info( "Added the RoIBResult object fixer algorithm" )
-
-#
-# Create the LVL1_ROI object with the correct muon content.
-# Warning: The Calo RoIs should be taken from the original LVL1_ROI object!
-#
-from AnalysisTriggerAlgs.AnalysisTriggerAlgsConfig import RoIBResultToAOD
-theJob += RoIBResultToAOD()
-theJob.RoIBResultToAOD.DoCalo = False
-theJob.RoIBResultToAOD.RoIBResultInputKey = "CorrectRoIBResult"
-theJob.RoIBResultToAOD.LVL1_ROIOutputKey = "LVL1_ROI"
-
-# Restore the original logger if necessary:
-if "orig_logger" in dir(): logger = orig_logger
--
GitLab