diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/CMakeLists.txt b/Calorimeter/CaloCnv/CaloAthenaPool/CMakeLists.txt
index dc28bc3a8e43fc394275c031e67641dcceccd2ec..8b5831b9e80f19c870056ed0e3bc2131a7c5c950 100644
--- a/Calorimeter/CaloCnv/CaloAthenaPool/CMakeLists.txt
+++ b/Calorimeter/CaloCnv/CaloAthenaPool/CMakeLists.txt
@@ -14,7 +14,6 @@ atlas_add_poolcnv_library( CaloAthenaPoolPoolCnv
CaloUtilsLib StoreGateLib AthenaPoolCnvSvcLib )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Find the helper code for the T/P tests:
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_14.5.0_test.py b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_14.5.0_test.py
deleted file mode 100644
index fc1a3799f6bb85f5d08ddc8a5f999bc8654a013b..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_14.5.0_test.py
+++ /dev/null
@@ -1,35 +0,0 @@
-infile = 'aod/AOD-14.5.0/AOD-14.5.0-full.pool.root'
-keys = [
- #CaloCellLinkContainer_p2
- 'MuonClusterCollection_Link',
- 'egClusterCollection_Link',
-
- #CaloClusterContainer_p4
- 'HLT@10',
- 'LArClusterEMFrwd@10',
- 'MuonClusterCollection@10',
- 'Tau1P3PCellCluster@10',
- 'Tau1P3PCellEM012ClusterContainer@10',
- 'Tau1P3PPi0ClusterContainer@10',
- 'LArClusterEMSofte@10',
- 'egClusterCollection@10',
- 'HLT_TrigCaloClusterMaker@10',
- 'EMTopoCluster430@10',
- 'CaloCalTopoCluster@10',
-
- #CaloTowerContainer_p1
- 'HLT_TrigCaloTowerMaker',
-
- #CaloCompactCellContainer
- #'AODCellContainer',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.1.0_test.py b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.1.0_test.py
deleted file mode 100644
index 32941262e35af72eeb9b8befa5dd3e032bed022e..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.1.0_test.py
+++ /dev/null
@@ -1,35 +0,0 @@
-infile = 'aod/AOD-15.1.0/AOD-15.1.0-full.pool.root'
-keys = [
- #CaloCellLinkContainer_p2
- 'MuonClusterCollection_Link',
- 'egClusterCollection_Link',
-
- #CaloClusterContainer_p5
- 'HLT@10',
- 'Tau1P3PCellEM012ClusterContainer@10',
- 'Tau1P3PCellCluster@10',
- 'Tau1P3PPi0ClusterContainer@10',
- 'LArClusterEMFrwd@10',
- 'MuonClusterCollection@10',
- 'egClusterCollection@10',
- 'LArClusterEMSofte@10',
- 'EMTopoCluster430@10',
- 'HLT_TrigCaloClusterMaker@10',
- 'CaloCalTopoCluster@10',
-
- #CaloShowerContainer_p2
- 'HLT',
-
- #CaloCompactCellContainer
- #'AODCellContainer',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.5.0_test.py b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.5.0_test.py
deleted file mode 100644
index d6ab24d2893ed71643d66bddf823ade53f58ce6b..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_15.5.0_test.py
+++ /dev/null
@@ -1,37 +0,0 @@
-infile = 'aod/AOD-15.5.0/AOD-15.5.0-full.pool.root'
-keys = [
- #CaloCellLinkContainer_p2
- 'MuonClusterCollection_Link',
- 'egClusterCollection_Link',
-
- #CaloClusterContainer_p6
- 'HLT@10',
- 'HLT_TrigCaloClusterMaker@10',
- 'Tau1P3PCellEM012ClusterContainer@10',
- 'Tau1P3PCellCluster@10',
- 'MuonClusterCollection@10',
- 'LArClusterEMFrwd@10',
- 'Tau1P3PPi0ClusterContainer@10',
- 'LArClusterEMSofte@10',
- 'HLT_TrigCaloClusterMaker_slw@10',
- 'egClusterCollection@10',
- 'EMTopoCluster430@10',
- 'HLT_TrigCaloClusterMaker_topo@10',
- 'CaloCalTopoCluster@10',
-
- #CaloShowerContainer_p2
- 'HLT',
-
- #CaloCompactCellContainer
- 'AODCellContainer',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_18.0.0_test.py b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_18.0.0_test.py
deleted file mode 100644
index f091f100e2110e2422a2e0ef23d08e4a662b3e71..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,63 +0,0 @@
-infile = 'esd/ESD-18.0.0.pool.root'
-keys = [
- #CaloCellLinkContainer_p2
- 'LArClusterEMFrwd_Link',
- 'LArClusterEM_Link',
- 'egClusterCollection_Link',
- 'EMTopoSW35_Link',
- 'MuonClusterCollection_Link',
- 'LArClusterEM7_11Nocorr_Link',
- 'LArClusterEMSofte_Link',
- 'Tau1P3PCellEM012ClusterContainer_Link',
- 'Tau1P3PCellCluster_Link',
- 'TauPi0BonnClusterContainer_Link',
- 'HLT_TrigCaloClusterMaker_topo_Link',
- 'CaloCalTopoCluster_Link',
-
- #CaloClusterContainer_p7
- 'HLT@10',
- 'LArClusterEMFrwd@10',
- 'MuonClusterCollection@10',
- 'Tau1P3PCellEM012ClusterContainer@10',
- 'Tau1P3PCellCluster@10',
- 'HLT_TrigT2Calo@10',
- 'HLT_TrigCaloClusterMaker_slw@10',
- 'LArClusterEMSofte@10',
- 'LArClusterEM7_11Nocorr@10',
- 'LArClusterEM@10',
- 'egClusterCollection@10',
- 'TauPi0BonnClusterContainer@10',
- 'EMTopoSW35@10',
- 'HLT_TrigCaloClusterMaker_topo@10',
- 'HLT_TrigCaloClusterMaker@10',
- 'CaloCalTopoCluster@10',
-
- #CaloShowerContainer_p2
- 'HLT@10',
- 'MuonClusterCollection_Data@10',
- 'LArClusterEM_Data@10',
- 'LArClusterEM7_11Nocorr_Data@10',
- 'egClusterCollection_Data@10',
- 'Tau1P3PCellEM012ClusterContainer_Data@10',
- 'LArClusterEMSofte_Data@10',
- 'EMTopoSW35_Data@10',
- 'Tau1P3PCellCluster_Data@10',
- 'TauPi0BonnClusterContainer_Data@10',
- 'CaloCalTopoCluster_Data@10',
-
- #CaloTopoTowerContainer_p1
- 'TopoTower',
-
- #CaloTowerContainer_p1
- 'CombinedTower',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_20.1.7.2_test.py b/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_20.1.7.2_test.py
deleted file mode 100644
index 0c80e918476654d3cad2921a9c0b59e7d0248ede..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCnv/CaloAthenaPool/share/CaloTPCnv_20.1.7.2_test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #CaloClusterCellLinkContainer
- 'InDetTrackParticlesAssociatedClusters_links@10',
- 'MuonClusterCollection_links@10',
- 'LArClusterEM_links@10',
- 'egammaClusters_links@10',
- 'LArClusterEM7_11Nocorr_links@10',
- 'CaloCalTopoClusters_links@10',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Control/AthenaCommon/python/DetFlags.py b/Control/AthenaCommon/python/DetFlags.py
deleted file mode 100755
index a98378e9cd53f5fe5ad12dec1dc1f3eedbe5112d..0000000000000000000000000000000000000000
--- a/Control/AthenaCommon/python/DetFlags.py
+++ /dev/null
@@ -1,663 +0,0 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-
-# DetFlags : Author Tadashi Maeno
-# Mods: David Rousseau, Paolo Calafiura, M. Gallas ( more flags and
-# tasks)
-# detectors : ID = bpipe pixel SCT TRT BCM
-# Forward = Lucid ZDC ALFA AFP FwdRegion
-# LAr = em HEC FCal
-# Calo = em HEC FCal Tile
-# Muon = MDT CSC TGC RPC sTGC MM
-# Truth
-# BField
-# FTK
-# tasks:
-# geometry : setup the geometry
-# dcs : DCS information is available
-# simulate : simulate
-# simulateLVL1 : LVL1 simulation
-# detdescr : setup detector description (for anything which is not geant)
-# pileup : collect hits from physics and min bias events
-# digitize : hit -> RDO (raw data objects)
-# makeRIO : RDO -> RIO (Reconstruction Input Objects)
-# writeBS : write RDO byte stream
-# readRDOBS : read RDO from byte stream
-# readRDOPool : read RDO from pool
-# readRIOBS : read RIO directly from BS
-# writeRDOPool : write RDO in pool
-# readRIOPool : read RIO from pool
-# writeRIOPool : write RIO in pool
-# overlay : overlay setup
-
-#
-# Some tasks are OR of other classes. They can only be used to test, not to set.
-# haveRDO = readRDOPool or readRDOBS
-# haveRIO = makeRIO or readRIOPool or readRIOBS
-#
-# subdetectors and tasks from a matrix of flags which are all
-# off by default
-# changing the flags:
-# tasks can be switched on/off for all detectors:
-# DetFlags.geometry.all_setOn() (or all_setOff()
-# a task for a given subdetector can be switched on/off
-# DetFlags.readRDO.pixel_setOn() (or setOff() )
-# setting off/on a group of subdetectors (e.g. LAr or Muon) switch off/on
-# all the corresponding subdetectors
-# a subdetector can be switched on/off for all tasks:
-# DetFlags.Muon_setOn() (or setOff() )
-#
-# Flags can be tested individually:
-#if DetFlags.geometry.pixel_on():
-# print "pix Geo On"
-#else:
-# print "pix Geo Off"
-# there is no off() method, just use not
-# Group of subdetectors can also be tested:
-#if DetFlags.detdescr.any_on() : true if any subdet is true
-#if DetFlags.detdescr.allOn() : true if all subdet is true
-#if DetFlags.detdescr.LAr_on() : true if any LAr det is true
-#if DetFlags.detdescr.LAr_allOn() : true if all LAr det is true
-#if DetFlags.haveRIO.Calo_on() : true if any Calo RIO are present (made or read from file)
-
-class DetFlags:
- # detectors
- class SubDetectors:
- def __init__ (self):
- # ID
- self._flag_bpipe = False
- self._flag_pixel = False
- self._flag_SCT = False
- self._flag_TRT = False
- self._flag_BCM = False
- # Forward
- self._flag_Lucid = False
- self._flag_ZDC = False
- self._flag_ALFA = False
- self._flag_AFP = False
- self._flag_FwdRegion = False
- # Calo
- self._flag_em = False
- self._flag_HEC = False
- self._flag_FCal = False
- self._flag_Tile = False
- # Muon
- self._flag_MDT = False
- self._flag_CSC = False
- self._flag_TGC = False
- self._flag_RPC = False
- self._flag_MM = False
- self._flag_sTGC = False
- # LVL1
- self._flag_LVL1 = False
- # Truth
- self._flag_Truth = False
- # BField
- self._flag_BField = False
- # FTK
- self._flag_FTK = False
-
- # create methods to set on/off sub-detectors
-
- # get my attributes
- for attr in dir(self)[:]:
- # get flag members
- if 0 == attr.find('_flag_'):
- # extract detector name
- detName = attr.replace('_flag_','')
-
- # temporary class for function object
- class TmpC:
- def __init__ (tmpSelf,attr):
- tmpSelf._attr = attr
- def setOn (tmpSelf):
- setattr(self,tmpSelf._attr,True)
- def setOff (tmpSelf):
- setattr(self,tmpSelf._attr,False)
- def on (tmpSelf):
- return getattr(self,tmpSelf._attr)
-
- # register methods
- tmpC = TmpC(attr)
- setattr(self,'%s_setOn' % detName, tmpC.setOn)
- setattr(self,'%s_setOff' % detName, tmpC.setOff)
- setattr(self,'%s_on' % detName, tmpC.on)
-
- # set on/off detector
- def Forward_setOn (self):
- self.Lucid_setOn()
- self.ZDC_setOn()
- self.ALFA_setOn()
- self.AFP_setOn()
- self.FwdRegion_setOn()
- def Forward_setOff (self):
- self.Lucid_setOff()
- self.ZDC_setOff()
- self.ALFA_setOff()
- self.AFP_setOff()
- self.FwdRegion_setOff()
- def ID_setOn (self):
- self.bpipe_setOn()
- self.pixel_setOn()
- self.SCT_setOn()
- self.TRT_setOn()
- self.BCM_setOn()
- def ID_setOff (self):
- self.bpipe_setOff()
- self.pixel_setOff()
- self.SCT_setOff()
- self.TRT_setOff()
- self.BCM_setOff()
- def Calo_setOn (self):
- self.em_setOn()
- self.HEC_setOn()
- self.FCal_setOn()
- self.Tile_setOn()
- def Calo_setOff (self):
- self.em_setOff()
- self.HEC_setOff()
- self.FCal_setOff()
- self.Tile_setOff()
- def LAr_setOn (self):
- self.em_setOn()
- self.HEC_setOn()
- self.FCal_setOn()
- def LAr_setOff (self):
- self.em_setOff()
- self.HEC_setOff()
- self.FCal_setOff()
- def Muon_setOn (self):
- self.MDT_setOn()
- self.CSC_setOn()
- self.TGC_setOn()
- self.RPC_setOn()
- self.MM_setOn()
- self.sTGC_setOn()
- def Muon_setOff (self):
- self.MDT_setOff()
- self.CSC_setOff()
- self.TGC_setOff()
- self.RPC_setOff()
- self.MM_setOff()
- self.sTGC_setOff()
-
- # set on/off all detectors
- def all_setOn (self):
- self.Forward_setOn()
- self.ID_setOn()
- self.Calo_setOn()
- self.Muon_setOn()
- self.Truth_setOn()
- self.BField_setOn()
- self.LVL1_setOn()
- def all_setOff (self):
- self.Forward_setOff()
- self.ID_setOff()
- self.Calo_setOff()
- self.Muon_setOff()
- self.Truth_setOff()
- self.BField_setOff()
- self.LVL1_setOff()
- self.FTK_setOff()
-
- # get methods
- def Forward_on (self):
- return self.ALFA_on() | self.ZDC_on() | self.Lucid_on() | self.AFP_on() | self.FwdRegion_on()
- def Forward_allOn (self):
- return self.ALFA_on() & self.ZDC_on() & self.Lucid_on() & self.AFP_on() & self.FwdRegion_on()
- def ID_on (self):
- return self.bpipe_on() | self.pixel_on() | self.SCT_on() | self.TRT_on() | self.BCM_on()
- def ID_allOn (self):
- return self.bpipe_on() & self.pixel_on() & self.SCT_on() & self.TRT_on() & self.BCM_on()
- def LAr_on (self):
- return self.em_on() | self.HEC_on() | self.FCal_on()
- def LAr_allOn (self):
- return self.em_on() & self.HEC_on() & self.FCal_on()
- def Calo_on (self):
- return self.LAr_on() | self.Tile_on()
- def Calo_allOn (self):
- return self.LAr_allOn() & self.Tile_on()
- def Muon_on (self):
- return self.MDT_on() | self.CSC_on() | self.TGC_on() | self.RPC_on() | self.sTGC_on() | self.MM_on()
- def Muon_allOn (self):
- return self.MDT_on() & self.CSC_on() & self.TGC_on() & self.RPC_on() & self.sTGC_on() & self.MM_on()
-
- def any_on (self):
- return self.ID_on() | self.Calo_on() | self.Muon_on() | self.Forward_on() | self.Truth_on() | self.BField_on() | self.FTK_on()
- def allOn (self):
- return self.ID_allOn() & self.Calo_allOn() & self.Muon_allOn() & self.Forward_on() & self.Truth_on() & self.BField_on()
-
- # ORed task
- class ORedTask:
- def __init__ (self, task):
- # ORed task list
- self._oredTasks = []
- self._oredTasks.append(task)
-
- # import "_on" method from task
- for attr in dir(task)[:]:
- # select "_on" method
- if attr.find('_on')!=-1 or attr.find('_allOn')!=-1:
- # temporary class for function object
- class TmpC:
- def __init__ (tmpSelf, oredTasks, method):
- tmpSelf._oredTasks = oredTasks
- tmpSelf._method = method
-
- # test if any task is on
- def oredTasks_on (tmpSelf):
- for tmpTask in tmpSelf._oredTasks:
- if getattr(tmpTask, tmpSelf._method)():
- return True
- return False
-
- # register "_on" method
- tmpC = TmpC(self._oredTasks, attr)
- setattr(self,attr,tmpC.oredTasks_on)
-
- # add a task to ORed task list
- def addTask (self, task):
- self._oredTasks.append(task)
-
- # tasks
- geometry = SubDetectors()
- dcs = SubDetectors()
- simulate = SubDetectors()
- simulateLVL1 = SubDetectors()
- detdescr = SubDetectors()
- digitize = SubDetectors()
- pileup = SubDetectors()
- makeRIO = SubDetectors()
- writeBS = SubDetectors()
- readRDOBS = SubDetectors()
- readRDOPool = SubDetectors()
- readRIOBS = SubDetectors()
- writeRDOPool = SubDetectors()
- readRIOPool = SubDetectors()
- writeRIOPool = SubDetectors()
- overlay = SubDetectors()
-
- # task list
- _taskList = []
- _taskList.append(geometry)
- _taskList.append(dcs)
- _taskList.append(simulate)
- _taskList.append(simulateLVL1)
- _taskList.append(detdescr)
- _taskList.append(digitize)
- _taskList.append(pileup)
- _taskList.append(makeRIO)
- _taskList.append(writeBS)
- _taskList.append(readRDOBS)
- _taskList.append(readRDOPool)
- _taskList.append(readRIOBS)
- _taskList.append(writeRDOPool)
- _taskList.append(readRIOPool)
- _taskList.append(writeRIOPool)
- _taskList.append(overlay)
-
- # ORed tasks
- haveRIO = ORedTask(makeRIO)
- haveRIO.addTask(readRIOBS)
- haveRIO.addTask(readRIOPool)
-
- haveRDO = ORedTask(readRDOPool)
- haveRDO.addTask(readRDOBS)
-
- _oredTaskList = []
- _oredTaskList.append(haveRIO)
- _oredTaskList.append(haveRDO)
-
- # generic method to set on/off a detector for all tasks
- def _setAllTask (cls, det, switch):
- command = '%s_%s' % (det, switch)
- for task in cls._taskList:
- getattr(task,command)()
-
- # set on/off sub-detector
- def bpipe_setOn (cls):
- cls._setAllTask('bpipe','setOn')
- def bpipe_setOff (cls):
- cls._setAllTask('bpipe','setOff')
- def pixel_setOn (cls):
- cls._setAllTask('pixel','setOn')
- def pixel_setOff (cls):
- cls._setAllTask('pixel','setOff')
- def SCT_setOn (cls):
- cls._setAllTask('SCT','setOn')
- def SCT_setOff (cls):
- cls._setAllTask('SCT','setOff')
- def TRT_setOn (cls):
- cls._setAllTask('TRT','setOn')
- def TRT_setOff (cls):
- cls._setAllTask('TRT','setOff')
- def BCM_setOn (cls):
- cls._setAllTask('BCM','setOn')
- def BCM_setOff (cls):
- cls._setAllTask('BCM','setOff')
-
- def ALFA_setOn (cls):
- cls._setAllTask('ALFA','setOn')
- def ALFA_setOff (cls):
- cls._setAllTask('ALFA','setOff')
- def AFP_setOn (cls):
- cls._setAllTask('AFP','setOn')
- def AFP_setOff (cls):
- cls._setAllTask('AFP','setOff')
- def FwdRegion_setOn (cls):
- cls._setAllTask('FwdRegion','setOn')
- def FwdRegion_setOff (cls):
- cls._setAllTask('FwdRegion','setOff')
- def ZDC_setOn (cls):
- cls._setAllTask('ZDC','setOn')
- def ZDC_setOff (cls):
- cls._setAllTask('ZDC','setOff')
- def Lucid_setOn (cls):
- cls._setAllTask('Lucid','setOn')
- def Lucid_setOff (cls):
- cls._setAllTask('Lucid','setOff')
-
- def em_setOn (cls):
- cls._setAllTask('em','setOn')
- def em_setOff (cls):
- cls._setAllTask('em','setOff')
- def HEC_setOn (cls):
- cls._setAllTask('HEC','setOn')
- def HEC_setOff (cls):
- cls._setAllTask('HEC','setOff')
- def FCal_setOn (cls):
- cls._setAllTask('FCal','setOn')
- def FCal_setOff (cls):
- cls._setAllTask('FCal','setOff')
- def Tile_setOn (cls):
- cls._setAllTask('Tile','setOn')
- def Tile_setOff (cls):
- cls._setAllTask('Tile','setOff')
-
- def MDT_setOn (cls):
- cls._setAllTask('MDT','setOn')
- def MDT_setOff (cls):
- cls._setAllTask('MDT','setOff')
- def CSC_setOn (cls):
- cls._setAllTask('CSC','setOn')
- def CSC_setOff (cls):
- cls._setAllTask('CSC','setOff')
- def TGC_setOn (cls):
- cls._setAllTask('TGC','setOn')
- def TGC_setOff (cls):
- cls._setAllTask('TGC','setOff')
- def RPC_setOn (cls):
- cls._setAllTask('RPC','setOn')
- def RPC_setOff (cls):
- cls._setAllTask('RPC','setOff')
- def sTGC_setOn (cls):
- cls._setAllTask('sTGC','setOn')
- def sTGC_setOff (cls):
- cls._setAllTask('sTGC','setOff')
- def MM_setOn (cls):
- cls._setAllTask('MM','setOn')
- def MM_setOff (cls):
- cls._setAllTask('MM','setOff')
-
- def Truth_setOn (cls):
- cls._setAllTask('Truth','setOn')
- def Truth_setOff (cls):
- cls._setAllTask('Truth','setOff')
-
- def BField_setOn (cls):
- cls._setAllTask('BField','setOn')
- def BField_setOff (cls):
- cls._setAllTask('BField','setOff')
-
- def FTK_setOn (cls):
- pass
- def FTK_setOff (cls):
- cls._setAllTask('FTK','setOff')
-
- def LVL1_setOn (cls):
- cls._setAllTask('LVL1','setOn')
- def LVL1_setOff (cls):
- cls._setAllTask('LVL1','setOff')
-
- # set on/off detector
- def Forward_setOn (cls):
- cls._setAllTask('Forward','setOn')
- def Forward_setOff (cls):
- cls._setAllTask('Forward','setOff')
- def ID_setOn (cls):
- cls._setAllTask('ID','setOn')
- def ID_setOff (cls):
- cls._setAllTask('ID','setOff')
- def Calo_setOn (cls):
- cls._setAllTask('Calo','setOn')
- def Calo_setOff (cls):
- cls._setAllTask('Calo','setOff')
- def LAr_setOn (cls):
- cls._setAllTask('LAr','setOn')
- def LAr_setOff (cls):
- cls._setAllTask('LAr','setOff')
- def Muon_setOn (cls):
- cls._setAllTask('Muon','setOn')
- def Muon_setOff (cls):
- cls._setAllTask('Muon','setOff')
-
- def all_setOn (cls):
- cls._setAllTask('all','setOn')
- def all_setOff (cls):
- cls._setAllTask('all','setOff')
-
- # generic method to test whether a detector is on for any tasks
- def _anyTask_on (cls, det):
- command = '%s_on' % det
- for task in cls._taskList:
- if getattr(task,command)():
- return True
- return False
-
- # test whether a sub-detector is on for any tasks
- def bpipe_on (cls):
- return cls._anyTask_on('bpipe')
- def pixel_on (cls):
- return cls._anyTask_on('pixel')
- def SCT_on (cls):
- return cls._anyTask_on('SCT')
- def TRT_on (cls):
- return cls._anyTask_on('TRT')
- def BCM_on (cls):
- return cls._anyTask_on('BCM')
-
- def ALFA_on (cls):
- return cls._anyTask_on('ALFA')
- def AFP_on (cls):
- return cls._anyTask_on('AFP')
- def FwdRegion_on (cls):
- return cls._anyTask_on('FwdRegion')
- def ZDC_on (cls):
- return cls._anyTask_on('ZDC')
- def Lucid_on (cls):
- return cls._anyTask_on('Lucid')
-
- def em_on (cls):
- return cls._anyTask_on('em')
- def HEC_on (cls):
- return cls._anyTask_on('HEC')
- def FCal_on (cls):
- return cls._anyTask_on('FCal')
- def Tile_on (cls):
- return cls._anyTask_on('Tile')
-
- def MDT_on (cls):
- return cls._anyTask_on('MDT')
- def CSC_on (cls):
- return cls._anyTask_on('CSC')
- def TGC_on (cls):
- return cls._anyTask_on('TGC')
- def RPC_on (cls):
- return cls._anyTask_on('RPC')
- def sTGC_on (cls):
- return cls._anyTask_on('sTGC')
- def MM_on (cls):
- return cls._anyTask_on('MM')
-
- def Truth_on (cls):
- return cls._anyTask_on('Truth')
-
- def BField_on(cls):
- return cls._anyTask_on('BField')
-
- def FTK_on(cls):
- return cls._anyTask_on('FTK')
-
- def LVL1_on (cls):
- return cls._anyTask_on('LVL1')
-
- # test whether a detector is on for any tasks
- def Forward_on (cls):
- return cls._anyTask_on('Forward')
- def ID_on (cls):
- return cls._anyTask_on('ID')
- def Calo_on (cls):
- return cls._anyTask_on('Calo')
- def LAr_on (cls):
- return cls._anyTask_on('LAr')
- def Muon_on (cls):
- return cls._anyTask_on('Muon')
-
- def any_on (cls):
- return cls._anyTask_on('any')
-
- # show flags
- def Print (cls):
- id =["bpipe","pixel","SCT","TRT","BCM"]
- forward=["Lucid", "ZDC", "ALFA", "AFP", "FwdRegion"]
- calo=["em","HEC","FCal","Tile"]
- muon=["MDT","CSC","TGC","RPC","sTGC","MM"]
- truth=["Truth"]
- l1=["LVL1"]
- bf=["BField"]
- ftk=["FTK"]
- # crate detectors row and format
- item=[]
- item.append("")
- format = "%13s :"
- alldets=id+forward+calo+muon+truth+l1+bf+ftk
- for det in alldets:
- format += "%"+str(max(6,len(det)+1))+"s" #"%10s"
- item.append(det)
- # print detectors row
- print (format % tuple(item))
-
- # print flags for each task
- for attr in dir(cls)[:]:
- # check if this attribute is in the task list
- if "__" not in attr: #avoid __class__ etc
- if cls.__dict__[attr] in cls._taskList+cls._oredTaskList:
- item=[]
- # task name
- item.append(attr)
- for det in alldets:
- # test whether each detector is on
- command = "%s_on" % det
- if getattr(cls.__dict__[attr],command)():
- item.append("ON")
- else:
- item.append("--")
- # print
- print (format % tuple(item))
-
- # class method
- _setAllTask = classmethod(_setAllTask)
- bpipe_setOn = classmethod(bpipe_setOn)
- bpipe_setOff = classmethod(bpipe_setOff)
- pixel_setOn = classmethod(pixel_setOn)
- pixel_setOff = classmethod(pixel_setOff)
- SCT_setOn = classmethod(SCT_setOn)
- SCT_setOff = classmethod(SCT_setOff)
- TRT_setOn = classmethod(TRT_setOn)
- TRT_setOff = classmethod(TRT_setOff)
- BCM_setOn = classmethod(BCM_setOn)
- BCM_setOff = classmethod(BCM_setOff)
- ALFA_setOn = classmethod(ALFA_setOn)
- ALFA_setOff= classmethod(ALFA_setOff)
- AFP_setOn = classmethod(AFP_setOn)
- AFP_setOff= classmethod(AFP_setOff)
- ZDC_setOn = classmethod(ZDC_setOn)
- ZDC_setOff = classmethod(ZDC_setOff)
- Lucid_setOn = classmethod(Lucid_setOn)
- Lucid_setOff = classmethod(Lucid_setOff)
- FwdRegion_setOn = classmethod(FwdRegion_setOn)
- FwdRegion_setOff= classmethod(FwdRegion_setOff)
- em_setOn = classmethod(em_setOn)
- em_setOff = classmethod(em_setOff)
- HEC_setOn = classmethod(HEC_setOn)
- HEC_setOff = classmethod(HEC_setOff)
- FCal_setOn = classmethod(FCal_setOn)
- FCal_setOff = classmethod(FCal_setOff)
- Tile_setOn = classmethod(Tile_setOn)
- Tile_setOff = classmethod(Tile_setOff)
- MDT_setOn = classmethod(MDT_setOn)
- MDT_setOff = classmethod(MDT_setOff)
- CSC_setOn = classmethod(CSC_setOn)
- CSC_setOff = classmethod(CSC_setOff)
- TGC_setOn = classmethod(TGC_setOn)
- TGC_setOff = classmethod(TGC_setOff)
- RPC_setOn = classmethod(RPC_setOn)
- RPC_setOff = classmethod(RPC_setOff)
- sTGC_setOn = classmethod(sTGC_setOn)
- sTGC_setOff = classmethod(sTGC_setOff)
- MM_setOn = classmethod(MM_setOn)
- MM_setOff = classmethod(MM_setOff)
- Truth_setOn = classmethod(Truth_setOn)
- Truth_setOff = classmethod(Truth_setOff)
- BField_setOn = classmethod(BField_setOn)
- BField_setOff = classmethod(BField_setOff)
- FTK_setOn = classmethod(FTK_setOn)
- FTK_setOff = classmethod(FTK_setOff)
- LVL1_setOn = classmethod(LVL1_setOn)
- LVL1_setOff = classmethod(LVL1_setOff)
- Forward_setOn = classmethod(Forward_setOn)
- Forward_setOff = classmethod(Forward_setOff)
- ID_setOn = classmethod(ID_setOn)
- ID_setOff = classmethod(ID_setOff)
- Calo_setOn = classmethod(Calo_setOn)
- Calo_setOff = classmethod(Calo_setOff)
- LAr_setOn = classmethod(LAr_setOn)
- LAr_setOff = classmethod(LAr_setOff)
- Muon_setOn = classmethod(Muon_setOn)
- Muon_setOff = classmethod(Muon_setOff)
- all_setOn = classmethod(all_setOn)
- all_setOff = classmethod(all_setOff)
-
- _anyTask_on = classmethod(_anyTask_on)
- bpipe_on = classmethod(bpipe_on)
- pixel_on = classmethod(pixel_on)
- SCT_on = classmethod(SCT_on)
- TRT_on = classmethod(TRT_on)
- BCM_on = classmethod(BCM_on)
- ALFA_on = classmethod(ALFA_on)
- AFP_on = classmethod(AFP_on)
- ZDC_on = classmethod(ZDC_on)
- Lucid_on = classmethod(Lucid_on)
- FwdRegion_on = classmethod(FwdRegion_on)
- em_on = classmethod(em_on)
- HEC_on = classmethod(HEC_on)
- FCal_on = classmethod(FCal_on)
- Tile_on = classmethod(Tile_on)
- MDT_on = classmethod(MDT_on)
- CSC_on = classmethod(CSC_on)
- TGC_on = classmethod(TGC_on)
- RPC_on = classmethod(RPC_on)
- sTGC_on = classmethod(sTGC_on)
- MM_on = classmethod(MM_on)
-
- Truth_on = classmethod(Truth_on)
- BField_on = classmethod(BField_on)
- FTK_on = classmethod(FTK_on)
- LVL1_on = classmethod(LVL1_on)
- Forward_on = classmethod(Forward_on)
- ID_on = classmethod(ID_on)
- Calo_on = classmethod(Calo_on)
- LAr_on = classmethod(LAr_on)
- Muon_on = classmethod(Muon_on)
- any_on = classmethod(any_on)
-
- Print = classmethod(Print)
diff --git a/Control/AthenaMonitoringKernel/python/GenericMonitoringTool.py b/Control/AthenaMonitoringKernel/python/GenericMonitoringTool.py
index 961751aa0f3a5a51164481d8e2f6908bd7d3a6a2..f6223798653034bce61d9340a1ca7b6d698c9c92 100644
--- a/Control/AthenaMonitoringKernel/python/GenericMonitoringTool.py
+++ b/Control/AthenaMonitoringKernel/python/GenericMonitoringTool.py
@@ -426,6 +426,9 @@ def defineHistogram(flags, varname, type='TH1F', path=None,
assert isinstance(ylabels, (list, tuple)),'ylabels must be list or tuple'
settings['ybins'] = len(ylabels)
settings['ylabels'] = ylabels
+ # if user did not specify ymin and ymax, set it here, as cannot have ymin=ymax=0
+ if ymin is None: settings["ymin"] = 0
+ if ymax is None: settings["ymax"] = settings["ymin"]+1
if zlabels is not None and len(zlabels)>0:
assert isinstance(zlabels, (list, tuple)),'zlabels must be list or tuple'
settings['zlabels'] = zlabels
diff --git a/Control/AthenaMonitoringKernel/test/test_defineHistogram.py b/Control/AthenaMonitoringKernel/test/test_defineHistogram.py
index cac4a894c0a6b417fa8756a08cd85123eb479f92..39993d79bd5d2e33463fae79ac27dcc8bbdf2b23 100644
--- a/Control/AthenaMonitoringKernel/test/test_defineHistogram.py
+++ b/Control/AthenaMonitoringKernel/test/test_defineHistogram.py
@@ -61,7 +61,7 @@ class Test( unittest.TestCase ):
def test_1D_labelsY( self ):
flags = initConfigFlags()
check = defineHistogram(flags, 'var', ylabels=["bin0", "bin1"])
- true = '{"alias": "var", "allvars": ["var"], "convention": "", "merge": "", "path": "", "title": "var", "treeDef": "", "type": "TH1F", "weight": "", "cutMask": "", "xarray": [], "xbins": 100, "xlabels": [], "xmax": 1, "xmin": 0, "xvar": "var", "yarray": [], "ybins": 2, "ylabels": ["bin0", "bin1"], "ymax": 0.0, "ymin": 0.0, "yvar": "", "zbins": 0.0, "zlabels": [], "zmax": 0.0, "zmin": 0.0, "zvar": "", "Sumw2": false, "kLBNHistoryDepth": 0, "kAddBinsDynamically": false, "kRebinAxes": false, "kCanRebin": false, "kVec": false, "kVecUO": false, "kCumulative": false, "kLive": false, "kAlwaysCreate": false}'
+ true = '{"alias": "var", "allvars": ["var"], "convention": "", "merge": "", "path": "", "title": "var", "treeDef": "", "type": "TH1F", "weight": "", "cutMask": "", "xarray": [], "xbins": 100, "xlabels": [], "xmax": 1, "xmin": 0, "xvar": "var", "yarray": [], "ybins": 2, "ylabels": ["bin0", "bin1"], "ymax": 1.0, "ymin": 0.0, "yvar": "", "zbins": 0.0, "zlabels": [], "zmax": 0.0, "zmin": 0.0, "zvar": "", "Sumw2": false, "kLBNHistoryDepth": 0, "kAddBinsDynamically": false, "kRebinAxes": false, "kCanRebin": false, "kVec": false, "kVecUO": false, "kCumulative": false, "kLive": false, "kAlwaysCreate": false}'
self.assertEqual(json.loads(check), json.loads(true))
def test_2D( self ):
@@ -85,7 +85,7 @@ class Test( unittest.TestCase ):
def test_2D_labelsXY( self ):
flags = initConfigFlags()
check = defineHistogram(flags, 'varX,varY', 'TH2F', xlabels=["bin0", "bin1"], ylabels=["bin0", "bin1", "bin2"])
- true = '{"alias": "varY_vs_varX", "allvars": ["varX", "varY"], "convention": "", "merge": "", "path": "", "title": "varX,varY", "treeDef": "", "type": "TH2F", "weight": "", "cutMask": "", "xarray": [], "xbins": 2, "xlabels": ["bin0", "bin1"], "xmax": 1, "xmin": 0, "xvar": "varX", "yarray": [], "ybins": 3, "ylabels": ["bin0", "bin1", "bin2"], "ymax": 0.0, "ymin": 0.0, "yvar": "varY", "zbins": 0.0, "zlabels": [], "zmax": 0.0, "zmin": 0.0, "zvar": "", "Sumw2": false, "kLBNHistoryDepth": 0, "kAddBinsDynamically": false, "kRebinAxes": false, "kCanRebin": false, "kVec": false, "kVecUO": false, "kCumulative": false, "kLive": false, "kAlwaysCreate": false}'
+ true = '{"alias": "varY_vs_varX", "allvars": ["varX", "varY"], "convention": "", "merge": "", "path": "", "title": "varX,varY", "treeDef": "", "type": "TH2F", "weight": "", "cutMask": "", "xarray": [], "xbins": 2, "xlabels": ["bin0", "bin1"], "xmax": 1, "xmin": 0, "xvar": "varX", "yarray": [], "ybins": 3, "ylabels": ["bin0", "bin1", "bin2"], "ymax": 1.0, "ymin": 0.0, "yvar": "varY", "zbins": 0.0, "zlabels": [], "zmax": 0.0, "zmin": 0.0, "zvar": "", "Sumw2": false, "kLBNHistoryDepth": 0, "kAddBinsDynamically": false, "kRebinAxes": false, "kCanRebin": false, "kVec": false, "kVecUO": false, "kCumulative": false, "kLive": false, "kAlwaysCreate": false}'
self.assertEqual(json.loads(check), json.loads(true))
def test_3D( self ):
diff --git a/DataQuality/DataQualityInterfaces/python/han.py b/DataQuality/DataQualityInterfaces/python/han.py
index d71c0a8864c245958e97b272766777dad893951d..aeb0fb5786315ed9bf2f42291c812c6fb263feec 100644
--- a/DataQuality/DataQualityInterfaces/python/han.py
+++ b/DataQuality/DataQualityInterfaces/python/han.py
@@ -71,6 +71,7 @@ def FixRegion(config: ROOT.TDirectory, top_level: dqi.HanConfigGroup, td: ROOT.T
"""Main code to translate the configuration given by 'top_level' into the
final configuration by expanding the regexes using the objects in 'td'"""
log.info('Translating regexes...')
+ HanConfigGroup = dqi.HanConfigGroup
refmapcache = {} # Avoid repeated lookups of reference TMaps
mapping = {}
@@ -81,14 +82,14 @@ def FixRegion(config: ROOT.TDirectory, top_level: dqi.HanConfigGroup, td: ROOT.T
iterate_hcfg(top_level, mapping, mapping_regex, mapping_groups)
mapping_assessors_final.update(mapping)
for path, g in mapping_groups.items():
- newgroup = dqi.HanConfigGroup()
+ newgroup = HanConfigGroup()
newgroup.SetName(g.GetName())
newgroup.SetPathName(path)
copyMetadata(newgroup, g)
mapping_groups_final[path] = newgroup
- l = []
+ l: List[str] = []
iterate_objs(td, l, td.GetPath())
for path, (a, p) in mapping_regex.items():
pre = re.compile(p)
@@ -110,7 +111,7 @@ def FixRegion(config: ROOT.TDirectory, top_level: dqi.HanConfigGroup, td: ROOT.T
if orig in mapping_groups_final:
log.debug(f'Deleting {orig}')
del mapping_groups_final[orig]
- newgroup = dqi.HanConfigGroup()
+ newgroup = HanConfigGroup()
newgroup.SetName(formatted_tok)
newgroup.SetPathName(target)
oldgroup = mapping_groups[orig]
@@ -158,9 +159,10 @@ def FixRegion(config: ROOT.TDirectory, top_level: dqi.HanConfigGroup, td: ROOT.T
log.error(f'Unable to look up assessor parent directory. Full error follows\n{e}: path {p}, assessor {a}, assessor name {a.GetName()}')
# need to in reverse order of depth. First count number of slashes:
keydepths = count_slashes(mapping_groups_final.items())
- for _, l in sorted(keydepths.items(), reverse=True):
- for p, g in l:
- log.debug(f'Final additions for {p}, {g}, {g.GetPathName()} into {os.path.dirname(p)}')
+ for _, l2 in sorted(keydepths.items(), reverse=True):
+ for p, g in l2:
+ if log.level <= logging.DEBUG:
+ log.debug(f'Final additions for {p}, {g.GetName()}, {g.GetPathName()} into {os.path.dirname(p)}')
if p != 'top_level':
try:
mapping_groups_final[os.path.dirname(p)].AddGroup(g)
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt b/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt
index c3d94b7fc0452f0aed15b3a6be74d8ce037cc32a..ded8bf3f65908af16e669631d9e8500ac323a87e 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# Declare the package name:
atlas_subdir( AthenaPoolUtilities )
@@ -26,16 +26,12 @@ atlas_add_dictionary( AthenaPoolUtilitiesDict
LINK_LIBRARIES AthenaPoolUtilities )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( share/post_tpcnvtest.sh )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Install the CMake code from the package:
atlas_install_generic( cmake/AthenaPoolUtilitiesTestConfig.cmake
DESTINATION cmake )
-atlas_install_generic( share/run_tpcnv_legacy_test.sh.in
- DESTINATION cmake/modules/scripts
- EXECUTABLE )
atlas_install_generic( share/run_tpcnv_test.sh.in
DESTINATION cmake/modules/scripts
EXECUTABLE )
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake b/Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake
index 0c8b718cec1581ffba786b11db87362103a99dd6..47570d20fff39dcb4a3de0545e3892f3b2ffd3a2 100644
--- a/Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake
+++ b/Database/AthenaPOOL/AthenaPoolUtilities/cmake/AthenaPoolUtilitiesTestConfig.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
# @file AthenaPoolUtilities/share/AthenaPoolUtilitiesTestConfig.make
@@ -8,47 +8,8 @@
#
# Example:
#
-# run_tpcnv_legacy_test( TrackParticleTPCnv_17.2.8 AOD-17.2.8-full )
+# run_tpcnv_test( TrackParticleTPCnv_17.2.8 AOD-17.2.8-full )
#
-
-function( run_tpcnv_legacy_test testName refName )
-
- cmake_parse_arguments( ARG "" "REFERENCE_TAG" "REQUIRED_LIBRARIES" ${ARGN} )
-
- # The package name is needed for the configuration of the test script:
- atlas_get_package_name( pkgName )
-
- # Find the test runner script:
- find_file( ATLAS_TPCNV_LEGACY_TEST_RUNNER "run_tpcnv_legacy_test.sh.in"
- PATH_SUFFIXES "share" "scripts"
- PATHS "${AthenaPoolUtilitiesTest_DIR}/.."
- "${CMAKE_BINARY_DIR}/${ATLAS_PLATFORM}/cmake/modules"
- ${CMAKE_MODULE_PATH} )
- if( NOT ATLAS_TPCNV_LEGACY_TEST_RUNNER )
- message( WARNING "Couldn't find run_tpcnv_legacy_test.sh.in" )
- return()
- endif()
- mark_as_advanced( ATLAS_TPCNV_LEGACY_TEST_RUNNER )
-
- # Create the script that will be run:
- configure_file( "${ATLAS_TPCNV_LEGACY_TEST_RUNNER}"
- "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/tpcnv_legacy_${testName}.sh"
- @ONLY )
-
- set( _env )
- if( ARG_REFERENCE_TAG )
- set( _env ENVIRONMENT "ATLAS_REFERENCE_TAG=${pkgName}/${ARG_REFERENCE_TAG}" )
- endif()
-
- # Create a test with it:
- atlas_add_test( ${testName}
- SCRIPT
- "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/tpcnv_legacy_${testName}.sh"
- PROPERTIES TIMEOUT 600
- POST_EXEC_SCRIPT "post_tpcnvtest.sh ${testName}" ${_env} )
-
-endfunction( run_tpcnv_legacy_test )
-
function( run_tpcnv_test testName refName )
cmake_parse_arguments( ARG "" "REFERENCE_TAG" "REQUIRED_LIBRARIES" ${ARGN} )
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/share/TPCnvTest.py b/Database/AthenaPOOL/AthenaPoolUtilities/share/TPCnvTest.py
deleted file mode 100644
index 407001097e82a4d9f704e564a637ba5d0b294c21..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolUtilities/share/TPCnvTest.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-##
-# @file AthenaPoolUtilities/share/TPCnvTest.py
-# @author sss
-# @date Nov 2015
-# @brief Helper for testing reading old data files.
-#
-# This JO can be used to test the reading of an old data file.
-#
-# Set the variable `infile' to the file to be read.
-# If this is not an absolute path, it is looked for under
-# /afs/cern.ch/atlas/maxidisk/d33/referencefiles.
-# Set the variable keys to the list of SG keys to dump.
-# A dump will be made to the file given by appending `.dump'
-# to the base part of infile.
-# The dump will be compared against a reference file in share.
-#
-
-import AthenaCommon.AtlasUnixStandardJob
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from PyUtils.moduleExists import moduleExists
-from PyUtils.fprint import fprintln
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-from future import standard_library
-standard_library.install_aliases()
-import subprocess
-
-# Make sure we don't have a stale file catalog.
-import os
-if os.path.exists ('PoolFileCatalog.xml'):
- os.remove ('PoolFileCatalog.xml')
-
-if (not 'ATLAS_REFERENCE_TAG' in globals() and
- 'ATLAS_REFERENCE_TAG' in os.environ):
- ATLAS_REFERENCE_TAG = os.environ['ATLAS_REFERENCE_TAG']
-
-refpaths = [os.environ.get ('ATLAS_REFERENCE_DATA', None),
- '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art',
- '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs',
- '/afs/cern.ch/atlas/maxidisk/d33/referencefiles']
-if infile.startswith ('rtt:'):
- infile = infile[4:]
-
-
-from AthenaPoolUtilities.DumperConfig import find_file, Dumper
-svcMgr.EventSelector.InputCollections = [ find_file (infile, refpaths) ]
-
-from AthenaCommon.DetFlags import DetFlags
-if not globals().get ('noMuon',False):
- DetFlags.detdescr.Muon_setOn()
- if moduleExists ('MuonRecExample'):
- import MuonRecExample.MuonAlignConfig
-if not globals().get ('noID',False):
- DetFlags.detdescr.ID_setOn()
-
-from AthenaCommon.JobProperties import jobproperties
-if jobproperties.Global.DetDescrVersion.isDefault():
- jobproperties.Global.DetDescrVersion = 'ATLAS-R1-2012-03-02-00'
-have_atlas_geo = moduleExists ('AtlasGeoModel')
-if have_atlas_geo:
- import AtlasGeoModel.GeoModelInit
- import AtlasGeoModel.SetGeometryVersion
- svcMgr.GeoModelSvc.IgnoreTagDifference = True
-
-if have_atlas_geo and moduleExists ('TrkEventCnvTools') and moduleExists ('MuonEventCnvTools'):
- from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
- from TrkEventCnvTools import TrkEventCnvToolsConf
- EventCnvSuperTool = TrkEventCnvToolsConf.Trk__EventCnvSuperTool('EventCnvSuperTool')
- if not hasattr(svcMgr, "MuonIdHelperSvc"):
- from AthenaCommon.CfgGetter import getService
- svcMgr += getService("MuonIdHelperSvc")
- ToolSvc += EventCnvSuperTool
-
-dumper = Dumper ('dumper', infile, keys, refpaths)
-topSequence += [dumper]
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/share/pre_tpcnvtest.sh b/Database/AthenaPOOL/AthenaPoolUtilities/share/pre_tpcnvtest.sh
deleted file mode 100755
index 559e7d78fc06fc974620382f58bb5c688500b648..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolUtilities/share/pre_tpcnvtest.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-test=$1
-if [ "$test" = "" ]; then
- exit 0
-fi
-
-testdir=${test}-${CMTCONFIG}
-rm -rf $testdir
-mkdir $testdir
-
-cd $testdir
-
-
diff --git a/Database/AthenaPOOL/AthenaPoolUtilities/share/run_tpcnv_legacy_test.sh.in b/Database/AthenaPOOL/AthenaPoolUtilities/share/run_tpcnv_legacy_test.sh.in
deleted file mode 100755
index ef9d28f7fe107b05740a412160bd235aa2fcc84e..0000000000000000000000000000000000000000
--- a/Database/AthenaPOOL/AthenaPoolUtilities/share/run_tpcnv_legacy_test.sh.in
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-for libroot in @ARG_REQUIRED_LIBRARIES@; do
- fullpath=""
- for p in `echo $LD_LIBRARY_PATH | tr : ' ' `; do
- thispath="$p/@CMAKE_SHARED_LIBRARY_PREFIX@${libroot}@CMAKE_SHARED_LIBRARY_SUFFIX@"
- if [ -r "$thispath" ]; then
- fullpath="$thispath"
- fi
- done
- if [ "$fullpath" = "" ]; then
- echo "WARNING: Library $libroot not found; skipping test @testName@"
- # Signal post_tpcnvtest.sh to skip the reffile comparison.
- touch @testName@-SKIPPED
- exit 0
- fi
-done
-rm -f @testName@-SKIPPED
-
-reffile=`echo @CMAKE_CURRENT_SOURCE_DIR@/share/@refName@.pool.root*.ref`
-if [ -f "$reffile" ] &&
- [ "@CMAKE_CURRENT_SOURCE_DIR@" != "@CMAKE_CURRENT_BINARY_DIR@" ]; then
- refbase=`basename $reffile`
- @CMAKE_COMMAND@ -E make_directory ../share
- @CMAKE_COMMAND@ -E create_symlink \
- $reffile ../share/$refbase
-fi
-
-testdir=@testName@
-rm -rf $testdir
-mkdir $testdir
-cd $testdir
-
-athena.py @pkgName@/@testName@_test.py
diff --git a/Event/EventAthenaPool/share/EventTPCnv_15.0.0_test.py b/Event/EventAthenaPool/share/EventTPCnv_15.0.0_test.py
deleted file mode 100644
index f28033a9e7653d309430e8e715a7fbf6c62abe30..0000000000000000000000000000000000000000
--- a/Event/EventAthenaPool/share/EventTPCnv_15.0.0_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-infile = 'aod/AOD-15.0.0/AOD-15.0.0-full.pool.root'
-keys = [
- #EventInfo_p2
- 'McEventInfo',
-
- #EventStreamInfo_p1
- 'InputMetaDataStore/StreamAOD',
- ]
-
-include ('EventAthenaPool/EventAthenaPoolTestDump.py')
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/EventAthenaPool/share/EventTPCnv_17.5.0_test.py b/Event/EventAthenaPool/share/EventTPCnv_17.5.0_test.py
deleted file mode 100644
index 17d9acf5ceca5cdc049952ff170d05b5552586bb..0000000000000000000000000000000000000000
--- a/Event/EventAthenaPool/share/EventTPCnv_17.5.0_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-infile = 'aod/AOD-17.5.0/AOD-17.5.0-full.pool.root'
-keys = [
- #EventInfo_p3
- 'McEventInfo',
-
- #EventStreamInfo_p2
- 'InputMetaDataStore/StreamAOD',
- ]
-
-include ('EventAthenaPool/EventAthenaPoolTestDump.py')
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/EventAthenaPool/share/EventTPCnv_18.0.0_test.py b/Event/EventAthenaPool/share/EventTPCnv_18.0.0_test.py
deleted file mode 100644
index 8368f0b822e29cd58732f3b64abb8cedeed88036..0000000000000000000000000000000000000000
--- a/Event/EventAthenaPool/share/EventTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #EventInfo_p4
- 'McEventInfo',
-
- #EventStreamInfo_p2
- 'InputMetaDataStore/StreamAOD',
- ]
-
-include ('EventAthenaPool/EventAthenaPoolTestDump.py')
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/EventAthenaPool/share/EventTPCnv_20.1.7.2_test.py b/Event/EventAthenaPool/share/EventTPCnv_20.1.7.2_test.py
deleted file mode 100644
index e45e29eee498cbec358923f584db89744758043a..0000000000000000000000000000000000000000
--- a/Event/EventAthenaPool/share/EventTPCnv_20.1.7.2_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #EventStreamInfo_p3
- 'InputMetaDataStore/StreamESD',
-
- #PileUpEventInfo_p5
- 'OverlayEvent',
- ]
-
-include ('EventAthenaPool/EventAthenaPoolTestDump.py')
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/EventBookkeeperAthenaPool/CMakeLists.txt b/Event/EventBookkeeperAthenaPool/CMakeLists.txt
index dc5ccdccfaa9fadf4da73c568a9abc6b7a08953f..50ae6c317a45ac75a7a21f7f68eae4526e7b1c1e 100644
--- a/Event/EventBookkeeperAthenaPool/CMakeLists.txt
+++ b/Event/EventBookkeeperAthenaPool/CMakeLists.txt
@@ -14,7 +14,6 @@ atlas_add_poolcnv_library( EventBookkeeperAthenaPoolPoolCnv
EventBookkeeperMetaData EventBookkeeperTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/EventBookkeeperAthenaPool/share/EventBookkeeperTPCnv_16.0.0_test.py b/Event/EventBookkeeperAthenaPool/share/EventBookkeeperTPCnv_16.0.0_test.py
deleted file mode 100644
index a86182893b02502f0fe92bf011e2fcefa8917fe8..0000000000000000000000000000000000000000
--- a/Event/EventBookkeeperAthenaPool/share/EventBookkeeperTPCnv_16.0.0_test.py
+++ /dev/null
@@ -1,18 +0,0 @@
-infile = 'aod/AOD-16.0.0/AOD-16.0.0-full.pool.root'
-keys = [
- #EventBookkeeperCollection_p1
- 'InputMetaDataStore/EventBookkeepers@4',
- 'InputMetaDataStore/EventSelector.Counter',
-
- #SkimDecisionCollection_p1
- 'StreamAOD_SkimDecisionsContainer',
- 'StreamESD_SkimDecisionsContainer',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Event/EventBookkeeperAthenaPool/share/EventBookkeeperTPCnv_18.0.0_test.py b/Event/EventBookkeeperAthenaPool/share/EventBookkeeperTPCnv_18.0.0_test.py
deleted file mode 100644
index da51cf41994c56d8ee2476053d38df8b6742dcca..0000000000000000000000000000000000000000
--- a/Event/EventBookkeeperAthenaPool/share/EventBookkeeperTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,17 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #EventBookkeeperCollection_p2
- 'InputMetaDataStore/IncompleteEventBookkeepers',
- 'InputMetaDataStore/EventBookkeepers@4',
-
- #SkimDecisionCollection_p1
- 'StreamESD_SkimDecisionsContainer',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Event/xAOD/xAODBTaggingAthenaPool/CMakeLists.txt b/Event/xAOD/xAODBTaggingAthenaPool/CMakeLists.txt
index 7f370b13b49f821717f9905b62f7ffefa743a14f..0d8c31034002eae50791a077231fc0a253b54d9b 100644
--- a/Event/xAOD/xAODBTaggingAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODBTaggingAthenaPool/CMakeLists.txt
@@ -23,7 +23,6 @@ atlas_add_poolcnv_library( xAODBTaggingAthenaPoolPoolCnv
xAODTracking GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODBTaggingAthenaPool/share/xAODBTaggingAthenaPool_21.0.79_test.py b/Event/xAOD/xAODBTaggingAthenaPool/share/xAODBTaggingAthenaPool_21.0.79_test.py
deleted file mode 100644
index ad89d0a5f4f1e7ef49123d39ffd096b8353f3a28..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODBTaggingAthenaPool/share/xAODBTaggingAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::BTaggingAuxContainer_v1
- 'BTagging_AntiKt4EMTopo',
-
- #xAOD::BTaggingTrigAuxContainer_v1
- 'HLT_xAOD__BTaggingContainer_HLTBjetFex',
-
- #xAOD::BTagVertexAuxContainer_v1
- 'BTagging_AntiKt4EMTopoJFVtx',
- 'HLT_xAOD__BTagVertexContainer_BjetVertexFex',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt b/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
index 5901acedf5bb5eed03cd14439426dc95880890f7..549bb1ccb66fb919e887e64d0ff093d371ab2a38 100644
--- a/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODCaloEventAthenaPool/CMakeLists.txt
@@ -23,7 +23,6 @@ atlas_add_poolcnv_library( xAODCaloEventAthenaPoolPoolCnv
AthenaPoolUtilities xAODCaloEvent GaudiKernel ${extra_libs} )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# In AthAnalysis xAOD::CaloCluster doesn't know about its CaloCell link. Which
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index fd0ae1a54f07a0eabc18abf2c302b7eb9769494e..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #xAOD::CaloCluster
- 'CaloCalTopoClusters',
- 'ForwardElectronClusters',
- 'HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex',
- 'InDetTrackParticlesAssociatedClusters',
- 'MuonClusterCollection',
- 'TauPi0Clusters',
- 'egammaClusters',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_21.0.79_test.py b/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_21.0.79_test.py
deleted file mode 100644
index 86a32d4556b172bf7741d336025c104c44cdc3a4..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODCaloEventAthenaPool/share/xAODCaloEventAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::CaloCluster
- 'CaloCalTopoClusters',
- 'ForwardElectronClusters',
- 'HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex',
- 'InDetTrackParticlesAssociatedClusters',
- 'MuonClusterCollection',
- 'TauPi0Clusters',
- 'egammaClusters',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODCaloRingsAthenaPool/CMakeLists.txt b/Event/xAOD/xAODCaloRingsAthenaPool/CMakeLists.txt
index 6a2cd31fb1b3e1305e4281f4aa972cf2e75e2ea5..10b2cb7ff0e37b323d169238a27a2a888729dfeb 100644
--- a/Event/xAOD/xAODCaloRingsAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODCaloRingsAthenaPool/CMakeLists.txt
@@ -19,7 +19,6 @@ atlas_add_poolcnv_library( xAODCaloRingsAthenaPoolPoolCnv
LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities xAODCaloRings )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODCaloRingsAthenaPool/share/xAODCaloRingsAthenaPool_21.0.79_test.py b/Event/xAOD/xAODCaloRingsAthenaPool/share/xAODCaloRingsAthenaPool_21.0.79_test.py
deleted file mode 100644
index b404b0d2a4314ef3793df9bbbb08d919b94ca978..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODCaloRingsAthenaPool/share/xAODCaloRingsAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::CaloRingsAuxContainer_v1
- 'ElectronCaloRings',
-
- #xAOD::RingSetAuxContainer_v1
- 'ElectronRingSets',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODEgammaAthenaPool/CMakeLists.txt b/Event/xAOD/xAODEgammaAthenaPool/CMakeLists.txt
index 5dffdefff64fc86274ff099746551b734aa788db..079bbe93da8d69a333e8f04b306ed9494fa827a4 100644
--- a/Event/xAOD/xAODEgammaAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODEgammaAthenaPool/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_add_poolcnv_library( xAODEgammaAthenaPoolPoolCnv
AthenaPoolUtilities xAODEgamma GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODEgammaAthenaPool/share/xAODEgammaAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODEgammaAthenaPool/share/xAODEgammaAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index 49796e875d343753c0c92e8cabd15b1555328b43..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEgammaAthenaPool/share/xAODEgammaAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #xAOD::ElectronAuxContainer
- 'Electrons',
- 'ForwardElectrons',
- 'HLT_xAOD__ElectronContainer_egamma_Electrons',
-
- #xAOD::PhotonAuxContainer
- 'Photons',
- 'HLT_xAOD__PhotonContainer_egamma_Photons',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODEgammaAthenaPool/share/xAODEgammaAthenaPool_21.0.79_test.py b/Event/xAOD/xAODEgammaAthenaPool/share/xAODEgammaAthenaPool_21.0.79_test.py
deleted file mode 100644
index 88519266234ffbed1252095886cdd702370feb79..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEgammaAthenaPool/share/xAODEgammaAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::ElectronAuxContainer_v3
- 'Electrons',
- 'ForwardElectrons',
-
- #xAOD::PhotonAuxContainer_v3
- 'Photons',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODEventShapeAthenaPool/CMakeLists.txt b/Event/xAOD/xAODEventShapeAthenaPool/CMakeLists.txt
index 4661eac89d7c2f89ce4190ee54936fab06903626..bb6af7b338fc732346414cca46e6ba6489d6c671 100644
--- a/Event/xAOD/xAODEventShapeAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODEventShapeAthenaPool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_add_poolcnv_library( xAODEventShapeAthenaPoolPoolCnv
LINK_LIBRARIES AthenaPoolCnvSvcLib AthenaPoolUtilities xAODEventShape )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODEventShapeAthenaPool/share/xAODEventShapeAthenaPool_21.0.79_test.py b/Event/xAOD/xAODEventShapeAthenaPool/share/xAODEventShapeAthenaPool_21.0.79_test.py
deleted file mode 100644
index 3d98bff7638261bce129fdcc67a96b5098d7a88a..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventShapeAthenaPool/share/xAODEventShapeAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::EventShapeAuxInfo_v1
- 'Kt4EMPFlowEventShape',
- 'Kt4EMTopoOriginEventShape',
- 'Kt4LCTopoOriginEventShape',
- 'NeutralParticleFlowIsoCentralEventShape',
- 'NeutralParticleFlowIsoForwardEventShape',
- 'ParticleFlowIsoCentralEventShape',
- 'ParticleFlowIsoForwardEventShape',
- 'TopoClusterIsoCentralEventShape',
- 'TopoClusterIsoForwardEventShape',
- 'TopoClusterIsoVeryForwardEventShape',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODJetAthenaPool/CMakeLists.txt b/Event/xAOD/xAODJetAthenaPool/CMakeLists.txt
index 2e51d19ac94ee42f92000c577bf6de924647f83c..d7ed97ebfb4bc142b03001bf3ac0259a24190c77 100644
--- a/Event/xAOD/xAODJetAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODJetAthenaPool/CMakeLists.txt
@@ -25,7 +25,6 @@ atlas_add_poolcnv_library( xAODJetAthenaPoolPoolCnv
AthenaPoolCnvSvcLib AthenaPoolUtilities xAODJet )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODJetAthenaPool/share/xAODJetAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODJetAthenaPool/share/xAODJetAthenaPool_20.7.2.2_test.py
deleted file mode 100644
index 85fb40d9433805a115b95cf9de0238ba2244b115..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODJetAthenaPool/share/xAODJetAthenaPool_20.7.2.2_test.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
-keys = [
- #xAOD::JetTrigAuxContainer_v2
- 'HLT_xAOD__JetContainer_EFJet',
- 'HLT_xAOD__JetContainer_FarawayJet',
- 'HLT_xAOD__JetContainer_SplitJet',
- 'HLT_xAOD__JetContainer_SuperRoi',
- 'HLT_xAOD__JetContainer_TrigTauJet',
- #'HLT_xAOD__JetContainer_a10r_tcemsubjesISFS',
- 'HLT_xAOD__JetContainer_a10tcemnojcalibFS',
- 'HLT_xAOD__JetContainer_a10tcemsubjesFS',
- 'HLT_xAOD__JetContainer_a3ionemsubjesFS',
- 'HLT_xAOD__JetContainer_a4ionemsubjesFS',
- 'HLT_xAOD__JetContainer_a4tcemnojcalibFS',
- #'HLT_xAOD__JetContainer_a4tcemsubjesISFS',
-
- #xAOD::JetAuxContainer_v1
- 'AntiKt10LCTopoJets',
- 'AntiKt10TruthJets',
- 'AntiKt10TruthWZJets',
- 'AntiKt2PV0TrackJets',
- 'AntiKt3PV0TrackJets',
- 'AntiKt4EMPFlowJets',
- 'AntiKt4EMTopoJets',
- 'AntiKt4LCTopoJets',
- 'AntiKt4PV0TrackJets',
- 'AntiKt4TruthJets',
- 'AntiKt4TruthWZJets',
- 'CamKt12LCTopoJets',
- 'CamKt12TruthJets',
- 'CamKt12TruthWZJets',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODJetAthenaPool/share/xAODJetAthenaPool_21.0.79_test.py b/Event/xAOD/xAODJetAthenaPool/share/xAODJetAthenaPool_21.0.79_test.py
deleted file mode 100644
index 90d0f7f10f2db7834ea909f860ee7e4a11ccbbe6..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODJetAthenaPool/share/xAODJetAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::JetTrigAuxContainer_v2
- 'HLT_xAOD__JetContainer_EFJet',
- 'HLT_xAOD__JetContainer_FarawayJet',
- 'HLT_xAOD__JetContainer_GSCJet',
- 'HLT_xAOD__JetContainer_SplitJet',
- 'HLT_xAOD__JetContainer_SuperRoi',
- 'HLT_xAOD__JetContainer_a10r_tcemsubjesISFS',
- 'HLT_xAOD__JetContainer_a10tclcwsubjesFS',
- 'HLT_xAOD__JetContainer_a10ttclcwjesFS',
- 'HLT_xAOD__JetContainer_a3ionemsubjesFS',
- 'HLT_xAOD__JetContainer_a4ionemsubjesFS',
- 'HLT_xAOD__JetContainer_a4tcemsubjesISFS',
- 'HLT_xAOD__JetContainer_a4tcemsubjesISFSftk',
- 'HLT_xAOD__JetContainer_a4tcemsubjesISFSftkrefit',
-
- #xAOD::JetAuxContainer_v1
- 'AntiKt4EMPFlowJets',
- 'AntiKt4EMTopoJets',
- 'AntiKt4LCTopoJets',
- 'InTimeAntiKt4TruthJets',
- 'OutOfTimeAntiKt4TruthJets',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODMissingETAthenaPool/CMakeLists.txt b/Event/xAOD/xAODMissingETAthenaPool/CMakeLists.txt
index dd33be14c7bbf6dee2389805b0b7c79eed3de538..3306d30addf0f696811985472dbdfebb362032ec 100644
--- a/Event/xAOD/xAODMissingETAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODMissingETAthenaPool/CMakeLists.txt
@@ -22,7 +22,6 @@ atlas_add_poolcnv_library( xAODMissingETAthenaPoolPoolCnv
AthenaPoolUtilities xAODMissingET GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODMissingETAthenaPool/share/xAODMissingETAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODMissingETAthenaPool/share/xAODMissingETAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index 388451597cf758b42402d88cd7cd20107708ac44..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMissingETAthenaPool/share/xAODMissingETAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #xAOD::MissingETAssociationMap
- 'METAssoc_AntiKt4EMPFlow',
- 'METAssoc_AntiKt4EMTopo',
- 'METAssoc_AntiKt4LCTopo',
-
- #xAOD::MissingETAuxComponentMap
- 'METMap_Truth',
-
- # xAOD::MissingETAuxContainer_v1
- 'MET_Calo',
- 'MET_Core_AntiKt4EMPFlow',
- 'MET_Core_AntiKt4EMTopo',
- 'MET_Core_AntiKt4LCTopo',
- 'MET_EMTopo',
- 'MET_EMTopoRegions',
- 'MET_LocHadTopo',
- 'MET_LocHadTopoRegions',
- 'MET_Reference_AntiKt4EMPFlow',
- 'MET_Reference_AntiKt4EMTopo',
- 'MET_Reference_AntiKt4LCTopo',
- 'MET_Track',
- 'MET_Truth',
- 'MET_TruthRegions',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODMissingETAthenaPool/share/xAODMissingETAthenaPool_21.0.79_test.py b/Event/xAOD/xAODMissingETAthenaPool/share/xAODMissingETAthenaPool_21.0.79_test.py
deleted file mode 100644
index 9215b4eceb413f7643184e221ea1b64efae18094..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMissingETAthenaPool/share/xAODMissingETAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::MissingETAuxAssociationMap_v2
- 'METAssoc_AntiKt4EMPFlow',
- 'METAssoc_AntiKt4EMTopo',
- 'METAssoc_AntiKt4LCTopo',
-
- #xAOD::MissingETAuxComponentMap_v1
- 'METMap_Truth',
-
- # xAOD::MissingETAuxContainer_v1
- 'MET_Calo',
- 'MET_Core_AntiKt4EMPFlow',
- 'MET_Core_AntiKt4EMTopo',
- 'MET_Core_AntiKt4LCTopo',
- 'MET_EMTopo',
- 'MET_EMTopoRegions',
- 'MET_LocHadTopo',
- 'MET_LocHadTopoRegions',
- 'MET_Reference_AntiKt4EMPFlow',
- 'MET_Reference_AntiKt4EMTopo',
- 'MET_Reference_AntiKt4LCTopo',
- 'MET_Track',
- 'MET_Truth',
- 'MET_TruthRegions',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt b/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt
index 9c8f759fcd66f1ecb68f82e564090c1b8a97667a..08611433670c4f33e7455d88a1871c5fa8508ded 100644
--- a/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODMuonAthenaPool/CMakeLists.txt
@@ -22,7 +22,6 @@ atlas_add_poolcnv_library( xAODMuonAthenaPoolPoolCnv
xAODTracking )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# In AthAnalysis xAOD::Muon doesn't know about its MuonSegment link. Which
diff --git a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index ce1e753990f2aa441de5754a9f771ece8884e170..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #Muons...
- 'Muons',
- 'Staus',
- 'HLT_xAOD__MuonContainer_MuonEFInfo',
- 'HLT_xAOD__MuonContainer_MuTagIMO_EF',
- 'HLT_xAOD__MuonContainer_eMuonEFInfo',
-
- #xAOD::MuonSegmentAuxContainer_v1
- 'MuonSegments',
- 'MuonTruthSegments',
-
- #xAOD::SlowMuonAuxContainer_v1
- 'SlowMuons',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.7.2.2_test.py
deleted file mode 100644
index 1a156a9f5dace7bd6ab38dbcfb442460edf801be..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.7.2.2_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
-keys = [
- #xAOD::MuonAuxContainer_v2
- 'Muons',
- 'Staus',
- 'HLT_xAOD__MuonContainer_MuonEFInfo',
- 'HLT_xAOD__MuonContainer_MuTagIMO_EF',
- 'HLT_xAOD__MuonContainer_eMuonEFInfo',
-
- #xAOD::MuonSegmentAuxContainer_v1
- 'MuonSegments',
- 'MuonTruthSegments',
- 'NCB_MuonSegments',
-
- #xAOD::SlowMuonAuxContainer_v1
- 'SlowMuons',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.7.9.9_test.py b/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.7.9.9_test.py
deleted file mode 100644
index 59bf960cdd03a611f03968f2f42cad446877bd8c..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_20.7.9.9_test.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.7.9.9/AOD-20.7.9.9-full.pool.root'
-keys = [
- #xAOD::MuonAuxContainer_v4
- 'Muons',
- 'Staus',
- 'HLT_xAOD__MuonContainer_MuonEFInfo',
- 'HLT_xAOD__MuonContainer_MuTagIMO_EF',
- 'HLT_xAOD__MuonContainer_MuonEFInfo_FullScan',
- 'HLT_xAOD__MuonContainer_MuonEFInfo_MSonlyTrackParticles_FullScan',
- 'HLT_xAOD__MuonContainer_eMuonEFInfo',
-
- #xAOD::MuonSegmentAuxContainer_v1
- 'MuonSegments',
- 'MuonTruthSegments',
- 'NCB_MuonSegments',
-
- #xAOD::SlowMuonAuxContainer_v1
- 'SlowMuons',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_21.0.79_test.py b/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_21.0.79_test.py
deleted file mode 100644
index 601f99fdb7bf82a7dd472fbee235702e69317053..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::MuonAuxContainer_v4
- 'Muons',
- 'Staus',
- 'HLT_xAOD__MuonContainer_MuonEFInfo',
-
- #xAOD::MuonSegmentAuxContainer_v1
- 'MuonSegments',
- 'MuonTruthSegments',
- 'NCB_MuonSegments',
-
- #xAOD::SlowMuonAuxContainer_v1
- 'SlowMuons',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_master-20190911_test.py b/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_master-20190911_test.py
deleted file mode 100644
index a994eea1e1105a82d2f817558017fe87a88b59cb..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODMuonAthenaPool/share/xAODMuonAthenaPool_master-20190911_test.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root'
-keys = [
- #xAOD::MuonAuxContainer_v5
- 'Muons',
- 'Staus',
- 'HLT_xAOD__MuonContainer_MuonEFInfo',
- 'HLT_xAOD__MuonContainer_MuonEFInfo_FullScan',
- 'HLT_xAOD__MuonContainer_MuonEFInfo_MSonlyTrackParticles_FullScan',
-
- #xAOD::MuonSegmentAuxContainer_v1
- 'MuGirlMuonSegments',
- 'MuonSegments',
- 'MuonTruthSegments',
- 'NCB_MuonSegments',
-
- #xAOD::SlowMuonAuxContainer_v1
- 'SlowMuons',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt b/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt
index cc7dc7c2fdc1904976354b0a5c323ffd1504e5f6..bc3deb855b9c9030fcbf9bba0b677e901de9e8bc 100644
--- a/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODPFlowAthenaPool/CMakeLists.txt
@@ -21,7 +21,6 @@ atlas_add_poolcnv_library( xAODPFlowAthenaPoolPoolCnv
AthenaPoolUtilities xAODPFlow )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODPFlowAthenaPool/share/xAODPFlowAthenaPool_21.0.79_test.py b/Event/xAOD/xAODPFlowAthenaPool/share/xAODPFlowAthenaPool_21.0.79_test.py
deleted file mode 100644
index 25353c80f5dd37d28a4d217136adae13f17441bd..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODPFlowAthenaPool/share/xAODPFlowAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::PFOAuxContainer_v1
- 'JetETMissChargedParticleFlowObjects',
- 'JetETMissNeutralParticleFlowObjects',
- 'TauChargedParticleFlowObjects',
- 'TauHadronicParticleFlowObjects',
- 'TauNeutralParticleFlowObjects',
- 'TauShotParticleFlowObjects',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODParticleEventAthenaPool/CMakeLists.txt b/Event/xAOD/xAODParticleEventAthenaPool/CMakeLists.txt
index e6f7979e25d33da8a4187374c53714693dd78e9c..fb79741d1e09ca42c58746d0dccb95f51e7bb90e 100644
--- a/Event/xAOD/xAODParticleEventAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODParticleEventAthenaPool/CMakeLists.txt
@@ -18,7 +18,6 @@ atlas_add_poolcnv_library( xAODParticleEventAthenaPoolPoolCnv
AthenaPoolUtilities xAODParticleEvent )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODParticleEventAthenaPool/share/xAODParticleAthenaPool_21.0.79_test.py b/Event/xAOD/xAODParticleEventAthenaPool/share/xAODParticleAthenaPool_21.0.79_test.py
deleted file mode 100644
index 716f9e862bc00c80f7616d48d683adb0f30e35fd..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODParticleEventAthenaPool/share/xAODParticleAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::ParticleAuxContainer_v1
- 'finalTauPi0s',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt
index 1d4422522e1db2c9759021997c6ee722d8b70d9d..98e167406e73eaee84918d3eb3c110fc3d5dd05a 100644
--- a/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTauAthenaPool/CMakeLists.txt
@@ -17,7 +17,6 @@ atlas_add_poolcnv_library( xAODTauAthenaPoolPoolCnv
AthenaPoolUtilities xAODTracking xAODTau GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index f797644ddaa025944f8d0a5ff500d12e1713fb01..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #xAOD::TauJetAuxContainer
- 'HLT_xAOD__TauJetContainer_TrigTauRecMerged',
- 'HLT_xAOD__TauJetContainer_TrigTauRecPreselection',
- 'TauJets',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_20.7.2.2_test.py
deleted file mode 100644
index fc457a051e908daaa81db1c02ab3594a3d3675f6..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_20.7.2.2_test.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
-keys = [
- #xAOD::DiTauJetAuxContainer_v1
- 'DiTauJets',
-
- #xAOD::TauJetAuxContainer_v2
- 'HLT_xAOD__TauJetContainer_TrigTauRecMerged',
- 'HLT_xAOD__TauJetContainer_TrigTauRecPreselection',
- 'TauJets',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_21.0.79_test.py
deleted file mode 100644
index ef909052a0982f5ab8029fa16b801b1b5b11f8ea..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTauAthenaPool/share/xAODTauAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::DiTauJetAuxContainer_v1
- 'DiTauJets',
-
- #xAOD::TauJetAuxContainer_v3
- 'HLT_xAOD__TauJetContainer_TrigTauRecMerged',
- 'HLT_xAOD__TauJetContainer_TrigTauRecPreselection',
- 'TauJets',
-
- #xAOD::TauTrackAuxContainer_v1
- 'TauTracks',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
index d505ee4e74db3c6a6bc084248c0e14e7a0844565..f97fe1e0b4e249356706691a71c88eeff0e77934 100644
--- a/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrackingAthenaPool/CMakeLists.txt
@@ -52,7 +52,6 @@ atlas_add_poolcnv_library( xAODTrackingAthenaPoolPoolCnv
xAODTruth )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# In AthAnalysis xAOD::TrackParticle doesn't know about its Trk::Track link.
diff --git a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index 304dade8198a64eef91f673eb16029a2f3f50901..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #xAOD::TrackParticle
-
-
- 'CombinedMuonTrackParticles',
- 'CombinedStauTrackParticles',
- 'ExtrapolatedMuonTrackParticles',
- 'ExtrapolatedStauTrackParticles',
- 'GSFTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFID',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauCore_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauIso_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_EFID',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_ExtrapTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_ExtrapTrackParticles',
- 'InDetForwardTrackParticles',
- 'InDetPixelPrdAssociationTrackParticles',
- 'InDetTrackParticles',
- 'MSonlyTracklets',
- 'MuonSpectrometerTrackParticles',
-
- #xAOD::VertexAuxContainer_v1
- 'BTagging_AntiKt10LCTopoSecVtx',
- 'BTagging_AntiKt10TruthWZSecVtx',
- 'BTagging_AntiKt2TrackSecVtx',
- 'BTagging_AntiKt3TrackSecVtx',
- 'BTagging_AntiKt4EMTopoSecVtx',
- 'BTagging_AntiKt4LCTopoSecVtx',
- 'BTagging_AntiKt4TrackSecVtx',
- 'BTagging_AntiKt4TruthWZSecVtx',
- 'GSFConversionVertices',
- 'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
- 'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
- 'HLT_xAOD__VertexContainer_SecondaryVertex',
- 'HLT_xAOD__VertexContainer_xPrimVx',
- 'MSDisplacedVertex',
- 'PrimaryVertices',
- 'TauSecondaryVertices',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_20.7.2.2_test.py b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_20.7.2.2_test.py
deleted file mode 100644
index b2ec8a912e58becf391593e984e87f13ba5fe1b0..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_20.7.2.2_test.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.7.2.2/AOD-20.7.2.2-full.pool.root'
-keys = [
- #xAOD::TrackParticleAuxContainer_v2
- 'CombinedMuonTrackParticles',
- 'CombinedStauTrackParticles',
- 'ExtrapolatedMuonTrackParticles',
- 'ExtrapolatedStauTrackParticles',
- 'GSFTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_EFID',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_EFID',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauCore_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_TauIso_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_EFID',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTF',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuTagIMO_EF_ExtrapTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_eMuonEFInfo_ExtrapTrackParticles',
- 'InDetForwardTrackParticles',
- 'InDetPixelPrdAssociationTrackParticles',
- 'InDetTrackParticles',
- 'MSonlyTracklets',
- 'MuonSpectrometerTrackParticles',
-
- #xAOD::VertexAuxContainer_v1
- 'BTagging_AntiKt10LCTopoSecVtx',
- 'BTagging_AntiKt10TruthWZSecVtx',
- 'BTagging_AntiKt2TrackSecVtx',
- 'BTagging_AntiKt3TrackSecVtx',
- 'BTagging_AntiKt4EMTopoSecVtx',
- 'BTagging_AntiKt4LCTopoSecVtx',
- 'BTagging_AntiKt4TrackSecVtx',
- 'BTagging_AntiKt4TruthWZSecVtx',
- 'GSFConversionVertices',
- 'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
- 'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
- 'HLT_xAOD__VertexContainer_SecondaryVertex',
- 'HLT_xAOD__VertexContainer_xPrimVx',
- 'MSDisplacedVertex',
- 'PrimaryVertices',
- 'TauSecondaryVertices',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_21.0.79_test.py
deleted file mode 100644
index 56f3c5c4091386be6247d2b1d31cf7c04bf68048..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::TrackParticleAuxContainer_v3
- 'CombinedMuonTrackParticles',
- 'CombinedStauTrackParticles',
- 'ExtrapolatedMuonTrackParticles',
- 'ExtrapolatedStauTrackParticles',
- 'GSFTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_GSFTrigTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BphysHighPt_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles_FullScan',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles_FullScan',
- 'InDetForwardTrackParticles',
- 'InDetPixelPrdAssociationTrackParticles',
- 'MSOnlyExtrapolatedMuonTrackParticles',
- 'MSonlyTracklets',
- 'MuonSpectrometerTrackParticles',
-
- #xAOD::VertexAuxContainer_v1
- 'BTagging_AntiKt4EMTopoSecVtx',
- 'GSFConversionVertices',
- 'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
- 'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
- 'HLT_xAOD__VertexContainer_PrimVertexFTK',
- 'HLT_xAOD__VertexContainer_PrimVertexFTKRaw',
- 'HLT_xAOD__VertexContainer_PrimVertexFTKRefit',
- 'HLT_xAOD__VertexContainer_SecondaryVertex',
- 'HLT_xAOD__VertexContainer_xPrimVx',
- 'MSDisplacedVertex',
- 'PrimaryVertices',
- 'TauSecondaryVertices',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_master-20190911_test.py b/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_master-20190911_test.py
deleted file mode 100644
index 125391368ecc25226c538823dfe9f61dd26248b7..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrackingAthenaPool/share/xAODTrackingAthenaPool_master-20190911_test.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root'
-keys = [
- #xAOD::TrackParticleAuxContainer_v4
- 'CombinedMuonTrackParticles',
- 'CombinedStauTrackParticles',
- 'ExtrapolatedMuonTrackParticles',
- 'ExtrapolatedStauTrackParticles',
- 'GSFTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_GSFTrigTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTKRefit_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_FTK_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bjet_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_BphysHighPt_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Bphysics_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Electron_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_FullScan_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_FTK_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Muon_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTKRefit_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_InDetTrigTrackingxAODCnv_Tau_FTK_IDTrig',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_CombTrackParticles_FullScan',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles',
- 'HLT_xAOD__TrackParticleContainer_MuonEFInfo_ExtrapTrackParticles_FullScan',
- 'InDetDisappearingTrackParticles',
- 'InDetForwardTrackParticles',
- 'InDetTrackParticles',
- 'MSOnlyExtrapolatedMuonTrackParticles',
- 'MSonlyTracklets',
- 'MuonSpectrometerTrackParticles',
-
- #xAOD::VertexAuxContainer_v1
- 'BTagging_AntiKt4EMTopoSecVtx',
- 'GSFConversionVertices',
- 'HLT_xAOD__VertexContainer_BjetSecondaryVertexFex',
- 'HLT_xAOD__VertexContainer_EFHistoPrmVtx',
- 'HLT_xAOD__VertexContainer_PrimVertexFTK',
- 'HLT_xAOD__VertexContainer_PrimVertexFTKRaw',
- 'HLT_xAOD__VertexContainer_PrimVertexFTKRefit',
- 'HLT_xAOD__VertexContainer_SecondaryVertex',
- 'HLT_xAOD__VertexContainer_xPrimVx',
- 'MSDisplacedVertex',
- 'PrimaryVertices',
- 'TauSecondaryVertices',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigCaloAthenaPool/CMakeLists.txt
index 3db347c6386cdde40b5ba14e4d9edbf788398f72..b9f3c555cda485985c24b9e55b757d35da8f6705 100644
--- a/Event/xAOD/xAODTrigCaloAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigCaloAthenaPool/CMakeLists.txt
@@ -21,7 +21,6 @@ atlas_add_poolcnv_library( xAODTrigCaloAthenaPoolPoolCnv
AthenaPoolUtilities xAODCaloEvent xAODTrigCalo GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/share/xAODTrigCaloAthenaPool_20.0.0.3_test.py b/Event/xAOD/xAODTrigCaloAthenaPool/share/xAODTrigCaloAthenaPool_20.0.0.3_test.py
deleted file mode 100644
index 508ecd50235d37feda85bdc0d899feef6a47bde7..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigCaloAthenaPool/share/xAODTrigCaloAthenaPool_20.0.0.3_test.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.0.0.3/AOD-20.0.0.3-full.pool.root'
-keys = [
- #xAOD::TrigCaloClusterAuxContainer_v1
- 'HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrigCaloAthenaPool/share/xAODTrigCaloAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigCaloAthenaPool/share/xAODTrigCaloAthenaPool_21.0.79_test.py
deleted file mode 100644
index 20af2e9ce6757e1fc96befdc42b95ac6bc5a155a..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigCaloAthenaPool/share/xAODTrigCaloAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::CaloClusterTrigAuxContainer_v1
- 'HLT_xAOD__CaloClusterContainer_TrigEFCaloCalibFex',
-
- #xAOD::TrigEMClusterAuxContainer_v2
- 'HLT_xAOD__TrigEMClusterContainer_TrigT2CaloEgamma',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt
index 70e57d0af92aa91a19917ef292ed9b6a9727bb64..18213dc72c8ccd17adde65f06aa697390dbd0a0b 100644
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigEgammaAthenaPool/CMakeLists.txt
@@ -22,7 +22,6 @@ atlas_add_poolcnv_library( xAODTrigEgammaAthenaPoolPoolCnv
AthenaPoolUtilities xAODEgamma xAODTrigEgamma GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTrigEgammaAthenaPool/share/xAODTrigEgammaAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigEgammaAthenaPool/share/xAODTrigEgammaAthenaPool_21.0.79_test.py
deleted file mode 100644
index 3be90db6c4cd62be2aca425879120d27c057f048..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigEgammaAthenaPool/share/xAODTrigEgammaAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::ElectronTrigAuxContainer_v1
- 'HLT_xAOD__ElectronContainer_egamma_Electrons',
- 'HLT_xAOD__ElectronContainer_egamma_Iso_Electrons',
- 'HLT_xAOD__ElectronContainer_egamma_SC_Electrons',
- 'HLT_xAOD__ElectronContainer_egamma_SC_Iso_Electrons',
- 'HLT_xAOD__MuonContainer_MuonEFInfo',
-
- #xAOD::PhotonTrigAuxContainer_v1
- 'HLT_xAOD__PhotonContainer_egamma_Iso_Photons',
- 'HLT_xAOD__PhotonContainer_egamma_Photons',
- 'HLT_xAOD__PhotonContainer_egamma_SC_Iso_Photons',
- 'HLT_xAOD__PhotonContainer_egamma_SC_Photons',
-
- #xAOD::TrigElectronAuxContainer_v1
- 'HLT_xAOD__TrigElectronContainer_L2ElectronFex',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrigMissingETAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigMissingETAthenaPool/CMakeLists.txt
index ba559278a65e0a6785d76f9b581aa40b92afb785..1901e831730d3171cf14cf6c593c22b170e0bbf3 100644
--- a/Event/xAOD/xAODTrigMissingETAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMissingETAthenaPool/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_add_poolcnv_library( xAODTrigMissingETAthenaPoolPoolCnv
GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTrigMissingETAthenaPool/share/xAODTrigMissingETAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigMissingETAthenaPool/share/xAODTrigMissingETAthenaPool_21.0.79_test.py
deleted file mode 100644
index 403cb086d4a52b34a00c269e74b6893a8722cc5f..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigMissingETAthenaPool/share/xAODTrigMissingETAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::TrigMissingETAuxContainer_v1
- 'HLT_xAOD__TrigMissingETContainer_EFJetEtSum',
- 'HLT_xAOD__TrigMissingETContainer_EFMissingET_Fex_2sidednoiseSupp_PUC',
- 'HLT_xAOD__TrigMissingETContainer_T2MissingET',
- 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET',
- 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_FEB',
- 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_mht',
- 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl',
- 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PS',
- 'HLT_xAOD__TrigMissingETContainer_TrigEFMissingET_topocl_PUC',
- 'HLT_xAOD__TrigMissingETContainer_TrigL2MissingET_FEB',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt
index f5a74e5d7efda9b96ff2c1d07c03c98ee436741a..4c96db5ee0f185b61ee99bdfe7ea3b76b2ff9181 100644
--- a/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigMuonAthenaPool/CMakeLists.txt
@@ -23,7 +23,6 @@ atlas_add_poolcnv_library( xAODTrigMuonAthenaPoolPoolCnv
AthenaPoolUtilities xAODTrigMuon )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/share/xAODTrigMuonAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTrigMuonAthenaPool/share/xAODTrigMuonAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index 6a48955c29db2639271c3e471e1998aacf8b3c4b..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigMuonAthenaPool/share/xAODTrigMuonAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #xAOD::L2CombinedMuonAuxContainer
- 'HLT_xAOD__L2CombinedMuonContainer_MuonL2CBInfo',
-
- #xAOD::L2StandAloneMuonAuxContainer
- 'HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfo',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrigMuonAthenaPool/share/xAODTrigMuonAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigMuonAthenaPool/share/xAODTrigMuonAthenaPool_21.0.79_test.py
deleted file mode 100644
index fdbad61aafd9e612a6eb441d6378f69a8f922ebc..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigMuonAthenaPool/share/xAODTrigMuonAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::L2CombinedMuonAuxContainer_v1
- 'HLT_xAOD__L2CombinedMuonContainer_MuonL2CBInfo',
-
- #xAOD::L2StandAloneMuonAuxContainer_v2
- 'HLT_xAOD__L2StandAloneMuonContainer_MuonL2SAInfo',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTrigRingerAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTrigRingerAthenaPool/CMakeLists.txt
index 29c3c7990992748e091a87bbfdf7a92ba468cd42..11392b107feefde2ed1d2f5892a4a0bb6cbf8df9 100644
--- a/Event/xAOD/xAODTrigRingerAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTrigRingerAthenaPool/CMakeLists.txt
@@ -19,7 +19,6 @@ atlas_add_poolcnv_library( xAODTrigRingerAthenaPoolPoolCnv
AthenaPoolUtilities xAODTrigRinger GaudiKernel )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTrigRingerAthenaPool/share/xAODTrigRingerAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTrigRingerAthenaPool/share/xAODTrigRingerAthenaPool_21.0.79_test.py
deleted file mode 100644
index 7b28d569bd59582f2d7989eab89229942d4bbb01..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTrigRingerAthenaPool/share/xAODTrigRingerAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::TrigRingerRingsAuxContainer_v2
- 'HLT_xAOD__TrigRingerRingsContainer_TrigT2CaloEgamma',
-
- #xAOD::TrigRNNOutputAuxContainer_v2
- 'HLT_xAOD__TrigRNNOutputContainer_TrigRingerNeuralFex',
- 'HLT_xAOD__TrigRNNOutputContainer_TrigTRTHTCounts',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTriggerAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTriggerAthenaPool/CMakeLists.txt
index 308bba0b836e85d170eeeea9d3cd63f7005c82f7..7a5426417c6d08e782784fcac5fa8965e46f97e0 100644
--- a/Event/xAOD/xAODTriggerAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTriggerAthenaPool/CMakeLists.txt
@@ -64,7 +64,6 @@ atlas_add_poolcnv_library( xAODTriggerAthenaPoolPoolCnv
AthenaPoolUtilities xAODTrigger )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTriggerAthenaPool/share/xAODTriggerAthenaPool_20.1.7.2_test.py b/Event/xAOD/xAODTriggerAthenaPool/share/xAODTriggerAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index cdcb0d74c3842539a89acb575eef1a6f8fdbc1dd..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTriggerAthenaPool/share/xAODTriggerAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #EmTauRoI
- 'HLT_xAOD__EmTauRoIContainer_L1TopoEM',
- 'HLT_xAOD__EmTauRoIContainer_L1TopoTau',
- 'LVL1EmTauRoIs',
-
- #EnergySumRoI
- 'LVL1EnergySumRoI',
-
- #JetRoI
- 'HLT_xAOD__JetRoIContainer_L1TopoJet',
- 'LVL1JetRoIs',
-
- #TrigComposite
- 'HLT_xAOD__TrigCompositeContainer_L1TopoComposite',
- 'HLT_xAOD__TrigCompositeContainer_L1TopoMET',
-
- #TrigNavigation
- 'TrigNavigation',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTriggerAthenaPool/share/xAODTriggerAthenaPool_master-20190911_test.py b/Event/xAOD/xAODTriggerAthenaPool/share/xAODTriggerAthenaPool_master-20190911_test.py
deleted file mode 100644
index 552b723c2f19ba5cff820cdca161a37ae33068e8..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTriggerAthenaPool/share/xAODTriggerAthenaPool_master-20190911_test.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-master-20190911/AOD-master-20190911-full.pool.root'
-keys = [
- #EmTauRoI_v2
- 'HLT_xAOD__EmTauRoIContainer_L1TopoEM',
- 'HLT_xAOD__EmTauRoIContainer_L1TopoTau',
- 'LVL1EmTauRoIs',
-
- #EnergySumRoI_v2
- 'LVL1EnergySumRoI',
-
- #JetRoI_v2
- 'HLT_xAOD__JetRoIContainer_L1TopoJet',
- 'LVL1JetRoIs',
-
- #TrigComposite_v2
- 'HLT_xAOD__TrigCompositeContainer_ExpressInfo_HLT',
- 'HLT_xAOD__TrigCompositeContainer_L1TopoComposite',
- 'HLT_xAOD__TrigCompositeContainer_L1TopoMET',
- 'HLT_xAOD__TrigCompositeContainer_MuonRoICluster',
- 'HLT_xAOD__TrigCompositeContainer_TrigEFDielectronMassFex',
-
- #TrigNavigation_v1
- 'TrigNavigation',
-
- #TrigPassBits_v1
- 'HLT_xAOD__TrigPassBitsContainer_passbits',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt b/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt
index ef792076eb5209597652f3606982422caae72a62..9a9adf0136fc1a5d74f499330d186ecdf0f19685 100644
--- a/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt
+++ b/Event/xAOD/xAODTruthAthenaPool/CMakeLists.txt
@@ -27,7 +27,6 @@ atlas_add_poolcnv_library( xAODTruthAthenaPoolPoolCnv
AthenaPoolUtilities xAODTruth )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Event/xAOD/xAODTruthAthenaPool/share/xAODTruthAthenaPool_21.0.79_test.py b/Event/xAOD/xAODTruthAthenaPool/share/xAODTruthAthenaPool_21.0.79_test.py
deleted file mode 100644
index 2945add9bb20052f550684dc35fc0d876f59a201..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODTruthAthenaPool/share/xAODTruthAthenaPool_21.0.79_test.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-
-infile = 'aod/AOD-21.0.79/AOD-21.0.79-full.pool.root'
-keys = [
- #xAOD::TruthEventAuxContainer_v1
- 'TruthEvents',
-
- #xAOD::TruthParticleAuxContainer_v1
- 'MuonTruthParticles',
-
- #xAOD::TruthVertexAuxContainer_v1
- 'TruthVertices',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/CMakeLists.txt b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/CMakeLists.txt
index 6418185f22af7dd5a02b7d6ce4943950c02fc776..77e2f7ef28227999af8a6b63e2d8abf24c45b8bb 100644
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/CMakeLists.txt
+++ b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_add_poolcnv_library( ZdcEventAthenaPoolPoolCnv
ZdcEventTPCnv ZdcEvent GaudiKernel )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/share/ZdcEventTPCnv_15.6.7_test.py b/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/share/ZdcEventTPCnv_15.6.7_test.py
deleted file mode 100644
index cbd5fd4ebcf7aa351417d301e6824d6f42880577..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ZDC/ZdcCnv/ZdcEventAthenaPool/share/ZdcEventTPCnv_15.6.7_test.py
+++ /dev/null
@@ -1,17 +0,0 @@
-infile = 'esd/ESD-15.6.7-data.pool.root'
-keys = [
- #ZdcDigitsCollection_p1
- 'ZdcDigitsCollection'
- ]
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DataSource.set_Value('data')
-
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
-# Force using DBRelease for offline test builds.
-import os
-if os.environ['SITEROOT'] == '/xyzzy':
- svcMgr.DBReplicaSvc.COOLSQLiteVetoPattern=''
diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/CMakeLists.txt
index a25af91b2597593c9f13262d5675042e7f48a991..a6a877652d5f39c653a38395a9112186a83ed98a 100644
--- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/CMakeLists.txt
@@ -32,7 +32,6 @@ atlas_add_test( BCM_RDO_ContainerCnv_p0_test
LINK_LIBRARIES InDetBCM_EventAthenaPool )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/share/InDetBCM_EventAthenaPool_20.1.7.2_test.py b/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/share/InDetBCM_EventAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index e711006c6ddcad0aa3cd4eb92c91e260e2921a6a..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/InDetBCM_EventAthenaPool/share/InDetBCM_EventAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #BCM_RDO_Container_p0
- 'BCM_CompactDOs',
- 'BCM_RDOs',
- ]
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
index 4668b82a04f2784d34d0748403f57c2c7803205e..a7113ffef66d964923a7c4f457c60dd839f1a47c 100644
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/CMakeLists.txt
@@ -36,7 +36,6 @@ atlas_add_dictionary( InDetEventAthenaPoolCnvDict
LINK_LIBRARIES Identifier GeneratorObjectsTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/share/InDetEventTPCnv_16.6.2.1_test.py b/InnerDetector/InDetEventCnv/InDetEventAthenaPool/share/InDetEventTPCnv_16.6.2.1_test.py
deleted file mode 100644
index d5a43aba271a659cd610800ee2ead41dd661e3fe..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/InDetEventAthenaPool/share/InDetEventTPCnv_16.6.2.1_test.py
+++ /dev/null
@@ -1,27 +0,0 @@
-infile = 'esd/ESD-16.6.2.1.pool.root'
-keys = [
- #InDet::PixelClusterContainer_p3
- 'PixelClusters',
-
- #InDet::SCT_ClusterContainer_p2
- 'SCT_Clusters',
-
- #InDet::TRT_DriftCircleContainer_p2
- 'TRT_DriftCircles',
-
- #InDetLowBetaContainer_tlp1
- 'InDetLowBetaCandidates',
-
- #InDet::PixelGangedClusterAmbiguities_p1
- 'PixelClusterAmbiguitiesMap',
-
- #InDetRawDataContainer_p1
- 'PixelRDOs',
- 'TRT_RDOs',
-
- #SCT_RawDataContainer_p2
- 'SCT_RDOs',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/CMakeLists.txt b/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/CMakeLists.txt
index 8249f5de3ac50380eca2be42ddd3d52b42b0cbb2..5ca377c0e9686905f3d01a2d97474c9554110a58 100644
--- a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/CMakeLists.txt
+++ b/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_add_poolcnv_library( InDetSimEventAthenaPoolPoolCnv
GaudiKernel InDetSimEventTPCnv InDetSimEvent )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/share/InDetSimEventTPCnv_HITS_test.py b/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/share/InDetSimEventTPCnv_HITS_test.py
deleted file mode 100644
index beceb6e3d6b1b2542c9bde9d605297f9a1b623d4..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetEventCnv/InDetSimEventAthenaPool/share/InDetSimEventTPCnv_HITS_test.py
+++ /dev/null
@@ -1,28 +0,0 @@
-infile = 'rtt:valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._000416.pool.root.1'
-keys = [
- #SiHitCollection_p2
- 'BLMHits',
- 'BCMHits',
- 'PixelHits@100',
- 'SCT_Hits@100',
-
- #TRT_HitCollection_p3
- 'TRTUncompressedHits@100',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-theApp.EvtMax = 10
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
-# Disable LAr alignment to avoid spurious warnings
-# when running in AthSimulation.
-svcMgr.GeoModelSvc.AlignCallbacks = False
-from IOVDbSvc.CondDB import conddb
-conddb.blockFolder ('/LAR/Align')
diff --git a/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/share/runInDetSecVtxFinder.py b/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/share/runInDetSecVtxFinder.py
index 3f9367145c49535bbe4fdb025bd75e6bd3920cd8..b69a523ae19bf24905058e9a3921dac618bd9be8 100644
--- a/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/share/runInDetSecVtxFinder.py
+++ b/InnerDetector/InDetRecAlgs/InDetSecVtxFinder/share/runInDetSecVtxFinder.py
@@ -40,7 +40,7 @@ if __name__ == "__main__":
# Contents
from DerivationFrameworkCore.SlimmingHelper import SlimmingHelper
TRUTH0SlimmingHelper = SlimmingHelper("TRUTH0SlimmingHelper", NamesAndTypes = flags.Input.TypedCollections, ConfigFlags = flags)
- TRUTH0SlimmingHelper.AppendToDictionary = {'EventInfo':'xAOD::EventInfo','EventInfoAux':'xAOD:EventAuxInfo',
+ TRUTH0SlimmingHelper.AppendToDictionary = {'EventInfo':'xAOD::EventInfo','EventInfoAux':'xAOD::EventAuxInfo',
'TruthEvents':'xAOD::TruthEventContainer','TruthEventsAux':'xAOD::TruthEventAuxContainer',
'TruthVertices':'xAOD::TruthVertexContainer','TruthVerticesAux':'xAOD::TruthVertexAuxContainer',
'TruthParticles':'xAOD::TruthParticleContainer','TruthParticlesAux':'xAOD::TruthParticleAuxContainer'}
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh
index 1d7790241be2f5e5d5770b9fca0c97fc305ba271..03ae26c664ddb27ffad6fa7d6dd178640d46c545 100755
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_zprime_tide.sh
@@ -39,7 +39,7 @@ Reco_tf.py \
--geometryVersion="default:ATLAS-R3S-2021-03-02-00" \
--digiSeedOffset1="8" \
--digiSeedOffset2="8" \
- --CA "default:True" "RDOtoRDOTrigger:False" \
+ --CA "default:True" \
--steering "doRDO_TRIG" "doTRIGtoALL" \
--outputDAOD_IDTIDEFile="DAOD_TIDE.pool.root" \
--outputRDOFile output.RDO.root \
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt b/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt
index 87879c99de6781471dae2f61ad5a79ddfdd29e1e..0fbebd656a0364bd4a91f8430701663688a11b8e 100644
--- a/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArAthenaPool/CMakeLists.txt
@@ -14,7 +14,6 @@ atlas_add_poolcnv_library( LArAthenaPoolPoolCnv
LArRecEvent )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArTPCnv_15.6.7_test.py b/LArCalorimeter/LArCnv/LArAthenaPool/share/LArTPCnv_15.6.7_test.py
deleted file mode 100644
index 60183c9509c82cb9e227cb0873719bb2c2749812..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArTPCnv_15.6.7_test.py
+++ /dev/null
@@ -1,22 +0,0 @@
-infile = 'esd/ESD-15.6.7-data.pool.root'
-keys = [
- #LArDigitContainer_p1
- 'LArDigitContainer_EMClust',
- 'LArDigitContainer_Thinned',
-
- #LArNoisyROSummary_p1
- 'LArNoisyROSummary',
- ]
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DataSource.set_Value('data')
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
-# Force using DBRelease for offline test builds.
-import os
-if os.environ['SITEROOT'] == '/xyzzy':
- svcMgr.DBReplicaSvc.COOLSQLiteVetoPattern=''
diff --git a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArTPCnv_20.1.7.2_test.py b/LArCalorimeter/LArCnv/LArAthenaPool/share/LArTPCnv_20.1.7.2_test.py
deleted file mode 100644
index e5cf333078c2d6dce625bc005329c9219f695aa6..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCnv/LArAthenaPool/share/LArTPCnv_20.1.7.2_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #LArNoisyROSummary_p3
- 'LArNoisyROSummary',
- ]
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt
index 72fedd8040e664ecf6abec07d45fe6979cc74f42..edb1012bb18525ea2b36a275507b2d4958ad2e1b 100644
--- a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt
+++ b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/CMakeLists.txt
@@ -11,7 +11,6 @@ atlas_add_poolcnv_library( LArSimEventAthenaPoolPoolCnv
LArSimEventTPCnv LArSimEvent )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimEventTPCnv_HITS_test.py b/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimEventTPCnv_HITS_test.py
deleted file mode 100644
index cb3a7870c3e36dae157328433d91d58e9c10654e..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArCnv/LArSimEventAthenaPool/share/LArSimEventTPCnv_HITS_test.py
+++ /dev/null
@@ -1,25 +0,0 @@
-infile = 'rtt:valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._000416.pool.root.1'
-keys = [
- #LArHitContainer_p2
- 'LArHitHEC@100',
- 'LArHitFCAL@100',
- 'LArHitEMB@100',
- 'LArHitEMEC@100',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-theApp.EvtMax = 10
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
-# Disable LAr alignment to avoid spurious warnings
-# when running in AthSimulation.
-svcMgr.GeoModelSvc.AlignCallbacks = False
-from IOVDbSvc.CondDB import conddb
-conddb.blockFolder ('/LAR/Align')
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt
index 2739fed33abe97063d0a2d05907f2c00564c36f8..99bb1adb7c06512ec9d1208880457f515a8b5ec5 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/CMakeLists.txt
@@ -69,7 +69,6 @@ atlas_add_dictionary( MuonRDOCnvDict
MuonSegment )
# Install files from the package:
-atlas_install_joboptions( share/*.py share/*.txt )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventAthenaPool_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventAthenaPool_jobOptions.py
deleted file mode 100644
index 19d0f4f96beb1cd2508802e9ddb58cb8d39de51a..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventAthenaPool_jobOptions.py
+++ /dev/null
@@ -1,6 +0,0 @@
-include( "MuonEventAthenaPool/MuonEventAthenaPool_joboptions.py" )
-
-#ROOT streaming service
-include ("AthenaPoolServices/AthenaRootStreamerSvc_jobOptions.py")
-StreamerSvc = Service ( "AthenaRootStreamerSvc" )
-StreamerSvc.Streamers += [ "CscRawDataStreamer_p0" ]
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventTPCnv_17.0.0_test.py b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventTPCnv_17.0.0_test.py
deleted file mode 100644
index cfd1f71b9b37301a4e16ec9bbea5ebdd3bfbc5e9..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventTPCnv_17.0.0_test.py
+++ /dev/null
@@ -1,40 +0,0 @@
-infile = 'esd/ESD-17.0.0.pool.root'
-keys = [
- #Muon::CscPrepDataContainer_tlp1
- 'CSC_Clusters',
-
- #Muon::CscStripPrepDataContainer_tlp1
- 'CSC_Measurements',
-
- #Muon::MuonPRD_Container_p2<Muon::RpcCoinData_p1>
- 'RPC_triggerHits',
-
- #Muon::MuonPRD_Container_p2<Muon::MdtPrepData_p2>
- 'MDT_DriftCircles',
-
- #Muon::RpcPrepDataContainer_tlp1
- 'RPC_Measurements',
-
- #Muon::TgcPrepDataContainer_tlp1
- 'TGC_MeasurementsNextBC',
- 'TGC_MeasurementsPriorBC',
- 'TGC_Measurements',
-
- #Muon::TgcCoinDataContainer_tlp2
- 'TrigT1CoinDataCollectionNextBC',
- 'TrigT1CoinDataCollectionPriorBC',
- 'TrigT1CoinDataCollection',
-
- #Muon::ChamberT0s_p1
- 'MboyMuonChamberT0s',
- 'MooreMuonChamberT0s',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Muon_setOn()
-DetFlags.detdescr.ID_setOn()
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventTPCnv_20.1.7.2_test.py b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventTPCnv_20.1.7.2_test.py
deleted file mode 100644
index 9158366704c98ad515b349a2812386c0d364b45c..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonEventTPCnv_20.1.7.2_test.py
+++ /dev/null
@@ -1,38 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #Muon::CscPrepDataContainer_tlp1
- 'CSC_Clusters',
-
- #Muon::CscStripPrepDataContainer_tlp1
- 'CSC_Measurements',
-
- #Muon::CscSimDataCollection_p1
- 'CSC_SDO',
-
- #Muon::MuonPRD_Container_p2<Muon::RpcCoinData_p1>
- 'RPC_triggerHits',
-
- #Muon::MuonPRD_Container_p2<Muon::TgcPrepData_p1>
- 'TGC_MeasurementsAllBCs',
-
- #Muon::MuonPRD_Container_p2<Muon::RpcPrepData_p3>
- 'RPC_Measurements',
-
- #Muon::MuonPRD_Container_p2<Muon::MdtPrepData_p2>
- 'MDT_DriftCircles',
-
- #Muon::TgcCoinDataContainer_tlp3
- 'TrigT1CoinDataCollectionNextBC',
- 'TrigT1CoinDataCollectionPriorBC',
- 'TrigT1CoinDataCollection',
-
- #Muon::MuonSimDataCollection_p1
- 'TGC_SDO',
- 'RPC_SDO',
- 'MDT_SDO',
- ]
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Muon_setOn()
-DetFlags.detdescr.ID_setOn()
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonRdoToPool_jobOptions.py b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonRdoToPool_jobOptions.py
deleted file mode 100644
index ad8cfd0eb6105a045059bf66fbf58b4a16825490..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/share/MuonRdoToPool_jobOptions.py
+++ /dev/null
@@ -1,26 +0,0 @@
-#--------------------------------------------------------------
-# jobOptions for writing RDO to POOL
-#--------------------------------------------------------------
-# Load POOL support
-include( "AthenaPoolCnvSvc/WriteAthenaPool_jobOptions.py" )
-
-# Define the output Db parameters (the default value are shown)
-Stream1.OutputFile = "MuonPool.root"
-
-# Converters:
-include( "EventAthenaPool/EventAthenaPool_joboptions.py" )
-include( "MuonEventAthenaPool/MuonEventAthenaPool_joboptions.py" )
-#include( "MuonEventAthenaPool/MuonEventAthenaPoolDict_joboptions.py")
-
-# list of output objects key
-# EventInfo
-Stream1 = Algorithm( "Stream1" )
-Stream1.ItemList+=["EventInfo#*"]
-# MDT
-Stream1.ItemList+=["MdtCsmContainer#*"]
-# RPC
-Stream1.ItemList+=["RpcPadContainer#*"]
-# TGC
-Stream1.ItemList+=["TgcRdoContainer#*"]
-# CSC
-Stream1.ItemList+=["CscRawDataContainer#*"]
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
index f74dd8b87749149c35fe0a46b9947984fb1bf63d..78dd18931bdd647e4b24890ccb5f19d3398f655c 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
@@ -146,7 +146,7 @@ void test1 ATLAS_NOT_THREAD_SAFE (const std::vector<Identifier>& ids)
int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
- if (!Athena_test::initGaudi("MuonEventAthenaPool/MuonEventAthenaPool_test.txt", pSvcLoc)) {
+ if (!Athena_test::initGaudi("MuonEventAthenaPool_test.txt", pSvcLoc)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
}
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
index b1204f13e60dc26b50a997355927c2fbf4aae50a..852f76c93a586a1eabf682abe22f95a87b61e7f2 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
/**
* @file MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
@@ -147,7 +147,7 @@ void test1 ATLAS_NOT_THREAD_SAFE ()
int main ATLAS_NOT_THREAD_SAFE ()
{
ISvcLocator* pSvcLoc;
- if (!Athena_test::initGaudi("MuonEventAthenaPool/MuonEventAthenaPool_test.txt", pSvcLoc)) {
+ if (!Athena_test::initGaudi("MuonEventAthenaPool_test.txt", pSvcLoc)) {
std::cerr << "This test can not be run" << std::endl;
return 0;
}
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/CMakeLists.txt b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/CMakeLists.txt
index 120cdbe73a87fa7de1163454cee87dc1a94bfcc6..c02ef9f0f713413a356aa06bf013f74faef1df46 100644
--- a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/CMakeLists.txt
+++ b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/CMakeLists.txt
@@ -15,7 +15,6 @@ atlas_add_poolcnv_library( MuonSimEventAthenaPoolPoolCnv
HitManagement )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/share/MuonSimEventTPCnv_HITS_test.py b/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/share/MuonSimEventTPCnv_HITS_test.py
deleted file mode 100644
index 27833f2d254ea0d53239648576d5435cbe8548d3..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonCnv/MuonSimEventAthenaPool/share/MuonSimEventTPCnv_HITS_test.py
+++ /dev/null
@@ -1,31 +0,0 @@
-infile = 'rtt:valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._000416.pool.root.1'
-keys = [
- #Muon::CSCSimHitCollection_p2
- 'CSC_Hits',
-
- #Muon::MDTSimHitCollection_p2
- 'MDT_Hits',
-
- #Muon::RPCSimHitCollection_p2
- 'RPC_Hits',
-
- #Muon::TGCSimHitCollection_p3
- 'TGC_Hits',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-theApp.EvtMax = 10
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
-# Disable LAr alignment to avoid spurious warnings
-# when running in AthSimulation.
-svcMgr.GeoModelSvc.AlignCallbacks = False
-from IOVDbSvc.CondDB import conddb
-conddb.blockFolder ('/LAR/Align')
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh
index 86f402b1d479d7df7a0e0ea9cbe3b174791fd697..f9db7dc2f5bd84d8487eea709ccdf636bfe86887 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q442_RAWtoALL_MT.sh
@@ -51,7 +51,7 @@ cd 1thread
#####################################################################
# now run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
--AMI q442 \
--preExec "all:flags.DQ.Steering.doHLTMon=False" \
--imf False \
@@ -73,7 +73,7 @@ cd 5thread
#####################################################################
# now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
--AMI q442 \
--preExec "all:flags.DQ.Steering.doHLTMon=False" \
--imf False \
@@ -95,7 +95,7 @@ cd 8thread
#####################################################################
# now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
--AMI q442 \
--preExec "all:flags.DQ.Steering.doHLTMon=False" \
--imf False \
diff --git a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh
index 7728d3ffe467b3c600669106ef483cd4de36db6d..f33a493b98d9686ef08e28872d9f08806572d4b6 100755
--- a/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh
+++ b/MuonSpectrometer/MuonValidation/MuonRecValidation/MuonRecRTT/test/test_q443_RAWtoALL_MT.sh
@@ -34,7 +34,7 @@ mkdir Serial
cd Serial
#####################################################################
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
--AMI q443 \
--conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
--postInclude "RAWtoALL:MuonPRDTest.NSWPRDValAlgReco.NSWPRDValAlgRecoCfg" \
@@ -60,7 +60,7 @@ cd 1thread
#####################################################################
# now run reconstruction with AthenaMT with 1 thread
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
--AMI q443 \
--conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
--multithreaded \
@@ -85,7 +85,7 @@ cd 5thread
#####################################################################
# now run reconstruction with AthenaMT with 5 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
--AMI q443 \
--conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
--imf False \
@@ -110,7 +110,7 @@ cd 8thread
#####################################################################
# now run reconstruction with AthenaMT with 8 threads
-Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' \
+Reco_tf.py --CA 'all:True' \
--AMI q443 \
--conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
--imf False \
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py
index c4eba1403cb9d6ce27d5cc17d822db283a49eb2b..0e7248459767ec759c75c0ae40941898a4efb895 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/python/HIGG1D1.py
@@ -301,7 +301,7 @@ def HIGG1D1Cfg(flags):
"HggPrimaryVertices":"xAOD::VertexContainer", "HggPrimaryVerticesAux":"xAOD::ShallowAuxContainer",
"Kt4EMPFlowCustomVtxEventShape":"xAOD::EventShape", "Kt4EMPFlowCustomVtxEventShapeAux":"xAOD::EventShapeAuxInfo",
"Kt4EMPFlowEventShape":"xAOD::EventShape", "Kt4EMPFlowEventShapeAux":"xAOD::EventShapeAuxInfo",
- "ZeeRefittedPrimaryVertices":"xAOD::VertexContainer","ZeeRefittedPrimaryVerticesAux":"xAOD:VertexAuxContainer",
+ "ZeeRefittedPrimaryVertices":"xAOD::VertexContainer","ZeeRefittedPrimaryVerticesAux":"xAOD::VertexAuxContainer",
"AFPSiHitContainer":"xAOD::AFPSiHitContainer","AFPSiHitContainerAux":"xAOD::AFPSiHitAuxContainer",
"AFPToFHitContainer":"xAOD::AFPToFHitContainer","AFPToFHitContainerAux":"xAOD::AFPToFHitAuxContainer",
"AFPVertexContainer":"xAOD::AFPVertexContainer", "AFPVertexContainerAux":"xAOD::AFPVertexAuxContainer",
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh
index bb680774e906320bad5d6818c22d7c7df5ef4d05..f0cf66da2e1439161903b02caf738b4348bc3a9b 100755
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_MC_grid.sh
@@ -14,7 +14,7 @@ ATHENA_CORE_NUMBER=4 Reco_tf.py \
--multithreaded \
--AMIConfig q445 \
--imf False \
---CA all:True RDOtoRDOTrigger:False \
+--CA all:True \
--preExec="all:flags.BTagging.Trackless=True" \
--maxEvents 25
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh
index 66e0f8080956ddf95a3b1f65c198b5ceb57f4008..e74134a30d37f06641ba87fe4e16d0e5ccea5777 100755
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_FTAG_AOD_withtrackless_data_grid.sh
@@ -14,7 +14,7 @@ ATHENA_CORE_NUMBER=4 Reco_tf.py \
--multithreaded \
--AMIConfig q449 \
--imf False \
---CA all:True RDOtoRDOTrigger:False \
+--CA all:True \
--preExec="all:flags.BTagging.Trackless=True" \
--maxEvents 25
diff --git a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
index 7f68be7f4a6eadc153acd608a8161064db22f23b..3b49428e1539ef60a52838a4fb7b2fbf54ad883f 100755
--- a/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
+++ b/PhysicsAnalysis/JetTagging/FlavourTaggingTests/test/test_trigAna_FTAG_PhysicsVariablePlots_AOD_grid.py
@@ -25,7 +25,7 @@ rdo2aod.max_events = 800
rdo2aod.threads = 4
rdo2aod.concurrent_events = 4
rdo2aod.args = '--outputAODFile=AOD.pool.root --steering="doRDO_TRIG"'
-rdo2aod.args += ' --CA "default:True" "RDOtoRDOTrigger:False"'
+rdo2aod.args += ' --CA "default:True"'
rdo2aod.args += ' --preExec="all:{:s};"'.format(preExec)
diff --git a/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt b/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt
index 03f280e8e151b4451feee43fc7a59575f02346d2..0e13b6a59f11e8cac0015a27e79421c5da56df8c 100644
--- a/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt
+++ b/Reconstruction/Jet/JetEventAthenaPool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_add_poolcnv_library( JetEventAthenaPoolPoolCnv
JetEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_15.9.0.5_test.py b/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_15.9.0.5_test.py
deleted file mode 100644
index bc46c88af75b4d1246281fdb95010d68138143aa..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_15.9.0.5_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-infile = 'aod/AOD-15.9.0.5/AOD-15.9.0.5-full.pool.root'
-keys = ['HLT_TrigCosmicJetRec',
- 'AtlfastJetContainer',
- 'HLT_TrigTauJet',
- 'Cone7H1TowerAODJets',
- # Can't read these because it requires TruthParticleCnvTool
- # from AtlasReconstruction.
- #'Cone4TruthJets',
- #'AntiKt4TruthJets',
- 'Cone4H1TopoJets',
- 'Cone4H1TowerAODJets',
- 'AntiKt6H1TopoJets',
- 'AntiKt6LCTopoJets',
- 'AntiKt6H1TowerAODJets',
- 'AntiKt4H1TowerAODJets',
- 'AntiKt4H1TopoJets',
- 'HLT_TrigJetRec',
- ]
-
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_17.0.0_test.py b/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_17.0.0_test.py
deleted file mode 100644
index 5a3737c54542a0cdfee70922b5b75915cf035086..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_17.0.0_test.py
+++ /dev/null
@@ -1,19 +0,0 @@
-infile = 'aod/AOD-17.0.0/AOD-17.0.0-full.pool.root'
-keys = [ 'HLT_TrigCosmicJetRec',
- 'HLT_TrigTauJet',
- # Can't read these because it requires TruthParticleCnvTool
- # from AtlasReconstruction.
- #'AntiKt4TruthJets',
- #'AntiKt6TruthJets',
- 'AntiKt4TopoJets',
- 'AntiKt6TowerAODJets',
- 'AntiKt4TowerAODJets',
- 'AntiKt6TopoJets',
- 'AntiKt4TopoEMJets',
- 'AntiKt6TopoEMJets',
- 'AntiKt4LCTopoJets',
- 'AntiKt6LCTopoJets',
- 'HLT_TrigJetRec',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_17.2.8_test.py b/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_17.2.8_test.py
deleted file mode 100644
index 257494e775badb78138fa4cd5c1aaf04c08a29d2..0000000000000000000000000000000000000000
--- a/Reconstruction/Jet/JetEventAthenaPool/share/JetTPCnv_17.2.8_test.py
+++ /dev/null
@@ -1,17 +0,0 @@
-infile = 'aod/AOD-17.2.8/AOD-17.2.8-full.pool.root'
-keys = [ 'HLT_TrigCosmicJetRec',
- 'AntiKt6TowerAODJets',
- 'HLT_TrigTauJet',
- 'AntiKt6GhostTowerAODJets',
- # Can't read these because it requires TruthParticleCnvTool
- # from AtlasReconstruction.
- #'AntiKt4TruthJets',
- 'AntiKt4TopoEMJets',
- 'AntiKt6TopoEMJets',
- 'AntiKt4LCTopoJets',
- 'AntiKt6LCTopoJets',
- 'HLT_TrigJetRec',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet.sh b/Reconstruction/Jet/JetValidation/test/test_jet.sh
index 942a00fec9f3cd198c9f26d85358f8bbd168f5bb..bf88a57d61af69eb35372a6be4d2ff52c60060a8 100755
--- a/Reconstruction/Jet/JetValidation/test/test_jet.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_jet.sh
@@ -11,7 +11,7 @@
export ATHENA_CORE_NUMBER=8
Reco_tf.py \
--AMI q443 \
- --CA "all:True" "RDOtoRDOTrigger:False" \
+ --CA "all:True" \
--sharedWriter True \
--steering 'doRDO_TRIG' 'doTRIGtoALL' \
--outputAODFile myAOD.pool.root \
diff --git a/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
index 657385aecef7c3569f8a8a2699866245d58dc451..e58730fe91b764a5d34c2dbe04d83e3ce0ef69bb 100755
--- a/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_jet_noPtCut.sh
@@ -11,7 +11,7 @@
export ATHENA_CORE_NUMBER=8
Reco_tf.py \
--AMI q443 \
- --CA "all:True" "RDOtoRDOTrigger:False" \
+ --CA "all:True" \
--sharedWriter True \
--steering 'doRDO_TRIG' 'doTRIGtoALL' \
--outputAODFile myAOD.pool.root \
diff --git a/Reconstruction/Jet/JetValidation/test/test_met.sh b/Reconstruction/Jet/JetValidation/test/test_met.sh
index 825e62e3a6f103adb613d74a98678fffb4c85f27..3bde295746dc0a03d4c82921c12787f98b5a3ec8 100755
--- a/Reconstruction/Jet/JetValidation/test/test_met.sh
+++ b/Reconstruction/Jet/JetValidation/test/test_met.sh
@@ -11,7 +11,7 @@
export ATHENA_CORE_NUMBER=8
Reco_tf.py \
--AMI q443 \
- --CA "all:True" "RDOtoRDOTrigger:False" \
+ --CA "all:True" \
--sharedWriter True \
--steering 'doRDO_TRIG' 'doTRIGtoALL' \
--outputAODFile myAOD.pool.root \
diff --git a/Reconstruction/RecAthenaPool/CMakeLists.txt b/Reconstruction/RecAthenaPool/CMakeLists.txt
index de2021c986a4ac8620f42fe67d4f8ed8bcf86344..77ad26c0fd457f0423a0f96e2d5383a0195c1885 100644
--- a/Reconstruction/RecAthenaPool/CMakeLists.txt
+++ b/Reconstruction/RecAthenaPool/CMakeLists.txt
@@ -16,7 +16,6 @@ atlas_add_poolcnv_library( RecAthenaPoolPoolCnv
GaudiKernel MissingETEvent muonEvent RecTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Reconstruction/RecAthenaPool/share/RecTPCnv_15.0.0_test.py b/Reconstruction/RecAthenaPool/share/RecTPCnv_15.0.0_test.py
deleted file mode 100644
index a360d6f42306f36093c16546b9df0580e83061e8..0000000000000000000000000000000000000000
--- a/Reconstruction/RecAthenaPool/share/RecTPCnv_15.0.0_test.py
+++ /dev/null
@@ -1,63 +0,0 @@
-infile = 'aod/AOD-15.0.0/AOD-15.0.0-full.pool.root'
-keys = [
- #MissingET_p1
- 'MET_RefGamma',
- 'MET_RefTau',
- 'MET_RefEle',
- 'ObjMET_TauJet',
- 'MET_RefMuon',
- 'MET_RefMuon_Track',
- 'AtlfastMissingEt',
- 'MET_CellOut',
- 'MET_CellOut_MiniJet',
- 'MET_Cryo',
- 'MET_CryoCone',
- 'MET_DM_All',
- 'MET_DM_Crack1',
- 'MET_DM_Crack2',
- 'MET_DM_Cryo',
- 'MET_Final',
- 'MET_LocHadTopoObj',
- 'MET_MuonBoy',
- 'MET_RefFinal',
- 'MET_RefJet',
- 'MET_TopoObj',
- 'ObjMET_IdTrk',
- 'ObjMET_Elec',
- 'MET_MuonBoy_Track',
- 'MET_MuonBoy_Spectro',
- 'ObjMET_Muon',
- 'MET_Muon',
- 'ObjMET_Jet',
- 'ObjMET_MiniJet',
- 'ObjMET_Rest',
- 'ObjMET_Final',
-
- #MissingEtCalo_p1
- 'MET_Base0',
- 'MET_Base',
- 'MET_Calib',
- 'MET_LocHadTopo',
- 'MET_Topo',
- 'MET_CorrTopo',
-
- #MissingEtTruth_p1
- 'MET_Truth',
- 'MET_Truth_PileUp',
-
- #MuonCaloEnergyContainer_p1
- 'MuonCaloEnergyCollection',
-
- #MuonContainer_p4
- 'MuGirlLowBetaCollection',
- 'AtlfastIsoMuonCollection',
- 'AtlfastMuonCollection',
- 'StacoMuonCollection',
- 'CaloMuonCollection',
- 'MuidMuonCollection',
-
- #MuonSpShowerContainer_p1
- 'MuonSpShowers',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/RecAthenaPool/share/RecTPCnv_15.6.1_test.py b/Reconstruction/RecAthenaPool/share/RecTPCnv_15.6.1_test.py
deleted file mode 100644
index ea9dc95f02675600b62011e442ea508cd0d08593..0000000000000000000000000000000000000000
--- a/Reconstruction/RecAthenaPool/share/RecTPCnv_15.6.1_test.py
+++ /dev/null
@@ -1,56 +0,0 @@
-infile = 'aod/AOD-15.6.1/AOD-15.6.1-full.pool.root'
-keys = [
- #MissingET_p2
- 'MET_RefEle',
- 'MET_RefGamma',
- 'MET_RefTau',
- 'MET_MuonBoy_Spectro',
- 'MET_MuonBoy_Track',
- 'MET_MuonBoy',
- 'MET_Cryo',
- 'MET_CryoCone',
- 'MET_LocHadTopoObj',
- 'MET_Final',
- 'MET_TowerObj',
- 'AtlfastMissingEt',
- 'MET_RefFinal',
- 'MET_RefJet',
- 'MET_TopoObj',
- 'MET_TopoTowerObj',
- 'MET_DM_All',
- 'MET_DM_Crack2',
- 'MET_DM_Cryo',
- 'MET_CellOut',
- 'MET_DM_Crack1',
- 'MET_Muon',
-
- #MissingEtCalo_p2
- 'MET_CorrTower',
- 'MET_Base0',
- 'MET_Base',
- 'MET_Calib',
- 'MET_LocHadTopo',
- 'MET_Topo',
- 'MET_CorrTopo',
- 'MET_CorrTopoTower',
-
- #MissingEtTruth_p2
- 'MET_Truth',
- 'MET_Truth_PileUp',
-
- #MuonCaloEnergyContainer_tlp1
- 'MuonCaloEnergyCollection',
-
- #MuonContainer_p5
- 'MuGirlLowBetaCollection',
- 'AtlfastIsoMuonCollection',
- 'CaloMuonCollection',
- 'AtlfastMuonCollection',
- 'MuidMuonCollection',
- 'StacoMuonCollection',
-
- #MuonSpShowerContainer_p1
- 'MuonSpShowers',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/RecAthenaPool/share/RecTPCnv_17.0.6_test.py b/Reconstruction/RecAthenaPool/share/RecTPCnv_17.0.6_test.py
deleted file mode 100644
index a769d063e801d84ca46ff3a31bf3c1764ed6c66c..0000000000000000000000000000000000000000
--- a/Reconstruction/RecAthenaPool/share/RecTPCnv_17.0.6_test.py
+++ /dev/null
@@ -1,73 +0,0 @@
-infile = 'aod/AOD-17.0.6/AOD-17.0.6-full.pool.root'
-keys = [
- #MissingETComposition_p1
- 'MET_RefComposition',
- 'MET_RefComposition_em',
-
- #MissingET_p3
- 'MET_RefGamma',
- 'MET_RefGamma_em',
- 'MET_RefMuon',
- 'MET_RefMuon_em',
- 'MET_RefMuon_Muid',
- 'MET_Muid',
- 'MET_RefTau',
- 'MET_MuonBoy',
- 'MET_MuonBoy_Spectro',
- 'MET_RefTau_em',
- 'MET_Muid_Track',
- 'MET_RefMuon_Track',
- 'MET_MuonBoy_Track',
- 'MET_RefMuon_Track_em',
- 'MET_RefMuon_Track_Muid',
- 'MET_Muid_Spectro',
- 'MET_RefEle',
- 'MET_Track',
- 'MET_Cryo',
- 'MET_DM_All',
- 'MET_RefEle_em',
- 'MET_TopoObj',
- 'MET_DM_Crack2',
- 'MET_DM_Cryo',
- 'MET_CryoCone',
- 'MET_DM_Crack1',
- 'MET_LocHadTopoObj',
- 'MET_Muon',
- 'MET_MuonMuid',
- 'MET_SoftJets_em',
- 'MET_Final',
- 'MET_SoftJets',
- 'MET_RefJet',
- 'MET_RefJet_em',
- 'MET_RefFinal',
- 'MET_CellOut_em',
- 'MET_RefFinal_em',
- 'MET_CellOut_Eflow',
- 'MET_CellOut_Eflow_Muid',
-
- #MissingEtCalo_p3
- 'MET_Base0',
- 'MET_Calib',
- 'MET_Base',
- 'MET_Topo',
- 'MET_CorrTopo',
- 'MET_LocHadTopo',
-
- #MissingEtTruth_p3
- 'MET_Truth',
- 'MET_Truth_PileUp',
-
- #MuonCaloEnergyContainer_tlp1
- 'MuonCaloEnergyCollection',
-
- #MuonContainer_p6
- 'MuGirlLowBetaCollection',
- 'CaloMuonCollection',
- 'StacoMuonCollection',
- 'MuidMuonCollection',
-
- #MuonSpShowerContainer_p1
- 'MuonSpShowers',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/RecAthenaPool/share/RecTPCnv_18.0.0_test.py b/Reconstruction/RecAthenaPool/share/RecTPCnv_18.0.0_test.py
deleted file mode 100644
index acdc6f91f8cb70b3dd56660590c29f743a61135d..0000000000000000000000000000000000000000
--- a/Reconstruction/RecAthenaPool/share/RecTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,50 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #MissingETComposition_p2
- 'MET_RefComposition',
-
- #MissingET_p3
- 'MET_RefGamma',
- 'MET_RefMuons',
- 'MET_RefTau',
- 'MET_Muons',
- 'MET_Muons_Track',
- 'MET_RefMuons_Track',
- 'MET_Muons_Spectro',
- 'MET_RefEle',
- 'MET_Cryo',
- 'MET_MuonMuons',
- 'MET_RefJet',
- 'MET_RefJet_JVF',
- 'MET_RefJet_JVFCut',
- 'MET_Track',
- 'MET_RefFinal',
- 'MET_CellOut_Eflow',
- 'MET_RefFinal_STVF',
- 'MET_CellOut_Eflow_JetArea',
- 'MET_CellOut_Eflow_STVF',
- 'MET_CellOut_Eflow_JetAreaJVF',
- 'MET_CellOut_Eflow_JetAreaRhoEta5JVF',
-
- #MissingEtCalo_p3
- 'MET_Base0',
- 'MET_Topo',
- 'MET_LocHadTopo',
-
- #MissingEtTruth_p3
- 'MET_Truth_PileUp',
- 'MET_Truth',
-
- #MuonCaloEnergyContainer_p1
- 'MuonCaloEnergyCollection',
-
- #MuonContainer_p6
- 'MuGirlLowBetaCollection',
- 'CaloMuonCollection',
- 'Muons',
-
- #MuonSpShowerContainer_p1
- 'MuonSpShowers',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
index bcc4090fdf8176cce4ff5d2bfcfdf96d4bb4e8ca..36cbdf5777d9870fef121bc0dcd8e585e7f20375 100755
--- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
+++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh
@@ -9,7 +9,7 @@
export ATHENA_CORE_NUMBER=8
Reco_tf.py \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
--multithreaded \
--inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc21_13p6TeV/HITSFiles/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8453_s3873/HITS.29625927._000632.pool.root.1 \
--steering 'doRDO_TRIG' \
diff --git a/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt b/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt
index b28f4247f198ab7ff66e724d3a313dcc6c9f3a16..f313b31d8958bbda68f55e9413d72b9df58be2ef 100644
--- a/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt
+++ b/Reconstruction/TrackParticleAthenaPool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_add_poolcnv_library( TrackParticleAthenaPoolPoolCnv
GaudiKernel Particle TrackParticleTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_16.6.3_test.py b/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_16.6.3_test.py
deleted file mode 100644
index 9f70b2ce426b973b4811974cad7acb62340387b2..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_16.6.3_test.py
+++ /dev/null
@@ -1,32 +0,0 @@
-infile = 'aod/AOD-16.6.3/AOD-16.6.3-full.pool.root'
-keys = [
- #Rec::TrackParticleContainer_tlp1
- 'HLT_InDetTrigParticleCreationIOTRT_CosmicsN_EFID',
- 'HLT_InDetTrigParticleCreation_CosmicsN_EFID',
- 'HLT_InDetTrigParticleCreation_Photon_EFID',
- 'MuTagTrackParticles',
- 'HLT_InDetTrigParticleCreationTRTOnly_Muon_EFID',
- 'MuidExtrTrackParticles',
- 'MuidCombTrackParticles',
- 'MuGirlRefittedTrackParticles',
- 'MuonboyTrackParticles',
- 'MuonboyMuonSpectroOnlyTrackParticles',
- 'HLT_InDetTrigParticleCreation_Muon_EFID',
- 'MuTagIMOTrackParticles',
- 'StacoTrackParticles',
- 'HLT_InDetTrigParticleCreation_Bphysics_EFID',
- 'MooreTrackParticles',
- 'HLT_InDetTrigParticleCreationCombined_Electron_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_Electron_EFID',
- 'HLT_InDetTrigParticleCreation_Bjet_EFID',
- 'AtlfastTrackParticles',
- 'HLT_InDetTrigParticleCreationTRTOnly_Tau_EFID',
- 'HLT_InDetTrigParticleCreation_Tau_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_FullScan_EFID',
- 'HLT_InDetTrigParticleCreation_FullScan_EFID',
- 'HLT_InDetTrigParticleCreation_Electron_EFID',
- 'TrackParticleCandidate',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_17.2.8_test.py b/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_17.2.8_test.py
deleted file mode 100644
index 4b959a629c8b79f65901974fd073f81ac10c6ef6..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_17.2.8_test.py
+++ /dev/null
@@ -1,40 +0,0 @@
-infile = 'aod/AOD-17.2.8/AOD-17.2.8-full.pool.root'
-keys = [
- #Rec::TrackParticleContainer_tlp2
- 'MuTagTrackParticles',
- 'SegmentTagTrackParticles',
- 'ResolvedForwardTrackParticles',
- 'HLT_InDetTrigParticleCreation_Photon_EFID',
- 'HLT_InDetTrigParticleCreation_CosmicsN_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_Tau_EFID',
- 'HLT_InDetTrigParticleCreationIOTRT_CosmicsN_EFID',
- 'HLT_InDetTrigParticleCreationCombined_Electron_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_FullScan_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_Muon_EFID',
- 'RefittedExtrapolatedMuonSpectrometerParticles',
- 'MuTagIMOTrackParticles',
- 'MuonboyMuonSpectroOnlyTrackParticles',
- 'HLT_InDetTrigParticleCreation_Bphysics_EFID',
- 'HLT_InDetTrigParticleCreation_Muon_EFID',
- 'MuonboyTrackParticles',
- 'MuidExtrTrackParticles',
- 'MooreTrackParticles',
- 'ExtrapolatedMuonSpectrometerParticles',
- 'StatCombinedMuonParticles',
- 'MuonSpectrometerParticles',
- 'MuidCombTrackParticles',
- 'StacoTrackParticles',
- 'CombinedFitMuonParticles',
- 'HLT_InDetTrigParticleCreationTRTOnly_Electron_EFID',
- 'HLT_InDetTrigParticleCreation_FullScan_EFID',
- 'HLT_InDetTrigParticleCreation_MuonIso_EFID',
- 'MuGirlRefittedTrackParticles',
- 'HLT_InDetTrigParticleCreation_Tau_EFID',
- 'HLT_InDetTrigParticleCreation_Bjet_EFID',
- 'GSFTrackParticleCandidate',
- 'HLT_InDetTrigParticleCreation_Electron_EFID',
- 'TrackParticleCandidate',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_18.0.0_test.py b/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_18.0.0_test.py
deleted file mode 100644
index 7355258bb67fc21fc289a2bba9bf726b5401d38c..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackParticleAthenaPool/share/TrackParticleTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,32 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #Rec::TrackParticleContainer_tlp2
- 'SegmentTagTrackParticles',
- 'HLT_InDetTrigParticleCreation_Photon_EFID',
- 'HLT_InDetTrigParticleCreation_CosmicsN_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_Tau_EFID',
- 'HLT_InDetTrigParticleCreationIOTRT_CosmicsN_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_FullScan_EFID',
- 'HLT_InDetTrigParticleCreationCombined_Electron_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_Muon_EFID',
- 'RefittedExtrapolatedMuonSpectrometerParticles',
- 'HLT_InDetTrigParticleCreation_Bphysics_EFID',
- 'ResolvedForwardTrackParticles',
- 'ExtrapolatedMuonSpectrometerParticles',
- 'MuonSpectrometerParticles',
- 'StatCombinedMuonParticles',
- 'CombinedFitMuonParticles',
- 'HLT_InDetTrigParticleCreation_Muon_EFID',
- 'MuGirlRefittedTrackParticles',
- 'HLT_InDetTrigParticleCreation_FullScan_EFID',
- 'HLT_InDetTrigParticleCreation_MuonIso_EFID',
- 'HLT_InDetTrigParticleCreationTRTOnly_Electron_EFID',
- 'HLT_InDetTrigParticleCreation_Tau_EFID',
- 'HLT_InDetTrigParticleCreation_Bjet_EFID',
- 'GSFTrackParticleCandidate',
- 'HLT_InDetTrigParticleCreation_Electron_EFID',
- 'TrackParticleCandidate',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Reconstruction/TrackParticleTruthAthenaPool/CMakeLists.txt b/Reconstruction/TrackParticleTruthAthenaPool/CMakeLists.txt
index c928b593b8f2dec038c3ea13f64ead318574d384..100513566ed0015b50f05f0cdf0f235d5543d0af 100644
--- a/Reconstruction/TrackParticleTruthAthenaPool/CMakeLists.txt
+++ b/Reconstruction/TrackParticleTruthAthenaPool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_add_poolcnv_library( TrackParticleTruthAthenaPoolPoolCnv
AthenaPoolCnvSvcLib ParticleTruth TrackParticleTruthTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Reconstruction/TrackParticleTruthAthenaPool/share/TrackParticleTruthTPCnv_18.0.0_test.py b/Reconstruction/TrackParticleTruthAthenaPool/share/TrackParticleTruthTPCnv_18.0.0_test.py
deleted file mode 100644
index fae2bbfb4195c73406e3a3ed738864b3b1e8dbbd..0000000000000000000000000000000000000000
--- a/Reconstruction/TrackParticleTruthAthenaPool/share/TrackParticleTruthTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,17 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #Rec::TrackParticleTruthCollection_p1
- 'RefittedExtrapolatedMuonSpectrometerParticlesTruth',
- 'CombinedFitMuonParticlesTruth',
- 'MuGirlRefittedTrackParticlesTruth',
- 'StatCombinedMuonParticlesTruth',
- 'ExtrapolatedMuonSpectrometerParticlesTruth',
- 'GSFTrackParticleTruthCollection',
- 'TrackParticleTruthCollection',
- ]
-
-#noMuon = True
-#noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Reconstruction/eflowAthenaPool/CMakeLists.txt b/Reconstruction/eflowAthenaPool/CMakeLists.txt
index 38cdedcd26ecca98dd57a874a0760c401d9ec362..59590f2b5b5d575f330e3ca160a0994cb055c2db 100644
--- a/Reconstruction/eflowAthenaPool/CMakeLists.txt
+++ b/Reconstruction/eflowAthenaPool/CMakeLists.txt
@@ -10,7 +10,6 @@ atlas_add_poolcnv_library( eflowAthenaPoolPoolCnv
LINK_LIBRARIES AthenaPoolUtilities AthenaPoolCnvSvcLib eflowEvent eflowEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Reconstruction/eflowAthenaPool/share/eflowEventTPCnv_17.5.0_test.py b/Reconstruction/eflowAthenaPool/share/eflowEventTPCnv_17.5.0_test.py
deleted file mode 100644
index 4383b9298b6bedd35d6f12bb01b5816059f8aeca..0000000000000000000000000000000000000000
--- a/Reconstruction/eflowAthenaPool/share/eflowEventTPCnv_17.5.0_test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-infile = 'aod/AOD-17.5.0/AOD-17.5.0-full.pool.root'
-keys = [
- #eflowObjectContainer_p4
- 'eflowObjects_tauMode',
- ]
-
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Reconstruction/eflowAthenaPool/share/eflowEventTPCnv_18.0.0_test.py b/Reconstruction/eflowAthenaPool/share/eflowEventTPCnv_18.0.0_test.py
deleted file mode 100644
index bea231c1aeebbee39e63181b447e03627011b0ff..0000000000000000000000000000000000000000
--- a/Reconstruction/eflowAthenaPool/share/eflowEventTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #eflowObjectContainer_p5
- 'eflowObjects_tauMode',
- ]
-
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt b/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt
index a1d272d33a26711510e7d4bbcfb5bbfbc0f10ab8..653408e3c2b473d7de2e27724500b2f5468a2aa2 100644
--- a/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt
+++ b/Reconstruction/egamma/egammaAthenaPool/CMakeLists.txt
@@ -13,7 +13,6 @@ atlas_add_poolcnv_library( egammaAthenaPoolPoolCnv
GaudiKernel egammaEvent egammaEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_15.1.0_test.py b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_15.1.0_test.py
deleted file mode 100644
index 3dc35bc493d540272ad7be69c67c87d4a81b4f80..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_15.1.0_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-infile = 'aod/AOD-15.1.0/AOD-15.1.0-full.pool.root'
-keys = [
- #ElectronContainer_p1
- 'AtlfastIsoElectronCollection',
- 'AtlfastElectronCollection',
- 'ElectronAODCollection',
-
- #PhotonContainer_p1
- 'AtlfastIsoPhotonCollection',
- 'AtlfastPhotonCollection',
- 'PhotonAODCollection',
-
- #egammaContainer_p1
- 'HLT_egamma_Photons',
- 'HLT_egamma_Electrons',
-
- #egDetailContainer_p1
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_15.6.9_test.py b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_15.6.9_test.py
deleted file mode 100644
index 14b43bec7bc0aaf7c3ef693f3dec39d46283e19e..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_15.6.9_test.py
+++ /dev/null
@@ -1,22 +0,0 @@
-infile = 'aod/AOD-15.6.9/AOD-15.6.9-full.pool.root'
-keys = [
- #ElectronContainer_p2
- 'AtlfastIsoElectronCollection',
- 'AtlfastElectronCollection',
- 'ElectronAODCollection',
-
- #PhotonContainer_p2
- 'AtlfastIsoPhotonCollection',
- 'AtlfastPhotonCollection',
- 'PhotonAODCollection',
-
- #egammaContainer_p2
- 'HLT_egamma',
- 'HLT_egamma_Photons',
- 'HLT_egamma_Electrons',
-
- #egDetailContainer_p2
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_16.6.7.1_test.py b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_16.6.7.1_test.py
deleted file mode 100644
index 61e65f2d6911a0d968a617dab6da9778eaadcedc..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_16.6.7.1_test.py
+++ /dev/null
@@ -1,22 +0,0 @@
-infile = 'aod/AOD-16.6.7.1/AOD-16.6.7.1-full.pool.root'
-keys = [
- #ElectronContainer_p4
- 'AtlfastIsoElectronCollection',
- 'AtlfastElectronCollection',
- 'ElectronAODCollection',
-
- #PhotonContainer_p4
- 'AtlfastIsoPhotonCollection',
- 'AtlfastPhotonCollection',
- 'PhotonAODCollection',
-
- #egammaContainer_p4
- 'HLT_egamma',
- 'HLT_egamma_Photons',
- 'HLT_egamma_Electrons',
-
- #egDetailContainer_p2
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_18.0.0_test.py b/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_18.0.0_test.py
deleted file mode 100644
index f1331d457ebea21b5e4a26fe4f269bb9bcb6de57..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAthenaPool/share/egammaEventTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,18 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #ElectronContainer_p5
- 'ElectronAODCollection',
-
- #PhotonContainer_p5
- 'PhotonAODCollection',
-
- #egammaContainer_p5
- 'HLT_egamma',
- 'HLT_egamma_Photons',
- 'HLT_egamma_Electrons',
-
- #egDetailContainer_p2
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/egamma/egammaAthenaPool/test/egammaAthenaPool.xml b/Reconstruction/egamma/egammaAthenaPool/test/egammaAthenaPool.xml
deleted file mode 100755
index ec9b33463b9b0d2445d1bdb30d2a28b8942b1041..0000000000000000000000000000000000000000
--- a/Reconstruction/egamma/egammaAthenaPool/test/egammaAthenaPool.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<atn>
- <TEST name="egammaAthenaPoolTests" type="makecheck">
- <package>Reconstruction/egammaAthenaPool</package>
- <timelimit>20</timelimit>
- <author> scott snyder </author>
- <mailto> snyder@bnl.gov </mailto>
- <expectations>
- <errorMessage>Athena exited abnormally</errorMessage>
- <errorMessage>differ</errorMessage>
- <warningMessage> # WARNING_MESSAGE : post.sh> ERROR</warningMessage>
- <successMessage>check ok</successMessage>
- <returnValue>0</returnValue>
- </expectations>
- </TEST>
-</atn>
diff --git a/Reconstruction/tauEventAthenaPool/CMakeLists.txt b/Reconstruction/tauEventAthenaPool/CMakeLists.txt
index b4f2ba2e804cf8076c5292073faa5abc00f1d58d..d68e8b5f200672e9e7b35ccce23287e2196609bc 100644
--- a/Reconstruction/tauEventAthenaPool/CMakeLists.txt
+++ b/Reconstruction/tauEventAthenaPool/CMakeLists.txt
@@ -12,7 +12,6 @@ atlas_add_poolcnv_library( tauEventAthenaPoolPoolCnv
tauEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_15.0.0_test.py b/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_15.0.0_test.py
deleted file mode 100644
index bb9bf7b90b2ad51463d01e7066984599d701792a..0000000000000000000000000000000000000000
--- a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_15.0.0_test.py
+++ /dev/null
@@ -1,14 +0,0 @@
-infile = 'aod/AOD-15.0.0/AOD-15.0.0-full.pool.root'
-keys = [
- #TauJetContainer_p3
- 'HLT_TrigTauRecCalo',
- 'AtlfastTauJetContainer',
- 'AtlfastTauJet1p3pContainer',
- 'HLT_TrigTauRecMerged',
- 'TauRecContainer',
-
- #TauDetailsContainer_tlp1
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_15.6.9_test.py b/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_15.6.9_test.py
deleted file mode 100644
index d04ceb6781b161a792dc2bea3b7908b2935efc76..0000000000000000000000000000000000000000
--- a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_15.6.9_test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-infile = 'aod/AOD-15.6.9/AOD-15.6.9-full.pool.root'
-keys = [
- #TauJetContainer_p3
- 'HLT_TrigTauRecCalo',
- 'AtlfastTauJetContainer',
- 'HLT_TrigTauRecMerged',
- 'TauRecContainer',
-
- #TauDetailsContainer_tlp2
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_17.2.9.1_test.py b/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_17.2.9.1_test.py
deleted file mode 100644
index ba2fbd6b86cfa2727fd94a3896c61ff41af159bf..0000000000000000000000000000000000000000
--- a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_17.2.9.1_test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-infile = 'aod/AOD-17.2.9.1/AOD-17.2.9.1-full.pool.root'
-keys = [
- #TauJetContainer_p4
- 'HLT_TrigTauRecCalo',
- 'HLT_TrigTauRecMerged',
- 'TauRecContainer',
-
- #TauDetailsContainer_tlp3
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_18.0.0_test.py b/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_18.0.0_test.py
deleted file mode 100644
index 821a2b0d4cf3a29b94067497f4b233628defb0ab..0000000000000000000000000000000000000000
--- a/Reconstruction/tauEventAthenaPool/share/tauEventTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,12 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #TauJetContainer_p5
- 'HLT_TrigTauRecCalo',
- 'HLT_TrigTauRecMerged',
- 'TauRecContainer',
-
- #TauDetailsContainer_tlp4
- # Dumped as part of the above.
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
index cc40f186d91366d76c5a31a15d46b30b92fe7887..4a8d0b36a870a50ee50ec7fb84ca61ccb6400e35 100644
--- a/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
+++ b/Reconstruction/tauMonitoring/python/tauMonitorAlgorithm.py
@@ -227,7 +227,11 @@ def tauMonitoringConfig(inputFlags,**kwargs):
igroup.defineHistogram(namer('RNNJetScoreSigTrans','RNNJetScoreSigTrans','',postfix), title='RNN Jet Score Sig Trans',
xbins=48, xmin=0, xmax=1.1,path=folder)
+ igroup.defineHistogram(namer('RNNEleScore','RNNEleScore','',postfix), title='RNN Ele Score',
+ xbins=100, xmin=0, xmax=1,path=folder)
+ igroup.defineHistogram(namer('RNNEleScoreSigTrans','RNNEleScoreSigTrans','',postfix), title='RNN Ele Score Sig Trans',
+ xbins=48, xmin=0, xmax=1.1,path=folder)
igroup.defineHistogram(namer('tauEt','tauEt','',postfix), title='Et of tau candidates;Transverse Energy (GeV);Number of Candidates',
xbins=60, xmin=0., xmax=300.,path=folder)
diff --git a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
index 234db266516672fb4f015d29d2704d06130342f7..791196f897c6fa85a82473c08cf5f58eb2f78472 100644
--- a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
+++ b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
@@ -66,6 +66,10 @@ StatusCode tauMonitorAlgorithm::fillHistograms(const EventContext &ctx) const {
auto RNNJetScoreSigTrans =
Monitored::Scalar<float>("RNNJetScoreSigTrans", 0.0);
+ auto RNNEleScore = Monitored::Scalar<float>("RNNEleScore", 0.0);
+ auto RNNEleScoreSigTrans =
+ Monitored::Scalar<float>("RNNEleScoreSigTrans", 0.0);
+
auto NumTracks = Monitored::Scalar<int>("NumTracks", 0.0);
auto NumTracksEt15RNNLoose =
Monitored::Scalar<int>("NumTracksEt15RNNLoose", 0.0);
@@ -260,6 +264,10 @@ StatusCode tauMonitorAlgorithm::fillHistograms(const EventContext &ctx) const {
RNNJetScoreSigTrans =
tau->discriminant(xAOD::TauJetParameters::TauID::RNNJetScoreSigTrans);
+ RNNEleScore = tau->discriminant(xAOD::TauJetParameters::TauID::RNNEleScore);
+ RNNEleScoreSigTrans =
+ tau->discriminant(xAOD::TauJetParameters::TauID::RNNEleScoreSigTrans);
+
muonVeto = tau->isTau(xAOD::TauJetParameters::MuonVeto);
tauRNNLoose = tau->isTau(xAOD::TauJetParameters::JetRNNSigLoose);
tauRNNMedium = tau->isTau(xAOD::TauJetParameters::JetRNNSigMedium);
@@ -681,8 +689,8 @@ StatusCode tauMonitorAlgorithm::fillHistograms(const EventContext &ctx) const {
fill(tool, tauPhi, tauEta, LB, tauEt, centFrac, isolFrac, EMRadius,
hadRadius, stripWidth2, nStrip, etEMAtEMScale, etHadAtEMScale,
- tauCharge, RNNJetScore, RNNJetScoreSigTrans, muonVeto, tauRNNLoose,
- tauRNNMedium, tauRNNTight, PSSFrac, EMFrac, EMFracTrk,
+ tauCharge, RNNJetScore, RNNJetScoreSigTrans, RNNEleScore, RNNEleScoreSigTrans,
+ muonVeto, tauRNNLoose, tauRNNMedium, tauRNNTight, PSSFrac, EMFrac, EMFracTrk,
EfracL2EffCluster, EisoEffCluster, InvMassEffClusters, nNeutPFO,
nShot, NumTracks, nClusters, jetSeedEta, jetSeedPhi, jetSeedPt,
dRmax, ptRatioEflowApprox, trkAvgDist);
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/CMakeLists.txt b/TileCalorimeter/TileSvc/TileEventAthenaPool/CMakeLists.txt
index 481b39add707494882593b4efd88b7274b10a195..aa6e28660de717b9a1f08252c1ccf5d7c68784a8 100644
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/CMakeLists.txt
+++ b/TileCalorimeter/TileSvc/TileEventAthenaPool/CMakeLists.txt
@@ -17,7 +17,6 @@ atlas_add_poolcnv_library( TileEventAthenaPoolPoolCnv
TileTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/share/TileTPCnv_15.6.4_test.py b/TileCalorimeter/TileSvc/TileEventAthenaPool/share/TileTPCnv_15.6.4_test.py
deleted file mode 100644
index ac2868486507aae19604f7c98b52128943bde665..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/share/TileTPCnv_15.6.4_test.py
+++ /dev/null
@@ -1,18 +0,0 @@
-infile = 'esd/ESD-15.6.4.pool.root'
-keys = [
- #TileL2Container_p1
- 'TileL2Cnt',
-
- #TileMuContainer_p1
- 'TileMuObj',
-
- #TileTTL1Container_p1
- 'TileTTL1MBTS',
- ]
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/TileCalorimeter/TileSvc/TileEventAthenaPool/share/TileTPCnv_20.1.7.2_test.py b/TileCalorimeter/TileSvc/TileEventAthenaPool/share/TileTPCnv_20.1.7.2_test.py
deleted file mode 100644
index 00c316c6f2b8abd9aa220272a3bba356ed9d99c6..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileSvc/TileEventAthenaPool/share/TileTPCnv_20.1.7.2_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #TileDigitsContainer_p1
- 'TileDigitsFlt',
-
- #TileL2Container_p2
- 'TileL2Cnt',
-
- #TileMuContainer_p1
- 'TileMuObj',
-
- #TileTTL1Container_p1
- 'TileTTL1MBTS',
- ]
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/CMakeLists.txt b/TileCalorimeter/TileSvc/TileSimEventAthenaPool/CMakeLists.txt
index 14a79a987def500b026b3aa480e24ff1911d36e2..acbfb586421f0061cecb5438cba2346b8dbf9909 100644
--- a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/CMakeLists.txt
+++ b/TileCalorimeter/TileSvc/TileSimEventAthenaPool/CMakeLists.txt
@@ -11,7 +11,6 @@ atlas_add_poolcnv_library( TileSimEventAthenaPoolPoolCnv
TileSimEvent TileSimEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/share/TileSimEventTPCnv_HITS_test.py b/TileCalorimeter/TileSvc/TileSimEventAthenaPool/share/TileSimEventTPCnv_HITS_test.py
deleted file mode 100644
index 02af4a1424a287cfc9ef8cc6c3d51ff88f3e0c77..0000000000000000000000000000000000000000
--- a/TileCalorimeter/TileSvc/TileSimEventAthenaPool/share/TileSimEventTPCnv_HITS_test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-infile = 'rtt:valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.simul.HITS.e3099_s2578_tid04919495_00/HITS.04919495._000416.pool.root.1'
-keys = [
- #TileHitVector_p1
- 'MBTSHits@100',
- 'TileHitVec@100',
- ]
-
-theApp.EvtMax = 10
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
-# Disable LAr alignment to avoid spurious warnings
-# when running in AthSimulation.
-svcMgr.GeoModelSvc.AlignCallbacks = False
-from IOVDbSvc.CondDB import conddb
-conddb.blockFolder ('/LAR/Align')
diff --git a/Tools/Tier0ChainTests/test/test_q443.sh b/Tools/Tier0ChainTests/test/test_q443.sh
index b11887d1bf4b13aa66625e5b1d24520c2e461428..ff2c6fdd537fbcc59f288b2ed12edb89c4b2fb88 100755
--- a/Tools/Tier0ChainTests/test/test_q443.sh
+++ b/Tools/Tier0ChainTests/test/test_q443.sh
@@ -11,7 +11,7 @@
Reco_tf.py \
--AMI=q443 \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
--conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
--multithreaded \
--maxEvents=500 \
diff --git a/Tools/Tier0ChainTests/test/test_q443_serial.sh b/Tools/Tier0ChainTests/test/test_q443_serial.sh
index 5bdccf03b5abf5be1d02711167ffdd9a55a596d6..1f5d7adea5619219479c161bda61024128c84e0d 100755
--- a/Tools/Tier0ChainTests/test/test_q443_serial.sh
+++ b/Tools/Tier0ChainTests/test/test_q443_serial.sh
@@ -9,7 +9,7 @@
# art-include: 24.0/Athena
Reco_tf.py \
---CA "all:True" "RDOtoRDOTrigger:False" \
+--CA "all:True" \
--AMI=q443 \
--conditionsTag 'default:OFLCOND-MC16-SDR-RUN2-11' 'RDOtoRDOTrigger:OFLCOND-MC16-SDR-RUN2-08-02' \
--maxEvents=100 \
diff --git a/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh b/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
index 9cade0d5d489e3599ee1bb066a6e0d955ecbbbb4..9d6099673d4a9f47cdc70e7582b36330e4af5f34 100755
--- a/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
+++ b/Tools/TrfTestsARTPlots/test/test_trf_q443_phys_physlite_ca.sh
@@ -9,7 +9,7 @@
# art-html: dcube_physlite
export ATHENA_CORE_NUMBER=8
-Reco_tf.py --CA "all:True" "RDOtoRDOTrigger:False" \
+Reco_tf.py --CA "all:True" \
--AMI q443 \
--steering doRDO_TRIG doTRIGtoALL \
--outputAODFile myAOD.pool.root \
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
index 22adabece70fcd260d30e820d56e219ca895aa29..7b7fccb0e6261fccc176afb73ddcb927ed43eeaf 100644
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
+++ b/Tracking/TrkEventCnv/TrkEventAthenaPool/CMakeLists.txt
@@ -14,7 +14,6 @@ atlas_add_poolcnv_library( TrkEventAthenaPoolPoolCnv
LINK_LIBRARIES TrkSpacePoint TrkEventTopLevelCnv TrkEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_14.5.0_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_14.5.0_test.py
deleted file mode 100644
index 4af6a820a431a283f30928ded0ed940ffd876ee8..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_14.5.0_test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-infile = 'aod/AOD-14.5.0/AOD-14.5.0-full.pool.root'
-keys = [
- #Trk::VxContainer_tlp1
- 'VxPrimaryCandidate',
- 'ConversionCandidate',
- 'HLT_PrimVx',
-
- #Trk::TrackCollection_tlp2
- 'Tracks',
- 'MuonSlimmedTrackCollection',
-
- #Trk::SegmentCollection_tlp1
- 'ConvertedMBoySegments',
- 'MuGirlSegments',
- 'MooreSegments',
-
- #V0Container_tlp1
- 'V0Candidates',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_15.6.7_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_15.6.7_test.py
deleted file mode 100644
index d5812c136f5ed5718dac7ffe81dcf4fd4d600e22..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_15.6.7_test.py
+++ /dev/null
@@ -1,28 +0,0 @@
-infile = 'aod/AOD-15.6.7/AOD-15.6.7-full.pool.root'
-keys = [
- #MVFVxContainer_tlp1
- #43.479 kb 7.172 kb 0.717 kb 0.164 20 (T) MVFVxContainer_tlp1???
-
- #Trk::VxContainer_tlp1
- 'HLT_ConversionVx',
- 'AllPhotonsVxCandidates',
- 'VxPrimaryCandidate',
- 'ConversionCandidate',
- 'HLT_PrimVx',
-
- #Trk::TrackCollection_tlp3
- 'Tracks',
- 'MuonSlimmedTrackCollection',
-
- #Trk::SegmentCollection_tlp1
- # Actually MdtTrackSegment, which was removed from the release.
- #'HLT_MDTsegments',
- 'MuGirlSegments',
- 'ConvertedMBoySegments',
- 'MooreSegments',
-
- #V0Container_tlp1
- 'V0Candidates',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_16.6.2.1_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_16.6.2.1_test.py
deleted file mode 100644
index a3b58c7f67ce849c18184ce82585d40d97f6b572..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_16.6.2.1_test.py
+++ /dev/null
@@ -1,27 +0,0 @@
-infile = 'aod/AOD-16.6.2.1/AOD-16.6.2.1-full.pool.root'
-keys = [
- #MVFVxContainer_tlp1
- #43.479 kb 7.172 kb 0.717 kb 0.164 20 (T) MVFVxContainer_tlp1???
-
- #Trk::VxContainer_tlp2
- 'SecVertices',
- 'AllPhotonsVxCandidates',
- 'VxPrimaryCandidate',
- 'HLT_ConversionVx',
- 'HLT_PrimVx',
- 'ConversionCandidate',
-
- #Trk::TrackCollection_tlp3
- 'MuonSlimmedTrackCollection',
- 'Tracks',
-
- #Trk::SegmentCollection_tlp1
- 'ConvertedMBoySegments',
- 'MuGirlSegments',
- 'MooreSegments',
-
- #V0Container_tlp2
- 'V0Candidates',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_17.2.8_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_17.2.8_test.py
deleted file mode 100644
index c5201e707bea07daea4df1473bb91d45e1a769f6..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_17.2.8_test.py
+++ /dev/null
@@ -1,23 +0,0 @@
-infile = 'aod/AOD-17.2.8/AOD-17.2.8-full.pool.root'
-keys = [
- #Trk::VxContainer_tlp2
- 'HLT_ConversionVx',
- 'SecVertices',
- 'AllPhotonsVxCandidates',
- 'VxPrimaryCandidate',
- 'ConversionCandidate',
- 'HLT_PrimVx',
-
- #Trk::TrackCollection_tlp3
- 'Tracks',
- 'MuonSlimmedTrackCollection',
- 'GSFTracks',
-
- #Trk::SegmentCollection_tlp1
- 'ConvertedMBoySegments',
- 'MuonSegments',
- 'MooreSegments',
- 'MuGirlSegments',
- ]
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
deleted file mode 100644
index 20898f1e0e3b28a76201cd01b43b609eb46ab36f..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,24 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #Trk::VxContainer_tlp2
- 'HLT_ConversionVx',
- 'SecVertices',
- 'AllPhotonsVxCandidates',
- 'VxPrimaryCandidate',
- 'ConversionCandidate',
- 'HLT_PrimVx',
-
- #Trk::TrackCollection_tlp4
- 'Tracks',
- 'MuonSlimmedTrackCollection',
- 'GSFTracks',
-
- #Trk::SegmentCollection_tlp2
- 'MuonSegments',
- 'MuGirlSegments',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py b/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
deleted file mode 100644
index 5a119dc5570c7d0cdd909febac5337712df9eb15..0000000000000000000000000000000000000000
--- a/Tracking/TrkEventCnv/TrkEventAthenaPool/share/TrkEventTPCnv_20.1.7.2_test.py
+++ /dev/null
@@ -1,26 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #Trk::TrackCollection_tlp5
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_Bjet_EFID',
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_Photon_EFID',
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_Bphysics_EFID',
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_CosmicsN_EFID',
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_FullScan_EFID',
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_Muon_EFID',
- 'ResolvedForwardTracks',
- 'MuonSpectrometerTracks',
- 'ExtrapolatedMuonTracks',
- 'CombinedMuonTracks',
- 'GSFTracks',
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_Tau_EFID',
- 'HLT_TrackCollection_InDetTrigTrackSlimmer_Electron_EFID',
- 'Tracks@10',
-
- #Trk::SegmentCollection_tlp3
- 'MuonSegments',
- ]
-
-#from AthenaCommon.JobProperties import jobproperties
-#jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt b/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt
index 397e6efb79c65af8642dc5fe164a8b873795ff2a..745ae6fe3021b47a9fe2ad9af86baa4cf909b316 100644
--- a/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigEventAthenaPool/CMakeLists.txt
@@ -70,7 +70,6 @@ atlas_add_poolcnv_library( TrigEventAthenaPoolPoolCnv
TrigTopoEvent TrigTopoEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_15.6.13.2_test.py b/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_15.6.13.2_test.py
deleted file mode 100644
index 255aebf66461231a1a54e363b8270b43410f7b73..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_15.6.13.2_test.py
+++ /dev/null
@@ -1,157 +0,0 @@
-infile = 'aod/AOD-15.6.13.2/AOD-15.6.13.2-full.pool.root'
-keys = [
- #RingerRingsContainer_tlp1
- 'RingerRingsContainer#HLT_TrigT2CaloEgamma',
-
- #TrigEMClusterContainer_tlp1
- 'TrigEMClusterContainer#HLT',
- 'TrigEMClusterContainer#HLT_TrigT2CaloCosmic',
- 'TrigEMClusterContainer#HLT_TrigcaloSwCluster',
- 'TrigEMClusterContainer#HLT_T2CaloSwCluster',
- 'TrigEMClusterContainer#HLT_TrigT2CaloEgamma',
-
- #TrigRNNOutputContainer_tlp1
- 'TrigRNNOutputContainer#HLT_TrigRingerNeuralFex',
-
- #TrigT2JetContainer_tlp1
- 'TrigT2JetContainer#HLT_TrigT2CosmicJet',
- 'TrigT2JetContainer#HLT_TrigT2CaloJet',
-
- #TrigT2MbtsBitsContainer_tlp1
- 'TrigT2MbtsBitsContainer#HLT_T2Mbts',
-
- #TrigTauClusterContainer_tlp1
- 'TrigTauClusterContainer#HLT_TrigT2CaloTau',
-
- #TrigTauClusterDetailsContainer_tlp1
- 'TrigTauClusterDetailsContainer#HLT_TrigT2CaloTauDetails',
-
- #TrigRoiDescriptorCollection_tlp1
- #'TrigRoiDescriptorCollection#HLT',
- #'TrigRoiDescriptorCollection#HLT_T2TauFinal',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloTau',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CosmicJet',
- #'TrigRoiDescriptorCollection#HLT_forMS',
- #'TrigRoiDescriptorCollection#HLT_forID',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_EF',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloJet',
- #'TrigRoiDescriptorCollection#HLT_initialRoI',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_L2',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloEgamma',
-
- #TrigInDetTrackCollection_tlp2
- 'TrigInDetTrackCollection#HLT',
- 'TrigInDetTrackCollection#HLT_TRTxK',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma_Brem',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Muon',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tile',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma',
- 'TrigInDetTrackCollection#HLT_TRTSegmentFinder',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Jet',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau_robust',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tau',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Bphysics',
-
- #TrigSpacePointCountsCollection_tlp1
- 'TrigSpacePointCountsCollection#HLT_spacepoints',
-
- #TrigTauTracksInfoCollection_tlp1
- 'TrigTauTracksInfoCollection#HLT',
-
- #TrigTrackCountsCollection_tlp1
- 'TrigTrackCountsCollection#HLT_trackcounts',
-
- #TrigTrtHitCountsCollection_tlp1
- 'TrigTrtHitCountsCollection#HLT_TrtHitCount',
-
- #TrigVertexCollection_tlp1
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex',
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex_SiTrack',
- 'TrigVertexCollection#HLT_T2HistoPrmVtx',
-
- #TrigMissingETContainer_tlp1
- 'TrigMissingETContainer#HLT_T2MissingET',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigEFMissingET',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_allCells',
-
- #CombinedMuonFeatureContainer_tlp1
- 'CombinedMuonFeatureContainer#HLT',
-
- #IsoMuonFeatureContainer_tlp1
- 'IsoMuonFeatureContainer#HLT',
-
- #MuonFeatureContainer_tlp1
- 'MuonFeatureContainer#HLT',
-
- #MuonFeatureDetailsContainer_tlp1
- 'MuonFeatureDetailsContainer#HLT',
-
- #TileMuFeatureContainer_tlp1
- 'TileMuFeatureContainer#HLT',
-
- #TileTrackMuFeatureContainer_tlp1
- 'TileTrackMuFeatureContainer#HLT',
-
- #TrigMuonEFInfoContainer_tlp2
- 'TrigMuonEFInfoContainer#HLT_MuTagIMO_EF',
- 'TrigMuonEFInfoContainer#HLT_eMuonEFInfo',
- 'TrigMuonEFInfoContainer#HLT_MuonEFInfo',
-
- #TrigEFBjetContainer_tlp2
- 'TrigEFBjetContainer#HLT_EFBjetFex',
-
- #TrigEFBphysContainer_tlp2
- 'TrigEFBphysContainer#HLT_EFDsPhiPiFex',
- 'TrigEFBphysContainer#HLT_EFBMuMuFex',
- 'TrigEFBphysContainer#HLT_EFTrackMass',
- 'TrigEFBphysContainer#HLT_EFMuPairs',
-
- #TrigElectronContainer_tlp2
- 'TrigElectronContainer#HLT_L2IDCaloFex',
- 'TrigElectronContainer#HLT_L2ElectronFex',
-
- #TrigL2BjetContainer_tlp2
- 'TrigL2BjetContainer#HLT_L2BjetFex',
-
- #TrigL2BphysContainer_tlp2
- 'TrigL2BphysContainer#HLT',
- 'TrigL2BphysContainer#HLT_L2BMuMuFex',
- 'TrigL2BphysContainer#HLT_L2BMuMuXFex',
- 'TrigL2BphysContainer#HLT_L2DiMuXFex',
- 'TrigL2BphysContainer#HLT_L2JpsieeFex',
- 'TrigL2BphysContainer#HLT_L2TrackMass',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexDs',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexPhi',
- 'TrigL2BphysContainer#HLT_TrigDiMuon',
-
- #TrigPhotonContainer_tlp2
- 'TrigPhotonContainer#HLT_L2PhotonFex',
-
- #TrigTauContainer_tlp1
- 'TrigTauContainer#HLT',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_15.6.1_test.py b/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_15.6.1_test.py
deleted file mode 100644
index 44c53464c1576b38387cc8ff3f36728589e0029a..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_15.6.1_test.py
+++ /dev/null
@@ -1,161 +0,0 @@
-infile = 'esd/ESD-15.6.1.pool.root'
-keys = [
- #RingerRingsContainer_tlp1
- 'RingerRingsContainer#HLT_TrigT2CaloEgamma',
-
- #TrigEMClusterContainer_tlp1
- 'TrigEMClusterContainer#HLT',
- 'TrigEMClusterContainer#HLT_TrigT2CaloCosmic',
- 'TrigEMClusterContainer#HLT_TrigcaloSwCluster',
- 'TrigEMClusterContainer#HLT_T2CaloSwCluster',
- 'TrigEMClusterContainer#HLT_TrigT2CaloEgamma',
-
- #TrigRNNOutputContainer_tlp1
- 'TrigRNNOutputContainer#HLT_TrigRingerNeuralFex',
-
- #TrigT2JetContainer_tlp1
- 'TrigT2JetContainer#HLT_TrigT2CosmicJet',
- 'TrigT2JetContainer#HLT_TrigT2CaloJet',
-
- #TrigT2MbtsBitsContainer_tlp1
- 'TrigT2MbtsBitsContainer#HLT_T2Mbts',
-
- #TrigTauClusterContainer_tlp1
- 'TrigTauClusterContainer#HLT_TrigT2CaloTau',
-
- #TrigTauClusterDetailsContainer_tlp1
- 'TrigTauClusterDetailsContainer#HLT_TrigT2CaloTauDetails',
-
- #TrigOperationalInfoCollection_tlp1
- #'TrigOperationalInfoCollection#HLT_OPI_L2',
- #'TrigOperationalInfoCollection#HLT_OPI_EF',
-
- #TrigRoiDescriptorCollection_tlp1
- #'TrigRoiDescriptorCollection#HLT',
- #'TrigRoiDescriptorCollection#HLT_T2TauFinal',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloTau',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CosmicJet',
- #'TrigRoiDescriptorCollection#HLT_forMS',
- #'TrigRoiDescriptorCollection#HLT_forID',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_EF',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_L2',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloJet',
- #'TrigRoiDescriptorCollection#HLT_initialRoI',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloEgamma',
-
- #TrigInDetTrackCollection_tlp1
- 'TrigInDetTrackCollection#HLT',
- 'TrigInDetTrackCollection#HLT_TRTxK',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma_Brem',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Muon',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tile',
- 'TrigInDetTrackCollection#HLT_TRTSegmentFinder',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Jet',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau_robust',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tau',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Bphysics',
-
- #TrigSpacePointCountsCollection_tlp1
- 'TrigSpacePointCountsCollection#HLT_spacepoints',
-
- #TrigTauTracksInfoCollection_tlp1
- 'TrigTauTracksInfoCollection#HLT',
-
- #TrigTrackCountsCollection_tlp1
- 'TrigTrackCountsCollection#HLT_trackcounts',
-
- #TrigTrtHitCountsCollection_tlp1
- 'TrigTrtHitCountsCollection#HLT_TrtHitCount',
-
- #TrigVertexCollection_tlp1
- 'TrigVertexCollection#HLT_T2HistoPrmVtx',
-
- #TrigMissingETContainer_tlp1
- 'TrigMissingETContainer#HLT_TrigEFMissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_noiseSupp',
- 'TrigMissingETContainer#HLT_T2MissingET',
- 'TrigMissingETContainer#HLT_TrigEFMissingET',
-
- #CombinedMuonFeatureContainer_tlp1
- 'CombinedMuonFeatureContainer#HLT',
-
- #IsoMuonFeatureContainer_tlp1
- 'IsoMuonFeatureContainer#HLT',
-
- #MuonFeatureContainer_tlp2
- 'MuonFeatureContainer#HLT',
-
- #MuonFeatureDetailsContainer_tlp1
- 'MuonFeatureDetailsContainer#HLT',
-
- #TileMuFeatureContainer_tlp1
- 'TileMuFeatureContainer#HLT',
-
- #TileTrackMuFeatureContainer_tlp1
- 'TileTrackMuFeatureContainer#HLT',
-
- #TrigMuonEFContainer_tlp1
- 'TrigMuonEFContainer#HLT_MuonEF',
-
- #TrigMuonEFInfoContainer_tlp1
- 'TrigMuonEFInfoContainer#HLT_MuTagIMO_EF',
- 'TrigMuonEFInfoContainer#HLT_eMuonEFInfo',
- 'TrigMuonEFInfoContainer#HLT_MuonEFInfo',
-
- #TrigEFBjetContainer_tlp2
- 'TrigEFBjetContainer#HLT_EFBjetFex',
-
- #TrigEFBphysContainer_tlp1
- 'TrigEFBphysContainer#HLT_EFDsPhiPiFex',
- 'TrigEFBphysContainer#HLT_EFBMuMuFex',
- 'TrigEFBphysContainer#HLT_EFMuPairs',
-
- #TrigElectronContainer_tlp2
- 'TrigElectronContainer#HLT_L2IDCaloFex',
- 'TrigElectronContainer#HLT_L2ElectronFex',
-
- #TrigL2BjetContainer_tlp2
- 'TrigL2BjetContainer#HLT_L2BjetFex',
-
- #TrigL2BphysContainer_tlp1
- 'TrigL2BphysContainer#HLT',
- 'TrigL2BphysContainer#HLT_L2BMuMuFex',
- 'TrigL2BphysContainer#HLT_L2BMuMuXFex',
- 'TrigL2BphysContainer#HLT_L2DiMuXFex',
- 'TrigL2BphysContainer#HLT_L2JpsieeFex',
- 'TrigL2BphysContainer#HLT_L2TrackMass',
- 'TrigL2BphysContainer#HLT_TrigDiMuon',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexDs',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexPhi',
-
- #TrigPhotonContainer_tlp2
- 'TrigPhotonContainer#HLT_L2PhotonFex',
-
- #TrigTauContainer_tlp1
- 'TrigTauContainer#HLT',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_16.0.3.3_test.py b/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_16.0.3.3_test.py
deleted file mode 100644
index 1a0b7c540e75d53d4f388cf9a011d6d98b3f73e0..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_16.0.3.3_test.py
+++ /dev/null
@@ -1,166 +0,0 @@
-infile = 'aod/AOD-16.0.3.3/AOD-16.0.3.3-full.pool.root'
-keys = [
- #RingerRingsContainer_tlp1
- 'RingerRingsContainer#HLT_TrigT2CaloEgamma',
-
- #TrigEMClusterContainer_tlp1
- 'TrigEMClusterContainer#HLT',
- 'TrigEMClusterContainer#HLT_TrigT2CaloCosmic',
- 'TrigEMClusterContainer#HLT_TrigcaloSwCluster',
- 'TrigEMClusterContainer#HLT_T2CaloSwCluster',
- 'TrigEMClusterContainer#HLT_TrigT2CaloEgamma',
-
- #TrigRNNOutputContainer_tlp1
- 'TrigRNNOutputContainer#HLT_TrigRingerNeuralFex',
-
- #TrigT2JetContainer_tlp1
- 'TrigT2JetContainer#HLT_TrigT2CosmicJet',
- 'TrigT2JetContainer#HLT_TrigT2CaloJet',
-
- #TrigT2MbtsBitsContainer_tlp1
- 'TrigT2MbtsBitsContainer#HLT_T2Mbts',
-
- #TrigTauClusterContainer_p3
- 'TrigTauClusterContainer#HLT_TrigT2CaloTau',
-
- #TrigTauClusterDetailsContainer_p2
- 'TrigTauClusterDetailsContainer#HLT_TrigT2CaloTauDetails',
-
- #TrigPassBitsCollection_p1
- #'TrigPassBitsCollection#HLT_passbits',
-
- #TrigRoiDescriptorCollection_tlp1
- #'TrigRoiDescriptorCollection#HLT',
- #'TrigRoiDescriptorCollection#HLT_T2TauFinal',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloTau',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CosmicJet',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_EF',
- #'TrigRoiDescriptorCollection#HLT_forMS',
- #'TrigRoiDescriptorCollection#HLT_forID',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloJet',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_L2',
- #'TrigRoiDescriptorCollection#HLT_initialRoI',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloEgamma',
-
- #TrigInDetTrackCollection_tlp2
- 'TrigInDetTrackCollection#HLT',
- 'TrigInDetTrackCollection#HLT_TRTxK',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma_Brem',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso_robust',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tile',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Muon',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Jet',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Bphysics',
- 'TrigInDetTrackCollection#HLT_TRTSegmentFinder',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma_robust',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tau',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Cosmics',
-
- #TrigSpacePointCountsCollection_tlp1
- 'TrigSpacePointCountsCollection#HLT_spacepoints',
-
- #TrigTauTracksInfoCollection_tlp1
- 'TrigTauTracksInfoCollection#HLT',
-
- #TrigTrackCountsCollection_tlp1
- 'TrigTrackCountsCollection#HLT_trackcounts',
-
- #TrigTrtHitCountsCollection_tlp1
- 'TrigTrtHitCountsCollection#HLT_TrtHitCount',
-
- #TrigVertexCollection_tlp2
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex',
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex_SiTrack',
- 'TrigVertexCollection#HLT_T2HistoPrmVtx',
-
- #TrigVertexCountsCollection_tlp1
- 'TrigVertexCountsCollection#HLT_vertexcounts',
-
- #TrigMissingETContainer_tlp1
- 'TrigMissingETContainer#HLT_T2MissingET',
- 'TrigMissingETContainer#HLT_L2JetEtSum',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigEFMissingET',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_allCells',
-
- #CombinedMuonFeatureContainer_p3
- 'CombinedMuonFeatureContainer#HLT',
-
- #IsoMuonFeatureContainer_p2
- 'IsoMuonFeatureContainer#HLT',
-
- #MuonFeatureContainer_p3
- 'MuonFeatureContainer#HLT',
-
- #MuonFeatureDetailsContainer_p2
- 'MuonFeatureDetailsContainer#HLT',
-
- #TileMuFeatureContainer_tlp1
- 'TileMuFeatureContainer#HLT',
-
- #TileTrackMuFeatureContainer_tlp1
- 'TileTrackMuFeatureContainer#HLT',
-
- #TrigMuonClusterFeatureContainer_tlp1
- 'TrigMuonClusterFeatureContainer#HLT_MuonCluster',
-
- #TrigMuonEFInfoContainer_tlp2
- 'TrigMuonEFInfoContainer#HLT_MuTagIMO_EF',
- 'TrigMuonEFInfoContainer#HLT_eMuonEFInfo',
- 'TrigMuonEFInfoContainer#HLT_MuonEFInfo',
-
- #TrigEFBjetContainer_tlp2
- 'TrigEFBjetContainer#HLT_EFBjetFex',
-
- #TrigEFBphysContainer_tlp2
- 'TrigEFBphysContainer#HLT_EFDsPhiPiFex',
- 'TrigEFBphysContainer#HLT_EFBMuMuFex',
- 'TrigEFBphysContainer#HLT_EFTrackMass',
- 'TrigEFBphysContainer#HLT_EFMuPairs',
-
- #TrigElectronContainer_tlp2
- 'TrigElectronContainer#HLT_L2IDCaloFex',
- 'TrigElectronContainer#HLT_L2ElectronFex',
-
- #TrigL2BjetContainer_tlp2
- 'TrigL2BjetContainer#HLT_L2BjetFex',
-
- #TrigL2BphysContainer_tlp2
- 'TrigL2BphysContainer#HLT',
- 'TrigL2BphysContainer#HLT_L2BMuMuXFex',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexDs',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexPhi',
- 'TrigL2BphysContainer#HLT_L2BMuMuFex',
- 'TrigL2BphysContainer#HLT_L2DiMuXFex',
- 'TrigL2BphysContainer#HLT_L2TrackMass',
- 'TrigL2BphysContainer#HLT_L2JpsieeFex',
- 'TrigL2BphysContainer#HLT_TrigDiMuon',
-
- #TrigPhotonContainer_tlp2
- 'TrigPhotonContainer#HLT_L2PhotonFex',
-
- #TrigTauContainer_tlp1
- 'TrigTauContainer#HLT',
-]
-
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Calo_setOn()
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_17.0.6_test.py b/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_17.0.6_test.py
deleted file mode 100644
index 8ff04a0028dcef349488cfea1e688b4fc81b55b1..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_17.0.6_test.py
+++ /dev/null
@@ -1,181 +0,0 @@
-infile = 'aod/AOD-17.0.6/AOD-17.0.6-full.pool.root'
-keys = [
- #RingerRingsContainer_p2
- 'RingerRingsContainer#HLT_TrigT2CaloEgamma',
-
- #TrigCaloClusterContainer_p3
- 'TrigCaloClusterContainer#HLT_TrigT2Calo',
-
- #TrigEMClusterContainer_p3
- 'TrigEMClusterContainer#HLT',
- 'TrigEMClusterContainer#HLT_TrigT2CaloCosmic',
- 'TrigEMClusterContainer#HLT_TrigcaloSwCluster',
- 'TrigEMClusterContainer#HLT_T2CaloSwCluster',
- 'TrigEMClusterContainer#HLT_TrigT2CaloEgamma',
-
- #TrigRNNOutputContainer_p2
- 'TrigRNNOutputContainer#HLT_TrigRingerNeuralFex',
-
- #TrigT2JetContainer_p3
- 'TrigT2JetContainer#HLT_TrigT2CosmicJet',
- 'TrigT2JetContainer#HLT_TrigT2CaloJet',
-
- #TrigT2MbtsBitsContainer_p3
- 'TrigT2MbtsBitsContainer#HLT_T2Mbts',
-
- #TrigTauClusterContainer_p4
- 'TrigTauClusterContainer#HLT_TrigT2CaloTau',
-
- #TrigTauClusterDetailsContainer_p2
- 'TrigTauClusterDetailsContainer#HLT_TrigT2CaloTauDetails',
-
- #TrigPassBitsCollection_p1
- #'TrigPassBitsCollection#HLT_passbits',
-
- #TrigPassFlagsCollection_p1
- #'TrigPassFlagsCollection#HLT_passflags',
- #'TrigPassFlagsCollection#HLT_isEM',
-
- #TrigRoiDescriptorCollection_p2
- #'TrigRoiDescriptorCollection#HLT',
- #'TrigRoiDescriptorCollection#HLT_T2TauFinal',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloTau',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CosmicJet',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_EF',
- #'TrigRoiDescriptorCollection#HLT_forMS',
- #'TrigRoiDescriptorCollection#HLT_forID',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloJet',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_L2',
- #'TrigRoiDescriptorCollection#HLT_initialRoI',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloEgamma',
-
- #TrigInDetTrackCollection_tlp3
- 'TrigInDetTrackCollection#HLT',
- 'TrigInDetTrackCollection#HLT_TRTxK',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tile',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Muon_noTRT',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma_Brem',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon_noTRT',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Muon',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Jet',
- 'TrigInDetTrackCollection#HLT_TRTSegmentFinder',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau_robust',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tau',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder',
-
- #TrigSpacePointCountsCollection_p4
- 'TrigSpacePointCountsCollection#HLT_spacepoints',
-
- #TrigTauTracksInfoCollection_p2
- 'TrigTauTracksInfoCollection#HLT',
-
- #TrigTrackCountsCollection_tlp1
- 'TrigTrackCountsCollection#HLT_trackcounts',
-
- #TrigTrtHitCountsCollection_p2
- 'TrigTrtHitCountsCollection#HLT_TrtHitCount',
-
- #TrigVertexCollection_tlp2
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex',
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex_SiTrack',
- 'TrigVertexCollection#HLT_T2HistoPrmVtx',
-
- #TrigVertexCountsCollection_tlp1
- 'TrigVertexCountsCollection#HLT_vertexcounts',
-
- #TrigMissingETContainer_p3
- 'TrigMissingETContainer#HLT_EFJetEtSum',
- 'TrigMissingETContainer#HLT_L2MissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_allCells',
- 'TrigMissingETContainer#HLT_L2JetEtSum',
- 'TrigMissingETContainer#HLT_T2MissingET',
- 'TrigMissingETContainer#HLT_TrigEFMissingET',
-
- #CombinedMuonFeatureContainer_p3
- 'CombinedMuonFeatureContainer#HLT',
-
- #IsoMuonFeatureContainer_p2
- 'IsoMuonFeatureContainer#HLT',
-
- #MuonFeatureContainer_p3
- 'MuonFeatureContainer#HLT',
-
- #MuonFeatureDetailsContainer_p2
- 'MuonFeatureDetailsContainer#HLT',
-
- #TileMuFeatureContainer_p2
- 'TileMuFeatureContainer#HLT',
-
- #TileTrackMuFeatureContainer_p3
- 'TileTrackMuFeatureContainer#HLT',
-
- #TrigMuonClusterFeatureContainer_tlp1
- 'TrigMuonClusterFeatureContainer#HLT_MuonCluster',
-
- #TrigMuonEFInfoContainer_tlp2
- 'TrigMuonEFInfoContainer#HLT_MuTagIMO_EF',
- 'TrigMuonEFInfoContainer#HLT_eMuonEFInfo',
- 'TrigMuonEFInfoContainer#HLT_MuonEFInfo',
-
- #TrigMuonEFIsolationContainer_p1
- 'TrigMuonEFIsolationContainer#HLT_MuonEFIsolation',
-
- #TrigEFBjetContainer_tlp2
- 'TrigEFBjetContainer#HLT_EFBjetFex',
-
- #TrigEFBphysContainer_tlp2
- 'TrigEFBphysContainer#HLT_EFDsPhiPiFex',
- 'TrigEFBphysContainer#HLT_EFTrackMass',
- 'TrigEFBphysContainer#HLT_EFBMuMuFex',
- 'TrigEFBphysContainer#HLT_EFMuPairs',
-
- #TrigElectronContainer_p3
- 'TrigElectronContainer#HLT_L2IDCaloFex',
- 'TrigElectronContainer#HLT_L2ElectronFex',
-
- #TrigL2BjetContainer_p3
- 'TrigL2BjetContainer#HLT_L2BjetFex',
-
- #TrigL2BphysContainer_tlp2
- 'TrigL2BphysContainer#HLT',
- 'TrigL2BphysContainer#HLT_L2BMuMuXFex',
- 'TrigL2BphysContainer#HLT_L2JpsieeFex',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexDs',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexPhi',
- 'TrigL2BphysContainer#HLT_L2DiMuXFex',
- 'TrigL2BphysContainer#HLT_L2TrackMass',
- 'TrigL2BphysContainer#HLT_L2BMuMuFex',
- 'TrigL2BphysContainer#HLT_TrigDiMuon',
-
- #TrigPhotonContainer_p3
- 'TrigPhotonContainer#HLT_L2PhotonFex',
-
- #TrigTauContainer_tlp1
- 'TrigTauContainer#HLT',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_18.0.0_test.py b/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_18.0.0_test.py
deleted file mode 100644
index 3a8760854d0a43d4511f9c3b73bbee4a3848969f..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_18.0.0_test.py
+++ /dev/null
@@ -1,200 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #RingerRingsContainer_p2
- 'RingerRingsContainer#HLT_TrigT2CaloEgamma',
-
- #TrigCaloClusterContainer_p3
- 'TrigCaloClusterContainer#HLT_TrigT2Calo',
-
- #TrigEMClusterContainer_p4
- 'TrigEMClusterContainer#HLT',
- 'TrigEMClusterContainer#HLT_T2CaloSwCluster',
- 'TrigEMClusterContainer#HLT_TrigT2CaloCosmic',
- 'TrigEMClusterContainer#HLT_TrigcaloSwCluster',
- 'TrigEMClusterContainer#HLT_TrigT2CaloEgamma',
-
- #TrigRNNOutputContainer_p2
- 'TrigRNNOutputContainer#HLT_TrigRingerNeuralFex',
- 'TrigRNNOutputContainer#HLT_TrigTRTHTCounts',
-
- #TrigT2JetContainer_p3
- 'TrigT2JetContainer#HLT_TrigT2CosmicJet',
- 'TrigT2JetContainer#HLT_TrigT2CaloJet',
-
- #TrigT2MbtsBitsContainer_p3
- 'TrigT2MbtsBitsContainer#HLT_T2Mbts',
-
- #TrigTauClusterContainer_p5
- 'TrigTauClusterContainer#HLT_TrigT2CaloTau',
-
- #TrigTauClusterDetailsContainer_p2
- 'TrigTauClusterDetailsContainer#HLT_TrigT2CaloTauDetails',
-
- #TrigPassBitsCollection_p1
- #'TrigPassBitsCollection#HLT_passbits',
-
- #TrigPassFlagsCollection_p1
- #'TrigPassFlagsCollection#HLT_passflags',
- #'TrigPassFlagsCollection#HLT_isEM',
-
- #TrigRoiDescriptorCollection_p2
- #'TrigRoiDescriptorCollection#HLT',
- #'TrigRoiDescriptorCollection#HLT_T2TauFinal',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloTau',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CosmicJet',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_EF',
- #'TrigRoiDescriptorCollection#HLT_forMS',
- #'TrigRoiDescriptorCollection#HLT_forID',
- #'TrigRoiDescriptorCollection#HLT_secondaryRoI_L2',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloEgamma',
- #'TrigRoiDescriptorCollection#HLT_initialRoI',
- #'TrigRoiDescriptorCollection#HLT_TrigT2CaloJet',
-
- #TrigInDetTrackCollection_tlp4
- 'TrigInDetTrackCollection#HLT',
- 'TrigInDetTrackCollection#HLT_TRTxK',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Jet',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Muon',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tile',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Cosmics',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_eGamma_Brem',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Jet_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Muon_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tau_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_Tile_robust',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_Tile',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_eGamma_robust',
- 'TrigInDetTrackCollection#HLT_TrigSiTrack_muonIso_robust',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_TauCore',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_muonIso',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_Muon',
- 'TrigInDetTrackCollection#HLT_TrigIDSCAN_Tau',
- 'TrigInDetTrackCollection#HLT_TRTSegmentFinder',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_TauIso',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_Bphysics',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_FullScan',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_eGamma',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_Tau',
- 'TrigInDetTrackCollection#HLT_TrigL2SiTrackFinder_Jet',
-
- #TrigSpacePointCountsCollection_p4
- 'TrigSpacePointCountsCollection#HLT_spacepoints',
-
- #TrigTauTracksInfoCollection_p2
- 'TrigTauTracksInfoCollection#HLT',
-
- #TrigTrackCountsCollection_tlp1
- 'TrigTrackCountsCollection#HLT_trackcounts',
-
- #TrigTrtHitCountsCollection_p2
- 'TrigTrtHitCountsCollection#HLT_TrtHitCount',
-
- #TrigVertexCollection_tlp2
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex',
- 'TrigVertexCollection#HLT_TrigBeamSpotVertex_SiTrack',
- 'TrigVertexCollection#HLT_EFHistoPrmVtx',
- 'TrigVertexCollection#HLT_T2HistoPrmVtx',
-
- #TrigVertexCountsCollection_tlp1
- 'TrigVertexCountsCollection#HLT_vertexcounts',
-
- #TrigMissingETContainer_p3
- 'TrigMissingETContainer#HLT_EFJetEtSum',
- 'TrigMissingETContainer#HLT_L2JetEtSum',
- 'TrigMissingETContainer#HLT_T2MissingET',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_topocl',
- 'TrigMissingETContainer#HLT_L2MissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigEFMissingET_FEB',
-
- #CombinedMuonFeatureContainer_p4
- 'CombinedMuonFeatureContainer#HLT',
-
- #IsoMuonFeatureContainer_p3
- 'IsoMuonFeatureContainer#HLT',
-
- #MuonFeatureContainer_p3
- 'MuonFeatureContainer#HLT',
-
- #MuonFeatureDetailsContainer_p2
- 'MuonFeatureDetailsContainer#HLT',
-
- #TileMuFeatureContainer_p2
- 'TileMuFeatureContainer#HLT',
-
- #TileTrackMuFeatureContainer_p3
- 'TileTrackMuFeatureContainer#HLT',
-
- #TrigMuonClusterFeatureContainer_tlp1
- 'TrigMuonClusterFeatureContainer#HLT_MuonCluster',
-
- #TrigMuonEFInfoContainer_tlp2
- 'TrigMuonEFInfoContainer#HLT_MuTagIMO_EF',
- 'TrigMuonEFInfoContainer#HLT_eMuonEFInfo',
- 'TrigMuonEFInfoContainer#HLT_MuonEFInfo',
-
- #TrigMuonEFIsolationContainer_p2
- 'TrigMuonEFIsolationContainer#HLT_MuonEFIsolation',
-
- #TrigEFBjetContainer_tlp2
- 'TrigEFBjetContainer#HLT_EFBjetFex',
-
- #TrigEFBphysContainer_tlp2
- 'TrigEFBphysContainer#HLT_EFMuPairs',
- 'TrigEFBphysContainer#HLT_EFBMuMuXFex',
- 'TrigEFBphysContainer#HLT_EFDsPhiPiFex',
- 'TrigEFBphysContainer#HLT_EFMultiMuFex',
- 'TrigEFBphysContainer#HLT_EFTrackMass',
- 'TrigEFBphysContainer#HLT_EFBMuMuFex',
-
- #TrigElectronContainer_p3
- 'TrigElectronContainer#HLT_L2IDCaloFex',
- 'TrigElectronContainer#HLT_L2ElectronFex',
-
- #TrigL2BjetContainer_p3
- 'TrigL2BjetContainer#HLT_L2BjetFex',
-
- #TrigL2BphysContainer_tlp2
- 'TrigL2BphysContainer#HLT',
- 'TrigL2BphysContainer#HLT_L2DiMuXFex',
- 'TrigL2BphysContainer#HLT_L2BMuMuXFex',
- 'TrigL2BphysContainer#HLT_L2JpsieeFex',
- 'TrigL2BphysContainer#HLT_L2MultiMuFex',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexDs',
- 'TrigL2BphysContainer#HLT_L2DsPhiPiFexPhi',
- 'TrigL2BphysContainer#HLT_L2TrackMass',
- 'TrigL2BphysContainer#HLT_L2BMuMuFex',
- 'TrigL2BphysContainer#HLT_TrigDiMuon',
-
- #TrigPhotonContainer_p3
- 'TrigPhotonContainer#HLT_L2PhotonFex',
-
- #TrigTauContainer_p3
- 'TrigTauContainer#HLT',
-
- #ElectronMuonTopoInfoContainer_p1
- 'ElectronMuonTopoInfoContainer#HLT_EF_EgMuTopoFEX',
- 'ElectronMuonTopoInfoContainer#HLT_EF_PhotonMuonTopoFEX',
- 'ElectronMuonTopoInfoContainer#HLT_EgMuTopoFEX',
- 'ElectronMuonTopoInfoContainer#HLT_L2_PhotonMuonTopoFEX',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_20.1.7.2_test.py b/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index 895b6d043f61e581dc470cf8a42c64a5750388c2..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigEventAthenaPool/share/TrigEventAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,96 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #TrigEMClusterContainer_p4
- 'TrigEMClusterContainer#HLT_TrigEMClusterContainer_TrigT2CaloCosmic',
-
- #TrigT2MbtsBitsContainer_p3
- 'TrigT2MbtsBitsContainer#HLT_TrigT2MbtsBitsContainer_T2Mbts',
-
- #TrigPassBitsCollection_p1
- #'TrigPassBitsCollection#HLT_TrigPassBitsCollection_passbits',
-
- #TrigPassFlagsCollection_p1
- #'TrigPassFlagsCollection#HLT_TrigPassFlagsCollection_isEM',
- #'TrigPassFlagsCollection#HLT_TrigPassFlagsCollection_passflags',
-
- #TrigRoiDescriptorCollection_p3
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_TrigT2CaloJet',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_TrigT2CosmicJet',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_secondaryRoI_EF',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_secondaryRoI_L2',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forMS',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_secondaryRoI_HLT',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forID2',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forID3',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_SuperRoi',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_SplitJet',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forID1',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_TrigJetRec',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_initialRoI',
- #'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection',
-
- #TrigInDetTrackCollection_tlp4
- 'TrigInDetTrackCollection#HLT_TrigInDetTrackCollection',
-
- #TrigSpacePointCountsCollection_p4
- 'TrigSpacePointCountsCollection#HLT_TrigSpacePointCountsCollection_spacepoints',
-
- #TrigTrackCountsCollection_tlp1
- 'TrigTrackCountsCollection#HLT_TrigTrackCountsCollection_trackcounts',
-
- #TrigVertexCollection_tlp2
- 'TrigVertexCollection#HLT_TrigVertexCollection_TrigBeamSpotVertex',
- 'TrigVertexCollection#HLT_TrigVertexCollection_TrigL2SiTrackFinder_FullScan_ZF_Only',
-
- #TrigVertexCountsCollection_tlp1
- 'TrigVertexCountsCollection#HLT_TrigVertexCountsCollection_vertexcounts',
-
- #TrigMissingETContainer_p3
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_EFJetEtSum',
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_L2JetEtSum',
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_T2MissingET',
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_L2MissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_TrigEFMissingET',
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_TrigEFMissingET_FEB',
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_TrigEFMissingET_topocl',
- 'TrigMissingETContainer#HLT_TrigMissingETContainer_TrigEFMissingET_topocl_PS',
-
- #CombinedMuonFeatureContainer_p4
- 'CombinedMuonFeatureContainer#HLT_CombinedMuonFeatureContainer',
-
- #IsoMuonFeatureContainer_p3
- 'IsoMuonFeatureContainer#HLT_IsoMuonFeatureContainer',
-
- #MuonFeatureContainer_p3
- 'MuonFeatureContainer#HLT_MuonFeatureContainer',
-
- #MuonFeatureDetailsContainer_p2
- 'MuonFeatureDetailsContainer#HLT_MuonFeatureDetailsContainer',
-
- #TileMuFeatureContainer_p2
- 'TileMuFeatureContainer#HLT_TileMuFeatureContainer',
-
- #TileTrackMuFeatureContainer_p3
- 'TileTrackMuFeatureContainer#HLT_TileTrackMuFeatureContainer',
-
- #TrigMuonClusterFeatureContainer_tlp1
- 'TrigMuonClusterFeatureContainer#HLT_TrigMuonClusterFeatureContainer_MuonCluster',
-
- #TrigMuonEFInfoContainer_tlp2
- 'TrigMuonEFInfoContainer#HLT_TrigMuonEFInfoContainer_MuTagIMO_EF',
- 'TrigMuonEFInfoContainer#HLT_TrigMuonEFInfoContainer_MuonEFInfo',
- 'TrigMuonEFInfoContainer#HLT_TrigMuonEFInfoContainer_eMuonEFInfo',
-
- #TrigMuonEFIsolationContainer_p2
- 'TrigMuonEFIsolationContainer#HLT_TrigMuonEFIsolationContainer_MuonEFIsolation',
-
- #TrigEFBjetContainer_tlp2
- 'TrigEFBjetContainer#HLT_TrigEFBjetContainer_EFBjetFex',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/CMakeLists.txt b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/CMakeLists.txt
index 346b9d7dc76e3dcb5ecf8771370f7e7a071173a1..97a373599f5967633c5cd3758511601cba463fdb 100644
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/CMakeLists.txt
+++ b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/CMakeLists.txt
@@ -25,7 +25,6 @@ atlas_add_poolcnv_library( TrigSteeringEventAthenaPoolPoolCnv
AthenaPoolCnvSvcLib TrigSteeringEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_15.6.1_test.py b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_15.6.1_test.py
deleted file mode 100644
index 040c3f265bb6d614040d0a7e8ab0a244b757ce9e..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_15.6.1_test.py
+++ /dev/null
@@ -1,26 +0,0 @@
-infile = 'esd/ESD-15.6.1.pool.root'
-keys = [
- #TrigOperationalInfoCollection_tlp1
- 'TrigOperationalInfoCollection#HLT_OPI_L2',
- 'TrigOperationalInfoCollection#HLT_OPI_EF',
-
- #TrigRoiDescriptorCollection_tlp1
- 'TrigRoiDescriptorCollection#HLT',
- 'TrigRoiDescriptorCollection#HLT_T2TauFinal',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CaloTau',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CosmicJet',
- 'TrigRoiDescriptorCollection#HLT_forMS',
- 'TrigRoiDescriptorCollection#HLT_forID',
- 'TrigRoiDescriptorCollection#HLT_secondaryRoI_EF',
- 'TrigRoiDescriptorCollection#HLT_secondaryRoI_L2',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CaloJet',
- 'TrigRoiDescriptorCollection#HLT_initialRoI',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CaloEgamma',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_18.0.0_test.py b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_18.0.0_test.py
deleted file mode 100644
index 103e5052c4e7ef5865a4d8957c231840a13ed597..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_18.0.0_test.py
+++ /dev/null
@@ -1,29 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #TrigPassBitsCollection_p1
- 'TrigPassBitsCollection#HLT_passbits',
-
- #TrigPassFlagsCollection_p1
- 'TrigPassFlagsCollection#HLT_passflags',
- 'TrigPassFlagsCollection#HLT_isEM',
-
- #TrigRoiDescriptorCollection_p2
- 'TrigRoiDescriptorCollection#HLT',
- 'TrigRoiDescriptorCollection#HLT_T2TauFinal',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CaloTau',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CosmicJet',
- 'TrigRoiDescriptorCollection#HLT_secondaryRoI_EF',
- 'TrigRoiDescriptorCollection#HLT_forMS',
- 'TrigRoiDescriptorCollection#HLT_forID',
- 'TrigRoiDescriptorCollection#HLT_secondaryRoI_L2',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CaloEgamma',
- 'TrigRoiDescriptorCollection#HLT_initialRoI',
- 'TrigRoiDescriptorCollection#HLT_TrigT2CaloJet',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_20.1.7.2_test.py b/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_20.1.7.2_test.py
deleted file mode 100644
index 0fbbf8b8b624076855c200abeb5832b97d38c8bc..0000000000000000000000000000000000000000
--- a/Trigger/TrigEvent/TrigSteeringEventAthenaPool/share/TrigSteeringEventAthenaPool_20.1.7.2_test.py
+++ /dev/null
@@ -1,31 +0,0 @@
-infile = 'esd/ESD-20.1.7.2.pool.root'
-keys = [
- #TrigPassBitsCollection_p1
- 'TrigPassBitsCollection#HLT_TrigPassBitsCollection_passbits',
-
- #TrigPassFlagsCollection_p1
- 'TrigPassFlagsCollection#HLT_TrigPassFlagsCollection_isEM',
- 'TrigPassFlagsCollection#HLT_TrigPassFlagsCollection_passflags',
-
- #TrigRoiDescriptorCollection_p3
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_TrigT2CaloJet',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_TrigT2CosmicJet',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_secondaryRoI_EF',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_secondaryRoI_L2',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forMS',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_secondaryRoI_HLT',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forID2',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forID3',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_SuperRoi',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_SplitJet',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_forID1',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_TrigJetRec',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection_initialRoI',
- 'TrigRoiDescriptorCollection#HLT_TrigRoiDescriptorCollection',
-]
-
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
index c550e06419cf790522aea15bc9977f58d196687d..a676142128fc5456047abe39c6506020be8f0d3f 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigJetHypoToolConfig.py
@@ -114,19 +114,24 @@ def trigJetEJsHypoToolFromDict(chain_dict):
return hypo
-def trigJetCRHypoToolFromDict(chain_dict):
+def trigJetCRVARHypoToolFromDict(chain_dict):
chain_name = chain_dict['chainName']
doBIBrm = int(0)
- if 'calratio' in chain_dict['chainParts'][0]['exotHypo'] or 'calratiormbib' in chain_dict['chainParts'][0]['exotHypo']:
- if 'calratiormbib' in chain_dict['chainParts'][0]['exotHypo']:
- doBIBrm = int(1)
+ if len(chain_dict['chainParts'][0]['exotHypo']) > 0:
+ exot_hypo = chain_dict['chainParts'][0]['exotHypo'][0]
else:
- raise Exception("misconfiguration of Exotic jet chain")
+ raise Exception("Unable to extract exotHypo calratio jet configuration from chain dict")
+ if 'calratiovar' in exot_hypo:
+ if 'calratiovarrmbib' in exot_hypo:
+ doBIBrm = int(1)
+ else:
+ raise Exception("misconfiguration of new calratio jet chain")
+
presel_matched = re.match(r'.*emf(?P<cut>\d?\d?[\d\D]+)', chain_dict['chainParts'][0]['trkpresel'])
emf_cut = presel_matched.groupdict()['cut']
import math
- hypo = CompFactory.TrigJetCRHypoTool(chain_name)
+ hypo = CompFactory.TrigJetCRVARHypoTool(chain_name)
hypo.MpufixLogRatio = math.log10(1./(float(emf_cut)*0.01) - 1.)
hypo.MinjetlogR = 1.2
hypo.MintrackPt = 2*GeV
@@ -136,17 +141,21 @@ def trigJetCRHypoToolFromDict(chain_dict):
return hypo
-def trigJetCROldHypoToolFromDict(chain_dict):
+def trigJetCRHypoToolFromDict(chain_dict):
chain_name = chain_dict['chainName']
doBIBrm = int(0)
- if 'calrtold' in chain_dict['chainParts'][0]['exotHypo'] or 'calrtoldrmbib' in chain_dict['chainParts'][0]['exotHypo']:
- if 'calrtoldrmbib' in chain_dict['chainParts'][0]['exotHypo']:
- doBIBrm = int(1)
+ if len(chain_dict['chainParts'][0]['exotHypo']) > 0:
+ exot_hypo = chain_dict['chainParts'][0]['exotHypo'][0]
else:
- raise Exception("misconfiguration of Exotic jet chain")
+ raise Exception("Unable to extract exotHypo calratio jet configuration from chain dict")
+ if 'calratio' in exot_hypo and ('calratiovar' not in exot_hypo):
+ if 'calratiormbib' in exot_hypo:
+ doBIBrm = int(1)
+ else:
+ raise Exception("misconfiguration of new calratio jet chain")
- hypo = CompFactory.TrigJetCROldHypoTool(chain_name)
+ hypo = CompFactory.TrigJetCRHypoTool(chain_name)
hypo.MinjetlogR = 1.2
hypo.MintrackPt = 2*GeV
hypo.MindeltaR = 0.2
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.cxx
index 623680fcfbfb24377cf8be5ddfd7555d469a4db1..826ced364318ed505aef09a655e6ce48f3561250 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#include <algorithm>
@@ -10,6 +10,7 @@
using namespace TrigCompositeUtils;
+
TrigJetCRHypoAlg::TrigJetCRHypoAlg( const std::string& name,
ISvcLocator* pSvcLocator ) :
::HypoBase( name, pSvcLocator ) { }
@@ -18,6 +19,7 @@ TrigJetCRHypoAlg::TrigJetCRHypoAlg( const std::string& name,
StatusCode TrigJetCRHypoAlg::initialize() {
ATH_CHECK(m_hypoTools.retrieve() );
+ ATH_CHECK(m_trackParticleKey.initialize());
ATH_CHECK(m_cellKey.initialize());
return StatusCode::SUCCESS;
@@ -26,7 +28,7 @@ StatusCode TrigJetCRHypoAlg::initialize() {
StatusCode TrigJetCRHypoAlg::execute( const EventContext& context ) const {
- ATH_MSG_DEBUG ( "Executing " << name() << "..." );
+ ATH_MSG_DEBUG( "Executing " << name() << "..." );
ATH_MSG_DEBUG("Retrieving HLT decision \"" << decisionInput().key() << "\"");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
@@ -42,6 +44,14 @@ StatusCode TrigJetCRHypoAlg::execute( const EventContext& context ) const {
// prepare imput for tools
std::vector<TrigJetCRHypoTool::JetInfo> hypoToolInput;
+
+ // get tracks from the key :
+ ATH_MSG_DEBUG( "Getting Track Handle "<<m_trackParticleKey);
+ auto trackHandle = SG::makeHandle(m_trackParticleKey, context );
+
+ ATH_CHECK( trackHandle.isValid() );
+ const xAOD::TrackParticleContainer* allTracks = trackHandle.get();
+ ATH_MSG_DEBUG ( allTracks->size() << " tracks found" );
// get cells from the key :
ATH_MSG_DEBUG( "Getting Cells Handle "<<m_cellKey);
@@ -50,26 +60,27 @@ StatusCode TrigJetCRHypoAlg::execute( const EventContext& context ) const {
ATH_CHECK( cellHandle.isValid() );
const CaloConstCellContainer* cells = cellHandle.get();
ATH_MSG_DEBUG ( cells->size() << " cells found" );
-
-
for (const Decision* previousDecision : *prevDecisions) {
// Create a new output Decision object, d, backed by the 'decisions' container.
// Links previousDecision as the parent of d.
+
Decision* d = newDecisionIn( decisions, previousDecision, hypoAlgNodeName(), context );
+
- // Obtain an ElementLink to the jet from the previous step, and set this to be the feature for this step too
- const LinkInfo<xAOD::JetContainer> jetLinkInfo = findLink<xAOD::JetContainer>(previousDecision, featureString());
- d->setObjectLink<xAOD::JetContainer>( featureString(), jetLinkInfo.link );
-
- // Obtain the set of chains which are active in previousDecision
- DecisionIDContainer previousDecisionIDs;
- decisionIDs(previousDecision, previousDecisionIDs);
+ const std::vector<LinkInfo< xAOD::JetContainer > >jetELs =
+ findLinks< xAOD::JetContainer >( previousDecision, featureString().c_str(), TrigDefs::lastFeatureOfType);
+ d->setObjectLink<xAOD::JetContainer>( featureString(), jetELs.at(0).link );
+ DecisionIDContainer previousDecisionIDs;
+ decisionIDs(previousDecision, previousDecisionIDs);
+ for (const LinkInfo< xAOD::JetContainer> & jetLinkInfo: jetELs){
// Collect all the required information for the tool together in a handy struct
+ hypoToolInput.emplace_back( TrigJetCRHypoTool::JetInfo{previousDecisionIDs, *(jetLinkInfo.link), allTracks, cells, d} );
+ }
+ // Obtain the set of chains which are active in previousDecision
+ }
- hypoToolInput.emplace_back( TrigJetCRHypoTool::JetInfo{previousDecisionIDs, *(jetLinkInfo.link),cells, d} );
- }
//Loop over all hypoToolinputs and get their decisions
for ( auto & tool: m_hypoTools ) {
@@ -81,3 +92,4 @@ StatusCode TrigJetCRHypoAlg::execute( const EventContext& context ) const {
return StatusCode::SUCCESS;
}
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.h
index 0634a9037943556bbd659507e2e6b34db708692e..036ed32b1ed3f96b794e5e23332b857d407b6736 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoAlg.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
@@ -12,7 +12,7 @@
#include "xAODJet/JetContainer.h"
#include "xAODTracking/VertexContainer.h"
#include "CaloEvent/CaloConstCellContainer.h"
-
+#include "AthLinks/ElementLinkVector.h"
#include "DecisionHandling/HypoBase.h"
#include "TrigJetCRHypoTool.h"
@@ -29,14 +29,18 @@ class TrigJetCRHypoAlg : public ::HypoBase {
TrigJetCRHypoAlg( const std::string& name, ISvcLocator* pSvcLocator );
- virtual StatusCode initialize() override;
+ virtual StatusCode initialize() override;
virtual StatusCode execute( const EventContext& context ) const override;
- private:
+
+private:
ToolHandleArray< TrigJetCRHypoTool > m_hypoTools {this,
"HypoTools",
- {},
+ {},
"Tools to perfrom selection"};
+
+ SG::ReadHandleKey<xAOD::TrackParticleContainer> m_trackParticleKey {this,
+ "Tracks","Key for precision tracks"};
SG::ReadHandleKey<CaloConstCellContainer> m_cellKey {this,
"Cells","Key for input CaloCellContainer"};
@@ -44,3 +48,5 @@ class TrigJetCRHypoAlg : public ::HypoBase {
};
#endif
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.cxx
index 27c43ff6599bdfda401f7347e3febd857363a425..cc023715c4b472da53bd2a01332cfe4c9a0e2555 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.cxx
@@ -23,15 +23,11 @@
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "xAODTrigger/TrigCompositeContainer.h"
-#include "CaloEvent/CaloCellContainer.h"
-#include "CaloEvent/CaloCell.h"
-#include "xAODCaloEvent/CaloCluster.h"
-#include "CaloEvent/CaloClusterContainer.h"
-
#include "CxxUtils/fpcompare.h"
#include "CxxUtils/phihelper.h"
#include "FourMomUtils/xAODP4Helpers.h"
-
+#include "xAODCaloEvent/CaloCluster.h"
+#include "CaloEvent/CaloClusterContainer.h"
using namespace TrigCompositeUtils;
TrigJetCRHypoTool::TrigJetCRHypoTool(const std::string& type,
@@ -43,10 +39,6 @@ TrigJetCRHypoTool::TrigJetCRHypoTool(const std::string& type,
}
-TrigJetCRHypoTool::~TrigJetCRHypoTool(){
-}
-
-
StatusCode TrigJetCRHypoTool::initialize(){
ATH_MSG_VERBOSE( "In TrigJetCRHypoTool, initialize()." );
@@ -65,131 +57,41 @@ StatusCode TrigJetCRHypoTool::initialize(){
return StatusCode::SUCCESS;
}
-bool TrigJetCRHypoTool::emf_dis( const xAOD::Jet* jet ) const {
-
-double jetEMF = jet->getAttribute<float>("EMFrac");
-double jetRatio=-999;
-if (CxxUtils::fpcompare::greater(jetEMF,0.)){
- if(CxxUtils::fpcompare::greater_equal(jetEMF,1.)){
- ATH_MSG_DEBUG( "Fails logR cut, EMF>=1" );
- return false;
- }
- else jetRatio = log10(double(1./jetEMF - 1.));
- }
- if ( jetRatio < m_pufixLogRatio) {
- ATH_MSG_DEBUG( "Jet "<< " below the " << m_pufixLogRatio << " threshold for the log-ratio cut; logRatio = " << jetRatio << "; skipping this jet.");
- return false;
- }
-
-
- // Loop over all tracks above m_trackPtCut and reject the jet if the closest track is at dR(jet, track)< m_deltaR
- auto jetPhi= jet->phi();
- auto jetEta= jet->eta();
- double pufixLR = -1;
-
- if( jetRatio < m_jetlogRCut ) {
-
- ATH_MSG_DEBUG( "Fails logR cut" << jetRatio << " > " << m_jetlogRCut );
- size_t nClusters = jet->numConstituents();
- double clusterPU_sumEEM = 0; double clusterPU_sumE = 0;
- for (size_t clust = 0; clust < nClusters; clust++) {
- const xAOD::CaloCluster * aCluster = dynamic_cast<const xAOD::CaloCluster*> (jet->rawConstituent(clust));
- double clusEEM = 0;
- clusEEM+=(aCluster)->eSample(CaloSampling::EMB1);
- clusEEM+=(aCluster)->eSample(CaloSampling::EMB2);
- clusEEM+=(aCluster)->eSample(CaloSampling::EMB3);
- clusEEM+=(aCluster)->eSample(CaloSampling::EME1);
- clusEEM+=(aCluster)->eSample(CaloSampling::EME2);
- clusEEM+=(aCluster)->eSample(CaloSampling::EME3);
- clusEEM+=(aCluster)->eSample(CaloSampling::FCAL1);
- double lambda = aCluster->getMomentValue(xAOD::CaloCluster::CENTER_LAMBDA);
-
- if (lambda > 500) continue;
-
- double d_eta = aCluster->rawEta() - jetEta;
- double d_phi = xAOD::P4Helpers::deltaPhi(aCluster->rawPhi(),jetPhi);
-
- double d_R2 = d_eta*d_eta + d_phi*d_phi;
-
- if (d_R2 < 0.15*0.15) continue;
- clusterPU_sumEEM+=clusEEM/1000.;
- clusterPU_sumE+=aCluster->rawE()/1000.;
- }
-
- double jetEEM_EMscale = 0; double jetE_EMscale = 0; //Working on EM scale because calE() doesn't always return correct EEM and cluster moment EMF not accessable during testing
-
- std::vector<double> samplingEnergy = jet->getAttribute<std::vector<double> >("EnergyPerSampling");
-
- for(size_t s=0; s<samplingEnergy.size(); s++) {
-
- double samplingE = 0.001*(samplingEnergy.at(s));
- if ( s < 8 || (s > 20 && s < 28) ) jetEEM_EMscale+=samplingE; // EM layers 0-7 and 21-27
- jetE_EMscale+=samplingE;
- }
-
- double pufixEMF = (jetEEM_EMscale - clusterPU_sumEEM)/(jetE_EMscale - clusterPU_sumE);
-
- if (CxxUtils::fpcompare::greater(pufixEMF,0.)){
- if(CxxUtils::fpcompare::greater_equal(pufixEMF,1.0)) pufixLR = -999.;
- else pufixLR = log10(double(1./pufixEMF - 1.));
- } else {
- pufixLR = 999;
- }
-
- if ( pufixLR < m_jetlogRCut) {
- ATH_MSG_DEBUG( "Jet "<< " is still below the " << m_jetlogRCut << " threshold for the log-ratio cut; recalculated logRatio = " << pufixLR << "; skipping this jet.");
- return false;
- }
-
- jetRatio = pufixLR;
-
- }else {
-
- if ( jetRatio < m_jetlogRCut) {
- return false;
- }
- ATH_MSG_DEBUG( "Jet "<< " above the " << m_jetlogRCut<< " threshold for the log-ratio cut; logRatio = " << jetRatio << "; skipping this jet.");
- }
- return true;
-}
-
-
-
bool TrigJetCRHypoTool::decide_on_single_jet( JetInfo& input ) const {
auto jet = input.jet;
+ auto trackContainer = input.allTracks;
auto cellContainer = input.cells;
- auto alltracks= jet->getAttribute<std::vector<ElementLink<xAOD::IParticleContainer> >>("TracksForMinimalJetTag");
+
//Checking jet logRatio requirements
double jetEMF = jet->getAttribute<float>("EMFrac");
- double jetRatio=-999;
- ATH_MSG_DEBUG( "Jet EMF = " << jetEMF << " jet pT = " << jet->pt() << "jet eta = " << jet->eta() << " phi = " << jet->phi() );
+ double jetRatio;
+
+ if (CxxUtils::fpcompare::greater(jetEMF,0.)){
+ if(CxxUtils::fpcompare::greater_equal(jetEMF,1.)){
+ ATH_MSG_DEBUG( "Fails logR cut, EMF>=1" );
+ return false;
+ }
+ else jetRatio = log10(double(1./jetEMF - 1.));
- if (!emf_dis(jet)){
- return false;
+ if( jetRatio < m_jetlogRCut ) return false;
}
+ // Loop over all tracks above m_trackPtCut and reject the jet if the closest track is at dR(jet, track)< m_deltaR
auto jetPhi= jet->phi();
auto jetEta= jet->eta();
+ for ( const xAOD::TrackParticle_v1* track : *trackContainer) {
- ATH_MSG_DEBUG("jet passed logR" );
+ if(track->pt() < m_trackPtCut ) continue;
- // Loop over all tracks above m_trackPtCut and reject the jet if the closest track is at dR(jet, track)< m_deltaR
- for ( unsigned int index(0); index < alltracks.size(); index++ ) {
- const xAOD::IParticle* track = *( alltracks.at(index));
-
- if(track->pt() < m_trackPtCut ) continue;
-
- double phi = track->p4().Phi();
- double eta = track->p4().Eta() ;
+ double phi = track->phi0();
+ double eta = track->eta();
- double dR = xAOD::P4Helpers::deltaR( eta, phi, jetEta, jetPhi );
- ATH_MSG_DEBUG("track with " << "pt=" << track->pt() << ", eta=" << eta << ", phi=" << phi << " dR = " << dR);
- if (dR<m_deltaR) return false;
+ double dR = xAOD::P4Helpers::deltaR( eta, phi, jetEta, jetPhi );
+ if (dR<m_deltaR) return false;
}
- ATH_MSG_DEBUG("jet passed tracking" );
if(m_doBIBrm==1){
int countCaloCell=0;
@@ -198,11 +100,10 @@ bool TrigJetCRHypoTool::decide_on_single_jet( JetInfo& input ) const {
for(CaloCellContainer::const_iterator celliter = cellContainer->begin(); celliter != cellContainer->end(); ++celliter){
//LoF cell selection in tile:
if((*celliter)->caloDDE()->is_tile() && (*celliter)->energy() > m_minCellEt){
- double d_phi = xAOD::P4Helpers::deltaPhi( (*celliter)->phi(), jetPhi );
- double d_R = xAOD::P4Helpers::deltaR( (*celliter)->eta(), (*celliter)->phi(), jetEta, jetPhi );
- //select cells in a horizontal line, not being part of the jet and timing consistent with BIB
- ATH_MSG_DEBUG(" cell E " << (*celliter)->energy() << " dPhi " << d_phi << " dR = " << d_R << " time " << (*celliter)->time() );
- if(std::abs(d_phi) < 0.2 && d_R > 0.4){
+ double d_phi = xAOD::P4Helpers::deltaPhi( (*celliter)->phi(), jetPhi );
+ double d_R = xAOD::P4Helpers::deltaR( (*celliter)->eta(), (*celliter)->phi(), jetEta, jetPhi );
+ //select cells in a horizontal line, not being part of the jet and timing consistent with BIB
+ if(std::abs(d_phi) < 0.2 && d_R > 0.4){
//-early
float t = (*celliter)->time();
if(t < m_celltime){
@@ -212,57 +113,43 @@ bool TrigJetCRHypoTool::decide_on_single_jet( JetInfo& input ) const {
float z = (*celliter)->z();
float r = sqrt(x*x + y*y);
- if((std::abs(t - (z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime) || (std::abs(t - (-z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime)){
- ATH_MSG_DEBUG(" cell is tile; cell E = " << (*celliter)->energy() << " cell phi = " << (*celliter)->phi() << " cell eta = " << (*celliter)->eta() << " cell r = " << r );
- // for selected cells, store in which layer they are
- if(r<2200){ countCell_layer[0]++;}
- else if(r>=2200 && r<2600){ countCell_layer[1]++;}
- else if(r>=2600 && r<3100){ countCell_layer[2]++;}
- else if(r>=3100){ countCell_layer[3]++;}
- }
- }
- }
+ if((std::abs(t - (z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime) || (std::abs(t - (-z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime)){
+ // for selected cells, store in which layer they are
+ if(r<2200){ countCell_layer[0]++;}
+ else if(r>=2200 && r<2600){ countCell_layer[1]++;}
+ else if(r>=2600 && r<3100){ countCell_layer[2]++;}
+ else if(r>=3100){ countCell_layer[3]++;}
+ }
+ }
+ }
}
}
-
- // get max number of selected cells in a layer
- for(int i=0; i<4; i++){
- if(countCaloCell<countCell_layer[i]) countCaloCell=countCell_layer[i];
- }
-
- ATH_MSG_DEBUG("Jet Pt " << jet->pt() << "; eta "<< jetEta << "; phi " << jetPhi <<"; logRatio " << jetRatio << "; LoF Cells " << countCaloCell );
+ // get max number of selected cells in a layer
+ for(int i=0; i<4; i++)
+ if(countCaloCell<countCell_layer[i]) countCaloCell=countCell_layer[i];
//apply cut on number of cells here
- if (countCaloCell>=m_countCaloCell){
- ATH_MSG_DEBUG( "Jet discarded, identified as BIB" );
- return false;
- }
- else {
- ATH_MSG_DEBUG( "Jet is not BIB" );
- return true;
- }
-
+ if (countCaloCell>=m_countCaloCell) return false;
+
+ return true;
}
- ATH_MSG_DEBUG( "Passed selection" );
-
return true;
-
}
StatusCode TrigJetCRHypoTool::decide( std::vector<JetInfo>& input ) const{
for ( JetInfo& j: input ) {
if ( passed ( m_decisionId.numeric(), j.previousDecisionIDs ) ) {
-
if ( decide_on_single_jet( j ) ) {
- addDecisionID( m_decisionId, j.decision );
- return StatusCode::SUCCESS;
+ addDecisionID( m_decisionId, j.decision );
+ return StatusCode::SUCCESS;
+
}
}
}
- return StatusCode::SUCCESS;
+ return StatusCode::SUCCESS;
}
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.h
index d38cf8c70c33428c68b75301aa715755ea706917..1453fe53b1fdfbb3ce3f9ef144af8cd1abc9112d 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRHypoTool.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRIGJETCRHYPOTOOL_H
@@ -16,11 +16,12 @@
*
*
********************************************************************/
-
+#include "AthLinks/ElementLinkVector.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
+
#include "TrigHLTJetHypo/ITrigJetHypoToolHelper.h"
#include "xAODEventInfo/EventInfo.h"
@@ -38,21 +39,19 @@ class TrigJetCRHypoTool: public AthAlgTool{
const std::string& name,
const IInterface* parent);
- ~TrigJetCRHypoTool();
virtual StatusCode initialize() override final;
// typedef for passing jet - decision object assocation
using JetDecision = std::pair<const xAOD::Jet*,TrigCompositeUtils::Decision*>;
+
struct JetInfo {
const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
const xAOD::Jet* jet;
+ const xAOD::TrackParticleContainer* allTracks;
const CaloConstCellContainer* cells;
TrigCompositeUtils::Decision* decision;
};
-
- bool emf_dis( const xAOD::Jet* jet ) const;
-
/**
* @brief decides upon a collection of jets
**/
@@ -85,11 +84,11 @@ class TrigJetCRHypoTool: public AthAlgTool{
// minjetlogR may be read from trigger chain name -- to be updated
Gaudi::Property< float > m_jetlogRCut{ this, "MinjetlogR", { float(1.2 ) }, "Jet logR requirement" };
- Gaudi::Property< float > m_pufixLogRatio{ this, "MpufixLogRatio", { float(1.2 ) }, "Jet pufix logR requirement" };
Gaudi::Property< float > m_trackPtCut{ this, "MintrackPt", { float( 2.0*Gaudi::Units::GeV ) }, "Track pT requirement" };
Gaudi::Property< float > m_deltaR{ this, "MindeltaR", { float( 0.2 ) }, "deltaR(jet, track) requirement" };
Gaudi::Property< bool > m_doBIBrm{ this, "doBIBremoval", { int(0) }, "option to include BIB removal" };
+ Gaudi::Property< bool > m_doEMFrm{ this, "doEMFremoval", { int(0) }, "option to include pileip removal" };
Gaudi::Property< float > m_dEta{ this, "BibMinDeltaEta", { float( 0.4 ) }, "BIB deltaEta requirement" };
Gaudi::Property< float > m_dPhi{ this, "BibMinDeltaPhi", { float( 0.2 ) }, "BIB deltaPhi requirement" };
@@ -101,3 +100,4 @@ class TrigJetCRHypoTool: public AthAlgTool{
};
#endif
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoTool.cxx
deleted file mode 100644
index 03c828cdad7672430b66169fffa48a8009a42df0..0000000000000000000000000000000000000000
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoTool.cxx
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-*/
-
-// ********************************************************************
-//
-// NAME: TrigJetCROldHypoTool.cxx
-// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
-//
-//
-// ********************************************************************
-
-#include "TrigJetCROldHypoTool.h"
-#include "GaudiKernel/StatusCode.h"
-#include "CLHEP/Units/PhysicalConstants.h"
-
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
-#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/lineSplitter.h"
-#include "./DebugInfoCollector.h"
-#include "./xAODJetCollector.h"
-
-#include "TrigCompositeUtils/HLTIdentifier.h"
-#include "TrigCompositeUtils/TrigCompositeUtils.h"
-#include "xAODTrigger/TrigCompositeContainer.h"
-
-#include "CxxUtils/fpcompare.h"
-#include "CxxUtils/phihelper.h"
-#include "FourMomUtils/xAODP4Helpers.h"
-#include "xAODCaloEvent/CaloCluster.h"
-#include "CaloEvent/CaloClusterContainer.h"
-using namespace TrigCompositeUtils;
-
-TrigJetCROldHypoTool::TrigJetCROldHypoTool(const std::string& type,
- const std::string& name,
- const IInterface* parent) :
- AthAlgTool(type, name, parent),
- m_decisionId(HLT::Identifier::fromToolName(name)){
-
-}
-
-
-
-StatusCode TrigJetCROldHypoTool::initialize(){
- ATH_MSG_VERBOSE( "In TrigJetCROldHypoTool, initialize()." );
-
- if (m_visitDebug){
-
- DebugInfoCollector collector(name());
- ATH_CHECK(m_helper->getDescription(collector));
- auto s = collector.toString();
-
- for(const auto& l : lineSplitter(s)){
- ATH_MSG_INFO(l);
- }
- }
-
- return StatusCode::SUCCESS;
-}
-
-bool TrigJetCROldHypoTool::decide_on_single_jet( JetInfo& input ) const {
-
- auto jet = input.jet;
- auto trackContainer = input.allTracks;
- auto cellContainer = input.cells;
-
- //Checking jet logRatio requirements
- double jetEMF = jet->getAttribute<float>("EMFrac");
- ATH_MSG_DEBUG( "Jet EMF = " << jetEMF << " jet pT = " << jet->pt() << "jet eta = " << jet->eta() << " phi = " << jet->phi() );
- double jetRatio;
-
- if (CxxUtils::fpcompare::greater(jetEMF,0.)){
- if(CxxUtils::fpcompare::greater_equal(jetEMF,1.)){
- ATH_MSG_DEBUG( "Fails logR cut, EMF>=1" );
- return false;
- }
- else jetRatio = log10(double(1./jetEMF - 1.));
-
- if( jetRatio < m_jetlogRCut ) {
- ATH_MSG_DEBUG( "Fails logR cut" << jetRatio << " > " << m_jetlogRCut );
- return false;
- }
- }
-
- ATH_MSG_DEBUG("jet passed logR" );
-
- // Loop over all tracks above m_trackPtCut and reject the jet if the closest track is at dR(jet, track)< m_deltaR
- auto jetPhi= jet->phi();
- auto jetEta= jet->eta();
-
- for ( const xAOD::TrackParticle_v1* track : *trackContainer) {
-
- if(track->pt() < m_trackPtCut ) continue;
-
- double phi = track->phi0();
- double eta = track->eta();
-
- double dR = xAOD::P4Helpers::deltaR( eta, phi, jetEta, jetPhi );
- ATH_MSG_DEBUG(" track with " << "pt=" << track->pt() << ", eta=" << eta << ", phi=" << phi << " dR = " << dR);
- if (dR<m_deltaR) return false;
- }
-
- ATH_MSG_DEBUG("jet passed tracking" );
-
- if(m_doBIBrm==1){
- int countCaloCell=0;
- double countCell_layer[4] = {0,0,0,0};
-
- for(CaloCellContainer::const_iterator celliter = cellContainer->begin(); celliter != cellContainer->end(); ++celliter){
- //LoF cell selection in tile:
- if((*celliter)->caloDDE()->is_tile() && (*celliter)->energy() > m_minCellEt){
- double d_phi = xAOD::P4Helpers::deltaPhi( (*celliter)->phi(), jetPhi );
- double d_R = xAOD::P4Helpers::deltaR( (*celliter)->eta(), (*celliter)->phi(), jetEta, jetPhi );
- //select cells in a horizontal line, not being part of the jet and timing consistent with BIB
- ATH_MSG_DEBUG(" cell E " << (*celliter)->energy() << " dPhi " << d_phi << " dR = " << d_R << " time " << (*celliter)->time() );
- if(std::abs(d_phi) < 0.2 && d_R > 0.4){
- //-early
- float t = (*celliter)->time();
- if(t < m_celltime){
- // check cell's time consitency with BIB
- float x = (*celliter)->x();
- float y = (*celliter)->y();
- float z = (*celliter)->z();
- float r = sqrt(x*x + y*y);
-
- if((std::abs(t - (z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime) || (std::abs(t - (-z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime)){
- ATH_MSG_DEBUG(" cell is tile; cell E = " << (*celliter)->energy() << " cell phi = " << (*celliter)->phi() << " cell eta = " << (*celliter)->eta() << " cell r = " << r );
- // for selected cells, store in which layer they are
- if(r<2200){ countCell_layer[0]++;}
- else if(r>=2200 && r<2600){ countCell_layer[1]++;}
- else if(r>=2600 && r<3100){ countCell_layer[2]++;}
- else if(r>=3100){ countCell_layer[3]++;}
- }
- }
- }
- }
- }
-
- // get max number of selected cells in a layer
- for(int i=0; i<4; i++)
- if(countCaloCell<countCell_layer[i]) countCaloCell=countCell_layer[i];
-
- ATH_MSG_DEBUG("Jet Pt " << jet->pt() << "; eta "<< jetEta << "; phi " << jetPhi <<"; logRatio " << jetRatio << "; LoF Cells " << countCaloCell );
-
- //apply cut on number of cells here
- if (countCaloCell>=m_countCaloCell){
- ATH_MSG_DEBUG( "Jet discarded, identified as BIB" );
- return false;
- }
- else {
- ATH_MSG_DEBUG( "Jet is not BIB" );
- return true;
- }
-
- }
-
- ATH_MSG_DEBUG( "Passed selection" );
- return true;
-
-}
-
-StatusCode TrigJetCROldHypoTool::decide( std::vector<JetInfo>& input ) const{
- for ( JetInfo& j: input ) {
- if ( passed ( m_decisionId.numeric(), j.previousDecisionIDs ) ) {
- if ( decide_on_single_jet( j ) ) {
- addDecisionID( m_decisionId, j.decision );
- return StatusCode::SUCCESS;
-
- }
- }
- }
- return StatusCode::SUCCESS;
-
-}
-
-
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoAlg.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoAlg.cxx
similarity index 58%
rename from Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoAlg.cxx
rename to Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoAlg.cxx
index fefe1c6db5a37c3b04ec84e9566a98d57091173d..a2cfc80a3bd7f5034af18c763444041d248a40e5 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoAlg.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoAlg.cxx
@@ -1,34 +1,32 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#include <algorithm>
-#include "TrigJetCROldHypoAlg.h"
-#include "TrigJetCROldHypoTool.h"
+#include "TrigJetCRVARHypoAlg.h"
+#include "TrigJetCRVARHypoTool.h"
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
using namespace TrigCompositeUtils;
-
-TrigJetCROldHypoAlg::TrigJetCROldHypoAlg( const std::string& name,
+TrigJetCRVARHypoAlg::TrigJetCRVARHypoAlg( const std::string& name,
ISvcLocator* pSvcLocator ) :
::HypoBase( name, pSvcLocator ) { }
-StatusCode TrigJetCROldHypoAlg::initialize() {
+StatusCode TrigJetCRVARHypoAlg::initialize() {
ATH_CHECK(m_hypoTools.retrieve() );
- ATH_CHECK(m_trackParticleKey.initialize());
ATH_CHECK(m_cellKey.initialize());
return StatusCode::SUCCESS;
}
-StatusCode TrigJetCROldHypoAlg::execute( const EventContext& context ) const {
+StatusCode TrigJetCRVARHypoAlg::execute( const EventContext& context ) const {
- ATH_MSG_DEBUG( "Executing " << name() << "..." );
+ ATH_MSG_DEBUG ( "Executing " << name() << "..." );
ATH_MSG_DEBUG("Retrieving HLT decision \"" << decisionInput().key() << "\"");
auto previousDecisionsHandle = SG::makeHandle( decisionInput(), context );
@@ -43,15 +41,7 @@ StatusCode TrigJetCROldHypoAlg::execute( const EventContext& context ) const {
ATH_MSG_DEBUG( "Creating new output decision handle");
// prepare imput for tools
- std::vector<TrigJetCROldHypoTool::JetInfo> hypoToolInput;
-
- // get tracks from the key :
- ATH_MSG_DEBUG( "Getting Track Handle "<<m_trackParticleKey);
- auto trackHandle = SG::makeHandle(m_trackParticleKey, context );
-
- ATH_CHECK( trackHandle.isValid() );
- const xAOD::TrackParticleContainer* allTracks = trackHandle.get();
- ATH_MSG_DEBUG ( allTracks->size() << " tracks found" );
+ std::vector<TrigJetCRVARHypoTool::JetInfo> hypoToolInput;
// get cells from the key :
ATH_MSG_DEBUG( "Getting Cells Handle "<<m_cellKey);
@@ -60,27 +50,26 @@ StatusCode TrigJetCROldHypoAlg::execute( const EventContext& context ) const {
ATH_CHECK( cellHandle.isValid() );
const CaloConstCellContainer* cells = cellHandle.get();
ATH_MSG_DEBUG ( cells->size() << " cells found" );
+
+
for (const Decision* previousDecision : *prevDecisions) {
// Create a new output Decision object, d, backed by the 'decisions' container.
// Links previousDecision as the parent of d.
-
Decision* d = newDecisionIn( decisions, previousDecision, hypoAlgNodeName(), context );
-
- const std::vector<LinkInfo< xAOD::JetContainer > >jetELs =
- findLinks< xAOD::JetContainer >( previousDecision, featureString().c_str(), TrigDefs::lastFeatureOfType);
- d->setObjectLink<xAOD::JetContainer>( featureString(), jetELs.at(0).link );
- DecisionIDContainer previousDecisionIDs;
- decisionIDs(previousDecision, previousDecisionIDs);
+ // Obtain an ElementLink to the jet from the previous step, and set this to be the feature for this step too
+ const LinkInfo<xAOD::JetContainer> jetLinkInfo = findLink<xAOD::JetContainer>(previousDecision, featureString());
+ d->setObjectLink<xAOD::JetContainer>( featureString(), jetLinkInfo.link );
- for (const LinkInfo< xAOD::JetContainer> & jetLinkInfo: jetELs){
- // Collect all the required information for the tool together in a handy struct
- hypoToolInput.emplace_back( TrigJetCROldHypoTool::JetInfo{previousDecisionIDs, *(jetLinkInfo.link), allTracks, cells, d} );
- }
// Obtain the set of chains which are active in previousDecision
- }
+ DecisionIDContainer previousDecisionIDs;
+ decisionIDs(previousDecision, previousDecisionIDs);
+ // Collect all the required information for the tool together in a handy struct
+
+ hypoToolInput.emplace_back( TrigJetCRVARHypoTool::JetInfo{previousDecisionIDs, *(jetLinkInfo.link),cells, d} );
+ }
//Loop over all hypoToolinputs and get their decisions
for ( auto & tool: m_hypoTools ) {
@@ -92,4 +81,3 @@ StatusCode TrigJetCROldHypoAlg::execute( const EventContext& context ) const {
return StatusCode::SUCCESS;
}
-
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoAlg.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoAlg.h
similarity index 54%
rename from Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoAlg.h
rename to Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoAlg.h
index 99094ac40cdd52fbc12fca57507af131a4fa9bf2..720a622ff5c686b15fad26761d7a90dbcd77d9bc 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoAlg.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoAlg.h
@@ -1,10 +1,10 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TrigHLTJetHypo_TrigJetCROLDHypoAlg_H
-#define TrigHLTJetHypo_TrigJetCROLDHypoAlg_H
+#ifndef TrigHLTJetHypo_TrigJetCRVARHypoAlg_H
+#define TrigHLTJetHypo_TrigJetCRVARHypoAlg_H
#include <string>
@@ -12,35 +12,31 @@
#include "xAODJet/JetContainer.h"
#include "xAODTracking/VertexContainer.h"
#include "CaloEvent/CaloConstCellContainer.h"
-#include "AthLinks/ElementLinkVector.h"
+
#include "DecisionHandling/HypoBase.h"
-#include "TrigJetCROldHypoTool.h"
+#include "TrigJetCRVARHypoTool.h"
/**
- * @class TrigJetCROldHypoAlg
+ * @class TrigJetCRVARHypoAlg
* @brief HypoAlg for low-EMF trackless jets algorithm
* @details HypoAlg needed to associate trigger navigation to jets selected for writing out by exotic jets algorithms
* @author
**/
-class TrigJetCROldHypoAlg : public ::HypoBase {
+class TrigJetCRVARHypoAlg : public ::HypoBase {
public:
- TrigJetCROldHypoAlg( const std::string& name, ISvcLocator* pSvcLocator );
+ TrigJetCRVARHypoAlg( const std::string& name, ISvcLocator* pSvcLocator );
- virtual StatusCode initialize() override;
+ virtual StatusCode initialize() override;
virtual StatusCode execute( const EventContext& context ) const override;
-
-private:
- ToolHandleArray< TrigJetCROldHypoTool > m_hypoTools {this,
+ private:
+ ToolHandleArray< TrigJetCRVARHypoTool > m_hypoTools {this,
"HypoTools",
- {},
+ {},
"Tools to perfrom selection"};
-
- SG::ReadHandleKey<xAOD::TrackParticleContainer> m_trackParticleKey {this,
- "Tracks","Key for precision tracks"};
SG::ReadHandleKey<CaloConstCellContainer> m_cellKey {this,
"Cells","Key for input CaloCellContainer"};
@@ -48,5 +44,3 @@ private:
};
#endif
-
-
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoTool.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoTool.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..ce87865b6a7660ebdc04b17458b49dbda0793002
--- /dev/null
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoTool.cxx
@@ -0,0 +1,223 @@
+/*
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+*/
+
+// ********************************************************************
+//
+// NAME: TrigJetCRVARHypoTool.cxx
+// PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
+//
+//
+// ********************************************************************
+
+#include "TrigJetCRVARHypoTool.h"
+#include "GaudiKernel/StatusCode.h"
+#include "CLHEP/Units/PhysicalConstants.h"
+
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/xAODJetAsIJetFactory.h"
+#include "TrigHLTJetHypo/TrigHLTJetHypoUtils/lineSplitter.h"
+#include "./DebugInfoCollector.h"
+#include "./xAODJetCollector.h"
+
+#include "TrigCompositeUtils/HLTIdentifier.h"
+#include "TrigCompositeUtils/TrigCompositeUtils.h"
+#include "xAODTrigger/TrigCompositeContainer.h"
+
+#include "CaloEvent/CaloCellContainer.h"
+#include "CaloEvent/CaloCell.h"
+#include "xAODCaloEvent/CaloCluster.h"
+#include "CaloEvent/CaloClusterContainer.h"
+
+#include "CxxUtils/fpcompare.h"
+#include "CxxUtils/phihelper.h"
+#include "FourMomUtils/xAODP4Helpers.h"
+
+using namespace TrigCompositeUtils;
+
+TrigJetCRVARHypoTool::TrigJetCRVARHypoTool(const std::string& type,
+ const std::string& name,
+ const IInterface* parent) :
+ AthAlgTool(type, name, parent),
+ m_decisionId(HLT::Identifier::fromToolName(name)){
+
+}
+
+
+TrigJetCRVARHypoTool::~TrigJetCRVARHypoTool(){
+}
+
+
+
+StatusCode TrigJetCRVARHypoTool::initialize(){
+ ATH_MSG_VERBOSE( "In TrigJetCRVARHypoTool, initialize()." );
+
+ if (m_visitDebug){
+
+ DebugInfoCollector collector(name());
+ ATH_CHECK(m_helper->getDescription(collector));
+ auto s = collector.toString();
+
+ for(const auto& l : lineSplitter(s)){
+ ATH_MSG_INFO(l);
+ }
+ }
+
+ return StatusCode::SUCCESS;
+}
+
+bool TrigJetCRVARHypoTool::emf_dis(const xAOD::Jet* jet ) const {
+
+ double jetEMF = jet->getAttribute<float>("EMFrac");
+ double jetRatio=-999;
+ if (CxxUtils::fpcompare::greater(jetEMF,0.)){
+ if(CxxUtils::fpcompare::greater_equal(jetEMF,1.)){
+ ATH_MSG_DEBUG( "Fails logR cut, EMF>=1" );
+ return false;
+ }
+ else jetRatio = log10(double(1./jetEMF - 1.));
+
+ if ( jetRatio < m_pufixLogRatio)
+ return false;
+
+ // Loop over all tracks above m_trackPtCut and reject the jet if the closest track is at dR(jet, track)< m_deltaR
+ auto jetPhi= jet->phi();
+ auto jetEta= jet->eta();
+ double pufixLR = -1;
+
+ if( jetRatio < m_jetlogRCut ) {
+ size_t nClusters = jet->numConstituents();
+ double clusterPU_sumEEM = 0; double clusterPU_sumE = 0;
+ for (size_t clust = 0; clust < nClusters; clust++) {
+ const xAOD::CaloCluster * aCluster = dynamic_cast<const xAOD::CaloCluster*> (jet->rawConstituent(clust));
+ double clusEEM = 0;
+ clusEEM+=(aCluster)->eSample(CaloSampling::EMB1);
+ clusEEM+=(aCluster)->eSample(CaloSampling::EMB2);
+ clusEEM+=(aCluster)->eSample(CaloSampling::EMB3);
+ clusEEM+=(aCluster)->eSample(CaloSampling::EME1);
+ clusEEM+=(aCluster)->eSample(CaloSampling::EME2);
+ clusEEM+=(aCluster)->eSample(CaloSampling::EME3);
+ clusEEM+=(aCluster)->eSample(CaloSampling::FCAL1);
+ double lambda = aCluster->getMomentValue(xAOD::CaloCluster::CENTER_LAMBDA);
+
+ if (lambda > 500) continue;
+
+ double d_eta = aCluster->rawEta() - jetEta;
+ double d_phi = xAOD::P4Helpers::deltaPhi(aCluster->rawPhi(),jetPhi);
+ double d_R2 = d_eta*d_eta + d_phi*d_phi;
+
+ if (d_R2 < 0.15*0.15) continue;
+ clusterPU_sumEEM+=clusEEM/1000.;
+ clusterPU_sumE+=aCluster->rawE()/1000.;
+ }
+
+ double jetEEM_EMscale = 0; double jetE_EMscale = 0; //Working on EM scale because calE() doesn't always return correct EEM and cluster moment EMF not accessable during testing
+ std::vector<double> samplingEnergy = jet->getAttribute<std::vector<double> >("EnergyPerSampling");
+
+ for(size_t s=0; s<samplingEnergy.size(); s++) {
+ double samplingE = 0.001*(samplingEnergy.at(s));
+ if ( s < 8 || (s > 20 && s < 28) ) jetEEM_EMscale+=samplingE; // EM layers 0-7 and 21-27
+ jetE_EMscale+=samplingE;
+ }
+
+ double pufixEMF = (jetEEM_EMscale - clusterPU_sumEEM)/(jetE_EMscale - clusterPU_sumE);
+
+ if (CxxUtils::fpcompare::greater(pufixEMF,0.)){
+ if(CxxUtils::fpcompare::greater_equal(pufixEMF,1.0)) pufixLR = -999.;
+ else pufixLR = log10(double(1./pufixEMF - 1.));
+ }else return true;
+
+ if ( pufixLR < m_jetlogRCut) return false;
+
+ jetRatio = pufixLR;
+ }
+ return true;
+ }
+
+return true;
+}
+
+
+
+bool TrigJetCRVARHypoTool::decide_on_single_jet( JetInfo& input ) const {
+
+ auto jet = input.jet;
+ auto cellContainer = input.cells;
+ auto alltracks= jet->getAttribute<std::vector<ElementLink<xAOD::IParticleContainer> >>("TracksForMinimalJetTag");
+ //Checking jet logRatio requirements
+ if (!emf_dis(jet)){
+ return false;
+ }
+
+ auto jetPhi= jet->phi();
+ auto jetEta= jet->eta();
+
+ // Loop over all tracks above m_trackPtCut and reject the jet if the closest track is at dR(jet, track)< m_deltaR
+ for ( unsigned int index(0); index < alltracks.size(); index++ ) {
+ const xAOD::IParticle* track = *( alltracks.at(index));
+ if(track->pt() < m_trackPtCut ) continue;
+ double phi = track->p4().Phi();
+ double eta = track->p4().Eta() ;
+ double dR = xAOD::P4Helpers::deltaR( eta, phi, jetEta, jetPhi );
+ if (dR<m_deltaR) return false;
+ }
+
+ if(m_doBIBrm==1){
+ int countCaloCell=0;
+ double countCell_layer[4] = {0,0,0,0};
+
+ for(CaloCellContainer::const_iterator celliter = cellContainer->begin(); celliter != cellContainer->end(); ++celliter){
+ //LoF cell selection in tile:
+ if((*celliter)->caloDDE()->is_tile() && (*celliter)->energy() > m_minCellEt){
+ double d_phi = xAOD::P4Helpers::deltaPhi( (*celliter)->phi(), jetPhi );
+ double d_R = xAOD::P4Helpers::deltaR( (*celliter)->eta(), (*celliter)->phi(), jetEta, jetPhi );
+ //select cells in a horizontal line, not being part of the jet and timing consistent with BIB
+ if(std::abs(d_phi) < 0.2 && d_R > 0.4){
+ //-early
+ float t = (*celliter)->time();
+ if(t < m_celltime){
+ // check cell's time consitency with BIB
+ float x = (*celliter)->x();
+ float y = (*celliter)->y();
+ float z = (*celliter)->z();
+ float r = sqrt(x*x + y*y);
+
+ if((std::abs(t - (z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime) || (std::abs(t - (-z-sqrt(z*z + r*r))/CLHEP::c_light) < m_dBIBtime)){
+ // for selected cells, store in which layer they are
+ if(r<2200){ countCell_layer[0]++;}
+ else if(r>=2200 && r<2600){ countCell_layer[1]++;}
+ else if(r>=2600 && r<3100){ countCell_layer[2]++;}
+ else if(r>=3100){ countCell_layer[3]++;}
+ }
+ }
+ }
+ }
+ }
+
+ // get max number of selected cells in a layer
+ for(int i=0; i<4; i++){
+ if(countCaloCell<countCell_layer[i]) countCaloCell=countCell_layer[i];
+ }
+
+ //apply cut on number of cells here
+ if (countCaloCell>=m_countCaloCell) return false;
+
+ return true;
+}
+
+return true;
+}
+
+StatusCode TrigJetCRVARHypoTool::decide( std::vector<JetInfo>& input ) const{
+ for ( JetInfo& j: input ) {
+ if ( passed ( m_decisionId.numeric(), j.previousDecisionIDs ) ) {
+
+ if ( decide_on_single_jet( j ) ) {
+ addDecisionID( m_decisionId, j.decision );
+ return StatusCode::SUCCESS;
+ }
+ }
+ }
+ return StatusCode::SUCCESS;
+}
+
+
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoTool.h b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoTool.h
similarity index 86%
rename from Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoTool.h
rename to Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoTool.h
index 6e10a49d55b42724ae9e669441ff48bd592e7e31..923289e15eea81de85489e23e7608786bee3362b 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCROldHypoTool.h
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/TrigJetCRVARHypoTool.h
@@ -1,27 +1,26 @@
/*
- Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TRIGJETCROLDHYPOTOOL_H
-#define TRIGJETCROLDHYPOTOOL_H
+#ifndef TRIGJETCRVARHYPOTOOL_H
+#define TRIGJETCRVARHYPOTOOL_H
/********************************************************************
*
- * NAME: TrigJetCROldHypoTool.h
+ * NAME: TrigJetCRVARHypoTool.h
* PACKAGE: Trigger/TrigHypothesis/TrigHLTJetHypo
*
- * * @class TrigJetCROldHypoTool
+ * * @class TrigJetCRVARHypoTool
* * @brief HypoTool for
* * @details HypoTool needed to decide on exotic jet selections
* * @author
*
*
********************************************************************/
-#include "AthLinks/ElementLinkVector.h"
+
#include "TrigCompositeUtils/HLTIdentifier.h"
#include "AthenaBaseComps/AthAlgTool.h"
#include "TrigCompositeUtils/TrigCompositeUtils.h"
#include "AthenaMonitoringKernel/GenericMonitoringTool.h"
-
#include "TrigHLTJetHypo/ITrigJetHypoToolHelper.h"
#include "xAODEventInfo/EventInfo.h"
@@ -31,27 +30,29 @@
#include "xAODTracking/VertexContainer.h"
#include <CaloEvent/CaloConstCellContainer.h>
-class TrigJetCROldHypoTool: public AthAlgTool{
+class TrigJetCRVARHypoTool: public AthAlgTool{
public:
- TrigJetCROldHypoTool(const std::string& type,
+ TrigJetCRVARHypoTool(const std::string& type,
const std::string& name,
const IInterface* parent);
+ ~TrigJetCRVARHypoTool();
virtual StatusCode initialize() override final;
// typedef for passing jet - decision object assocation
using JetDecision = std::pair<const xAOD::Jet*,TrigCompositeUtils::Decision*>;
-
struct JetInfo {
const TrigCompositeUtils::DecisionIDContainer previousDecisionIDs;
const xAOD::Jet* jet;
- const xAOD::TrackParticleContainer* allTracks;
const CaloConstCellContainer* cells;
TrigCompositeUtils::Decision* decision;
};
+
+ bool emf_dis( const xAOD::Jet* jet ) const;
+
/**
* @brief decides upon a collection of jets
**/
@@ -84,11 +85,11 @@ class TrigJetCROldHypoTool: public AthAlgTool{
// minjetlogR may be read from trigger chain name -- to be updated
Gaudi::Property< float > m_jetlogRCut{ this, "MinjetlogR", { float(1.2 ) }, "Jet logR requirement" };
+ Gaudi::Property< float > m_pufixLogRatio{ this, "MpufixLogRatio", { float(1.2 ) }, "Jet pufix logR requirement" };
Gaudi::Property< float > m_trackPtCut{ this, "MintrackPt", { float( 2.0*Gaudi::Units::GeV ) }, "Track pT requirement" };
Gaudi::Property< float > m_deltaR{ this, "MindeltaR", { float( 0.2 ) }, "deltaR(jet, track) requirement" };
Gaudi::Property< bool > m_doBIBrm{ this, "doBIBremoval", { int(0) }, "option to include BIB removal" };
- Gaudi::Property< bool > m_doEMFrm{ this, "doEMFremoval", { int(0) }, "option to include pileip removal" };
Gaudi::Property< float > m_dEta{ this, "BibMinDeltaEta", { float( 0.4 ) }, "BIB deltaEta requirement" };
Gaudi::Property< float > m_dPhi{ this, "BibMinDeltaPhi", { float( 0.2 ) }, "BIB deltaPhi requirement" };
@@ -100,4 +101,3 @@ class TrigJetCROldHypoTool: public AthAlgTool{
};
#endif
-
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
index cbd438c068b4dccd91188a775a587fc9ccc15d04..cf79a979436f27014eeef410ae567bc296c76335 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/src/components/TrigHLTJetHypo_entries.cxx
@@ -42,8 +42,8 @@
#include "../TrigJetEJsHypoTool.h"
#include "../TrigJetCRHypoAlg.h"
#include "../TrigJetCRHypoTool.h"
-#include "../TrigJetCROldHypoAlg.h"
-#include "../TrigJetCROldHypoTool.h"
+#include "../TrigJetCRVARHypoAlg.h"
+#include "../TrigJetCRVARHypoTool.h"
DECLARE_COMPONENT(TrigJetHypoToolConfig_fastreduction)
DECLARE_COMPONENT(TrigJetHypoToolConfig_conditionfilter)
@@ -84,5 +84,5 @@ DECLARE_COMPONENT(TrigJetEJsHypoAlg)
DECLARE_COMPONENT(TrigJetEJsHypoTool)
DECLARE_COMPONENT(TrigJetCRHypoAlg)
DECLARE_COMPONENT(TrigJetCRHypoTool)
-DECLARE_COMPONENT(TrigJetCROldHypoAlg)
-DECLARE_COMPONENT(TrigJetCROldHypoTool)
+DECLARE_COMPONENT(TrigJetCRVARHypoAlg)
+DECLARE_COMPONENT(TrigJetCRVARHypoTool)
diff --git a/Trigger/TrigT1/TrigT1CaloByteStream/share/jobOfragment_ReadLVL1CaloBS.py b/Trigger/TrigT1/TrigT1CaloByteStream/share/jobOfragment_ReadLVL1CaloBS.py
index d1d3e56422a81b6d3421c7353a78df4afc4ca02b..a453815194372b0b79698157435622fb555658fa 100755
--- a/Trigger/TrigT1/TrigT1CaloByteStream/share/jobOfragment_ReadLVL1CaloBS.py
+++ b/Trigger/TrigT1/TrigT1CaloByteStream/share/jobOfragment_ReadLVL1CaloBS.py
@@ -1,6 +1,6 @@
# Bytestream to TrigT1Calo objects conversions
ByteStreamAddressProviderSvc = Service( "ByteStreamAddressProviderSvc" )
-ByteStreamAddressProviderSvc.TypeNames += [ "xAOD:TriggerTowerContainer_v2/TriggerTowers" ]
+ByteStreamAddressProviderSvc.TypeNames += [ "xAOD::TriggerTowerContainer_v2/TriggerTowers" ]
ByteStreamAddressProviderSvc.TypeNames += [ "DataVector<LVL1::CPMTower>/CPMTowers" ]
ByteStreamAddressProviderSvc.TypeNames += [ "DataVector<LVL1::CPMTower>/CPMTowersOverlap" ]
ByteStreamAddressProviderSvc.TypeNames += [ "DataVector<LVL1::CPMHits>/CPMHits" ]
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/CMakeLists.txt b/Trigger/TrigT1/TrigT1EventAthenaPool/CMakeLists.txt
index fe50be8f22666221e0715d615c9e7354a2946133..01aa7c7fb6ed4b0d1062967f608aaf1dd453a3d9 100644
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1EventAthenaPool/CMakeLists.txt
@@ -43,7 +43,6 @@ atlas_add_poolcnv_library( TrigT1EventAthenaPoolPoolCnv
TrigT1Result )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Trigger/TrigT1/TrigT1EventAthenaPool/share/TrigT1EventTPCnv_18.0.0_test.py b/Trigger/TrigT1/TrigT1EventAthenaPool/share/TrigT1EventTPCnv_18.0.0_test.py
deleted file mode 100644
index cfcddf5daf10d2fe5336e09caa792c2f82ec7af7..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1EventAthenaPool/share/TrigT1EventTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,51 +0,0 @@
-infile = 'esd/ESD-18.0.0.pool.root'
-keys = [
- #CMMCPHitsCollection_tlp1
- 'CMMCPHits',
-
- #CMMEtSumsCollection_tlp1
- 'CMMEtSums',
-
- #CMMJetHitsCollection_tlp1
- 'CMMJetHits',
-
- #CMMRoI_p1
- 'CMMRoIs',
-
- #CPMHitsCollection_tlp1
- 'CPMHits',
-
- #CPMRoICollection_tlp1
- 'CPMRoIs',
-
- #CPMTowerCollection_tlp1
- 'CPMTowers',
-
- #CTP_RDO_p2
- 'CTP_RDO',
-
- #JEMEtSumsCollection_tlp1
- 'JEMEtSums',
-
- #JEMHitsCollection_tlp1
- 'JEMHits',
-
- #JEMRoICollection_tlp1
- 'JEMRoIs',
-
- #JetElementCollection_tlp1
- 'JetElements',
-
- #MuCTPI_RDO_p1
- 'MUCTPI_RDO',
-
- #RoIBResult_p1
- 'RoIBResult',
-
- #TriggerTowerCollection_tlp1
- 'TriggerTowers',
- ]
-
-noMuon = True
-noID = True
-include ('AthenaPoolUtilities/TPCnvTest.py')
diff --git a/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt b/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
index 445130d455d9faa43176bdb5dcc4eb5126df763a..bde1725bb1cceab4b0e46c75d44e504133fdc437 100644
--- a/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1NSW/CMakeLists.txt
@@ -13,5 +13,3 @@ atlas_add_component( TrigT1NSW
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaBaseComps CxxUtils GaudiKernel MuonRDO TrigT1NSWSimToolsLib )
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
diff --git a/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py b/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py
deleted file mode 100644
index 4f6cbaf87a3a9d7ba0415c3b34b44498f7a8ff5e..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1NSW/share/NSWL1.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-import glob
-import os
-
-###################################################
-# Some basic settings and input file submission
-###################################################
-MessageSvc.defaultLimit=100
-MessageSvc.useColors = True
-MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags, jobproperties
-athenaCommonFlags.AllowIgnoreConfigError=False #This job will stop if an include fails
-athenaCommonFlags.EvtMax = -1
-athenaCommonFlags.SkipEvents = 0
-
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-import AthenaPoolCnvSvc.ReadAthenaPool # needed to use EventSelector
-#to run on mutliple files at once please use -c "customInput='/some/path/*pattern*.root'"
-if 'customInput' not in locals() or 'customInput' not in globals():
- print("customInput not defined: the job will be launched on the GRID")
- svcMgr.EventSelector.InputCollections=jobproperties.AthenaCommonFlags.FilesInput.get_Value()
-else:
- if(os.path.isdir(customInput)): customInput+="/*.root"
- svcMgr.EventSelector.InputCollections=glob.glob(customInput)
-
-###################################################
-# Detector flags: needed to setup geometry tools
-###################################################
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.Muon_setOn()
-DetFlags.digitize.MM_setOn()
-DetFlags.digitize.sTGC_setOn()
-DetFlags.Truth_setOn()
-DetFlags.Print()
-
-###################################################
-# Initialize ATLAS geometry
-###################################################
-jobproperties.Global.DetDescrVersion="ATLAS-R3S-2021-01-00-02"
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-from AtlasGeoModel import MuonGM
-from AtlasGeoModel import Agdd2Geo
-
-from AtlasGeoModel.MuonGMJobProperties import MuonGeometryFlags
-if not hasattr(svcMgr, "MuonIdHelperSvc"):
- from AthenaCommon.CfgGetter import getService
- svcMgr += getService("MuonIdHelperSvc")
-
-###################################################
-# Initialize the trigger related things
-###################################################
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from TrigT1NSW.TrigT1NSWConf import NSWL1__NSWL1Simulation
-topSequence += NSWL1__NSWL1Simulation("NSWL1Simulation")
-
-#Switch on and off trigger simulaton components sTGC / MicroMegas
-topSequence.NSWL1Simulation.DosTGC=True
-topSequence.NSWL1Simulation.DoPad=True
-topSequence.NSWL1Simulation.DoStrip=True
-topSequence.NSWL1Simulation.UseLookup=False #use lookup table for the pad trigger
-topSequence.NSWL1Simulation.DoMM=True
-topSequence.NSWL1Simulation.DoMMDiamonds=True
-
-#Toggle Ntuple making for Tools, if set to False for NSWL1Simulation, all the tools are set to False automatically as well
-topSequence.NSWL1Simulation.DoNtuple=True
-topSequence.NSWL1Simulation.PadTdsTool.DoNtuple=True
-topSequence.NSWL1Simulation.PadTriggerTool.DoNtuple=True
-topSequence.NSWL1Simulation.StripTdsTool.DoNtuple=True
-topSequence.NSWL1Simulation.StripClusterTool.DoNtuple=True
-topSequence.NSWL1Simulation.StripSegmentTool.DoNtuple=True
-topSequence.NSWL1Simulation.MMTriggerTool.DoNtuple=True
-
-#useful for validation of geometry and offline analyses
-topSequence.NSWL1Simulation.PadTriggerLookupTool.DumpSectorGeometry=False
-
-#Tools' Messaging Levels
-topSequence.NSWL1Simulation.OutputLevel=INFO
-topSequence.NSWL1Simulation.PadTdsTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.PadTriggerTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.StripTdsTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.StripClusterTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.StripSegmentTool.OutputLevel=INFO
-topSequence.NSWL1Simulation.MMTriggerTool.OutputLevel=INFO
-
-if MuonGeometryFlags.hasSTGC():
- from MuonRegionSelector.MuonRegionSelectorConf import sTGC_RegSelCondAlg
- from AthenaCommon.AlgSequence import AthSequencer
- from AthenaConfiguration.ComponentFactory import CompFactory
- condseq = AthSequencer('AthCondSeq')
- if not hasattr( condseq, "MuonDetectorCondAlg" ):
- import MuonRecExample.MuonAlignConfig
-
- from RegionSelector.RegSelToolConfig import makeRegSelTool_sTGC
- tool = makeRegSelTool_sTGC()
-
-#-----------------------------------------------------------------------------
-# save ROOT histograms and Tuple
-#-----------------------------------------------------------------------------
-if topSequence.NSWL1Simulation.DoNtuple:
-
- if not hasattr( ServiceMgr, "THistSvc" ):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
- ServiceMgr.THistSvc.Output += [ "NSWL1Simulation DATAFILE='NSWL1Simulation.root' OPT='RECREATE'" ]
- print(ServiceMgr)
-
-else:#to avoid any possible crash. If DoNtuple is set to true for a tool but false for NSWL1Simulation the code will crash
- # ideally that should have been already handled in C++ side
- topSequence.NSWL1Simulation.PadTdsTool.DoNtuple=False
- topSequence.NSWL1Simulation.PadTriggerTool.DoNtuple=False
- topSequence.NSWL1Simulation.StripTdsTool.DoNtuple=False
- topSequence.NSWL1Simulation.StripClusterTool.DoNtuple=False
- topSequence.NSWL1Simulation.StripSegmentTool.DoNtuple=False
- topSequence.NSWL1Simulation.MMTriggerTool.DoNtuple=False
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/CMakeLists.txt b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/CMakeLists.txt
index c4a19a4cf46746f01672a41206aec571e9551a47..52a089a305530920a5c1b24a5afd4369fa0f055e 100644
--- a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/CMakeLists.txt
+++ b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/CMakeLists.txt
@@ -16,7 +16,6 @@ atlas_add_poolcnv_library( TrigTruthEventAthenaPoolPoolCnv
TrigTruthEventTPCnv )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_scripts( test/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Set up (a) test(s) for the converter(s):
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_15.8.0_test.py b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_15.8.0_test.py
deleted file mode 100644
index d72445f4295420b2561086dfad40c15a20e1da81..0000000000000000000000000000000000000000
--- a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_15.8.0_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-infile = 'aod/AOD-15.8.0/AOD-15.8.0-full.pool.root'
-keys = [
- #TrigInDetTrackTruthMap_tlp1
- 'TrigInDetTrackTruthMap',
- ]
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_18.0.0_test.py b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_18.0.0_test.py
deleted file mode 100644
index 8ec00ea038fe05763caceeed8dbbec1ce6fce4db..0000000000000000000000000000000000000000
--- a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_18.0.0_test.py
+++ /dev/null
@@ -1,11 +0,0 @@
-infile = 'aod/AOD-18.0.0/AOD-18.0.0-full.pool.root'
-keys = [
- #TrigInDetTrackTruthMap_tlp2
- 'TrigInDetTrackTruthMap',
- ]
-
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_20.1.7.2_test.py b/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_20.1.7.2_test.py
deleted file mode 100644
index 27492a395f99963b1d6081c2cff3bf7ab80f9861..0000000000000000000000000000000000000000
--- a/Trigger/TrigTruthEvent/TrigTruthEventAthenaPool/share/TrigTruthEventTPCnv_20.1.7.2_test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-infile = 'aod/AOD-20.1.7.2/AOD-20.1.7.2-full.pool.root'
-keys = [
- #TrigInDetTrackTruthMap
- 'TrigInDetTrackTruthMap',
- ]
-
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = 'ATLAS-GEO-10-00-00'
-noMuon = True
-noID = True
-
-include ('AthenaPoolUtilities/TPCnvTest.py')
-
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 329927cb15c649080c5993d4d408daf6dc1582b5..91f910d2e767d1a9a3f16e2a5150b4d3fe0fbddd 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -15525,64 +15525,34 @@ HLT_j20_0eta290_boffperf_pf_ftf_preselj180_PhysicsTLA_L1J100:
2: 23
3: 23
4: 2
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1J100:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU140:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU100:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU40HT:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU40_EMPTY:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60HL:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU40_UNPAIRED_ISO:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60HM:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU60:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60_EMPTY:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU140:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU40HT:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU80HL:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60HL:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1jJ160:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60HM:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU140:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60_EMPTY:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU40HT:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60HM:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU80HL:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60_EMPTY:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1jJ160:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1TAU40_EMPTY:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1jJ160:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1TAU40_UNPAIRED_ISO:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU140:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU40HT:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60HM:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60_EMPTY:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1jJ160:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac012_calratio_roiftf_preselj20emf12_L1TAU60:
- eventCount: 0
- stepCounts:
- 0: 1
- 1: 1
- stepFeatures:
- 0: 1
- 1: 1
-HLT_j20_CLEANllp_momemfrac024_calratio_roiftf_preselj20emf24_L1TAU60:
- eventCount: 0
- stepCounts:
- 0: 2
- 1: 2
- stepFeatures:
- 0: 2
- 1: 2
HLT_j20_DarkJetPEBTLA_L1HT190-jJ40s5pETA21:
eventCount: 15
stepCounts:
@@ -15657,7 +15627,7 @@ HLT_j20_PhysicsTLA_L1jJ90_DETA20-jJ90J:
0: 140
1: 140
2: 15
-HLT_j20_calratio_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27:
+HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27:
eventCount: 1
stepCounts:
0: 5
@@ -16585,40 +16555,66 @@ HLT_j30_0eta290_020jvt_boffperf_pf_ftf_L1jJ50:
0: 20
1: 113
2: 113
-HLT_j30_CLEANllp_calrtold_L1TAU100:
+HLT_j30_CLEANllp_calratio_L1TAU100:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 3
-HLT_j30_CLEANllp_calrtold_L1TAU40_EMPTY:
- eventCount: 0
-HLT_j30_CLEANllp_calrtold_L1TAU40_UNPAIRED_ISO:
- eventCount: 0
-HLT_j30_CLEANllp_calrtold_L1TAU60:
+HLT_j30_CLEANllp_calratio_L1TAU60:
eventCount: 0
stepCounts:
0: 5
stepFeatures:
0: 20
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU100:
+HLT_j30_CLEANllp_calratiormbib_L1TAU100:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
0: 3
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU40_EMPTY:
- eventCount: 0
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU40_UNPAIRED_ISO:
- eventCount: 0
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU60:
+HLT_j30_CLEANllp_calratiormbib_L1TAU60:
eventCount: 0
stepCounts:
0: 5
stepFeatures:
0: 20
-HLT_j30_CLEANllp_momemfrac006_calrtold_L1TAU60:
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU140:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU40HT:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60HM:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60_EMPTY:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60_UNPAIRED_ISO:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU80:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1jJ160:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU140:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU40HT:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60HM:
eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60_EMPTY:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60_UNPAIRED_ISO:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU80:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1jJ160:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac012_calratiovar_roiftf_preselj20emf12_L1jJ160:
+ eventCount: 0
+ stepCounts:
+ 0: 1
+ 1: 1
+ stepFeatures:
+ 0: 1
+ 1: 1
HLT_j30_mu3vtx_L12MU8F:
eventCount: 0
HLT_j340_0eta290_020jvt_bdl1d77_pf_ftf_preselj225_L1J100:
@@ -33399,7 +33395,7 @@ HLT_xe0_cell_L1XE55:
0: 6
stepFeatures:
0: 6
-HLT_xe0_cell_L1ZB:
+HLT_xe0_cell_L1ZeroBias:
eventCount: 0
HLT_xe0_cell_L1gXEJWOJ100:
eventCount: 0
@@ -33433,7 +33429,7 @@ HLT_xe0_mhtpufit_em_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_mhtpufit_em_L1ZB:
+HLT_xe0_mhtpufit_em_L1ZeroBias:
eventCount: 0
HLT_xe0_mhtpufit_em_L1gXEJWOJ100:
eventCount: 0
@@ -33471,7 +33467,7 @@ HLT_xe0_mhtpufit_pf_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_mhtpufit_pf_L1ZB:
+HLT_xe0_mhtpufit_pf_L1ZeroBias:
eventCount: 0
HLT_xe0_mhtpufit_pf_L1gXEJWOJ100:
eventCount: 0
@@ -33509,7 +33505,7 @@ HLT_xe0_nn_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_nn_L1ZB:
+HLT_xe0_nn_L1ZeroBias:
eventCount: 0
HLT_xe0_nn_L1gXEJWOJ100:
eventCount: 0
@@ -33547,7 +33543,7 @@ HLT_xe0_pfopufit_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_pfopufit_L1ZB:
+HLT_xe0_pfopufit_L1ZeroBias:
eventCount: 0
HLT_xe0_pfopufit_L1gXEJWOJ100:
eventCount: 0
@@ -33585,7 +33581,7 @@ HLT_xe0_pfsum_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_pfsum_L1ZB:
+HLT_xe0_pfsum_L1ZeroBias:
eventCount: 0
HLT_xe0_pfsum_L1gXEJWOJ100:
eventCount: 0
@@ -33623,7 +33619,7 @@ HLT_xe0_pfsum_cssk_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_pfsum_cssk_L1ZB:
+HLT_xe0_pfsum_cssk_L1ZeroBias:
eventCount: 0
HLT_xe0_pfsum_cssk_L1gXEJWOJ100:
eventCount: 0
@@ -33661,7 +33657,7 @@ HLT_xe0_pfsum_vssk_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_pfsum_vssk_L1ZB:
+HLT_xe0_pfsum_vssk_L1ZeroBias:
eventCount: 0
HLT_xe0_pfsum_vssk_L1gXEJWOJ100:
eventCount: 0
@@ -33695,7 +33691,7 @@ HLT_xe0_tcpufit_L1XE55:
0: 6
stepFeatures:
0: 6
-HLT_xe0_tcpufit_L1ZB:
+HLT_xe0_tcpufit_L1ZeroBias:
eventCount: 0
HLT_xe0_tcpufit_L1gXEJWOJ100:
eventCount: 0
@@ -33729,7 +33725,7 @@ HLT_xe0_trkmht_L1XE55:
stepFeatures:
0: 6
1: 6
-HLT_xe0_trkmht_L1ZB:
+HLT_xe0_trkmht_L1ZeroBias:
eventCount: 0
HLT_xe0_trkmht_L1gXEJWOJ100:
eventCount: 0
diff --git a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
index 095bdd9b58df70d86a34e171263d613b098a9804..d598be75468c9a3f13b0506db5673723354ef4ad 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
@@ -64,7 +64,7 @@ class TrigInDetReco(ExecStep):
self.args = '--outputAODFile=AOD.pool.root --steering "doRDO_TRIG"'
self.args += ' --CA'
if not self._isCA:
- self.args += ' "default:True" "RDOtoRDOTrigger:False"'
+ self.args += ' "default:True"'
if ( self.postinclude_trig != '' ) :
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 02a0fbd621f71ff728b504218265255e7679f529..d07ae6e4c9a84e6ca627d63ca3444e8f8e5f4896 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -6035,51 +6035,33 @@ HLT_j20_0eta290_boffperf_pf_ftf_preselj140_PhysicsTLA_L1J50_DETA20-J50J:
eventCount: 0
HLT_j20_0eta290_boffperf_pf_ftf_preselj180_PhysicsTLA_L1J100:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1J100:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU140:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU100:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU40HT:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU40_EMPTY:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60HL:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU40_UNPAIRED_ISO:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60HM:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU60:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60_EMPTY:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU140:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU40HT:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU80HL:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60HL:
+HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1jJ160:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60HM:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU140:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60_EMPTY:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU40HT:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60HM:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU80HL:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60_EMPTY:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1jJ160:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1TAU40_EMPTY:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1TAU40_UNPAIRED_ISO:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU140:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU40HT:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60HM:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60_EMPTY:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1jJ160:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac012_calratio_roiftf_preselj20emf12_L1TAU60:
- eventCount: 0
-HLT_j20_CLEANllp_momemfrac024_calratio_roiftf_preselj20emf24_L1TAU60:
+HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1jJ160:
eventCount: 0
HLT_j20_DarkJetPEBTLA_L1HT190-jJ40s5pETA21:
eventCount: 0
@@ -6113,7 +6095,7 @@ HLT_j20_PhysicsTLA_L1jJ90_DETA20-jJ90J:
0: 13
1: 13
2: 3
-HLT_j20_calratio_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27:
+HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27:
eventCount: 0
HLT_j20_pf_ftf_presel4j85_PhysicsTLA_L13J50:
eventCount: 0
@@ -6457,31 +6439,51 @@ HLT_j30_0eta290_020jvt_boffperf_pf_ftf_L1jJ50:
0: 12
1: 17
2: 17
-HLT_j30_CLEANllp_calrtold_L1TAU100:
- eventCount: 0
-HLT_j30_CLEANllp_calrtold_L1TAU40_EMPTY:
- eventCount: 0
-HLT_j30_CLEANllp_calrtold_L1TAU40_UNPAIRED_ISO:
+HLT_j30_CLEANllp_calratio_L1TAU100:
eventCount: 0
-HLT_j30_CLEANllp_calrtold_L1TAU60:
+HLT_j30_CLEANllp_calratio_L1TAU60:
eventCount: 0
stepCounts:
0: 2
stepFeatures:
0: 5
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU100:
+HLT_j30_CLEANllp_calratiormbib_L1TAU100:
eventCount: 0
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU40_EMPTY:
- eventCount: 0
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU40_UNPAIRED_ISO:
- eventCount: 0
-HLT_j30_CLEANllp_calrtoldrmbib_L1TAU60:
+HLT_j30_CLEANllp_calratiormbib_L1TAU60:
eventCount: 0
stepCounts:
0: 2
stepFeatures:
0: 5
-HLT_j30_CLEANllp_momemfrac006_calrtold_L1TAU60:
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU140:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU40HT:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60HM:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60_EMPTY:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60_UNPAIRED_ISO:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU80:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratio_L1jJ160:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU140:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU40HT:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60HM:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60_EMPTY:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60_UNPAIRED_ISO:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU80:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1jJ160:
+ eventCount: 0
+HLT_j30_CLEANllp_momemfrac012_calratiovar_roiftf_preselj20emf12_L1jJ160:
eventCount: 0
HLT_j30_mu3vtx_L12MU8F:
eventCount: 0
@@ -12120,7 +12122,7 @@ HLT_xe0_cell_L1XE50:
eventCount: 0
HLT_xe0_cell_L1XE55:
eventCount: 0
-HLT_xe0_cell_L1ZB:
+HLT_xe0_cell_L1ZeroBias:
eventCount: 0
HLT_xe0_cell_L1gXEJWOJ100:
eventCount: 0
@@ -12138,7 +12140,7 @@ HLT_xe0_mhtpufit_em_L1XE50:
eventCount: 0
HLT_xe0_mhtpufit_em_L1XE55:
eventCount: 0
-HLT_xe0_mhtpufit_em_L1ZB:
+HLT_xe0_mhtpufit_em_L1ZeroBias:
eventCount: 0
HLT_xe0_mhtpufit_em_L1gXEJWOJ100:
eventCount: 0
@@ -12158,7 +12160,7 @@ HLT_xe0_mhtpufit_pf_L1XE50:
eventCount: 0
HLT_xe0_mhtpufit_pf_L1XE55:
eventCount: 0
-HLT_xe0_mhtpufit_pf_L1ZB:
+HLT_xe0_mhtpufit_pf_L1ZeroBias:
eventCount: 0
HLT_xe0_mhtpufit_pf_L1gXEJWOJ100:
eventCount: 0
@@ -12178,7 +12180,7 @@ HLT_xe0_nn_L1XE50:
eventCount: 0
HLT_xe0_nn_L1XE55:
eventCount: 0
-HLT_xe0_nn_L1ZB:
+HLT_xe0_nn_L1ZeroBias:
eventCount: 0
HLT_xe0_nn_L1gXEJWOJ100:
eventCount: 0
@@ -12198,7 +12200,7 @@ HLT_xe0_pfopufit_L1XE50:
eventCount: 0
HLT_xe0_pfopufit_L1XE55:
eventCount: 0
-HLT_xe0_pfopufit_L1ZB:
+HLT_xe0_pfopufit_L1ZeroBias:
eventCount: 0
HLT_xe0_pfopufit_L1gXEJWOJ100:
eventCount: 0
@@ -12218,7 +12220,7 @@ HLT_xe0_pfsum_L1XE50:
eventCount: 0
HLT_xe0_pfsum_L1XE55:
eventCount: 0
-HLT_xe0_pfsum_L1ZB:
+HLT_xe0_pfsum_L1ZeroBias:
eventCount: 0
HLT_xe0_pfsum_L1gXEJWOJ100:
eventCount: 0
@@ -12238,7 +12240,7 @@ HLT_xe0_pfsum_cssk_L1XE50:
eventCount: 0
HLT_xe0_pfsum_cssk_L1XE55:
eventCount: 0
-HLT_xe0_pfsum_cssk_L1ZB:
+HLT_xe0_pfsum_cssk_L1ZeroBias:
eventCount: 0
HLT_xe0_pfsum_cssk_L1gXEJWOJ100:
eventCount: 0
@@ -12258,7 +12260,7 @@ HLT_xe0_pfsum_vssk_L1XE50:
eventCount: 0
HLT_xe0_pfsum_vssk_L1XE55:
eventCount: 0
-HLT_xe0_pfsum_vssk_L1ZB:
+HLT_xe0_pfsum_vssk_L1ZeroBias:
eventCount: 0
HLT_xe0_pfsum_vssk_L1gXEJWOJ100:
eventCount: 0
@@ -12278,7 +12280,7 @@ HLT_xe0_tcpufit_L1XE50:
eventCount: 0
HLT_xe0_tcpufit_L1XE55:
eventCount: 0
-HLT_xe0_tcpufit_L1ZB:
+HLT_xe0_tcpufit_L1ZeroBias:
eventCount: 0
HLT_xe0_tcpufit_L1gXEJWOJ100:
eventCount: 0
@@ -12296,7 +12298,7 @@ HLT_xe0_trkmht_L1XE50:
eventCount: 0
HLT_xe0_trkmht_L1XE55:
eventCount: 0
-HLT_xe0_trkmht_L1ZB:
+HLT_xe0_trkmht_L1ZeroBias:
eventCount: 0
HLT_xe0_trkmht_L1gXEJWOJ100:
eventCount: 0
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py
index a7f01279c14f2f6e7b5071f46f6e80d41525d9cb..386fe351439675c6f7efdc930618198d71f5f04f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CalibCosmicMon/EnhancedBiasChainConfiguration.py
@@ -20,7 +20,7 @@ l1seeds = { 'low' : \
#'L1_J30p0ETA49_2J20p0ETA49',\
'L1_JPSI-1M5-eEM9',\
'L1_MU8F',\
- 'L1_ZB',\
+ 'L1_ZeroBias',\
# 'L1_ZB_eEM18'
],\
'medium' : \
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py
index fbb5e67e60f1a9d01bd1d0576776263c8247d0c5..0250ada521b03f23cc82b672cf0bb700e54f6f0d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/MenuComponents.py
@@ -334,6 +334,9 @@ class EmptyMenuSequence:
@property
def maker(self):
+ # Input makers are added during DataFlow building (connectToFilter) when a chain
+ # uses this sequence in another step. So we need to make sure to update the
+ # algorithm when accessed.
self._maker.Alg = self.ca.getEventAlgo(self._maker.Alg.name)
return self._maker
@@ -373,80 +376,64 @@ class EmptyMenuSequence:
%(self.name, "Empty", self.maker.Alg.getName(), self.sequence.Alg.getName(), "None")
-class MenuSequence(object):
- """ Class to group reco sequences with the Hypo"""
- """ By construction it has one Hypo Only; behaviour changed to support muFastOvlpRmSequence() which has two, but this will change"""
+class MenuSequenceCA:
+ """Class to group reco sequences with the Hypo.
+ By construction it has one Hypo only; behaviour changed to support muFastOvlpRmSequence(),
+ which has two, but this will change."""
- def __init__(self, flags, Sequence, Maker, Hypo, HypoToolGen, IsProbe=False):
- assert Maker.name.startswith("IM"), "The input maker {} name needs to start with letter: IM".format(Maker.name)
- self._maker = InputMakerNode( Alg = Maker )
- input_maker_output= self.maker.readOutputList()[0] # only one since it's merged
+ def __init__(self, flags, selectionCA, HypoToolGen, isProbe=None, globalRecoCA=None):
+ # FIXME: isProbe argument is now unused in MenuSequenceCA and will be removed later
- self._name = CFNaming.menuSequenceName(Hypo.name)
- self._hypoToolConf = HypoToolConf( HypoToolGen )
- Hypo.RuntimeValidation = flags.Trigger.doRuntimeNaviVal
- self._hypo = HypoAlgNode( Alg = Hypo )
- hypo_output = CFNaming.hypoAlgOutName(Hypo.name)
- self._hypo.addOutput(hypo_output)
+ self.ca = selectionCA
+ self._globalCA = globalRecoCA
+ # separate the HypoCA to be merged later
+ self.hypoAcc = selectionCA.hypoAcc
+
+ sequence = self.ca.topSequence()
+ self._sequence = Node(Alg=sequence)
+
+ # InputMaker
+ inputMaker = [ a for a in self.ca.getEventAlgos() if isInputMakerBase(a)]
+ assert len(inputMaker) == 1, f"{len(inputMaker)} input makers in the ComponentAccumulator"
+ inputMaker = inputMaker[0]
+ self._maker = InputMakerNode( Alg = inputMaker )
+ input_maker_output = self.maker.readOutputList()[0] # only one since it's merged
+ assert inputMaker.name.startswith("IM"), f"Input maker {inputMaker.name} name needs to start with 'IM'"
+
+ # HypoAlg
+ hypoAlg = selectionCA.hypoAcc.getEventAlgos()
+ assert len(hypoAlg) == 1, f"{len(hypoAlg)} hypo algs in the ComponentAccumulator"
+ hypoAlg = hypoAlg[0]
+ hypoAlg.RuntimeValidation = flags.Trigger.doRuntimeNaviVal
+
+ self._name = CFNaming.menuSequenceName(hypoAlg.name)
+ self._hypo = HypoAlgNode( Alg = hypoAlg )
+ self._hypo.addOutput( CFNaming.hypoAlgOutName(hypoAlg.name) )
self._hypo.setPreviousDecision( input_maker_output )
+ self._hypoToolConf = HypoToolConf( HypoToolGen )
- # Connect InputMaker output to ROBPrefetchingAlg(s) if there are any (except for probe seq which is handled later)
+ # Connect InputMaker output to ROBPrefetchingAlg(s) if there are any
if ROBPrefetching.StepRoI in flags.Trigger.ROBPrefetchingOptions:
- seqChildren = Sequence.getChildren() if hasattr(Sequence,'getChildren') else Sequence.Members
- for child in seqChildren:
- if hasattr(child,'ROBPrefetchingInputDecisions') and input_maker_output not in child.ROBPrefetchingInputDecisions and not IsProbe:
- locked = bool(child.isLocked()) if hasattr(child,'isLocked') else False
- if locked:
- child.unlock()
- child.ROBPrefetchingInputDecisions += [input_maker_output]
- if locked:
- child.lock()
- #probe legs in lagacy config need the IM cloned
- #CA based chains should use SelectionCA which does the probe leg changes directly, so skip if already a probe sequence
- if IsProbe and 'probe' not in Sequence.getName():
- def getProbeSequence(baseSeq,probeIM):
- # Add IM and sequence contents to duplicated sequence
- probeSeq = baseSeq.clone(baseSeq.getName()+"_probe")
- probeSeq += probeIM
- if isinstance(probeIM,CompFactory.EventViewCreatorAlgorithm):
- for child in baseSeq.getChildren()[1:]:
- probeChild = child.clone(child.getName()+"_probe")
- if hasattr(child,'ROBPrefetchingInputDecisions') and (ROBPrefetching.StepRoI in flags.Trigger.ROBPrefetchingOptions):
- # child is a ROB prefetching alg, map the probe IM decisions
- probeChild.ROBPrefetchingInputDecisions = [str(probeIM.InputMakerOutputDecisions)]
- elif probeIM.ViewNodeName == child.getName():
- # child is the view alg sequence, map it to the probe sequence
- probeIM.ViewNodeName = probeChild.getName()
- for viewalg in child.getChildren():
- probeChild += viewalg
- probeSeq += probeChild
- return probeSeq
- # Make sure nothing was lost
- _Sequence = getProbeSequence(baseSeq=Sequence,probeIM=Maker)
- assert len(_Sequence.getChildren()) == len(Sequence.getChildren()), f'Different number of children in sequence {_Sequence.getName()} vs {Sequence.getName()} ({len(_Sequence.getChildren())} vs {len(Sequence.getChildren())})'
- else:
- _Sequence = Sequence
- if ROBPrefetching.StepRoI in flags.Trigger.ROBPrefetchingOptions:
- seqChildren = Sequence.getChildren() if hasattr(Sequence,'getChildren') else Sequence.Members
- for child in seqChildren:
- if hasattr(child,'ROBPrefetchingInputDecisions') and input_maker_output not in child.ROBPrefetchingInputDecisions:
- locked = bool(child.isLocked()) if hasattr(child,'isLocked') else False
- if locked:
- child.unlock()
- child.ROBPrefetchingInputDecisions += [input_maker_output]
- if locked:
- child.lock()
-
+ for child in sequence.Members:
+ if ( isinstance(child, CompFactory.ROBPrefetchingAlg) and
+ input_maker_output not in child.ROBPrefetchingInputDecisions ):
+ child.ROBPrefetchingInputDecisions.append(input_maker_output)
- self._sequence = Node( Alg=_Sequence)
+ log.debug("connecting InputMaker and HypoAlg, adding: InputMaker::%s.output=%s",
+ self.maker.Alg.name, input_maker_output)
+ log.debug("HypoAlg::%s.HypoInputDecisions=%s, HypoAlg::%s.HypoOutputDecisions=%s",
+ self.hypo.Alg.name, self.hypo.readInputList()[0],
+ self.hypo.Alg.name, self.hypo.readOutputList()[0])
- log.debug("connecting InputMaker and HypoAlg, adding: \n\
- InputMaker::%s.output=%s",\
- self.maker.Alg.name, input_maker_output)
- log.debug("HypoAlg::%s.HypoInputDecisions=%s, \n \
- HypoAlg::%s.HypoOutputDecisions=%s",\
- self.hypo.Alg.name, self.hypo.readInputList()[0], self.hypo.Alg.name, self.hypo.readOutputList()[0])
+ def __del__(self):
+ self.ca.wasMerged()
+ self.hypoAcc.wasMerged()
+ if self._globalCA:
+ self._globalCA.wasMerged()
+ @property
+ def globalRecoCA(self):
+ return self._globalCA
@property
def name(self):
@@ -458,61 +445,26 @@ class MenuSequence(object):
@property
def maker(self):
+ # Input makers are added during DataFlow building (connectToFilter) when a chain
+ # uses this sequence in another step. So we need to make sure to update the
+ # algorithm when accessed.
+ self._maker.Alg = self.ca.getEventAlgo(self._maker.Alg.name)
return self._maker
@property
def hypo(self):
return self._hypo
- @staticmethod
- def getProbeHypo(flags,basehypo):
- '''Clone hypo & input maker'''
- probehypo = basehypo.clone(basehypo.getName()+"_probe")
- for p,v in basehypo.getValuedProperties().items():
- setattr(probehypo,p,getattr(basehypo,p))
- return probehypo
-
- @staticmethod
- def getProbeInputMaker(flags,baseIM):
- probeIM = baseIM.clone(baseIM.getName()+"_probe")
- for p,v in baseIM.getValuedProperties().items():
- setattr(probeIM,p,getattr(baseIM,p))
-
- if isinstance(probeIM,CompFactory.EventViewCreatorAlgorithm):
- assert(baseIM.Views)
- probeIM.Views = baseIM.Views.Path + "_probe"
- probeIM.RoITool = baseIM.RoITool
- log.debug(f"getProbeInputMaker: Setting InputCachedViews on {probeIM.getName()} to read decisions from tag leg {baseIM.getName()}: {baseIM.InputMakerOutputDecisions}")
- probeIM.InputCachedViews = baseIM.InputMakerOutputDecisions
- def updateHandle(baseTool, probeTool, handleName):
- if hasattr(baseTool, handleName) and getattr(baseTool, handleName).Path!="StoreGateSvc+":
- setattr(probeTool, handleName, getattr(baseTool, handleName).Path + "_probe")
- updateHandle(baseIM.RoITool, probeIM.RoITool, "RoisWriteHandleKey")
- if hasattr(baseIM.RoITool, "RoiCreator"):
- updateHandle(baseIM.RoITool, probeIM.RoITool, "ExtraPrefetchRoIsKey")
- updateHandle(baseIM.RoITool.RoiCreator, probeIM.RoITool.RoiCreator, "RoisWriteHandleKey")
- else:
- raise TypeError(f"Probe leg input maker may not be of type '{baseIM.__class__}'.")
-
- # Reset this initially to avoid interference
- # with the original
- probeIM.InputMakerInputDecisions = []
- return probeIM
-
def getOutputList(self):
- outputlist = []
- outputlist.append(self._hypo.readOutputList()[0])
- return outputlist
+ return [self._hypo.readOutputList()[0]]
-
def connectToFilter(self, outfilter):
- """ Connect filter to the InputMaker"""
+ """Connect filter to the InputMaker"""
log.debug("connecting %s to inputs of %s", outfilter, self.maker.Alg.name)
self.maker.addInput(outfilter)
-
-
+
def createHypoTools(self, flags, chainDict):
- if type(self._hypoToolConf) is list:
+ if isinstance(self._hypoToolConf, list):
log.warning ("This sequence %s has %d multiple HypoTools ",self.sequence.name, len(self.hypoToolConf))
for hypo, hypoToolConf in zip(self._hypo, self._hypoToolConf):
hypoToolConf.setConf( chainDict )
@@ -524,17 +476,13 @@ class MenuSequence(object):
def getHypoToolConf(self) :
return self._hypoToolConf
- def getHypoToolMap(self,chainDict) :
- self._hypoToolConf.setConf( chainDict )
- return (self._hypo.Alg.getName(), self._hypoToolConf)
-
def addToSequencer(self, recoSeq_list, hypo_list):
recoSeq_list.add(self.sequence.Alg)
hypo_list.add(self._hypo.Alg)
def buildDFDot(self, cfseq_algs, all_hypos, last_step_hypo_nodes, file):
cfseq_algs.append(self.maker)
- cfseq_algs.append(self.sequence )
+ cfseq_algs.append(self.sequence)
file.write(" %s[fillcolor=%s]\n"%(self.maker.Alg.getName(), algColor(self.maker.Alg)))
file.write(" %s[fillcolor=%s]\n"%(self.sequence.Alg.getName(), algColor(self.sequence.Alg)))
cfseq_algs.append(self._hypo)
@@ -543,58 +491,11 @@ class MenuSequence(object):
return cfseq_algs, all_hypos, last_step_hypo_nodes
def __repr__(self):
- hyponame = self._hypo.Alg.getName()
+ hyponame = self._hypo.Alg.name
hypotool = self._hypoToolConf.name
return "MenuSequence::%s \n Hypo::%s \n Maker::%s \n Sequence::%s \n HypoTool::%s\n"\
- %(self.name, hyponame, self.maker.Alg.getName(), self.sequence.Alg.getName(), hypotool)
-
-
-class MenuSequenceCA(MenuSequence):
- ''' MenuSequence with Component Accumulator '''
+ %(self.name, hyponame, self.maker.Alg.name, self.sequence.Alg.name, hypotool)
- def __init__(self, flags, selectionCA, HypoToolGen, isProbe=False, globalRecoCA=None ):
- self.ca = selectionCA
- self._globalCA = globalRecoCA
- allAlgs = self.ca.getEventAlgos()
- inputMaker = [ a for a in allAlgs if isInputMakerBase(a)]
- assert len(inputMaker) == 1, "Wrong number of input makers in the component accumulator {}".format(len(inputMaker))
- inputMaker = inputMaker[0]
-
- # separate the HypoCA to be merged later
- self.hypoAcc = selectionCA.hypoAcc
- hypoAlg = selectionCA.hypoAcc.getEventAlgos()
- # this is needed for legacy config: the tools need to be in the menuSequence
- # following 2 lines can be removed once the legacy configuration is off
- for tool in selectionCA.hypoAcc.getPublicTools():
- self.ca.addPublicTool(tool)
- assert len(hypoAlg) == 1, "Wrong number of hypo algs in the component accumulator {}".format(len(hypoAlg))
- hypoAlg = hypoAlg[0]
- MenuSequence.__init__(self, flags, self.ca.topSequence(), inputMaker, hypoAlg, HypoToolGen, IsProbe=isProbe)
-
- @property
- def sequence(self):
- return self._sequence
-
- @property
- def maker(self):
- makerAlg = self.ca.getEventAlgo(self._maker.Alg.getName())
- self._maker.Alg = makerAlg
- return self._maker
-
- @property
- def hypo(self):
- return self._hypo
-
- @property
- def globalRecoCA(self):
- return self._globalCA
-
- def __del__(self):
- self.ca.wasMerged()
- self.hypoAcc.wasMerged()
- if self._globalCA:
- self._globalCA.wasMerged()
-
class Chain(object):
"""Basic class to define the trigger menu """
@@ -1029,6 +930,7 @@ class InViewRecoCA(ComponentAccumulator):
def inputMaker( self ):
return self.viewMakerAlg
+
class SelectionCA(ComponentAccumulator):
""" CA component for MenuSequenceCA sequence """
def __init__(self, name, isProbe=False):
@@ -1059,7 +961,6 @@ class SelectionCA(ComponentAccumulator):
"""To be used when the hypo alg configuration comes with auxiliary tools/services"""
self.hypoAcc.merge(other)
-
def addHypoAlgo(self, algo):
"""To be used when the hypo alg configuration does not require auxiliary tools/services"""
if self.isProbe:
@@ -1067,8 +968,6 @@ class SelectionCA(ComponentAccumulator):
algo.name=newname
self.hypoAcc.addEventAlgo(algo)
-
-
def hypo(self):
"""Access hypo algo (or throws)"""
h = findAlgorithmByPredicate(self.stepViewSequence, lambda alg: "HypoInputDecisions" in alg._descriptors ) # can't use isHypo
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py
index 81642d360a8738031416940b903e6dd4b2cd32dc..1424a4305b7bd6e2dbaff302fb32bd0cd57d0cd8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/ExoticJetSequencesConfig.py
@@ -37,15 +37,15 @@ def jetEJsMenuSequence(flags, jetsIn):
return MenuSequenceCA(flags, selAcc, HypoToolGen=trigJetEJsHypoToolFromDict)
-def jetCRMenuSequence(flags, jetsIn):
+def jetCRVARMenuSequence(flags, jetsIn):
- from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetCRHypoToolFromDict
+ from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetCRVARHypoToolFromDict
# Get track sequence name
from ..CommonSequences.FullScanDefs import fs_cells
cellsin=fs_cells
reco = InEventRecoCA(
- f"CalRatio_{jetsIn}_RecoSequence",
+ f"CalRatioVar_{jetsIn}_RecoSequence",
inputMaker=CompFactory.InputMakerForRoI(
"IM_CalRatio_HypoOnlyStep",
RoITool = CompFactory.ViewCreatorInitialROITool(),
@@ -53,20 +53,20 @@ def jetCRMenuSequence(flags, jetsIn):
)
)
- selAcc = SelectionCA(f"CalRatio_{jetsIn}")
+ selAcc = SelectionCA(f"CalRatioVar_{jetsIn}")
selAcc.mergeReco(reco)
selAcc.addHypoAlgo(
- CompFactory.TrigJetCRHypoAlg(
- "L2CalRatio",
+ CompFactory.TrigJetCRVARHypoAlg(
+ "L2CalRatioVar",
Cells = cellsin
)
)
- return MenuSequenceCA(flags, selAcc, HypoToolGen=trigJetCRHypoToolFromDict)
+ return MenuSequenceCA(flags, selAcc, HypoToolGen=trigJetCRVARHypoToolFromDict)
-def jetCROldMenuSequence(flags, jetsIn):
+def jetCRMenuSequence(flags, jetsIn):
- from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetCROldHypoToolFromDict
+ from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetCRHypoToolFromDict
# Get track sequence name
from ..CommonSequences.FullScanDefs import fs_cells, trkFSRoI
@@ -77,17 +77,17 @@ def jetCROldMenuSequence(flags, jetsIn):
from .JetTrackingConfig import JetFSTrackingCfg
trk_acc = JetFSTrackingCfg(flags, trkopt='ftf', RoIs=trkFSRoI)
- reco = InEventRecoCA(f"CalRatioold_{jetsIn}Reco", inputMaker=getTrackingInputMaker(flags,'ftf'))
+ reco = InEventRecoCA(f"CalRatio_{jetsIn}Reco", inputMaker=getTrackingInputMaker(flags,'ftf'))
reco.mergeReco(trk_acc)
- selAcc = SelectionCA(f"CalRatioOld_{jetsIn}")
+ selAcc = SelectionCA(f"CalRatio_{jetsIn}")
selAcc.mergeReco(reco)
selAcc.addHypoAlgo(
- CompFactory.TrigJetCROldHypoAlg(
- "L2CalRatioOld",
+ CompFactory.TrigJetCRHypoAlg(
+ "L2CalRatio",
Tracks = sequenceOut,
Cells = cellsin
)
)
- return MenuSequenceCA(flags, selAcc, HypoToolGen=trigJetCROldHypoToolFromDict)
+ return MenuSequenceCA(flags, selAcc, HypoToolGen=trigJetCRHypoToolFromDict)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py
index 628e24631838c74820fb9130eeaee7bff98e1c48..4902b648f4ac19076f878da96c7edd16c6ddaba2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetChainConfiguration.py
@@ -15,7 +15,7 @@ from .JetMenuSequencesConfig import (
jetCaloRecoMenuSequence,
jetCaloPreselMenuSequence,
)
-from .ExoticJetSequencesConfig import jetEJsMenuSequence, jetCRMenuSequence,jetCROldMenuSequence
+from .ExoticJetSequencesConfig import jetEJsMenuSequence, jetCRVARMenuSequence,jetCRMenuSequence
from . import JetRecoCommon
from . import JetPresel
@@ -79,7 +79,6 @@ class JetChainConfiguration(ChainConfigurationBase):
if self.L1Threshold != '' and self.L1Threshold != l1th:
raise RuntimeError('Cannot configure a jet chain with different L1 thresholds')
self.L1Threshold = l1th
-
# Verify that the preselection is defined only once
if p["trkpresel"]!="nopresel" and ip+1!=len(jChainParts): # Last jet chainPart, presel should go here
log.error("Likely inconsistency encountered in preselection specification for %s",self.chainName)
@@ -175,11 +174,11 @@ class JetChainConfiguration(ChainConfigurationBase):
if self.exotHypo != '' and ("emerging" in self.exotHypo or "trackless" in self.exotHypo):
EJsStep = self.getJetEJsChainStep(flags, jetCollectionName, self.exotHypo)
chainSteps+= [EJsStep]
+ elif self.exotHypo != '' and ("calratiovar" in self.exotHypo):
+ CRVARStep = self.getJetCRVARChainStep(flags, self.jetName, self.exotHypo)
+ chainSteps+= [ CRVARStep]
elif self.exotHypo != '' and ("calratio" in self.exotHypo):
- CRStep = self.getJetCRChainStep(flags, self.jetName, self.exotHypo)
- chainSteps+= [ CRStep]
- elif self.exotHypo != '' and ("calrtold" in self.exotHypo):
- CRStep = self.getJetCROldChainStep(flags,self.jetName, self.exotHypo)
+ CRStep = self.getJetCRChainStep(flags,self.jetName, self.exotHypo)
chainSteps+= [self.getEmptyStep(2, 'RoIFTFEmptyStep'), CRStep]
myChain = self.buildChain(chainSteps)
@@ -311,36 +310,42 @@ class JetChainConfiguration(ChainConfigurationBase):
return chainStep
- def getJetCRChainStep(self, flags, jetCollectionName, exotdictstring):
+ def getJetCRVARChainStep(self, flags, jetCollectionName, exotdictstring):
- if 'calratio' in exotdictstring:
+ if 'calratiovar' in exotdictstring:
MinjetlogR = 1.2
- doBIBremoval = int(0)
+ if 'calratiovarrmbib' in exotdictstring:
+ doBIBremoval = int(1)
+ else:
+ doBIBremoval = int(0)
else:
- log.error('Misconfiguration of trackless exotic jet chain - need calratio selection')
+ log.error('Misconfiguration of trackless exotic jet chain - need calratiovar selection')
exit(1)
log.debug("Running exotic jets with MinjetlogR: " + str(MinjetlogR) + "\t BIB rm " + str(doBIBremoval) + "\thypo: " + exotdictstring)
- stepName = "CRStep_"+self.chainName
- jetSeq = jetCRMenuSequence(flags, jetsIn=jetCollectionName)
+ stepName = "CRVARStep_"+self.chainName
+ jetSeq = jetCRVARMenuSequence(flags, jetsIn=jetCollectionName)
chainStep = ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
return chainStep
- def getJetCROldChainStep(self, flags, jetCollectionName, exotdictstring):
+ def getJetCRChainStep(self, flags, jetCollectionName, exotdictstring):
- if 'calrtold' in exotdictstring:
+ if 'calratio' in exotdictstring and ('calratiovar' not in exotdictstring):
MinjetlogR = 1.2
- doBIBremoval = int(0)
+ if 'calratiormbib' in exotdictstring:
+ doBIBremoval = int(1)
+ else:
+ doBIBremoval = int(0)
else:
- log.error('Misconfiguration of trackless exotic jet chain - need calrtold selection')
+ log.error('Misconfiguration of trackless exotic jet chain - need calratio selection')
exit(1)
log.debug("Running exotic jets with MinjetlogR: " + str(MinjetlogR) + "\t BIB rm " + str(doBIBremoval) + "\thypo: " + exotdictstring)
- stepName = "CRPldStep_"+self.chainName
- jetSeq = jetCROldMenuSequence(flags, jetsIn=jetCollectionName)
+ stepName = "CRStep_"+self.chainName
+ jetSeq = jetCRMenuSequence(flags, jetsIn=jetCollectionName)
chainStep = ChainStep(stepName, [jetSeq], multiplicity=[1], chainDicts=[self.dict])
return chainStep
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/EndOfEvent.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/EndOfEvent.py
index 303a741d94e0c705568ed546c378547962faf884..8be7bb06c174d4eab1af0ed8fdab36b6f4dc043a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/EndOfEvent.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MET/EndOfEvent.py
@@ -4,7 +4,6 @@
from typing import List
from AthenaCommon.CFElements import parOR
-from AthenaCommon.Configurable import ConfigurableCABehavior
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from .ConfigHelpers import AlgConfig, stringToMETRecoDict
from ..CommonSequences.FullScanDefs import caloFSRoI, trkFSRoI
@@ -46,16 +45,16 @@ def getMETRecoSequences(flags, purposes: List[str]):
alg for alg in _algs_by_purpose.get(purpose, []) if alg not in ef_reco_algs
]
seqname = f"{''.join(purposes)}EndOfEventRecoSequence"
- with ConfigurableCABehavior():
- merged_ca = ComponentAccumulator()
- merged_ca.addSequence(parOR(seqname), primary=True)
- max_step_idx = 0
- for alg in ef_reco_algs:
- cfg = AlgConfig.fromRecoDict(**stringToMETRecoDict(alg))
- step_output = cfg.make_reco_algs(flags, **cfg.interpret_reco_dict())
- max_step_idx = max(max_step_idx, step_output.max_step_idx)
- for ca in step_output.steps:
- merged_ca.merge(ca, seqname)
+
+ merged_ca = ComponentAccumulator()
+ merged_ca.addSequence(parOR(seqname), primary=True)
+ max_step_idx = 0
+ for alg in ef_reco_algs:
+ cfg = AlgConfig.fromRecoDict(**stringToMETRecoDict(alg))
+ step_output = cfg.make_reco_algs(flags, **cfg.interpret_reco_dict())
+ max_step_idx = max(max_step_idx, step_output.max_step_idx)
+ for ca in step_output.steps:
+ merged_ca.merge(ca, seqname)
rois = [caloFSRoI]
if max_step_idx > 1:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
index 707d38fe3367ef9e9b1a5b2df5b8b4e88e79853c..e763336f56686361092436ef4c29e5ca10ed05d6 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py
@@ -227,35 +227,28 @@ def getDevSignatures():
chains['Jet'] = [
-
- # old calratio chain with emf cut
- ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calrtold_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ # Calratio LLP-NoMATCH analogs
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU40HT', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU40HT', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60HM', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60HM', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
# new calratio chain fo comparison only
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac024_calratio_roiftf_preselj20emf24_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac012_calratio_roiftf_preselj20emf12_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU80HL', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60HL', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU80HL', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60HL', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
# new calratio chain
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1jJ160', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1jJ160', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU40_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1TAU40_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1TAU40_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1TAU40_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU40HT', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU40HT', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU60HM', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU60HM', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1jJ160', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1jJ160', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU40HT', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU40HT', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU60HM', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU60HM', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
# Phase I duplicates for primary calratio TAU
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratio_roiftf_preselj20emf6_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
- ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiormbib_roiftf_preselj20emf6_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovar_roiftf_preselj20emf6_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
+ ChainProp(name='HLT_j20_CLEANllp_momemfrac006_calratiovarrmbib_roiftf_preselj20emf6_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+DevGroup),
# ATR-28412 test lower than VBF inclusive
ChainProp(name='HLT_j70_j50a_j0_DJMASS900j50dphi200x400deta_L1MJJ-500-NFF', l1SeedThresholds=['FSNOSEED']*3,stream=['VBFDelayed'],groups=PrimaryLegGroup+MultiJetGroup+LegacyTopoGroup), # previously HLT_j70_j50_0eta490_invm1000j70_dphi20_deta40_L1MJJ-500-NFF
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
index 813bd0824042e20af4f60ce9e5ef125f626d9d20..40817f4d8582f5c4b95138302979d1afce7bc8b2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run3_v1.py
@@ -121,20 +121,15 @@ def getMCSignatures():
## ATR-25456 - calratio jet chains
- ChainProp(name='HLT_j30_CLEANllp_calrtold_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
- ChainProp(name='HLT_j30_CLEANllp_calrtoldrmbib_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
+ ChainProp(name='HLT_j30_CLEANllp_calratio_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
+ ChainProp(name='HLT_j30_CLEANllp_calratiormbib_L1TAU60', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
#ChainProp(name='HLT_j30_CLEANllp_calratio_L1eTAU80', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
#ChainProp(name='HLT_j30_CLEANllp_calratiormbib_L1eTAU80', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
# Calratio Legacy primary chains
- ChainProp(name='HLT_j30_CLEANllp_calrtold_L1TAU100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
- ChainProp(name='HLT_j30_CLEANllp_calrtoldrmbib_L1TAU100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
-
- # Calratio Legacy support chains
- ChainProp(name='HLT_j30_CLEANllp_calrtold_L1TAU40_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
- ChainProp(name='HLT_j30_CLEANllp_calrtoldrmbib_L1TAU40_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
- ChainProp(name='HLT_j30_CLEANllp_calrtold_L1TAU40_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
- ChainProp(name='HLT_j30_CLEANllp_calrtoldrmbib_L1TAU40_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup),
+ ChainProp(name='HLT_j30_CLEANllp_calratio_L1TAU100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+ ChainProp(name='HLT_j30_CLEANllp_calratiormbib_L1TAU100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+
# supporting chains for background studies
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/P1_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/P1_run3_v1.py
index c448e9e11e5eda7a68b15f0c81f84f17adfb1a47..e099b8f2a2b84924a214db8f9bd0b8fea2c14a5f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/P1_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/P1_run3_v1.py
@@ -284,7 +284,7 @@ def addCommonP1Signatures(chains):
# ChainProp(name='HLT_noalg_L1RD1_BGRP10', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo','express'],groups=['RATE:Calibration','BW:Detector']),
#ZeroBias
- ChainProp(name='HLT_noalg_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'],groups=['RATE:CPS_ZB']+ZeroBiasGroup+SupportLegGroup),# ATR-21367
+ ChainProp(name='HLT_noalg_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'],groups=['RATE:CPS_ZB']+ZeroBiasGroup+SupportPhIGroup),# ATR-21367
ChainProp(name='HLT_noalg_zb_L1RD1_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'],groups=ZeroBiasGroup+SupportGroup),# ATR-25032
@@ -310,7 +310,7 @@ def addCommonP1Signatures(chains):
ChainProp(name='HLT_mb_mbts_all_L1MBTS_C', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], monGroups=['mbMon:online'], groups=MinBiasGroup),
ChainProp(name='HLT_mb_mbts_all_L1MBTS_1_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], monGroups=['mbMon:online'], groups=MinBiasGroup), #ATR-21740
ChainProp(name='HLT_mb_mbts_all_L1RD2_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], monGroups=['mbMon:online'], groups=MinBiasGroup), # ATR-21367
- ChainProp(name='HLT_mb_mbts_all_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'],monGroups=['mbMon:online'], groups=['RATE:CPS_ZB']+ZeroBiasGroup+SupportLegGroup),# ATR-21367
+ ChainProp(name='HLT_mb_mbts_all_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'],monGroups=['mbMon:online'], groups=['RATE:CPS_ZB']+ZeroBiasGroup+SupportPhIGroup),# ATR-21367
ChainProp(name='HLT_mb_mbts_all_L1MBTS_2_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], monGroups=['mbMon:online'], groups=MinBiasGroup), #ATR-21999
ChainProp(name='HLT_mb_mbts_all_L1MBTS_1_1_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['MinBias'], monGroups=['mbMon:online'], groups=MinBiasGroup), #ATR-21999
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_HI_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_HI_run3_v1.py
index 203d337ddf20b3d5457b583ea6643dafc818dc30..16d29eb05d45c8ed3fafb08393d1865f5b1cb4c1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_HI_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_HI_run3_v1.py
@@ -786,7 +786,7 @@ def getPhysicsHISignatures():
ChainProp(name='HLT_noalg_L1jTE200', l1SeedThresholds=['FSNOSEED'], stream=[MinBiasStream], groups=['PS:NoBulkMCProd']+MinBiasGroup+SupportPhIGroup),
#----ZeroBias
- ChainProp(name='HLT_noalg_zb_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=['PS:NoBulkMCProd']+ZeroBiasGroup),
+ ChainProp(name='HLT_noalg_zb_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=['PS:NoBulkMCProd']+ZeroBiasGroup),
#ZDC bits streamer
#Commented out for the 2022 Nov Pb+Pb test run as the corresponding L1 ZDC items were commented out in the L1 menu
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
index 2dc777e4bf0c241815919cecbf2f8b1f872afd86..a532701bb5c0a1b1b9fb4cead24977a61553ab16 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py
@@ -943,16 +943,17 @@ def setupMenu(menu_name):
ChainProp(name='HLT_xe0_mhtpufit_pf_L1XE55', l1SeedThresholds=['FSNOSEED'], stream=['Main', 'express'], groups=SupportLegGroup+METGroup+['RATE:CPS_XE55'], monGroups=['metMon:t0']),
ChainProp(name='HLT_xe0_nn_L1XE55', l1SeedThresholds=['FSNOSEED'], stream=['Main', 'express'], groups=SupportLegGroup+METGroup+['RATE:CPS_XE55'], monGroups=['metMon:t0']),
- ChainProp(name='HLT_xe0_cell_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']), #ATR-26456
- ChainProp(name='HLT_xe0_tcpufit_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_trkmht_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_pfopufit_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_pfsum_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_pfsum_cssk_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_pfsum_vssk_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_mhtpufit_em_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_mhtpufit_pf_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
- ChainProp(name='HLT_xe0_nn_L1ZB', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportLegGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ # ATR-28910 L1_ZB to L1_ZeroBias
+ ChainProp(name='HLT_xe0_cell_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']), #ATR-26456
+ ChainProp(name='HLT_xe0_tcpufit_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_trkmht_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_pfopufit_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_pfsum_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_pfsum_cssk_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_pfsum_vssk_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_mhtpufit_em_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_mhtpufit_pf_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
+ ChainProp(name='HLT_xe0_nn_L1ZeroBias', l1SeedThresholds=['FSNOSEED'], stream=['ZeroBias'], groups=SupportPhIGroup+METGroup+['RATE:ZeroBias','RATE:CPS_ZB']),
#ATR-28679
ChainProp(name='HLT_xe0_cell_L1jXE110', l1SeedThresholds=['FSNOSEED'], stream=['Main', 'express'], groups=SupportPhIGroup+METGroup+['RATE:CPS_jXE110'], monGroups=['metMon:t0']),
@@ -1004,6 +1005,24 @@ def setupMenu(menu_name):
]
chains['Jet'] += [
+ # High ET chain
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1jJ160', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1jJ160', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
+ # Calratio backup for jJ160
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU80', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU80', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
+ # Calratio Legacy support chains
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratio_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac006_calratiormbib_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
+ # new version of triggers with pileup recalculation, should be prescaled
+ ChainProp(name='HLT_j30_CLEANllp_momemfrac012_calratiovar_roiftf_preselj20emf12_L1jJ160', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
+
+
+
# Support performance chains (for emulation+calibration studies) ATR-20624
ChainProp(name='HLT_j0_perf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=SingleJetGroup+SupportGroup+['RATE:CPS_RD0_FILLED']),
ChainProp(name='HLT_j0_perf_pf_ftf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['Main'], groups=SingleJetGroup+SupportGroup+['RATE:CPS_RD0_FILLED']),
@@ -1445,20 +1464,7 @@ def setupMenu(menu_name):
# ATR-28563
- ChainProp(name='HLT_j20_calratio_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup+Topo2Group),
-
-
- # ATR-22696 calratio primaries
- #ChainProp(name='HLT_j30_CLEANllp_calratio_L1LLP-NOMATCH', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup+LegacyTopoGroup),
- #ChainProp(name='HLT_j30_CLEANllp_calratiormbib_L1LLP-NOMATCH', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup+LegacyTopoGroup),
- # Phase I duplicates for primary calratio TAU
- #ChainProp(name='HLT_j30_CLEANllp_calratio_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
- #ChainProp(name='HLT_j30_CLEANllp_calratiormbib_L1eTAU140', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup),
- # calratio support
- #ChainProp(name='HLT_j30_CLEANllp_calratio_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
- #ChainProp(name='HLT_j30_CLEANllp_calratiormbib_L1eTAU60_EMPTY', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
- #ChainProp(name='HLT_j30_CLEANllp_calratio_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
- #ChainProp(name='HLT_j30_CLEANllp_calratiormbib_L1eTAU60_UNPAIRED_ISO', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportPhIGroup),
+ ChainProp(name='HLT_j20_calratiovar_roiftf_preselj20emf24_L1LLPDPHI-jXE27-jJ27', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryPhIGroup+Topo2Group),
]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py
index 26c9e64c721a58b99162abc1593e6bf26b3554fc..a30c390819d18ce38a073a308f0ca362e03268c4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/SignatureDicts.py
@@ -355,7 +355,7 @@ JetChainParts = {
'exotHypo' : ['emergingPTF0p2dR1p2', 'emergingPTF0p1dR1p2', 'emergingPTF0p09dR1p2', 'emergingPTF0p08dR1p2', 'emergingPTF0p075dR1p2', 'emergingPTF0p07dR1p2', 'emergingPTF0p0dR1p2',
'emergingPTF0p2dR0p4', 'emergingPTF0p1dR0p4', 'emergingPTF0p09dR0p4', 'emergingPTF0p08dR0p4', 'emergingPTF0p075dR0p4', 'emergingPTF0p07dR0p4', 'emergingPTF0p0dR0p4',
'tracklessdR1p2', 'tracklessdR0p4',
- 'calratio','calratiormbib','calrtold','calrtoldrmbib' # Exotics CalRatio jets (trackless and low-EMF, with option to clean out BIB)
+ 'calratio','calratiormbib','calratiovar','calratiovarrmbib' # Exotics CalRatio jets (trackless and low-EMF, with option to clean out BIB)
],
# Simple hypo configuration. Single property cuts defined as MINvarMAX
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
index 27665cf4d61882f8265400b49f1b0bfa19f5f1ca..8e1c1a0722aaaef1bd3cff1fedba75c56f505b86 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
@@ -220,7 +220,7 @@ class MonitorDef:
"L1_MBTS_1", "L1_MBTS_1_1", "L1_MBTS_2",
"L1_MBTS_1_A", "L1_MBTS_1_C", "L1_MBTS_4_A", "L1_MBTS_4_C",
"L1_MBTS_1_1_EMPTY",
- "L1_ZB",
+ "L1_ZeroBias",
"L1_AFP_A_AND_C_TOF_jJ50",
# Phase-I
"L1_AFP_A_AND_C_TOF_T0T1_jJ90",
@@ -262,7 +262,7 @@ class MonitorDef:
"L1_CALREQ0", "L1_CALREQ1", "L1_CALREQ2",
"L1_BPTX0_BGRP12","L1_BPTX1_BGRP12",
"L1_TGC_BURST",
- "L1_ZB",
+ "L1_ZeroBias",
# Forward
# AFP
"L1_AFP_A", "L1_AFP_C",
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuCommon.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuCommon.py
index fb530f28d3b37a2914e3d2968f79f073b16cabb3..a48924f17de2da0a3bf0e04b69955950c0e4eb13 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuCommon.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuCommon.py
@@ -67,7 +67,7 @@ RequiredL1Items = [
'L1_RD3_FILLED',
# ZB
- 'L1_ZB',
+ 'L1_ZeroBias',
]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
index 89bbcaea533c2356c1d9a3b33283ab3de1bb8e6b..f39bc031585b7ff253cb2656df958b9ae1270ca1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_run3_v1_inputs.py
@@ -19,7 +19,7 @@ def defineInputsMenu():
if conn["name"] == "Topo1Opt3":
conn["thresholds"] += [
('jXEPerf100',1),
- ]
+ ]
if conn["name"] == "Topo1Opt1":
conn["thresholds"] += [
('eTAU40HT',2),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
index 99bb5ceeb3ae11f176dc4d03b23b6daf50ae94af..84d7f359cca1aabf1ae40faa2f9d33307a028566 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1.py
@@ -57,8 +57,8 @@ def defineMenu():
'L1_eTAU20', 'L1_jTAU20', 'L1_jTAU30', 'L1_jTAU30M', 'L1_cTAU20M',
'L1_eTAU20L', 'L1_eTAU20M',
'L1_eTAU30', 'L1_cTAU30M',
- 'L1_eTAU35', 'L1_cTAU35M',
- 'L1_eTAU40HM',
+ 'L1_eTAU35', 'L1_cTAU35M',
+ 'L1_eTAU40HM',
'L1_eTAU60', 'L1_eTAU60_EMPTY', 'L1_eTAU60_UNPAIRED_ISO',
'L1_eTAU80', 'L1_eTAU140',
@@ -171,9 +171,6 @@ def defineMenu():
# LAr saturation
'L1_LArSaturation',
- # ZeroBias
- 'L1_ZeroBias',
-
# multi jet
'L1_J50_2J40p0ETA25_3J15p0ETA25',
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py
index d7337fe60c6a878fbda342f9e5c515a0170dd557..12dc362f706802e98dc54ab0c655056fa09a08a2 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_Physics_pp_run3_v1_inputs.py
@@ -123,14 +123,13 @@ def defineInputsMenu():
(None,3),
'eTAU20L', 'eTAU20M', 'eTAU30', 'eTAU30M',
- 'eTAU35', 'eTAU35M', 'eTAU60', 'eTAU80', 'eTAU140',
- 'eTAU40HM',
-
+ 'eTAU35', 'eTAU35M', 'eTAU40HM','eTAU60', 'eTAU80', 'eTAU140',
+
# eTAU thresholds for production
- #'eTAUSPARE6', 'eTAUSPARE7',
-
- None, None,
-
+ #'eTAUSPARE6', 'eTAUSPARE7',
+
+ None, None,
+
# gLJ thresholds for commissioning
'gLJ80p0ETA25', 'gLJ100p0ETA25', 'gLJ140p0ETA25', 'gLJ160p0ETA25',
@@ -146,7 +145,7 @@ def defineInputsMenu():
'gJ50p0ETA25', 'gJ100p0ETA25',
'gJ400p0ETA25',
-
+
]
})