From 1bab604c39fc9fc8a2a87fb1c7f3f62baefd0c77 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <fwinkl@cern>
Date: Wed, 10 Mar 2021 21:00:30 +0100
Subject: [PATCH] TrigT1CTP: remove defunct monitoring configuration
The Run-2 monitoring is no longer used and its configuration does not
actually do anything anymore as the monitoring has been migrated
already. Also delete `share/` directory with unused job options.
---
Trigger/TrigT1/TrigT1CTP/CMakeLists.txt | 3 +-
Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h | 5 +-
.../TrigT1CTP/python/TrigT1CTPConfig.py | 13 +----
.../TrigT1CTP/python/TrigT1CTPMonitoring.py | 16 ------
.../TrigT1CTP/share/TrigT1CTP_jobOptions.py | 13 -----
.../TrigT1CTP/share/jobOptions.ReadCTP_RDO.py | 56 -------------------
6 files changed, 3 insertions(+), 103 deletions(-)
delete mode 100644 Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py
delete mode 100755 Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_jobOptions.py
delete mode 100755 Trigger/TrigT1/TrigT1CTP/share/jobOptions.ReadCTP_RDO.py
diff --git a/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt b/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt
index 848b147db386..d6c8989ddd1b 100644
--- a/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1CTP/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( TrigT1CTP )
@@ -18,7 +18,6 @@ atlas_add_component( TrigT1CTP
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
atlas_install_generic( data/*.cfg
DESTINATION share/TrigT1CTP
EXECUTABLE )
diff --git a/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h b/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
index c4a3af78178f..c354b863d8fa 100644
--- a/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
+++ b/Trigger/TrigT1/TrigT1CTP/doc/packagedoc.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -36,9 +36,6 @@ triggers are simulated: random trigger, prescaled clock trigger and bunch group
- LVL1CTP::RandomTrigger: simulation of the internal random trigger
@section TrigT1CTP_TrigT1CTPJobOptions Job Options
- The algorithms of the TrigT1CTP package can be configured using configurables.
- For an example see TrigT1CTP_jobOptions.py:
- @include TrigT1CTP_jobOptions.py
Configuration classes for the LVL1CTP::CTPSimulation algorithm are:
- python::TrigT1CTPConfig::DefaultCTPSimulation: common setup (do not use directly)
diff --git a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
index 46154ac7a2fd..c75004047a00 100755
--- a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
+++ b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
from TrigT1CTP.TrigT1CTPConf import LVL1CTP__CTPSimulation
@@ -10,8 +10,6 @@ class DefaultCTPSimulation(LVL1CTP__CTPSimulation):
from AthenaCommon.Logging import logging
self.log = logging.getLogger( 'CTPSimulation' )
- self.AthenaMonTools = []
-
def setDefaultRandomService(self, rndmSvc = 'AtRanluxGenSvc'):
# Random service is not needed anymore in Run 3 for CTP
pass
@@ -62,15 +60,6 @@ class CTPSimulationInReco(DefaultCTPSimulation):
self.DoPSCL=True
self.DoNIM=True
- # add validation histograms
- from TrigT1CTP.TrigT1CTPMonitoring import TrigT1CTPValidationMonitoring
- self.AthenaMonTools += [ TrigT1CTPValidationMonitoring() ]
-
- from TriggerJobOpts.TriggerFlags import TriggerFlags
- if "Log" in TriggerFlags.enableMonitoring():
- from TriggerJobOpts.Lvl1TriggerGetter import getLvl1OutputLevel
- self.OutputLevel=getLvl1OutputLevel()
-
def setDefaults(self, handle):
from TriggerJobOpts.TriggerFlags import TriggerFlags
handle.DoCalo = TriggerFlags.doCalo()
diff --git a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py b/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py
deleted file mode 100644
index 055a168211b9..000000000000
--- a/Trigger/TrigT1/TrigT1CTP/python/TrigT1CTPMonitoring.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-from TrigMonitorBase.TrigGenericMonitoringToolConfig import defineHistogram, TrigGenericMonitoringToolConfig
-
-class TrigT1CTPValidationMonitoring(TrigGenericMonitoringToolConfig):
- def __init__ (self, name="CTPValidation"):
- super(TrigT1CTPValidationMonitoring, self).__init__(name)
-
- """ define monitoring histograms for CTP validation(RTT) """
-
- self.defineTarget("Validation")
-
- self.Histograms += [ defineHistogram('TIP', type='TH1F', title='CTP TIP', xbins=352, xmin=0., xmax=352.) ]
- #self.Histograms += [ defineHistogram('TBP', type='TH1F', title='CTP TBP', xbins=512, xmin=0., xmax=512.) ]
- #self.Histograms += [ defineHistogram('TAP', type='TH1F', title='CTP TAP', xbins=512, xmin=0., xmax=512.) ]
- #self.Histograms += [ defineHistogram('TAV', type='TH1F', title='CTP TAV', xbins=512, xmin=0., xmax=512.) ]
diff --git a/Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_jobOptions.py b/Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_jobOptions.py
deleted file mode 100755
index 2335fad3972e..000000000000
--- a/Trigger/TrigT1/TrigT1CTP/share/TrigT1CTP_jobOptions.py
+++ /dev/null
@@ -1,13 +0,0 @@
-#--------------------------------------------------------------
-# CTP simulation algorithm
-#--------------------------------------------------------------
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from TrigT1CTP.TrigT1CTPConfig import CTPSimulation
-topSequence += CTPSimulation("CTPSimulation")
-
-topSequence.CTPSimulation.UseLegacyInterface = False
-topSequence.CTPSimulation.UseDeadTime = False
-#topSequence.CTPSimulation.OutputLevel = DEBUG
diff --git a/Trigger/TrigT1/TrigT1CTP/share/jobOptions.ReadCTP_RDO.py b/Trigger/TrigT1/TrigT1CTP/share/jobOptions.ReadCTP_RDO.py
deleted file mode 100755
index c006d74e65ec..000000000000
--- a/Trigger/TrigT1/TrigT1CTP/share/jobOptions.ReadCTP_RDO.py
+++ /dev/null
@@ -1,56 +0,0 @@
-
-#--------------------------------------------------------------
-# Get Global flags
-#--------------------------------------------------------------
-from AthenaCommon.GlobalFlags import GlobalFlags
-GlobalFlags.DetGeo.set_atlas()
-GlobalFlags.InputFormat.set_pool()
-GlobalFlags.Print()
-include( "AthenaCommon/AthenaCommonFlags.py" )
-
-include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" )
-
-#--------------------------------------------------------------
-# Pool Converters
-#--------------------------------------------------------------
-include( "TrigT1EventAthenaPool/TrigT1EventAthenaPool_joboptions.py" )
-
-#--------------------------------------------------------------
-# Pool input
-#--------------------------------------------------------------
-EventSelector = Service( "EventSelector" )
-EventSelector.InputCollections = PoolInput
-
-#
-# Load the configuration:
-#
-include( "TrigT1Config/TrigT1Config_jobOptions.py" )
-
-theApp.Dlls += [ "TrigT1CTP" ]
-CTP_RDO = Algorithm( "CTP_RDO" )
-CTP_RDO.NtupleLocID = "/FILE1/CTP/200"
-CTP_RDO.OutputLevel = VERBOSE
-
-#--------------------------------------------------------------
-# NTuple output
-#--------------------------------------------------------------
-theApp.Dlls += ["RootHistCnv"]
-theApp.HistogramPersistency = "ROOT"
-HistogramPersistencySvc = Service( "HistogramPersistencySvc" )
-HistogramPersistencySvc.OutputFile = "histo.hbook"
-NTupleSvc = Service( "NTupleSvc" )
-NTupleSvc.Output = RootOutput
-
-#--------------------------------------------------------------
-# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-MessageSvc = Service( "MessageSvc" )
-MessageSvc.OutputLevel = INFO
-MessageSvc.defaultLimit = 10000000
-
-#--------------------------------------------------------------
-# Event related parameters
-#--------------------------------------------------------------
-# Number of events to be processed (default is 10)
-theApp.EvtMax = EvtMax
-theApp.EvtSel = "EventSelector"
--
GitLab