diff --git a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
index f34f2f71c6cbf73d146882583ca6ec26f98a0d84..4997d32b6eb7b55641a3a7c261ab0ec925041d04 100644
--- a/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
+++ b/Calorimeter/CaloCondPhysAlgs/CMakeLists.txt
@@ -21,4 +21,4 @@ atlas_add_component( CaloCondPhysAlgs
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_joboptions( share/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-ignore=F401,F821 )
-atlas_install_scripts( share/CaloRescaleNoiseHV.sh share/CaloNoise_fillDB.py share/CaloPedestalShift.sh share/CaloPedestal_fillDB.py share/CaloScaleNoise_jobOptions.py )
+atlas_install_scripts( share/CaloRescaleNoiseHV.sh share/CaloNoise_fillDB.py share/CaloPedestalShift.sh share/CaloPedestal_fillDB.py )
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloAddPedShift_jobOptions.py b/Calorimeter/CaloCondPhysAlgs/share/CaloAddPedShift_jobOptions.py
deleted file mode 100644
index b4a972838adf034315e4b40b6a69a2afffa9bb3e..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloAddPedShift_jobOptions.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloRescaleNoise
-#
-#==============================================================
-
-
-# write here the run number and lumiblock of a time after the HV has stabilized to the version that has to be corrected offline
-# and for which we don't do online re-calibration
-
-if 'RunNumber' not in dir():
- RunNumber = 999999
-if 'LumiBlock' not in dir():
- LumiBlock = 0
-if 'FileName' not in dir():
- FileName = "pedestal_shift.txt"
-
-if 'GlobalTag' not in dir():
- GlobalTag = 'CONDBR2-ES1PA-2023-01'
-
-if 'Geometry' not in dir():
- Geometry = 'ATLAS-R2-2015-03-01-00'
-
-printfunc ("RunNumber ",RunNumber)
-printfunc ("LumiBlock ",LumiBlock)
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-from IOVDbSvc.CondDB import conddb
-folder= '/CALO/Ofl/Pedestal/CellPedestal'
-conddb.addFolder('CALO_OFL',folder)
-
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloAddCellPedShift
-theCaloAddCellPedShift = CaloAddCellPedShift("CaloAddCellPedShift")
-theCaloAddCellPedShift.FolderName=folder
-theCaloAddCellPedShift.inputFile=FileName
-
-topSequence += theCaloAddCellPedShift
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = 0
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='pedestalshift_data.root' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloCellEnergyCorr2Ntuple.py b/Calorimeter/CaloCondPhysAlgs/share/CaloCellEnergyCorr2Ntuple.py
deleted file mode 100644
index 64563c3a455ab69b20ee00b72f16246beea4f007..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloCellEnergyCorr2Ntuple.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloNoise2Ntuple
-#
-#==============================================================
-
-# configuration for data
-
-if 'RunNumber' not in dir():
- RunNumber = 258914
-if 'LumiBlock' not in dir():
- LumiBlock = 1
-if 'GlobalTag' not in dir():
- GlobalTag = 'CONDBR2-BLKPA-2015-09'
-if 'Geometry' not in dir():
- Geometry = 'ATLAS-GEO-21-00-01'
-if 'outputNtuple' not in dir():
- outputNtuple="cellcorr.root"
-if 'InputDB' not in dir():
- InputDB="COOLOFL_LAR/CONDBR2"
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(-1.)
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-conddb.addFolder("","<db>"+InputDB+"</db>/LAR/CellCorrOfl/EnergyCorr")
-if "folderTag" in dir():
- conddb.addOverride("/LAR/CellCorrOfl/EnergyCorr",folderTag)
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloCellEnergyCorr2Ntuple
-theCalo2Ntuple = CaloCellEnergyCorr2Ntuple("CaloCellEnergyCorr2Ntuple")
-theCalo2Ntuple.InputKey="/LAR/CellCorrOfl/EnergyCorr"
-topSequence += theCalo2Ntuple
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = 0
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='"+outputNtuple+"' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloCellPosition2Ntuple.py b/Calorimeter/CaloCondPhysAlgs/share/CaloCellPosition2Ntuple.py
deleted file mode 100644
index 75c397ce5f749cf327f0d9410b268e68afbf9b89..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloCellPosition2Ntuple.py
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloCellPosition2Ntuple
-#
-#==============================================================
-
-# configuration for MC
-
-if 'RunNumber' not in dir():
- RunNumber = 999999
-if 'Geometry' not in dir():
- Geometry = 'ATLAS-R2-2015-03-01-00'
-if 'GlobalTag' not in dir():
- GlobalTag = 'OFLCOND-RUN12-SDR-35'
-if 'InputDB' not in dir():
- InputDB="sqlite://;schema=LArCellPosition.db;dbname=OFLP200"
-if 'Folder' not in dir():
- Folder="/LAR/LArCellPositionShift"
-if 'FolderTag' not in dir():
- FolderTag="LArCellPositionShift-test"
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('geant4')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-#include("LArConditionsCommon/LArConditionsCommon_MC_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from IOVDbSvc.CondDB import conddb
-conddb.blockFolder("/LAR/LArCellPositionShift")
-conddb.addFolder("","<dbConnection>"+InputDB+"</dbConnection>"+Folder+"<tag>"+FolderTag+"</tag>",True)
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloCellPosition2Ntuple
-theCaloCellPosition2Ntuple = CaloCellPosition2Ntuple("CaloCellPosition2Ntuple")
-topSequence += theCaloCellPosition2Ntuple
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = 1
-svcMgr.EventSelector.InitialTimeStamp = 0
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellPosition.root' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloFillCellPositionShift.py b/Calorimeter/CaloCondPhysAlgs/share/CaloFillCellPositionShift.py
deleted file mode 100644
index e06d3b13f7288d14201fcea5ef72befdfb6b8435..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloFillCellPositionShift.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloNoise2Ntuple
-#
-#==============================================================
-
-# configuration for data
-
-if 'GlobalTag' not in dir():
- GlobalTag = 'OFLCOND-RUN12-SDR-35'
-
-if 'RunNumber' not in dir():
- RunNumber = 999999
-
-if 'Geometry' not in dir():
- Geometry = 'ATLAS-R2-2015-03-01-00'
-
-if 'FolderTag' not in dir():
- FolderTag="LArCellPositionShift-ideal"
-
-if 'OutputSQLiteFile' not in dir():
- OutputSQLiteFile="LArCellPosition.db"
-
-IOVRunNumberMin=0
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-conddb.blockFolder("/LAR/LArCellPositionShift")
-
-conddb.blockFolder("/LAR/LArCellPositionShift")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloFillCellPositionShift
-theFillCaloCellPositionShift = CaloFillCellPositionShift("CaloFillCellPositionShift")
-topSequence += theFillCaloCellPositionShift
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = 1
-svcMgr.EventSelector.InitialTimeStamp = 0
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-myOCA=OutputConditionsAlg("myOCA","LArCellPositionShift.pool.root")
-myOCA.ObjectList = ["CaloRec::CaloCellPositionShift#LArCellPositionShift#/LAR/LArCellPositionShift"]
-myOCA.WriteIOV = True
-myOCA.OutputLevel= DEBUG
-myOCA.IOVTagList = [ FolderTag ]
-
-####to set the IOV to cover all run/event
-include ("RegistrationServices/IOVRegistrationSvc_jobOptions.py")
-###IOVRunNumberMin/Max etc defined in the above
-myOCA.Run1=IOVRunNumberMin
-#myOCA.Run2=IOVRunNumberMax
-
-svcMgr.IOVDbSvc.dbConnection="sqlite://;schema="+OutputSQLiteFile+";dbname=OFLP200"
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_MC.py b/Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_MC.py
deleted file mode 100644
index 882519404a6d5e7aaf74aa60aee478266c29f8a4..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_MC.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloNoise2Ntuple
-#
-#==============================================================
-
-# configuration for MC
-
-if 'RunNumber' not in dir():
- RunNumber = 999999
-if 'Geometry' not in dir():
- Geometry = 'ATLAS-R2-2016-01-02-01'
-if 'GlobalTag' not in dir():
- GlobalTag = 'OFLCOND-RUN12-SDR-33'
-if 'outputNtuple' not in dir():
- outputNtuple="cellnoise_MC.root"
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('geant4')
-
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_MC_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-CaloNoiseCondAlg ('totalNoise')
-CaloNoiseCondAlg ('electronicNoise')
-CaloNoiseCondAlg ('pileupNoise')
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloNoise2Ntuple
-theCaloNoise2Ntuple = CaloNoise2Ntuple("CaloNoise2Ntuple")
-topSequence += theCaloNoise2Ntuple
-
-if "dbNoise" in dir():
- conddb.addMarkup("/LAR/NoiseOfl/CellNoise","<db>"+dbNoise+"</db>")
-
-if "folderTag" in dir():
- conddb.addOverride("/LAR/NoiseOfl/CellNoise",folderTag)
-
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = 1
-svcMgr.EventSelector.InitialTimeStamp = 0
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='"+outputNtuple+"' OPT='RECREATE'"]
-
-from AthenaCommon.AlgSequence import AthSequencer
-condSequence = AthSequencer("AthCondSeq")
-if hasattr(condSequence, 'TileSamplingFractionCondAlg'):
- condSequence.TileSamplingFractionCondAlg.G4Version = -1
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_data.py b/Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_data.py
deleted file mode 100644
index ba8f1911d814bba23a8d150d8f9760b4ee5b7f19..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloNoise2Ntuple_data.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloNoise2Ntuple
-#
-#==============================================================
-
-# configuration for data
-
-if 'RunNumber' not in dir():
- RunNumber = 258914
-if 'LumiBlock' not in dir():
- LumiBlock = 1
-
-if 'GlobalTag' not in dir():
- GlobalTag = 'CONDBR2-ES1PA-2015-04'
-if 'Geometry' not in dir():
- Geometry = 'ATLAS-R2-2015-03-01-00'
-if 'outputNtuple' not in dir():
- outputNtuple="cellnoise_data.root"
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(-1.)
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-CaloNoiseCondAlg ('totalNoise')
-CaloNoiseCondAlg ('electronicNoise')
-CaloNoiseCondAlg ('pileupNoise')
-
-if "dbNoise" in dir():
- conddb.addMarkup("/LAR/NoiseOfl/CellNoise","<db>"+dbNoise+"</db>")
-
-if "folderTag" in dir():
- conddb.addOverride("/LAR/NoiseOfl/CellNoise",folderTag)
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloNoise2Ntuple
-theCaloNoise2Ntuple = CaloNoise2Ntuple("CaloNoise2Ntuple")
-topSequence += theCaloNoise2Ntuple
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = 0
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='"+outputNtuple+"' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_jobOptions.py b/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_jobOptions.py
deleted file mode 100644
index 89d1384a6abdf024fca93cb7d407e2abffd38a58..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_jobOptions.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloRescaleNoise
-#
-#==============================================================
-
-# configuration for data
-
-GlobalTag = 'COMCOND-ES1C-000-00'
-RunNumber = 154757
-LumiBlock = 1
-Geometry = 'ATLAS-GEO-01-00-00'
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/COMP200')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-CaloNoiseCondAlg ('totalNoise')
-CaloNoiseCondAlg ('electronicNoise')
-CaloNoiseCondAlg ('pileupNoise')
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloRescaleNoise
-theCaloRescaleNoise = CaloRescaleNoise("CaloRescaleNoise")
-
-topSequence += theCaloRescaleNoise
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_offlineOnly_jobOptions.py b/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_offlineOnly_jobOptions.py
deleted file mode 100644
index 0a3f2f27e55fc094c0d3cd50e7e21b4df7f4a693..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_offlineOnly_jobOptions.py
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloRescaleNoise
-#
-#==============================================================
-
-
-# write here the run number and lumiblock of a time after the HV has stabilized to the version that has to be corrected offline
-# and for which we don't do online re-calibration
-
-if 'RunNumber' not in dir():
- RunNumber = 999999
-if 'LumiBlock' not in dir():
- LumiBlock = 1
-
-if 'GlobalTag' not in dir():
- GlobalTag = 'COMCOND-ES1PT-004-00'
-
-if 'Geometry' not in dir():
- Geometry = 'ATLAS-GEO-20-00-00'
-
-printfunc ("RunNumber ",RunNumber)
-printfunc ("LumiBlock ",LumiBlock)
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/CONDBR2')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-printfunc (" runiov ", runiov)
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-#TimeStamp = 1274368420
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-CaloNoiseCondAlg ('totalNoise')
-CaloNoiseCondAlg ('electronicNoise')
-CaloNoiseCondAlg ('pileupNoise')
-
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloRescaleNoise
-theCaloRescaleNoise = CaloRescaleNoise("CaloRescaleNoise")
-
-topSequence += theCaloRescaleNoise
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_online_jobOptions.py b/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_online_jobOptions.py
deleted file mode 100644
index 1897bbc83967769b6c405ed04828397c5d95f50c..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloRescaleNoise_online_jobOptions.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloRescaleNoise
-#
-#==============================================================
-
-
-# TimeStamp gives the time to use to access the new HV setting
-
-from time import strptime
-from calendar import timegm
-
-if "date" not in dir():
- date="2010-07-29:13:00:00"
-
-if "TimeStamp" not in dir():
- try:
- ts=strptime(date+'/UTC','%Y-%m-%d:%H:%M:%S/%Z')
- TimeStamp=int(timegm(ts))*1000000000
- except ValueError:
- printfunc ("ERROR in time specification, use e.g. 2007-05-25:14:01:00")
-
-printfunc (" TimeStamp to use for HV reading ", TimeStamp)
-
-# put here the run number of the period for which the HV correction was the old correction, but after the UPD1 IoV of the mapping change (in case of HV mapping change)
-
-if "RunNumberOld" in dir():
- LumiBlock=0
-
-if "RunNumberOld" not in dir():
- from LArCalibProcessing.TimeStampToRunLumi import TimeStampToRunLumi
- rlb=TimeStampToRunLumi(TimeStamp,dbInstance="CONDBR2")
- if rlb is None:
- printfunc ("WARNING: Failed to convert time",TimeStamp,"into a run/lumi number" )
- RunNumberOld = 999999
- LumiBlock = 0
- else:
- RunNumberOld = rlb[0]
- LumiBlock = rlb[1]
-
-
-if "GlobalTag" not in dir():
- GlobalTag = 'COMCOND-BLKPA-2017-09'
-
-if "Geometry" not in dir():
- Geometry = 'ATLAS-R2-2015-04-00-00'
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(int(RunNumberOld))
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-globalflags.DatabaseInstance.set_Value_and_Lock("CONDBR2")
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from IOVDbSvc.CondDB import conddb
-conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoise-RUN2-UPD1-00")
-
-from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-CaloNoiseCondAlg ('totalNoise')
-CaloNoiseCondAlg ('electronicNoise')
-CaloNoiseCondAlg ('pileupNoise')
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloRescaleNoise
-theCaloRescaleNoise = CaloRescaleNoise("CaloRescaleNoise")
-
-topSequence += theCaloRescaleNoise
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumberOld
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = int(TimeStamp/1e9)
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/CaloScaleNoise_jobOptions.py b/Calorimeter/CaloCondPhysAlgs/share/CaloScaleNoise_jobOptions.py
deleted file mode 100644
index 5124a54c1ec04d4ea4aea4374e162bda4991864d..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/CaloScaleNoise_jobOptions.py
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloRescaleNoise
-#
-#==============================================================
-
-
-# TimeStamp gives the time to use to access the new HV setting
-
-import sys
-from time import strptime
-from calendar import timegm
-
-if "date" not in dir():
- date="2010-07-29:13:00:00"
-
-if "TimeStamp" not in dir():
- try:
- ts=strptime(date+'/UTC','%Y-%m-%d:%H:%M:%S/%Z')
- TimeStamp=int(timegm(ts))*1000000000
- except ValueError:
- printfunc ("ERROR in time specification, use e.g. 2007-05-25:14:01:00")
-
-printfunc (" TimeStamp to use for HV reading ", TimeStamp)
-
-# put here the run number of the period for which the HV correction was the old correction, but after the UPD1 IoV of the mapping change (in case of HV mapping change)
-
-if "RunNumberOld" in dir():
- LumiBlock=0
-
-if "RunNumberOld" not in dir():
- from LArCalibProcessing.TimeStampToRunLumi import TimeStampToRunLumi
- rlb=TimeStampToRunLumi(TimeStamp,dbInstance="CONDBR2")
- if rlb is None:
- printfunc ("WARNING: Failed to convert time",TimeStamp,"into a run/lumi number" )
- RunNumberOld = 999999
- LumiBlock = 0
- else:
- RunNumberOld = rlb[0]
- LumiBlock = rlb[1]
-
-if "mu" not in dir():
- mu=0
-
-if mu < 0:
- # deduce the current mu
- from LArCalibProcessing import extractOFCFlavor
- mu=extractOFCFlavor.getOFCFlavor()
-
-printfunc ("Using mu: ",mu)
-
-if "dt" not in dir():
- dt=25
-
-printfunc ("Using dt: ",dt)
-
-if "GlobalTag" not in dir():
- GlobalTag = 'COMCOND-BLKPA-2017-09'
-
-if "Geometry" not in dir():
- Geometry = 'ATLAS-R2-2015-04-00-00'
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(int(RunNumberOld))
-
-
-from PerfMonComps.PerfMonFlags import jobproperties
-jobproperties.PerfMonFlags.doMonitoring = True
-from AthenaCommon.Resilience import protectedInclude
-protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-globalflags.DatabaseInstance.set_Value_and_Lock("CONDBR2")
-
-# for scaling purposes, we need fixed 1
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1)
-
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from IOVDbSvc.CondDB import conddb
-if "sqliteHVCorr" in dir():
- conddb.addMarkup("/LAR/ElecCalibFlat/HVScaleCorr","<db>sqlite://;schema="+sqliteHVCorr+";dbname=CONDBR2</db>")
-
-if mu==0:
- #conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc0_25ns")
- # for 2017:
- conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise-mc16-ofc25mc15mu0-25ns-A3MinBias_1phi_v2")
-else:
- if dt==25:
- #conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc25mu20_25ns")
- # for the 2017 running:
- conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise-mc16-ofc25mc15mu20-25ns-A3MinBias_1phi_v2")
- else:
- #conddb.addOverride("/LAR/NoiseOfl/CellNoise","LARNoiseOflCellNoisenoise_2015_ofc25mu20_50ns")
- # not possible for 2017:
- printfunc ("Could not handle 50ns in 2017")
- sys.exit(-1)
-
-from CaloTools.CaloNoiseCondAlg import CaloNoiseCondAlg
-CaloNoiseCondAlg ('totalNoise')
-CaloNoiseCondAlg ('electronicNoise')
-CaloNoiseCondAlg ('pileupNoise')
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloRescaleNoise
-theCaloRescaleNoise = CaloRescaleNoise("CaloRescaleNoise")
-theCaloRescaleNoise.absScaling=True
-
-topSequence += theCaloRescaleNoise
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumberOld
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = int(TimeStamp/1e9)
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.defaultLimit = 100000000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-svcMgr.IOVDbSvc.OutputLevel = INFO
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMB-EMEC_PS_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMB-EMEC_PS_Energy_Rescale.py
deleted file mode 100644
index f49b64fb1a7c2b44a8119cdbdde086d6fe5772e0..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/EMB-EMEC_PS_Energy_Rescale.py
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloCellCalcEnergyCorr
-#
-#==============================================================
-
-
-sqlite="EMB-EMEC_PS_CellEnergyCorrection.db"
-
-# write here the run number and lumiblock of a time after temperature drop
-
-RunNumber = 275429
-LumiBlock = 1
-
-#LastRunNumber = 999999
-
-#GlobalTag = 'COMCOND-ES1PA-006-02'
-GlobalTag = 'CONDBR2-ES1PA-2017-09'
-Geometry = 'ATLAS-R2-2015-04-00-00'
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/CONDBR2')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-printfunc (" runiov ", runiov)
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-#TimeStamp = 1274368420
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-
-#from PerfMonComps.PerfMonFlags import jobproperties
-#jobproperties.PerfMonFlags.doMonitoring = True
-#from AthenaCommon.Resilience import treatException,protectedInclude
-#protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloCellCalcEnergyCorr
-theRescaler=CaloCellCalcEnergyCorr("EMBRescaler")
-theRescaler.CaloSamples = [ 0, 4 ]
-# the EMBPS has a 1200V OFC bias (1.005)
-# and EMECPS has a 2000V OFC on 1600V bias (0.9943)
-theRescaler.SampleValues = [ 1.005, 0.9943 ]
-
-topSequence += theRescaler
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-## if not hasattr(ServiceMgr, 'THistSvc'):
-## from GaudiSvc.GaudiSvcConf import THistSvc
-## ServiceMgr += THistSvc()
-
-## ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"];
-
-OutputList=[ "AthenaAttributeList#/LAR/CellCorrOfl/EnergyCorr", ]
-OutputTagList=["LARCellCorrOflEnergyCorr-UPD1-00",]
-
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,True)
-
-
-#Periode C1-C8 (28 Jun - 23 Jul)
-theOutputConditionsAlg.Run1 = RunNumber
-theOutputConditionsAlg.LB1 = 1
-
-#theOutputConditionsAlg.Run2 = LastRunNumber + 1
-#theOutputConditionsAlg.LB2 = 0
-
-svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=CONDBR2"
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
-svcMgr.IOVRegistrationSvc.OverrideNames += ["CaloCondBlob16M"]
-svcMgr.IOVRegistrationSvc.OverrideTypes += [ "Blob16M" ]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#svcMgr.IOVDbSvc.OutputLevel =
-
-
-
-
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale.py
deleted file mode 100644
index e1dc3414db6cb714ba7b187351c658882788c908..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale.py
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloCellCalcEnergyCorr
-#
-#==============================================================
-
-
-sqlite="EMBPSCellEnergyCorrection.db"
-
-# write here the run number and lumiblock of a time after temperature drop
-
-RunNumber = 211670
-LumiBlock = 1
-
-# and last run number with changed teperature
-
-LastRunNumber = 212272
-
-GlobalTag = 'COMCOND-ES1PA-006-02'
-Geometry = 'ATLAS-GEO-18-00-00'
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/COMP200')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-printfunc (" runiov ", runiov)
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-#TimeStamp = 1274368420
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-
-#from PerfMonComps.PerfMonFlags import jobproperties
-#jobproperties.PerfMonFlags.doMonitoring = True
-#from AthenaCommon.Resilience import treatException,protectedInclude
-#protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloCellCalcEnergyCorr
-theRescaler=CaloCellCalcEnergyCorr("EMBRescaler")
-theRescaler.CaloSamples = [ 0, 1, 2, 3 ]
-# the EMBPS has a 1200V OFC bias (0.993) in addition to a temperature one
-theRescaler.SampleValues = [ 0.99155, 0.99854, 0.99854, 0.99854 ]
-
-topSequence += theRescaler
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-## if not hasattr(ServiceMgr, 'THistSvc'):
-## from GaudiSvc.GaudiSvcConf import THistSvc
-## ServiceMgr += THistSvc()
-
-## ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"];
-
-OutputList=[ "AthenaAttributeList#/LAR/CellCorrOfl/EnergyCorr", ]
-OutputTagList=["LARCellCorrOflEnergyCorr-UPD1-00",]
-
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,True)
-
-
-#Periode C1-C8 (28 Jun - 23 Jul)
-theOutputConditionsAlg.Run1 = RunNumber
-theOutputConditionsAlg.LB1 = 1
-
-theOutputConditionsAlg.Run2 = LastRunNumber + 1
-theOutputConditionsAlg.LB2 = 0
-
-svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
-svcMgr.IOVRegistrationSvc.OverrideNames += ["CaloCondBlob16M"]
-svcMgr.IOVRegistrationSvc.OverrideTypes += [ "Blob16M" ]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#svcMgr.IOVDbSvc.OutputLevel =
-
-
-
-
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale_1.py b/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale_1.py
deleted file mode 100644
index c8296ae6cc3ad493c488cf825c33be394ce102dd..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/EMBPS_Energy_Rescale_1.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloCellCalcEnergyCorr
-#
-#==============================================================
-
-
-sqlite="EMBPSOnlyCellEnergyCorrection.db"
-
-# write here the run number and lumiblock of a time after temperature drop
-
-RunNumber = 212393
-LumiBlock = 1
-
-#LastRunNumber = 999999
-
-GlobalTag = 'COMCOND-ES1PA-006-02'
-Geometry = 'ATLAS-GEO-18-00-00'
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/COMP200')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-printfunc (" runiov ", runiov)
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-#TimeStamp = 1274368420
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-
-#from PerfMonComps.PerfMonFlags import jobproperties
-#jobproperties.PerfMonFlags.doMonitoring = True
-#from AthenaCommon.Resilience import treatException,protectedInclude
-#protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloCellCalcEnergyCorr
-theRescaler=CaloCellCalcEnergyCorr("EMBRescaler")
-theRescaler.CaloSamples = [ 0 ]
-# the EMBPS has a 1200V OFC bias (1.005)
-theRescaler.SampleValues = [ 1.005 ]
-
-topSequence += theRescaler
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-## if not hasattr(ServiceMgr, 'THistSvc'):
-## from GaudiSvc.GaudiSvcConf import THistSvc
-## ServiceMgr += THistSvc()
-
-## ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"];
-
-OutputList=[ "AthenaAttributeList#/LAR/CellCorrOfl/EnergyCorr", ]
-OutputTagList=["LARCellCorrOflEnergyCorr-UPD1-00",]
-
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,True)
-
-
-#Periode C1-C8 (28 Jun - 23 Jul)
-theOutputConditionsAlg.Run1 = RunNumber
-theOutputConditionsAlg.LB1 = 1
-
-#theOutputConditionsAlg.Run2 = LastRunNumber + 1
-#theOutputConditionsAlg.LB2 = 0
-
-svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
-svcMgr.IOVRegistrationSvc.OverrideNames += ["CaloCondBlob16M"]
-svcMgr.IOVRegistrationSvc.OverrideTypes += [ "Blob16M" ]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#svcMgr.IOVDbSvc.OutputLevel =
-
-
-
-
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py
deleted file mode 100644
index 88084ea393ae8020b05c66b5eb027e6aebf4df2e..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/EMB_EMEC_PS_HV_Energy_Rescale.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloCellCalcEnergyCorr
-#
-#==============================================================
-
-
-sqlite="EMB_EMEC_PS_800HV_CellEnergyCorrection.db"
-
-# write here the run number and lumiblock of a time after temperature drop
-
-RunNumber = 274936
-LumiBlock = 1
-
-#LastRunNumber = 999999
-
-GlobalTag = 'CONDBR2-ES1PA-2017-09'
-Geometry = 'ATLAS-R2-2015-04-00-00'
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/CONDBR2')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-printfunc (" runiov ", runiov)
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-#TimeStamp = 1274368420
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-
-#from PerfMonComps.PerfMonFlags import jobproperties
-#jobproperties.PerfMonFlags.doMonitoring = True
-#from AthenaCommon.Resilience import treatException,protectedInclude
-#protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloCellCalcEnergyCorr
-theRescaler=CaloCellCalcEnergyCorr("EMBRescaler")
-theRescaler.CaloSamples = [ 0, 4 ]
-# the EMBPS has a 1200V OFC bias (1.005)
-# and EMECPS has a 2000V OFC on 1600V bias (0.9943)
-theRescaler.SampleValues = [ 1.005, 0.9943 ]
-theRescaler.HVLines = [ 281014, 283014, 293013, 295013, 288000, 290000, 289000, 291000, 289004, 291004, 289008, 291008, 292000, 294000, 280000, 282000, 281004, 283004, 284000, 286000, 284008, 286008, 268008, 270008, 264012, 266012, 284014, 286014]
-theRescaler.HVvalues = [ 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992, 0.992 ]
-
-topSequence += theRescaler
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-## if not hasattr(ServiceMgr, 'THistSvc'):
-## from GaudiSvc.GaudiSvcConf import THistSvc
-## ServiceMgr += THistSvc()
-
-## ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"];
-
-OutputList=[ "AthenaAttributeList#/LAR/CellCorrOfl/EnergyCorr", ]
-OutputTagList=["LARCellCorrOflEnergyCorr-UPD1-00",]
-
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,True)
-
-
-#Periode C1-C8 (28 Jun - 23 Jul)
-theOutputConditionsAlg.Run1 = RunNumber
-theOutputConditionsAlg.LB1 = 1
-
-#theOutputConditionsAlg.Run2 = LastRunNumber + 1
-#theOutputConditionsAlg.LB2 = 0
-
-svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=CONDBR2"
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
-svcMgr.IOVRegistrationSvc.OverrideNames += ["CaloCondBlob16M"]
-svcMgr.IOVRegistrationSvc.OverrideTypes += [ "Blob16M" ]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#svcMgr.IOVDbSvc.OutputLevel =
-
-
-
-
diff --git a/Calorimeter/CaloCondPhysAlgs/share/EMB_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/EMB_Energy_Rescale.py
deleted file mode 100644
index 4288218898050dc927f6ad120eeac45854e09dd0..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/EMB_Energy_Rescale.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloCellCalcEnergyCorr
-#
-#==============================================================
-
-
-sqlite="EMBCellEnergyCorrection.db"
-
-# write here the run number and lumiblock of a time after temperature drop
-
-RunNumber = 210349
-LumiBlock = 1
-
-# and last run number with changed teperature
-
-LastRunNumber = 212272
-
-GlobalTag = 'COMCOND-ES1PA-006-02'
-Geometry = 'ATLAS-GEO-18-00-00'
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/COMP200')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-printfunc (" runiov ", runiov)
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-#TimeStamp = 1274368420
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-
-#from PerfMonComps.PerfMonFlags import jobproperties
-#jobproperties.PerfMonFlags.doMonitoring = True
-#from AthenaCommon.Resilience import treatException,protectedInclude
-#protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import CaloCellCalcEnergyCorr
-theRescaler=CaloCellCalcEnergyCorr("EMBRescaler")
-theRescaler.CaloSamples = [ 0, 1, 2, 3 ]
-theRescaler.SampleValues = [ 0.99854, 0.99854, 0.99854, 0.99854 ]
-
-topSequence += theRescaler
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-## if not hasattr(ServiceMgr, 'THistSvc'):
-## from GaudiSvc.GaudiSvcConf import THistSvc
-## ServiceMgr += THistSvc()
-
-## ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"];
-
-OutputList=[ "AthenaAttributeList#/LAR/CellCorrOfl/EnergyCorr", ]
-OutputTagList=["LARCellCorrOflEnergyCorr-UPD1-00",]
-
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,True)
-
-
-#Periode C1-C8 (28 Jun - 23 Jul)
-theOutputConditionsAlg.Run1 = RunNumber
-theOutputConditionsAlg.LB1 = 1
-
-theOutputConditionsAlg.Run2 = LastRunNumber + 1
-theOutputConditionsAlg.LB2 = 0
-
-svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
-svcMgr.IOVRegistrationSvc.OverrideNames += ["CaloCondBlob16M"]
-svcMgr.IOVRegistrationSvc.OverrideTypes += [ "Blob16M" ]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#svcMgr.IOVDbSvc.OutputLevel =
-
-
-
-
diff --git a/Calorimeter/CaloCondPhysAlgs/share/FCAL_HV_Energy_Rescale.py b/Calorimeter/CaloCondPhysAlgs/share/FCAL_HV_Energy_Rescale.py
deleted file mode 100644
index 1083776ec259a0cae43cb0c551c0ab61d6a81cfd..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/FCAL_HV_Energy_Rescale.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file for CaloRescaleNoise
-#
-#==============================================================
-
-
-sqlite="FCALEnergyCorrection.db"
-
-# write here the run number and lumiblock of a time after the HV has stabilized to the version that has to be corrected offline
-# and for which we don't do online re-calibration
-
-RunNumber = 207306
-LumiBlock = 1
-
-GlobalTag = 'COMCOND-ES1PA-006-01'
-Geometry = 'ATLAS-GEO-18-00-00'
-
-
-from RecExConfig.RecFlags import rec
-rec.RunNumber.set_Value_and_Lock(RunNumber)
-
-from CoolConvUtilities.AtlCoolLib import indirectOpen
-
-trigDB=indirectOpen('COOLONL_TRIGGER/COMP200')
-trigfolder=trigDB.getFolder('/TRIGGER/LUMI/LBLB')
-runiov=(RunNumber << 32)+ LumiBlock
-printfunc (" runiov ", runiov)
-obj=trigfolder.findObject(runiov,0)
-payload=obj.payload()
-TimeStamp=payload['StartTime']/1000000000
-trigDB.closeDatabase()
-
-# this setting is just to get directly pileup noise as b and write back the same in the database...
-from CaloTools.CaloNoiseFlags import jobproperties
-jobproperties.CaloNoiseFlags.FixedLuminosity.set_Value_and_Lock(1.)
-
-#TimeStamp = 1274368420
-
-printfunc (" TimeStamp : ",TimeStamp)
-
-
-#from PerfMonComps.PerfMonFlags import jobproperties
-#jobproperties.PerfMonFlags.doMonitoring = True
-#from AthenaCommon.Resilience import treatException,protectedInclude
-#protectedInclude( "PerfMonComps/PerfMonSvc_jobOptions.py" )
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.all_setOff()
-DetFlags.LAr_setOn()
-DetFlags.Tile_setOn()
-DetFlags.digitize.all_setOff()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('data')
-
-import AthenaCommon.AtlasUnixGeneratorJob
-
-# Get a handle to the default top-level algorithm sequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-
-# Setup Db stuff
-import AthenaPoolCnvSvc.AthenaPool
-
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion=Geometry
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-include( "CaloConditions/CaloConditions_jobOptions.py")
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_comm_jobOptions.py")
-
-svcMgr.IOVDbSvc.GlobalTag = GlobalTag
-
-from LArConditionsCommon import LArHVDB
-
-#--------------------------------------------------------------
-# Private Application Configuration options
-#--------------------------------------------------------------
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import FCAL_HV_Energy_Rescale
-theRescaler=FCAL_HV_Energy_Rescale("FCALHVRescaler")
-
-topSequence += theRescaler
-
-#--------------------------------------------------------------
-#--- Dummy event loop parameters
-#--------------------------------------------------------------
-svcMgr.EventSelector.RunNumber = RunNumber
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.EventsPerLB = 1
-svcMgr.EventSelector.FirstLB = LumiBlock
-svcMgr.EventSelector.InitialTimeStamp = TimeStamp
-svcMgr.EventSelector.TimeStampInterval = 5
-svcMgr.EventSelector.OverrideRunNumber=True
-theApp.EvtMax = 1
-
-
-# ------------------------------------------------------------------
-# --- Ntuple
-# ------------------------------------------------------------------
-## if not hasattr(ServiceMgr, 'THistSvc'):
-## from GaudiSvc.GaudiSvcConf import THistSvc
-## ServiceMgr += THistSvc()
-
-## ServiceMgr.THistSvc.Output = ["file1 DATAFILE='cellnoise_data.root' OPT='RECREATE'"];
-
-OutputList=[ "AthenaAttributeList#/LAR/CellCorrOfl/EnergyCorr", ]
-OutputTagList=["LARCellCorrOflEnergyCorr-UPD1-00",]
-
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-theOutputConditionsAlg=OutputConditionsAlg("OutputConditionsAlg","dummy.pool.root",
- OutputList,OutputTagList,True)
-
-
-#Periode C1-C8 (28 Jun - 23 Jul)
-theOutputConditionsAlg.Run1 = 205248
-theOutputConditionsAlg.LB1 = 1
-
-theOutputConditionsAlg.Run2 = 207332 + 1
-theOutputConditionsAlg.LB2 = 0
-
-svcMgr.IOVDbSvc.dbConnection = "sqlite://;schema="+sqlite+";dbname=COMP200"
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.RecreateFolders = True #Allow add in a second tag
-svcMgr.IOVRegistrationSvc.OverrideNames += ["CaloCondBlob16M"]
-svcMgr.IOVRegistrationSvc.OverrideTypes += [ "Blob16M" ]
-
-
-#--------------------------------------------------------------
-# Set output level threshold (1=VERBOSE, 2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#--------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.debugLimit = 100000
-svcMgr.MessageSvc.infoLimit = 100000
-svcMgr.MessageSvc.Format = "% F%30W%S%7W%R%T %0W%M"
-#svcMgr.IOVDbSvc.OutputLevel =
-
-
-
-
diff --git a/Calorimeter/CaloCondPhysAlgs/share/LArMinBiasAlg_jobOptions.py b/Calorimeter/CaloCondPhysAlgs/share/LArMinBiasAlg_jobOptions.py
deleted file mode 100644
index 0fcb1abe92a5341fe2e9b4c05635dd8156c46c37..0000000000000000000000000000000000000000
--- a/Calorimeter/CaloCondPhysAlgs/share/LArMinBiasAlg_jobOptions.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-###############################################################
-#
-# Job options file to run Digitization
-#
-#==============================================================
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.detdescr.all_setOn()
-DetFlags.Muon_setOff()
-DetFlags.digitize.LAr_setOn()
-DetFlags.makeRIO.LAr_setOn()
-
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo.set_Value_and_Lock('atlas')
-globalflags.DataSource.set_Value_and_Lock('geant4')
-
-
-include( "AthenaPoolCnvSvc/ReadAthenaPool_jobOptions.py" )
-include( "PartPropSvc/PartPropSvc.py" )
-#
-# Pool Converters
-#
-include( "EventAthenaPool/EventAthenaPool_joboptions.py" )
-include( "GeneratorObjectsAthenaPool/GeneratorObjectsAthenaPool_joboptions.py" )
-include( "LArAthenaPool/LArAthenaPool_joboptions.py" )
-include( "G4SimAthenaPOOL/G4SimAthenaPOOL_joboptions.py" )
-
-# Get a handle to the ServiceManager
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-# Get a handle to the ApplicationManager
-from AthenaCommon.AppMgr import theApp
-#
-# Pool input
-#
-# With these two files there are
-# 5000 lowPt events
-# 500 highPt event
-#
-# the cross-section weights are 39.8606 and 0.138128
-# to take into account the difference in numbers of events (factor 10 )the weights should be
-# 39.8606/10 = 3.98606
-# and 0.13818/1 = 0.13818
-#
-svcMgr.EventSelector.InputCollections = [
-"mc15_13TeV.119995.Pythia8_A2MSTW2008LO_minbias_inelastic_low.merge.HITS.e3432_s2081_s2132_tid04838062_00/HITS.04838062._000027.pool.root.1",
-"mc15_13TeV.119996.Pythia8_A2MSTW2008LO_minbias_inelastic_high.merge.HITS.e3432_s2081_s2132_tid04838063_00/HITS.04838063._000833.pool.root.1"
-]
-
-# the Tile, LAr and Calo detector description package
-from AthenaCommon.GlobalFlags import jobproperties
-jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-02-01-00'
-
-
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-
-include( "CaloIdCnv/CaloIdCnv_joboptions.py" )
-include( "TileIdCnv/TileIdCnv_jobOptions.py" )
-include( "LArDetDescr/LArDetDescr_joboptions.py" )
-include("LArConditionsCommon/LArConditionsCommon_MC_jobOptions.py")
-
-from LArRecUtils.LArMCSymCondAlg import LArMCSymCondAlgDefault
-LArMCSymCondAlgDefault()
-
-from CaloCondPhysAlgs.CaloCondPhysAlgsConf import LArMinBiasAlg
-larMinBiasAlg = LArMinBiasAlg()
-larMinBiasAlg.datasetID_lowPt =119995
-larMinBiasAlg.datasetID_highPt=119996
-larMinBiasAlg.weight_lowPt =3.98606
-larMinBiasAlg.weight_highPt=0.138128
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-topSequence += larMinBiasAlg
-
-
-#--------------------------------------------------------------
-# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-#-------------------------------------------------------------
-svcMgr.MessageSvc.OutputLevel = INFO
-
-if not hasattr(ServiceMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-ServiceMgr.THistSvc.Output = ["file1 DATAFILE='ntuple.root' OPT='RECREATE'"]
-
-#--------------------------------------------------------------
-# Event related parameters
-#--------------------------------------------------------------
-# Number of events to be processed (default is 10)
-theApp.EvtMax = 1000000
-theApp.EvtSel = "EventSelector"
diff --git a/Database/IOVDbSvc/python/CondDB.py b/Database/IOVDbSvc/python/CondDB.py
new file mode 100644
index 0000000000000000000000000000000000000000..013066b510b1807d0e40a2ee8bcde035cce4e994
--- /dev/null
+++ b/Database/IOVDbSvc/python/CondDB.py
@@ -0,0 +1,437 @@
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+# CondDB.py
+# Configuration for Athena conditions DB access
+# usage:
+# from IOVDbSvc.CondDB import conddb
+# then add folders with
+# conddb.addFolder('INDET','/Indet/Align')
+# conddb.addFolder('INDET,'/Indet/Align <tag>my_explicit_tag</tag>') or
+# conddb.addFolderWithTag('INDET','/Indet/Align','my_explicit_tag')
+# conddb.addFolderSplitOnline('INDET','/Indet/OnlineF','/Indet/OfflineF')
+# conddb.addFolderSplitMC('INDET','/Indet/DataFolder','/Indet/MCFolder')
+# override a tag with
+# conddb.addOverride('/Indet/Align','override_tag_value')
+# block a folder from being added later
+# conddb.blockFolder('/Indet/Align')
+# add a folder even though blocked
+# conddb.addFolder('INDET','/Indet/Align',True)
+# conddb.addFolderWithTag('INDET','/Indet/Align','my_explicit_tag',True)
+# add markup (additional XML) to existing folder specifications
+# conddb.addMarkup('/Indet/Align','<channelSelection>1:3</channelSelection>')
+#
+# If the className argument is provided to addFolder, then also register
+# with CondInputLoader.
+
+import os
+
+from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+from IOVSvc.IOVSvcConf import CondSvc
+from IOVSvc.IOVSvcConf import CondInputLoader
+from AthenaServices.AthenaServicesConf import Athena__ConditionsCleanerSvc
+from AthenaServices.AthenaServicesConf import Athena__DelayedConditionsCleanerSvc
+from AthenaCommon.AlgSequence import AthSequencer
+from AthenaCommon.ConcurrencyFlags import jobproperties as jp
+
+
+svcMgr += CondSvc()
+
+condSeq = AthSequencer("AthCondSeq")
+if not hasattr(condSeq, "CondInputLoader"):
+ condInputLoader = CondInputLoader( "CondInputLoader")
+ # We always want CondInputLoader to be first in the condSeq
+ # for serial running
+ condSeq.insert(0, condInputLoader)
+else:
+ condInputLoader = condSeq.CondInputLoader
+
+# Enable conditions garbage collection.
+nConcurrentEvents = max(1,jp.ConcurrencyFlags.NumConcurrentEvents())
+cleaner = Athena__DelayedConditionsCleanerSvc(RingSize = 2*nConcurrentEvents)
+svcMgr += cleaner
+svcMgr += Athena__ConditionsCleanerSvc (CleanerSvc = cleaner)
+
+class CondDB:
+ "Class to hold configuration information for Athena conditions DB access"
+ def __init__(self,doOldStyleConfig=False):
+ "Setup conditions DB - IOVDbSvc and connections according to GlobalFlags"
+ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+ from AthenaCommon.Logging import logging
+ self.msg = logging.getLogger( 'IOVDbSvc.CondDB' )
+ self.msg.debug("Loading basic services for CondDBSetup...")
+
+ # AthenaPool and IOVDbSvc configuration
+ from AthenaPoolCnvSvc import AthenaPool # noqa: F401
+ from IOVDbSvc import IOVDb # noqa: F401
+ # local access to IOVDbSvc parameters
+ self.iovdbsvc=svcMgr.IOVDbSvc
+
+ # initialise list of allowed DBs
+ self.dblist={}
+ # and list of blocked folders
+ self.blocklist=[]
+
+ # decide which instance to setup
+ # default database
+ self.dbname=''
+ # names for MC and data database in case forceMC/forceData are used
+ self.dbmc=''
+ self.dbdata=''
+ self.poolcats=[]
+ from AthenaCommon.GlobalFlags import globalflags
+ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+ self.isOnline=athenaCommonFlags.isOnline()
+ self.isMC=not globalflags.DataSource()=='data'
+ if (globalflags.DetGeo() in ['atlas','commis']):
+ # ATLAS full or commissioning geometry
+ self.dbmc='OFLP200'
+ self.dbdata=globalflags.DatabaseInstance() #could be 'auto'
+ if self.isMC:
+ # Monte Carlo
+ self.dbname=self.dbmc
+ self.poolcats=['oflcond']
+ else:
+ # real data
+ if (self.dbdata=='auto'):
+ project_name = ''
+ if athenaCommonFlags.FilesInput():
+ from PyUtils.MetaReader import read_metadata
+ metadata = read_metadata(athenaCommonFlags.FilesInput())
+ project_name = metadata[athenaCommonFlags.FilesInput()[0]]['project_name']
+
+ self.dbdata=self._InstanceFromProjectName(project_name)
+ self.msg.info("Configuring database instance '%s' based on project tag '%s'", self.dbdata, project_name)
+ self.dbname=self.dbdata
+ self.poolcats=['comcond','oflcond']
+ elif (globalflags.DetGeo() in ['ctbh8','ctbh6']):
+ self.dbmc='TMCP200'
+ self.dbdata='TBDP200'
+ if self.isMC:
+ # 2004 combined testbeam, Monte Carlo
+ self.dbname=self.dbmc
+ self.poolcats=['tbcond','oflcond']
+ else:
+ # 2004 combined testbeam, real data
+ self.dbname=self.dbdata
+ self.poolcats=['tbcond','oflcond']
+ else:
+ raise RuntimeError("Unknown globalflags.DetGeo: %s" % globalflags.DetGeo())
+ if (self.dbname!=''):
+ self.msg.info('Setting up conditions DB access to instance %s', self.dbname)
+ # set up all access options - online schemas
+ self._SetAcc('INDET','COOLONL_INDET')
+ self._SetAcc('INDET_ONL','COOLONL_INDET')
+ self._SetAcc('PIXEL','COOLONL_PIXEL')
+ self._SetAcc('PIXEL_ONL','COOLONL_PIXEL')
+ self._SetAcc('SCT','COOLONL_SCT')
+ self._SetAcc('SCT_ONL','COOLONL_SCT')
+ self._SetAcc('TRT','COOLONL_TRT')
+ self._SetAcc('TRT_ONL','COOLONL_TRT')
+ self._SetAcc('LAR','COOLONL_LAR')
+ self._SetAcc('LAR_ONL','COOLONL_LAR')
+ self._SetAcc('TILE','COOLONL_TILE')
+ self._SetAcc('TILE_ONL','COOLONL_TILE')
+ self._SetAcc('MUON','COOLONL_MUON')
+ self._SetAcc('MUON_ONL','COOLONL_MUON')
+ self._SetAcc('MUONALIGN','COOLONL_MUONALIGN')
+ self._SetAcc('MUONALIGN_ONL','COOLONL_MUONALIGN')
+ self._SetAcc('MDT','COOLONL_MDT')
+ self._SetAcc('MDT_ONL','COOLONL_MDT')
+ self._SetAcc('RPC','COOLONL_RPC')
+ self._SetAcc('RPC_ONL','COOLONL_RPC')
+ self._SetAcc('TGC','COOLONL_TGC')
+ self._SetAcc('TGC_ONL','COOLONL_TGC')
+ self._SetAcc('CSC','COOLONL_CSC')
+ self._SetAcc('CSC_ONL','COOLONL_CSC')
+ self._SetAcc('TDAQ','COOLONL_TDAQ')
+ self._SetAcc('TDAQ_ONL','COOLONL_TDAQ')
+ self._SetAcc('GLOBAL','COOLONL_GLOBAL')
+ self._SetAcc('GLOBAL_ONL','COOLONL_GLOBAL')
+ self._SetAcc('TRIGGER','COOLONL_TRIGGER')
+ self._SetAcc('TRIGGER_ONL','COOLONL_TRIGGER')
+ self._SetAcc('CALO','COOLONL_CALO')
+ self._SetAcc('CALO_ONL','COOLONL_CALO')
+ self._SetAcc('FWD','COOLONL_FWD')
+ self._SetAcc('FWD_ONL','COOLONL_FWD')
+ # set up all access options - offline schemas
+ # only do this if isOnline flag is NOT set
+ # or MC flag is set, to allow HLT testing using MC database
+ if (self.isMC or not self.isOnline):
+ self._SetAcc('INDET_OFL','COOLOFL_INDET')
+ self._SetAcc('PIXEL_OFL','COOLOFL_PIXEL')
+ self._SetAcc('SCT_OFL','COOLOFL_SCT')
+ self._SetAcc('TRT_OFL','COOLOFL_TRT')
+ self._SetAcc('LAR_OFL','COOLOFL_LAR')
+ self._SetAcc('TILE_OFL','COOLOFL_TILE')
+ self._SetAcc('MUON_OFL','COOLOFL_MUON')
+ self._SetAcc('MUONALIGN_OFL','COOLOFL_MUONALIGN')
+ self._SetAcc('MDT_OFL','COOLOFL_MDT')
+ self._SetAcc('RPC_OFL','COOLOFL_RPC')
+ self._SetAcc('TGC_OFL','COOLOFL_TGC')
+ self._SetAcc('CSC_OFL','COOLOFL_CSC')
+ self._SetAcc('TDAQ_OFL','COOLOFL_TDAQ')
+ self._SetAcc('DCS_OFL','COOLOFL_DCS')
+ self._SetAcc('GLOBAL_OFL','COOLOFL_GLOBAL')
+ self._SetAcc('TRIGGER_OFL','COOLOFL_TRIGGER')
+ self._SetAcc('CALO_OFL','COOLOFL_CALO')
+ self._SetAcc('FWD_OFL','COOLOFL_FWD')
+ else:
+ self.msg.info('Running in online mode - no access to COOLOFL schemas')
+ self.iovdbsvc.OnlineMode=True
+
+ # setup default connection to localfile, and put in LOCAL symbol
+ localfile="sqlite://;schema=mycool.db;dbname="
+ self.dblist['LOCAL']=localfile
+ self.iovdbsvc.dbConnection=localfile+self.dbname
+
+ # setup knowledge of dbinstance in IOVDbSvc, for global tag x-check
+ self.iovdbsvc.DBInstance=self.dbname
+
+
+ # setup DBReplicaSvc to veto DBRelease SQLite files if real data
+ if not self.isMC:
+ from DBReplicaSvc.DBReplicaSvcConf import DBReplicaSvc
+ svcMgr+=DBReplicaSvc(COOLSQLiteVetoPattern="/DBRelease/")
+
+ # enable Frontier cache alignment if it looks like Frontier will
+ # be used (via FRONTIER_SERVER variable)
+ # but not for HLT (ATR-4646)
+ if 'FRONTIER_SERVER' in os.environ.keys() and os.environ['FRONTIER_SERVER']!="" and not self.isOnline:
+ self.iovdbsvc.CacheAlign=3
+
+ # setup PoolSvc catalogues
+ from PoolSvc.PoolSvcConf import PoolSvc
+ if not hasattr (svcMgr, 'PoolSvc'):
+ svcMgr+=PoolSvc()
+ # add the standard catalogues
+ # Set entries which will be resolved using ATLAS_POOLCOND_PATH
+ # (if set) - the actual resolution is done inside PoolSvc C++
+ for i in self.poolcats:
+ svcMgr.PoolSvc.ReadCatalog+=["apcfile:poolcond/PoolCat_%s.xml" % i]
+ svcMgr.PoolSvc.ReadCatalog+=["apcfile:poolcond/PoolFileCatalog.xml"]
+ else:
+ raise RuntimeError('Not enough configuration information to setup ConditionsDB access (are GlobalFlags being used?)')
+ self.msg.debug("Loading basic services for CondDBSetup... [DONE]")
+
+ def addFolder(self,ident,folder,force=False,forceMC=False,forceData=False,
+ className=None,extensible=False):
+ """Add access to the given folder, in the identified subdetector schema.
+If EXTENSIBLE is set, then if we access an open-ended IOV at the end of the list,
+the end time for this range will be set to just past the current event.
+Subsequent accesses will update this end time for subsequent events.
+This allows the possibility of later adding a new IOV using IOVSvc::setRange."""
+ # first check if access to this folder was blocked, unless forcing
+ for block in self.blocklist:
+ if (folder.find(block)>=0 and not force): return
+ folderadd=''
+ # now check if ident is defined, and add folder
+ if (ident in self.dblist.keys()):
+ folderadd="<db>%s%s</db> %s" % (self.dblist[ident],self._GetName(forceMC,forceData),folder)
+ elif (ident==''):
+ folderadd=folder
+ elif (ident.find('.')>0):
+ # interpret the identifier as a filename for SQLite file
+ folderadd='<db>sqlite://;schema=%s;dbname=%s</db> %s' % (ident,self._GetName(forceMC,forceData),folder)
+ else:
+ raise RuntimeError("Conditions database identifier %s is not defined" % ident)
+ if extensible:
+ folderadd = folderadd + '<extensible/>'
+
+ self.iovdbsvc.Folders+=[folderadd]
+
+ if className:
+ key = (className, self.extractFolder(folder))
+ if key not in condInputLoader.Load:
+ condInputLoader.Load.add(key)
+
+ def addFolderWithTag(self,ident,folder,tag,force=False,forceMC=False,forceData=False,className=None):
+ "Add access to the given folder/schema, using a specified tag"
+ self.addFolder(ident,folder+" <tag>%s</tag>" % tag,force,forceMC,forceData,className=className)
+
+ def addFolderSplitOnline(self,ident,folder1,folder2,force=False,forceMC=False,forceData=False,
+ className=None,extensible=False):
+ "Add access to given folder, using folder1 online, folder2 offline"
+ if self.isOnline and not self.isMC:
+ self.addFolder(ident,folder1,force=force,forceMC=forceMC,forceData=forceData,
+ className=className,extensible=extensible)
+ return folder1
+ else:
+ self.addFolder(ident+'_OFL',folder2,force=force,forceMC=forceMC,forceData=forceData,
+ className=className,extensible=extensible)
+ return folder2
+
+ def addFolderSplitMC(self,ident,folder1,folder2,force=False,forceMC=False,forceData=False,className=None):
+ "Add access to given folder, using folder1 (online) for real data, folde2 (offline) for MC"
+ if self.isMC:
+ self.addFolder(ident+'_OFL',folder2,force=force,forceMC=forceMC,forceData=forceData,className=className)
+ else:
+ self.addFolder(ident,folder1,force=force,forceMC=forceMC,forceData=forceData,className=className)
+
+ def addOverride(self,folder,tag):
+ "Add a tag override for the specified folder"
+ overrideDirective = '<prefix>%s</prefix> <tag>%s</tag>' % (folder,tag)
+ if overrideDirective not in self.iovdbsvc.overrideTags:
+ self.iovdbsvc.overrideTags+=[overrideDirective]
+
+ def blockFolder(self,folder):
+ "Block use of specified conditions DB folder so data can be read from elsewhere"
+ self.blocklist+=[folder]
+ # check existing list of folders and remove it if found
+ for i in range(0,len(self.iovdbsvc.Folders)):
+ if (self.iovdbsvc.Folders[i].find(folder)>=0):
+ del self.iovdbsvc.Folders[i]
+ break
+
+ folderName = self.extractFolder(folder)
+ for f in condInputLoader.Load:
+ if (f[-1] == folderName):
+ condInputLoader.Load.remove(f) # OK since we break after this
+ break
+
+ def folderRequested(self,folder):
+ "Return true if the given folder has already been requested"
+ for i in self.iovdbsvc.Folders:
+ if (i.find(folder)>=0): return True
+ return False
+
+ def addMarkup(self,folder,markup):
+ "Add given XML markup to folder string for given folder"
+ nmod=0
+ for i in range(0,len(self.iovdbsvc.Folders)):
+ if (self.iovdbsvc.Folders[i].find(folder)>=0):
+ self.iovdbsvc.Folders[i]+=markup
+ nmod+=1
+ if (nmod==0):
+ raise RuntimeError("conddb.addMarkup: Folder %s is not known to IOVDbSvc" % folder)
+
+
+ def setGlobalTag(self,tag):
+ "Set the GlobalTag value used as the key for hierarhical conditions"
+ self.iovdbsvc.GlobalTag=tag
+
+
+ def setRequireLock(self,lock=True):
+ "Set the flag indicating global tags will be required to be locked"
+ self.iovdbsvc.CheckLock=lock
+
+ def setWriteDataToFile(self, writeData=False):
+ "Set option to write data to file"
+ self.iovdbsvc.OutputToFile=writeData
+
+ def setCrestToFile(self, crestData=False):
+ "Set option to write CREST data to file"
+ self.iovdbsvc.CrestToFile=crestData
+
+
+ def extractFolder(self,folderstr):
+ "Extract the folder name (non-XML text) from a IOVDbSvc.Folders entry"
+ fname=""
+ xmltag=""
+ ix=0
+ while ix<len(folderstr):
+ if (folderstr[ix]=='<' and xmltag==""):
+ ix2=folderstr.find('>',ix)
+ if (ix2!=-1):
+ xmltag=(folderstr[ix+1:ix2]).strip()
+ ix=ix2+1
+ if xmltag[-1] == '/':
+ xmltag=""
+ ix=ix+1
+ elif (folderstr[ix:ix+2]=='</' and xmltag!=""):
+ ix2=folderstr.find('>',ix)
+ if (ix2!=-1):
+ xmltag=""
+ ix=ix2+1
+ else:
+ ix2=folderstr.find('<',ix)
+ if ix2==-1: ix2=len(folderstr)
+ if (xmltag==""): fname=fname+folderstr[ix:ix2]
+ ix=ix2
+ return fname.strip()
+
+
+ def dumpFolderTags(self,outfile,folderNames=False,folderOrigin=False):
+ "Write out folder-specific tag names to file, for use with AtlCoolCopy tools"
+ ofile=open(outfile,'w')
+ for folderstr in self.iovdbsvc.Folders:
+ # extract tag specifications and write in file
+ if (folderNames):
+ # also extract the name of the folder - all non-XML text
+ fname=self.extractFolder(folderstr)
+ if (fname!=""):
+ dbtype=""
+ # find the database schema and insert :ONL or :OFL
+ if (folderOrigin):
+ if '<db>' in folderstr:
+ idx1=folderstr.find('<db>')+4
+ idx2=folderstr.find('</db>')
+ if (idx2>0):
+ dbname=folderstr[idx1:idx2].strip()
+ if 'ONL' in dbname:
+ dbtype=':ONL'
+ elif 'OFL' in dbname:
+ dbtype=':OFL'
+ ofile.write('--folder %s%s\n' % (fname,dbtype))
+ if '<tag>' in folderstr:
+ idx1=folderstr.find('<tag>')+5
+ idx2=folderstr.find('</tag>')
+ if (idx2>0):
+ tag=folderstr[idx1:idx2].strip()
+ # do not write out TagInfo magic tags, except when giving
+ # folderOrigin
+ if ((tag.find('TagInfo')!=0 and tag!='HEAD') or folderOrigin):
+ ofile.write('--tag %s\n' % tag)
+ # also extract any special tag names from overrideTags list
+ for folderstr in self.iovdbsvc.overrideTags:
+ # extract tag specifications and write in file
+ if '<tag>' in folderstr:
+ idx1=folderstr.find('<tag>')+5
+ idx2=folderstr.find('</tag>')
+ if (idx2>0):
+ tag=folderstr[idx1:idx2].strip()
+ # do not write out TagInfo magic tags
+ if (tag.find('TagInfo')!=0 and tag!='HEAD'):
+ ofile.write('--tag %s\n' % tag)
+ ofile.close()
+
+ def dumpFolderReadReal(self,outfile):
+ "Dump configuration information for use in ReadReal in AthenaDBTestRec"
+ ofile=open(outfile,'w')
+ ofile.write('FolderList=%s\n' % self.iovdbsvc.Folders.__repr__())
+ ofile.close()
+
+ def GetInstance(self,forceMC=False,forceData=False):
+ "Get the name of the DB instance in use (e.g. OFLP200)"
+ return self._GetName(forceMC,forceData)
+
+
+ def _SetAcc(self,ident,schema):
+ "Internal helper function to setup database access string"
+ self.dblist[ident]="%s/" % schema
+
+ def _GetName(self,forceMC,forceData):
+ "Internal get db instance name, taking into account forceData/MC flags"
+ if forceMC:
+ return self.dbmc
+ elif forceData:
+ return self.dbdata
+ else:
+ return self.dbname
+
+ #decide database instance based on project tag dataXX_
+ def _InstanceFromProjectName(self,projectName):
+ try:
+ year=int(projectName[4:6])
+ except Exception:
+ self.msg.warning(f"Failed to extract year from project tag '{projectName}', using CONDBR2.")
+ return "CONDBR2"
+
+ if (year>13):
+ return "CONDBR2"
+ else:
+ return "COMP200"
+
+
+# make instance for use
+# false indicates no backward compatibility objects
+conddb=CondDB(False)
diff --git a/Database/IOVDbSvc/python/IOVDb.py b/Database/IOVDbSvc/python/IOVDb.py
new file mode 100644
index 0000000000000000000000000000000000000000..dd3384b2604cda0dfe93918a658312593616d7a4
--- /dev/null
+++ b/Database/IOVDbSvc/python/IOVDb.py
@@ -0,0 +1,55 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+
+## @file IOVDb.py
+## @brief Core job python configurable to setup IOVDbSvc
+## @author RD Schaffer <R.D.Schaffer@cern.ch>
+###############################################################
+#
+# The core jobOptions for IOVDbSvc
+# Setup the basic sercives
+#
+#==============================================================
+#
+# Required libs:
+
+def _loadBasicIOVDb():
+ """Loads the basic services for IOVDbSvc"""
+
+ ## make sure we have been -at least- minimally correctly configured
+ import AthenaCommon.AtlasUnixStandardJob # noqa: F401
+
+ from AthenaCommon.Logging import logging
+ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+
+ msg = logging.getLogger( 'loadBasicIOVDb' )
+ msg.debug( "Loading basic services for IOVDbSvc..." )
+
+ # Load IOVDbSvc
+ from IOVDbSvc.IOVDbSvcConf import IOVDbSvc
+ svcMgr += IOVDbSvc()
+
+ # Set IOVDbSvc as proxy provider
+ from AthenaCommon.ConfigurableDb import getConfigurable
+ if not hasattr (svcMgr, 'ProxyProviderSvc'):
+ svcMgr += getConfigurable("ProxyProviderSvc")()
+ svcMgr.ProxyProviderSvc.ProviderNames += [ "IOVDbSvc" ]
+
+ # Load IOVSvc
+ from IOVSvc.IOVSvcConf import IOVSvc
+ svcMgr += IOVSvc()
+
+ # Load EventInfoMgt
+ import EventInfoMgt.EventInfoMgtInit # noqa: F401
+
+ # add in /TagInfo to be read from File meta data
+ svcMgr.IOVDbSvc.Folders+=["/TagInfo<metaOnly/>"]
+
+ msg.debug( "Loading basic services for IOVDb... [DONE]" )
+ return
+
+## load basic services configuration at module import
+_loadBasicIOVDb()
+
+## clean-up: avoid running multiple times this method
+del _loadBasicIOVDb
+
diff --git a/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt b/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt
index 41b29976fcdc61221869c10b8af1b9dd24761f84..8dfabe6de35d009fd4ba78237353ad670b553ceb 100644
--- a/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt
+++ b/Event/xAOD/xAODEventFormatCnv/CMakeLists.txt
@@ -55,24 +55,24 @@ atlas_add_dictionary( xAODEventFormatCnvTestDict
EXTRA_FILES src/test/dict/*.cxx )
# Install files from the package.
-atlas_install_joboptions( share/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
# Test(s) in the package.
-atlas_add_test( Write
- SCRIPT athena.py --threads=8 xAODEventFormatCnv/EventFormatWriteTestJobOptions.py
- POST_EXEC_SCRIPT nopost.sh )
+atlas_add_test( WriteEventFormat
+ SCRIPT python -m xAODEventFormatCnv.TestWriteEventFormat
+ POST_EXEC_SCRIPT noerror.sh )
-atlas_add_test( Read
- SCRIPT athena.py --threads=8 xAODEventFormatCnv/EventFormatReadTestJobOptions.py
- POST_EXEC_SCRIPT nopost.sh
- DEPENDS Write )
+atlas_add_test( ReadEventFormat
+ SCRIPT python -m xAODEventFormatCnv.TestReadEventFormat
+ POST_EXEC_SCRIPT noerror.sh
+ DEPENDS WriteEventFormat )
-atlas_add_test( ReadWrite
- SCRIPT athena.py --threads=8 xAODEventFormatCnv/EventFormatReadWriteJobOptions.py
- POST_EXEC_SCRIPT nopost.sh
- DEPENDS Write )
+atlas_add_test( ReadWriteEventFormat
+ SCRIPT python -m xAODEventFormatCnv.TestReadWriteEventFormat
+ POST_EXEC_SCRIPT noerror.sh
+ DEPENDS WriteEventFormat )
-atlas_add_test( Content
- SCRIPT test/TestEventFormatContent.py readWriteTestStream0.pool.root EventFormat
+atlas_add_test( EventFormatContent
+ SCRIPT test/TestEventFormatContent.py ReadWriteTest0.pool.root EventFormat
POST_EXEC_SCRIPT nopost.sh
- DEPENDS ReadWrite )
+ DEPENDS ReadWriteEventFormat )
diff --git a/Event/xAOD/xAODEventFormatCnv/python/EventFormatTestConfig.py b/Event/xAOD/xAODEventFormatCnv/python/EventFormatTestConfig.py
new file mode 100644
index 0000000000000000000000000000000000000000..1a06cb804bce90b5bc544b27b7d13e6c4e9f43db
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/python/EventFormatTestConfig.py
@@ -0,0 +1,71 @@
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+
+from AthenaConfiguration import AllConfigFlags, MainServicesConfig
+from AthenaConfiguration.ComponentFactory import CompFactory
+from OutputStreamAthenaPool.OutputStreamConfig import (
+ OutputStreamCfg,
+ addToMetaData,
+ outputStreamName,
+)
+
+
+def EventFormatTestFlags(eventsPerFile=5, inputFiles=None):
+ if inputFiles is None:
+ inputFiles = []
+
+ flags = AllConfigFlags.initConfigFlags()
+ flags.Input.Files = inputFiles
+ flags.Concurrency.NumThreads = 8
+ flags.Exec.MaxEvents = eventsPerFile
+
+ return flags
+
+
+def EventFormatTestOutputCfg(
+ flags,
+ streamName="Test",
+ numberOfStreams=5,
+ itemList=None,
+):
+ if itemList is None:
+ itemList = []
+
+ acc = MainServicesConfig.MainServicesCfg(flags)
+
+ for i in range(numberOfStreams):
+ acc.merge(
+ OutputStreamCfg(
+ flags,
+ streamName=f"{streamName}{i}",
+ ItemList=itemList,
+ disableEventTag=True,
+ )
+ )
+
+ acc.merge(
+ addToMetaData(
+ flags,
+ streamName=f"{streamName}{i}",
+ itemOrList=[
+ f"xAOD::EventFormat#EventFormat{outputStreamName(streamName)}{i}",
+ "xAOD::FileMetaData#FileMetaData",
+ "xAOD::FileMetaDataAuxInfo#FileMetaDataAux.",
+ ],
+ HelperTools=[
+ CompFactory.xAODMaker.EventFormatStreamHelperTool(
+ f"{outputStreamName(streamName)}{i}_EventFormatStreamHelperTool",
+ Key=f"EventFormat{outputStreamName(streamName)}{i}",
+ DataHeaderKey=f"{outputStreamName(streamName)}{i}",
+ TypeNames=[".*xAODMakerTest::.*"],
+ OutputLevel=1,
+ ),
+ CompFactory.xAODMaker.FileMetaDataCreatorTool(
+ f"{outputStreamName(streamName)}{i}_FileMetaDataCreatorTool",
+ OutputKey="FileMetaData",
+ StreamName=f"{outputStreamName(streamName)}{i}",
+ ),
+ ],
+ )
+ )
+
+ return acc
diff --git a/Event/xAOD/xAODEventFormatCnv/python/TestReadEventFormat.py b/Event/xAOD/xAODEventFormatCnv/python/TestReadEventFormat.py
new file mode 100644
index 0000000000000000000000000000000000000000..1029dbdacf45d20c5e425732219ec8f869243aca
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/python/TestReadEventFormat.py
@@ -0,0 +1,48 @@
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+import sys
+
+from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+from AthenaConfiguration.ComponentFactory import CompFactory
+from AthenaConfiguration import MainServicesConfig
+from AthenaServices.MetaDataSvcConfig import MetaDataSvcCfg
+from xAODEventFormatCnv.EventFormatTestConfig import EventFormatTestFlags
+
+
+def main():
+ flags = EventFormatTestFlags(
+ inputFiles=["Test0.pool.root"],
+ eventsPerFile=1,
+ )
+
+ flags.lock()
+
+ acc = MainServicesConfig.MainServicesCfg(flags)
+ acc.merge(PoolReadCfg(flags))
+ acc.addEventAlgo(CompFactory.xAODMakerTest.EventFormatPrinterAlg())
+
+ acc.merge(
+ MetaDataSvcCfg(
+ flags,
+ tools=[
+ CompFactory.xAODMaker.EventFormatMetaDataTool(
+ "EventFormatMetaDataTool",
+ OutputLevel=1,
+ Keys=[
+ "EventFormatStreamTest0",
+ "EventFormatAOD",
+ "SomeNotExistentKey",
+ ],
+ ),
+ CompFactory.xAODMaker.FileMetaDataTool(
+ "FileMetaDataTool",
+ OutputLevel=3,
+ ),
+ ],
+ )
+ )
+
+ acc.run(flags.Exec.MaxEvents)
+
+
+if __name__ == "__main__":
+ sys.exit(main())
diff --git a/Event/xAOD/xAODEventFormatCnv/python/TestReadWriteEventFormat.py b/Event/xAOD/xAODEventFormatCnv/python/TestReadWriteEventFormat.py
new file mode 100644
index 0000000000000000000000000000000000000000..d1be7b7b34d068d86dcacc4876e5e9d2121b2008
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/python/TestReadWriteEventFormat.py
@@ -0,0 +1,79 @@
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+import sys
+
+from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
+from AthenaServices.MetaDataSvcConfig import MetaDataSvcCfg
+from AthenaConfiguration.ComponentFactory import CompFactory
+from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
+from xAODEventFormatCnv.EventFormatTestConfig import (
+ EventFormatTestFlags,
+ EventFormatTestOutputCfg,
+)
+
+
+def main():
+ numberOfStreams = 1
+ flags = EventFormatTestFlags(
+ inputFiles=["Test0.pool.root"],
+ eventsPerFile=1,
+ )
+ streamName = "ReadWriteTest"
+ for i in range(numberOfStreams):
+ flags.addFlag(
+ f"Output.{streamName}{i}FileName",
+ f"{streamName}{i}.pool.root",
+ )
+ flags.addFlag(f"Output.doWrite{streamName}{i}", True)
+
+ flags.lock()
+
+ itemList = [
+ "xAODMakerTest::AVec#TestObject",
+ "xAODMakerTest::AAuxContainer#TestObjectAux.",
+ "xAODMakerTest::AVec#TestObject2",
+ "xAODMakerTest::AAuxContainer#TestObject2Aux.",
+ "xAOD::EventInfo#EventInfo",
+ "xAOD::EventAuxInfo#EventInfoAux.",
+ ]
+
+ acc = EventFormatTestOutputCfg(
+ flags,
+ streamName="ReadWriteTest",
+ itemList=itemList,
+ numberOfStreams=numberOfStreams,
+ )
+
+ acc.addEventAlgo(
+ CompFactory.xAODMakerTest.ACreatorAlg("ACreator", OutputKey="TestObject2")
+ )
+ acc.merge(EventInfoCnvAlgCfg(flags=flags, inputKey="", disableBeamSpot=True))
+ acc.merge(PoolReadCfg(flags))
+ acc.merge(
+ MetaDataSvcCfg(
+ flags,
+ tools=[
+ CompFactory.xAODMaker.EventFormatMetaDataTool(
+ "EventFormatMetaDataTool",
+ OutputLevel=1,
+ Keys=[
+ "EventFormatStreamTest0",
+ "EventFormatAOD",
+ "SomeNotExistentKey",
+ ],
+ ),
+ CompFactory.xAODMaker.FileMetaDataTool(
+ "FileMetaDataTool",
+ OutputLevel=3,
+ ),
+ ],
+ )
+ )
+ acc.addEventAlgo(CompFactory.xAODMakerTest.EventFormatPrinterAlg())
+ acc.addEventAlgo(
+ CompFactory.xAODMakerTest.ACreatorAlg("ACreator", OutputKey="TestObject2")
+ )
+ acc.run(flags.Exec.MaxEvents)
+
+
+if __name__ == "__main__":
+ sys.exit(main())
diff --git a/Event/xAOD/xAODEventFormatCnv/python/TestWriteEventFormat.py b/Event/xAOD/xAODEventFormatCnv/python/TestWriteEventFormat.py
new file mode 100644
index 0000000000000000000000000000000000000000..64261fc76d99e6e9386229aca24f10fe15b51ce9
--- /dev/null
+++ b/Event/xAOD/xAODEventFormatCnv/python/TestWriteEventFormat.py
@@ -0,0 +1,52 @@
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+import sys
+from AthenaConfiguration.ComponentFactory import CompFactory
+from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
+from xAODEventFormatCnv.EventFormatTestConfig import (
+ EventFormatTestFlags,
+ EventFormatTestOutputCfg,
+)
+from AthenaServices.MetaDataSvcConfig import MetaDataSvcCfg
+
+
+def main():
+ numberOfStreams = 5
+ streamName = "Test"
+ flags = EventFormatTestFlags(eventsPerFile=5)
+ for i in range(numberOfStreams):
+ flags.addFlag(
+ f"Output.{streamName}{i}FileName",
+ f"{streamName}{i}.pool.root",
+ )
+ flags.addFlag(f"Output.doWrite{streamName}{i}", True)
+
+ flags.lock()
+
+ acc = EventFormatTestOutputCfg(
+ flags,
+ itemList=[
+ "xAODMakerTest::AVec#TestObject",
+ "xAODMakerTest::AAuxContainer#TestObjectAux.",
+ "xAOD::EventInfo#EventInfo",
+ "xAOD::EventAuxInfo#EventInfoAux.",
+ ],
+ )
+ acc.addEventAlgo(
+ CompFactory.xAODMakerTest.ACreatorAlg("ACreator", OutputKey="TestObject"),
+ sequenceName="AthAlgSeq",
+ )
+ acc.merge(EventInfoCnvAlgCfg(flags, disableBeamSpot=True))
+ acc.merge(
+ MetaDataSvcCfg(
+ flags,
+ toolNames=[
+ "xAODMaker::EventFormatMetaDataTool",
+ "xAODMaker::FileMetaDataTool",
+ ],
+ )
+ )
+ acc.run(flags.Exec.MaxEvents)
+
+
+if __name__ == "__main__":
+ sys.exit(main())
diff --git a/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadTestJobOptions.py b/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadTestJobOptions.py
deleted file mode 100644
index 7f8cbc51a35f1ad6d49f36f7c569731402e4f878..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadTestJobOptions.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-"""Test reading xAOD::EventFormat
-
-Read in POOL files created by the write test job options. Uses the metadata
-tool to transcribe the EventFormat metadata to the MetaDataStore. Then an
-algorithm reads the EventFormat from the MetaDataStore and prints the content.
-
- Typical usage example
- 1. run: athena xAODEventFormatCnv/EventFormatWriteTestJobOptions.py
- 2. run: athena xAODEventFormatCnv/EventFormatReadTestJobOptions.py
-"""
-from AthenaCommon import CfgMgr
-from AthenaCommon.AlgSequence import AlgSequence
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ToolSvc
-import AthenaPoolCnvSvc.ReadAthenaPool
-
-
-# grab input files
-svcMgr.EventSelector.InputCollections = [
- "testStream0.pool.root",
-]
-
-# propagate xAOD::EventFormat from InputMetaDataStore to MetaDataStore
-ToolSvc += CfgMgr.xAODMaker__EventFormatMetaDataTool(
- "EventFormatMetaDataTool",
- OutputLevel=1,
- Keys=["EventFormattestStream0", "EventFormatAOD", "SomeNotExistentKey"],
-)
-ToolSvc += CfgMgr.xAODMaker__FileMetaDataTool(
- "FileMetaDataTool",
- OutputLevel=3,
-)
-svcMgr.MetaDataSvc.MetaDataTools += [
- ToolSvc.EventFormatMetaDataTool, ToolSvc.FileMetaDataTool
-]
-
-
-# Add the xAOD::EventFormat printer algorithm to main algorithm sequence
-algSeq = AlgSequence()
-algSeq += CfgMgr.xAODMakerTest__EventFormatPrinterAlg()
-
-# read the last event of the first file and the first event of the second file
-# to test metadata access across file boundary
-theApp.EvtMax = 1
diff --git a/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadWriteJobOptions.py b/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadWriteJobOptions.py
deleted file mode 100644
index adf534dde9c788b2783e2db1bd23544cce221f6f..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventFormatCnv/share/EventFormatReadWriteJobOptions.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-"""Test writing xAOD::EventFormat in job reading from input
-
-Read in POOL files created by the write test job options. Uses the metadata
-tool to transcribe the EventFormat metadata to the MetaDataStore. Then an
-algorithm reads the EventFormat from the MetaDataStore and prints the content.
-
- Typical usage example
- 1. run: athena xAODEventFormatCnv/EventFormatWriteTestJobOptions.py
- 2. run: athena xAODEventFormatCnv/EventFormatReadWriteTestJobOptions.py
-"""
-from AthenaCommon import CfgMgr
-from AthenaCommon.AlgSequence import AlgSequence
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ToolSvc
-import AthenaPoolCnvSvc.ReadAthenaPool
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
-from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-
-VERBOSE = 1
-DEBUG = 2
-INFO = 3
-NUMBER_OF_STREAMS = 1
-
-
-def makeStream(name='TestStream'):
- """create and return an output stream"""
- test_stream = MSMgr.NewStream(
- StreamName=name,
- FileName="{}.pool.root".format(name),
- noTag=True,
- )
- # Add dummy items for testing
- test_stream.AddItem("xAODMakerTest::AVec#TestObject")
- test_stream.AddItem("xAODMakerTest::AAuxContainer#TestObjectAux.")
- test_stream.AddItem("xAODMakerTest::AVec#TestObject2")
- test_stream.AddItem("xAODMakerTest::AAuxContainer#TestObject2Aux.")
- for tool in test_stream.GetMetaDataStream().HelperTools:
- if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
- tool.TypeNames += ['.*xAODMakerTest::.*']
- tool.OutputLevel = VERBOSE
- break
- return test_stream
-
-
-# grab input files
-svcMgr.EventSelector.InputCollections = [
- "testStream0.pool.root",
-]
-
-# propagate xAOD::EventFormat from InputMetaDataStore to MetaDataStore
-ToolSvc += CfgMgr.xAODMaker__EventFormatMetaDataTool(
- "EventFormatMetaDataTool",
- OutputLevel=VERBOSE,
-)
-ToolSvc += CfgMgr.xAODMaker__FileMetaDataTool(
- "FileMetaDataTool",
- OutputLevel=3,
-)
-svcMgr.MetaDataSvc.MetaDataTools += [
- ToolSvc.EventFormatMetaDataTool, ToolSvc.FileMetaDataTool
-]
-
-
-# Add the xAOD::EventFormat printer algorithm to main algorithm sequence
-algSeq = AlgSequence()
-algSeq += CfgMgr.xAODMakerTest__EventFormatPrinterAlg()
-
-
-# Add (an) xAOD creator algorithm(s) to the job.
-algSeq += CfgMgr.xAODMakerTest__ACreatorAlg(
- "ACreator", OutputKey="TestObject2"
-)
-
-# Write some output streams to file with this container.
-streams = [
- makeStream('readWriteTestStream{}'.format(i)) for i in range(NUMBER_OF_STREAMS)
-]
-
-# Make sure event info is available
-algSeq += xAODMaker__EventInfoCnvAlg()
-
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MetaDataSvc.OutputLevel = DEBUG
-
-# read the last event of the first file and the first event of the second file
-# to test metadata access across file boundary
-theApp.EvtMax = 1
diff --git a/Event/xAOD/xAODEventFormatCnv/share/EventFormatWriteTestJobOptions.py b/Event/xAOD/xAODEventFormatCnv/share/EventFormatWriteTestJobOptions.py
deleted file mode 100644
index 909a4025e8d71ca2daa114318d287bfeea04d106..0000000000000000000000000000000000000000
--- a/Event/xAOD/xAODEventFormatCnv/share/EventFormatWriteTestJobOptions.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
-"""Test writing event format information
-
-Open an arbitrary number of streams to write to. An algorithm creates dummy
-electrons. The EventFormatStreamHelperTool creates the corresponding
-EventFormat metadata in the output stream.
-
- Typical usage example:
-
- athena xAODEventFormatCnv/EventFormatWriteTestJobOptions.py
-"""
-from AthenaCommon import CfgMgr
-from AthenaCommon.AlgSequence import AlgSequence
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
-from OutputStreamAthenaPool.MultipleStreamManager import MSMgr
-from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatStreamHelperTool
-
-VERBOSE = 1
-DEBUG = 2
-INFO = 3
-EVENTS_PER_FILE = 5
-NUMBER_OF_STREAMS = 5
-
-
-def makeStream(name='TestStream'):
- """create and return an output stream"""
- test_stream = MSMgr.NewStream(
- StreamName=name,
- FileName="{}.pool.root".format(name),
- noTag=True,
- )
- # Add dummy items for testing
- test_stream.AddItem("xAODMakerTest::AVec#TestObject")
- test_stream.AddItem("xAODMakerTest::AAuxContainer#TestObjectAux.")
- for tool in test_stream.GetMetaDataStream().HelperTools:
- if isinstance(tool, xAODMaker__EventFormatStreamHelperTool):
- tool.TypeNames += ['.*xAODMakerTest::.*']
- tool.OutputLevel = VERBOSE
- break
- return test_stream
-
-
-algSeq = AlgSequence()
-
-# Add (an) xAOD creator algorithm(s) to the job.
-algSeq += CfgMgr.xAODMakerTest__ACreatorAlg(
- "ACreator", OutputKey="TestObject"
-)
-
-# Write some output streams to file with this container.
-streams = [
- makeStream('testStream{}'.format(i)) for i in range(NUMBER_OF_STREAMS)
-]
-
-# Make sure event info is available
-algSeq += xAODMaker__EventInfoCnvAlg()
-
-# Some extra job parameters.
-theApp.EvtMax = EVENTS_PER_FILE
-
-svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MetaDataSvc.OutputLevel = DEBUG
diff --git a/ForwardDetectors/AFP/AFP_Calibration/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Calibration/CMakeLists.txt
index c29e2ab75916ad938c113d2dcd0bb4d2ac1c8c00..53b611c5d8a27d27d5aa91bbd1c0d55d92e7da82 100644
--- a/ForwardDetectors/AFP/AFP_Calibration/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Calibration/CMakeLists.txt
@@ -17,8 +17,6 @@ atlas_add_component( AFP_Calibration
LINK_LIBRARIES AFP_CalibrationLib )
# Install files from the package:
-atlas_install_joboptions( scripts/*.py )
-
atlas_add_executable( run_AFP_PixelIdentifier
scripts/run_AFP_PixelIdentifier.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS}
diff --git a/ForwardDetectors/AFP/AFP_Calibration/scripts/AFP_PixelHistoFiller.py b/ForwardDetectors/AFP/AFP_Calibration/scripts/AFP_PixelHistoFiller.py
deleted file mode 100644
index 67487946dcc6a027084ccd43576b64a71ebc70fa..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Calibration/scripts/AFP_PixelHistoFiller.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
-
-"""
-The AFP Calibration Loop, filling the histograms, usage e.g.:
- athena AFP_Calibration/AFP_PixelHistoFiller.py --filesInput="/afs/cern.ch/user/p/pbalek/workspace/public/data17_13TeV.00338480.calibration_AFP.AOD/data17_13TeV.00338480.calibration_AFP.AOD._lb0000._SFO-1._0007.root"
-"""
-
-
-# it's important to have "POOLAccess" here. With "AthenaAccess" or others, the EventContext won't be filled properly
-jps.AthenaCommonFlags.AccessMode = "POOLAccess"
-
-# overwrite with --evtMax
-jps.AthenaCommonFlags.EvtMax=-1
-
-# overwrite with --filesInput
-jps.AthenaCommonFlags.FilesInput = ["/afs/cern.ch/user/p/pbalek/workspace/public/data17_13TeV.00338480.calibration_AFP.AOD/data17_13TeV.00338480.calibration_AFP.AOD._lb0000._SFO-1._0007.root"]
-
-algo = CfgMgr.AFP_PixelHistoFiller("AFP_PixelHistoFiller")
-athAlgSeq += algo
-
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/CMakeLists.txt b/ForwardDetectors/AFP/AFP_Monitoring/CMakeLists.txt
index 4ee4f3d02a94b8974283fa4442b476b2160b5dca..d874ac0d3b6ec909c477feae139f467a0f6a4c7a 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/CMakeLists.txt
+++ b/ForwardDetectors/AFP/AFP_Monitoring/CMakeLists.txt
@@ -12,5 +12,3 @@ atlas_add_component( AFP_Monitoring
src/components/*.cxx
LINK_LIBRARIES ${ROOT_LIBRARIES} AFP_RawEv AthenaBaseComps AthenaMonitoringLib GaudiKernel LWHists LumiBlockCompsLib StoreGateLib xAODEventInfo xAODForward )
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/share/AFPHitsMonitorToolTest.py b/ForwardDetectors/AFP/AFP_Monitoring/share/AFPHitsMonitorToolTest.py
deleted file mode 100755
index 8ec213a39bddb841ad59dc7a5bb2274e31395087..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Monitoring/share/AFPHitsMonitorToolTest.py
+++ /dev/null
@@ -1,116 +0,0 @@
-from AthenaCommon.GlobalFlags import globalflags
-globalflags.DetGeo = 'atlas'
-globalflags.DataSource = 'data'
-globalflags.InputFormat = 'pool'
-
-# # for AFP calibration stream 13 TeV physics run
-# globalflags.DetDescrVersion.set_Value_and_Lock('ATLAS-GEO-02-01-00')
-# # from AthenaCommon.JobProperties import jobproperties
-# # JobProperties.Global.DetDescrVersion
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as af
-af.FilesInput = [
-#"/media/DrugiDysk/ggach/ATLAS/AFPMonitoring/data/xAOD.out.root"
-#"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/moreData.root"
-#"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/xAOD.out.root"
-#"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/testxAOD.root"
-#"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/testxAOD2.root"
-#"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/testxAOD305359_1.root"
-#"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/testxAOD305359_2.root"
-#"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/testxAOD305359_3.root"
-"/media/DrugiDysk/ggach/ATLAS/AFPxAOD/data/testxAOD305359_4.root"
-]
-
-#af.EvtMax=1000 # number of event to process
-af.EvtMax=-1 # number of event to process
-
-from RecExConfig.RecFlags import rec
-rec.AutoConfiguration = ['everything']
-rec.readRDO = False
-rec.readESD = True
-rec.readAOD = True
-rec.doCBNT = False
-rec.doWriteESD = False
-rec.doWriteAOD = False
-rec.doWriteTAG = False
-rec.doDPD = False
-rec.doAOD = True
-#rec.doDPD = True
-rec.doFileMetaData = True
-
-# Output log setting
-OutputLevel = WARNING
-
-# main jobOption - must always be included
-include ("RecExCommon/RecExCommon_topOptions.py")
-
-# Must do tool configuration here for DB access to be autoconfigured from RecExCommon
-from LumiBlockComps.LuminosityToolDefault import LuminosityToolDefault
-lumiTool = LuminosityToolDefault()
-lumiTool.OutputLevel = WARNING
-ToolSvc += lumiTool
-
-# from LumiBlockComps.TrigLivefractionToolDefault import TrigLivefractionToolDefault
-# liveTool = TrigLivefractionToolDefault()
-# liveTool.OutputLevel = DEBUG
-# ToolSvc += liveTool
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-## add an AthenaMonManager algorithm to the list of algorithms to be ran
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-topSequence += AthenaMonManager( "AthMonTestMan" )
-
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-#svcMgr.MessageSvc.OutputLevel = INFO
-svcMgr.MessageSvc.OutputLevel = WARNING
-#svcMgr.MessageSvc.OutputLevel = DEBUG
-
-# ************************
-# Monitoring configuration
-# ************************
-
-## Setup the output file(s):
-from GaudiSvc.GaudiSvcConf import THistSvc
-svcMgr += THistSvc()
-
-## The string "TestMon" in the argument below is the 'FileKey'
-## used by Athena to access the output file internally
-svcMgr.THistSvc.Output += ["TestMon DATAFILE='TestMon.root' OPT='RECREATE'"]
-svcMgr.THistSvc.PrintAll = True
-svcMgr.THistSvc.OutputLevel = 4
-
-## AthenaMonManager is the Algorithm that manages many classes inheriting
-## from ManagedMonitorToolBase
-monMan = topSequence.AthMonTestMan
-
-## FileKey must match that given to THistSvc
-monMan.FileKey = "TestMon"
-
-## Set global monitoring parameters: see the AthenaMonManager class
-## in the Control/AthenaMonitoring package
-monMan.ManualDataTypeSetup = True
-#monMan.DataType = "monteCarlo"
-monMan.DataType = "data"
-monMan.Environment = "altprod"
-monMan.ManualRunLBSetup = False
-#monMan.Run = 1
-#monMan.LumiBlock = 1
-
-from AFP_Monitoring.AFP_MonitoringConf import AFPHitsMonitorTool
-TestTool = AFPHitsMonitorTool (
-name = "TestTool",
-PreScale = 0,
-EnableLumi = False,
-ProcessNEvents = 40
-## The next line is for cases when the AlgTool cannot be attached directly to AthenaMonManager
-# ManagerName = "AthMonTestMan"
-)
-TestTool.OutputLevel = WARNING
-
-ToolSvc += TestTool
-monMan.AthenaMonTools += [ TestTool ]
-
-
-
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/share/AFPMonitoring_jobOptions.py b/ForwardDetectors/AFP/AFP_Monitoring/share/AFPMonitoring_jobOptions.py
deleted file mode 100644
index a1a37f8a1079ad9a0770a8043d8e4f34782e1a54..0000000000000000000000000000000000000000
--- a/ForwardDetectors/AFP/AFP_Monitoring/share/AFPMonitoring_jobOptions.py
+++ /dev/null
@@ -1,101 +0,0 @@
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-## add an AthenaMonManager algorithm to the list of algorithms to be ran
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-AFPMonManager = AthenaMonManager( name = "AFPHitsMonitoringManager",
- FileKey = DQMonFlags.monManFileKey(),
- Environment = DQMonFlags.monManEnvironment(),
- ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(),
- DataType = DQMonFlags.monManDataType()
- )
-
-topSequence += AFPMonManager
-
-# ===== Silicon hits monitor =====
-from AFP_Monitoring.AFP_MonitoringConf import AFPHitsMonitorTool
-AFPSiHitsMonTool = AFPHitsMonitorTool (
-name = "AFPSiHitsMonitoring",
-PreScale = 0,
-EnableLumi = True
-)
-
-layersInStationN = 4
-from AFP_Monitoring.AFP_MonitoringConf import AFPSiStationMonitor
-
-# *** station 0 ***
-from AFP_Monitoring.AFP_MonitoringConf import AFPSiLayerMonitor
-layersStation0 = list()
-for layerID in range(layersInStationN):
- toolName = "station0Layer"
- toolName += str(layerID)
- layerTool = AFPSiLayerMonitor(name = toolName, pixelLayerID = layerID, stationID = 0)
- layerTool.hitsScaleFactor = 0.035 # factor used to correct hits number based on pile-up: hits = meas - factor*pile_up
- layerTool.hotSpotStartRow = 0 # pixel row marking the beginning of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndRow = 35 # pixel row marking the end of a hot-spot (included in the hot-spot)
- layerTool.hotSpotStartCol = 28 # pixel column marking the beginnig of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndCol = 36 # pixel column marking the end of a hot-spot (included in the hot-spot)
- ToolSvc += layerTool
- layersStation0.append(layerTool)
-
-station_0 = AFPSiStationMonitor (name = "AFPStation0", stationID = 0, layersMonitors = layersStation0)
-ToolSvc += station_0
-
-# *** station 1 ***
-from AFP_Monitoring.AFP_MonitoringConf import AFPSiLayerMonitor
-layersStation1 = list()
-for layerID in range(layersInStationN):
- toolName = "station1Layer"
- toolName += str(layerID)
- layerTool = AFPSiLayerMonitor(name = toolName, pixelLayerID = layerID, stationID = 1)
- layerTool.hitsScaleFactor = 0.035 # factor used to correct hits number based on pile-up: hits = meas - factor*pile_up
- layerTool.hotSpotStartRow = 0 # pixel row marking the beginning of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndRow = 35 # pixel row marking the end of a hot-spot (included in the hot-spot)
- layerTool.hotSpotStartCol = 28 # pixel column marking the beginnig of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndCol = 36 # pixel column marking the end of a hot-spot (included in the hot-spot)
- ToolSvc += layerTool
- layersStation1.append(layerTool)
-
-station_1 = AFPSiStationMonitor (name = "AFPStation1", stationID = 1, layersMonitors = layersStation1)
-ToolSvc += station_1
-
-# *** station 2 ***
-from AFP_Monitoring.AFP_MonitoringConf import AFPSiLayerMonitor
-layersStation2 = list()
-for layerID in range(layersInStationN):
- toolName = "station2Layer"
- toolName += str(layerID)
- layerTool = AFPSiLayerMonitor(name = toolName, pixelLayerID = layerID, stationID = 2)
- layerTool.hitsScaleFactor = 0.035 # factor used to correct hits number based on pile-up: hits = meas - factor*pile_up
- layerTool.hotSpotStartRow = 0 # pixel row marking the beginning of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndRow = 35 # pixel row marking the end of a hot-spot (included in the hot-spot)
- layerTool.hotSpotStartCol = 44 # pixel column marking the beginnig of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndCol = 52 # pixel column marking the end of a hot-spot (included in the hot-spot)
- ToolSvc += layerTool
- layersStation2.append(layerTool)
-
-station_2 = AFPSiStationMonitor (name = "AFPStation2", stationID = 2, layersMonitors = layersStation2)
-ToolSvc += station_2
-
-# *** station 3 ***
-from AFP_Monitoring.AFP_MonitoringConf import AFPSiLayerMonitor
-layersStation3 = list()
-for layerID in range(layersInStationN):
- toolName = "station3Layer"
- toolName += str(layerID)
- layerTool = AFPSiLayerMonitor(name = toolName, pixelLayerID = layerID, stationID = 3)
- layerTool.hitsScaleFactor = 0.035 # factor used to correct hits number based on pile-up: hits = meas - factor*pile_up
- layerTool.hotSpotStartRow = 0 # pixel row marking the beginning of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndRow = 35 # pixel row marking the end of a hot-spot (included in the hot-spot)
- layerTool.hotSpotStartCol = 44 # pixel column marking the beginnig of a hot-spot (included in the hot-spot)
- layerTool.hotSpotEndCol = 52 # pixel column marking the end of a hot-spot (included in the hot-spot)
- ToolSvc += layerTool
- layersStation3.append(layerTool)
-
-station_3 = AFPSiStationMonitor (name = "AFPStation3", stationID = 3, layersMonitors = layersStation3)
-ToolSvc += station_3
-
-AFPSiHitsMonTool.stationsMonitors = [station_0, station_1, station_2, station_3]
-
-AFPMonManager.AthenaMonTools += [ AFPSiHitsMonTool ]
-
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/python/AFP_LocReco.py b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/python/AFP_LocReco.py
index e290abc3bad4115ce1431cb5169fa418610e3696..55dead01ea35c7b97bb88f8c2439d1d55d80eb49 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/python/AFP_LocReco.py
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_LocReco/python/AFP_LocReco.py
@@ -63,9 +63,7 @@ def AFP_LocReco_TD_Cfg(flags, kwargs={}):
acc = ComponentAccumulator()
if flags.Input.isMC:
- # if other tags are desired, they can be set also in postExec, e.g.
- # --postExec 'from IOVDbSvc.CondDB import conddb; conddb.addOverride("/FWD/AFP/ToFParameters/Local","AFPMCToFLoc-329484-02");'
-
+ # if other tags are desired, they can be set also in postExec
acc.merge(addFolders(flags, "/FWD/AFP/ToFParameters/Local<tag>AFPMCToFLoc-ideal-01</tag>", 'FWD_OFL', className='CondAttrListCollection', db='OFLP200'))
tofLocParamTool = CompFactory.getComp("AFP::ToFLocParamDBTool")("ToFLocParamDBTool", loc_param_key="/FWD/AFP/ToFParameters/Local")
else:
@@ -143,20 +141,3 @@ def AFP_LocReco_TD_HLT(flags):
return acc
-#-- SiAlignDBTester part ------------------------------------------------------------
-# this is a setup for ReadCondHandle (see AFP_DBTools/SiAlignDBTester)
-
-# from IOVDbSvc.CondDB import conddb
-
-# conddb.addFolder("CALO","/CALO/HadCalibration2/CaloEMFrac", className='CaloLocalHadCoeff')
-# conddb.addFolderSplitOnline("INDET","/Indet/Onl/Beampos", "/Indet/Beampos", className='AthenaAttributeList')
-
-# schema = "<db>sqlite://;schema=Example.db;dbname=CONDBR2</db>"
-# folder = "/FWD/AFP/LocalAlignment"
-# locTag="<tag>AFPAlignLoc-00</tag>"
-
-# conddb.addFolder("", schema+folder+locTag, className='CondAttrListCollection')
-
-# from AFP_DBTools.AFP_DBToolsConf import SiAlignDBTester
-# TopLocRecSeq += SiAlignDBTester("SiAlignDBTester", OutputLevel=DEBUG)
-
diff --git a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/python/AFP_SiClusterTools.py b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/python/AFP_SiClusterTools.py
index f1583cce274f16f6e2e8b7d320cd690937209f27..1378afd54bfda6deb64f5e52d8ac7d2da9d4d567 100644
--- a/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/python/AFP_SiClusterTools.py
+++ b/ForwardDetectors/AFP/AFP_Reconstruction/AFP_SiClusterTools/python/AFP_SiClusterTools.py
@@ -22,9 +22,7 @@ def AFP_SiClusterTools_Cfg(flags, kwargs={}):
acc = ComponentAccumulator()
if flags.Input.isMC:
- # if other tags are desired, they can be set also in postExec, e.g.
- # --postExec 'from IOVDbSvc.CondDB import conddb; conddb.addOverride("/FWD/AFP/Align/Local","AFPMCAlignLoc-329484-02"); conddb.addOverride("/FWD/AFP/Align/Global","AFPMCAlignGlob-331020-01");'
-
+ # if other tags are desired, they can be set also in postExec
acc.merge(addFolders(flags, "/FWD/AFP/Align/Local<tag>AFPMCAlignLoc-ideal-01</tag>", 'FWD_OFL', className='CondAttrListCollection', db='OFLP200'))
acc.merge(addFolders(flags, "/FWD/AFP/Align/Global<tag>AFPMCAlignGlob-ideal-01</tag>",'FWD_OFL', className='CondAttrListCollection', db='OFLP200'))
diff --git a/ForwardDetectors/ALFA/ALFA_BeamTransport/share/jobOptions.ALFA_BeamTransport.py b/ForwardDetectors/ALFA/ALFA_BeamTransport/share/jobOptions.ALFA_BeamTransport.py
deleted file mode 100644
index 15c32e14e2b476d5f385d2b7b1f7f1c9a1290e39..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_BeamTransport/share/jobOptions.ALFA_BeamTransport.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from AthenaCommon.AlgSequence import AlgSequence
-topSeq = AlgSequence()
-
-ServiceMgr.MessageSvc.OutputLevel = DEBUG
-
-from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
-athenaCommonFlags.PoolEvgenInput = ['evgen.pgun.ALFA.pool.root']
-athenaCommonFlags.PoolHitsOutput.set_Off()
-athenaCommonFlags.EvtMax = -1
-
-from G4AtlasApps.SimFlags import SimFlags
-SimFlags.load_atlas_flags()
-SimFlags.EventFilter.set_Off()
-SimFlags.MagneticField.set_Off()
-
-include("G4AtlasApps/G4Atlas.flat.configuration.py")
-
-from AthenaCommon.CfgGetter import getAlgorithm
-topSeq += getAlgorithm("G4AtlasAlg",tryDefaultConfigurable=True)
-
-include("ALFA_BeamTransport/ALFA_BeamTransportConfig.py")
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_CLinkAlg/CMakeLists.txt
index 0aeceb2aac7f66117336232e908b0db3ada42d04..22936a0d62a11dbcb957c23d1e9b2a306ad64702 100644
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_CLinkAlg/CMakeLists.txt
@@ -9,5 +9,3 @@ atlas_add_component( ALFA_CLinkAlg
src/components/*.cxx
LINK_LIBRARIES AthenaBaseComps AthenaKernel AthLinks xAODForward ALFA_CLinkEv GaudiKernel )
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
diff --git a/ForwardDetectors/ALFA/ALFA_CLinkAlg/share/ALFA_CLinkAlg_joboption.py b/ForwardDetectors/ALFA/ALFA_CLinkAlg/share/ALFA_CLinkAlg_joboption.py
deleted file mode 100644
index 3140bf065054ede2d37371da51166996c3abf319..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_CLinkAlg/share/ALFA_CLinkAlg_joboption.py
+++ /dev/null
@@ -1,48 +0,0 @@
-#==============================================================
-# Job options file for the ALFA_CLinkAlg package
-#==============================================================
-
-from ALFA_CLinkAlg.ALFA_CLinkAlgConf import ALFA_CLinkAlg
-from AthenaCommon.AlgSequence import AlgSequence
-
-TopLocRecSeq = AlgSequence()
-TopLocRecSeq += ALFA_CLinkAlg("ALFA_CLinkAlg")
-
-alfaCLink = TopLocRecSeq.ALFA_CLinkAlg
-
-from AthenaCommon.GlobalFlags import globalflags
-if globalflags.DataSource()=='data':
- alfaCLink.DataType = 1
- IOVDbSvc = Service( "IOVDbSvc" )
- from IOVDbSvc.CondDB import conddb
-
- if not conddb.folderRequested('/RPO/DCS/BLM'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/BLM")
- if not conddb.folderRequested('/RPO/DCS/FECONFIGURATION'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/FECONFIGURATION")
- if not conddb.folderRequested('/RPO/DCS/HVCHANNEL'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/HVCHANNEL")
- if not conddb.folderRequested('/RPO/DCS/LOCALMONITORING'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/LOCALMONITORING")
- if not conddb.folderRequested('/RPO/DCS/MOVEMENT'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/MOVEMENT")
- if not conddb.folderRequested('/RPO/DCS/RADMON'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/RADMON")
- if not conddb.folderRequested('/RPO/DCS/TRIGGERRATES'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/TRIGGERRATES")
- if not conddb.folderRequested('/RPO/DCS/TRIGGERSETTINGS'):
- conddb.addFolder("DCS_OFL","/RPO/DCS/TRIGGERSETTINGS")
-
- ####for other possible servers see dbreplica.config in Athena installation directory
- #uncomment following line for test purposes only
- #IOVDbSvc.dbConnection="oracle://ATLAS_COOLPROD;schema=ATLAS_COOLOFL_DCS;dbname=COMP200"
- #IOVDbSvc.Folders += ["/RPO/DCS/BLM"]
- #IOVDbSvc.Folders += ["/RPO/DCS/FECONFIGURATION"]
- #IOVDbSvc.Folders += ["/RPO/DCS/HVCHANNEL"]
- #IOVDbSvc.Folders += ["/RPO/DCS/LOCALMONITORING"]
- #IOVDbSvc.Folders += ["/RPO/DCS/MOVEMENT"]
- #IOVDbSvc.Folders += ["/RPO/DCS/RADMON"]
- #IOVDbSvc.Folders += ["/RPO/DCS/TRIGGERRATES"]
- #IOVDbSvc.Folders += ["/RPO/DCS/TRIGGERSETTINGS"]
-else:
- alfaCLink.DataType = 0
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt b/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt
index 383674e05bc8ac20ebebbfd6627ce52a9fe1c097..5295b8c709d321fbe87d1f429c86eb23576caba9 100644
--- a/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt
+++ b/ForwardDetectors/ALFA/ALFA_Digitization/CMakeLists.txt
@@ -16,6 +16,5 @@ atlas_add_component( ALFA_Digitization
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
atlas_install_runtime( xtalk/*.txt )
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/share/ALFA_Digitization_jobOptions.py b/ForwardDetectors/ALFA/ALFA_Digitization/share/ALFA_Digitization_jobOptions.py
deleted file mode 100644
index b68bf5320d6f52a640838b622407a67721f81254..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Digitization/share/ALFA_Digitization_jobOptions.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
-from AthenaCommon import CfgGetter
-job += CfgGetter.getAlgorithm("ALFA_DigiAlg/ALFA_DigiAlg", tryDefaultConfigurable=True)
-alfa = job.ALFA_DigiAlg.DigitizationTool
diff --git a/ForwardDetectors/ALFA/ALFA_Digitization/share/ALFA_PileUpTool_JobOptions.py b/ForwardDetectors/ALFA/ALFA_Digitization/share/ALFA_PileUpTool_JobOptions.py
deleted file mode 100644
index 4a4ed0174c576c903c0f8e3b7528e8d6a43d4aee..0000000000000000000000000000000000000000
--- a/ForwardDetectors/ALFA/ALFA_Digitization/share/ALFA_PileUpTool_JobOptions.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
-from AthenaCommon import CfgGetter
-job.PileUpToolsAlg.PileUpTools += [ CfgGetter.getPrivateTool("ALFA_PileUpTool", checkType=True) ]
-alfaPileUpTool = job.PileUpToolsAlg.PileUpTools[ "ALFA_PileUpTool" ]
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt b/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt
index 4dfc43b9f37b4ef384d89d04b108f53e5125c055..5e968e407c6edc2653193b61da603eee8a28bd9a 100644
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/CMakeLists.txt
@@ -13,6 +13,3 @@ atlas_add_component( LUCID_Monitoring
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} AthenaMonitoringLib LUCID_RawEvent )
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/share/LUCIDMon_jobOptions.py b/ForwardDetectors/LUCID/LUCID_Monitoring/share/LUCIDMon_jobOptions.py
deleted file mode 100755
index 50923284a0b2bae67c576ca5bfe9e12ba3b60bda..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/share/LUCIDMon_jobOptions.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-LucidMon = AthenaMonManager(name="LucidMonManager",
- FileKey = DQMonFlags.monManFileKey(),
- Environment = DQMonFlags.monManEnvironment(),
- ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(),
- DataType = DQMonFlags.monManDataType())
-
-topSequence += LucidMon
-
-from LUCID_Monitoring.LUCID_MonitoringConf import LUCID_HitsMoniTool
-
-LUCID_TestTool = LUCID_HitsMoniTool (name = "LUCID_HitsMoniTool")
-
-#ToolSvc += LUCID_TestTool
-
-LucidMon.AthenaMonTools += [ LUCID_TestTool ]
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py b/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py
deleted file mode 100755
index be7ea706f4997515105765b9291d0422953c3bd0..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/share/args.ESDtoAOD.lucid.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#################################################################################
-# Run arguments file auto-generated on Thu Aug 20 12:41:38 2009 by:
-# JobTransform: ESDtoAOD
-# Version: RecJobTransforms-00-08-33
-# Authors: David Cote <david.cote@cern.ch>
-#################################################################################
-
-from PyJobTransformsCore.runargs import RunArguments
-
-runArgs = RunArguments()
-
-runArgs.conditionsTag = 'COMCOND-ES1C-001-01'
-
-#runArgs.beamType = 'cosmics'
-
-runArgs.outputDQMonitorFile = 'MonitorESD.root'
-
-#runArgs.trigStream = 'IDCosmic'
-
-runArgs.maxEvents = -1
-
-runArgs.inputESDFile = ['myESD.pool.root']
-
-runArgs.preInclude = ['RecExCommon/RecoUsefulFlags.py', 'RecExCond/MinimalCommissioningSetup.py', 'RecJobTransforms/UseOracle.py', 'RecJobTransforms/debugConfig.py']
-
-runArgs.outputAODFile = 'myAOD.pool.root'
-
-runArgs.postExec = ['svcMgr.MessageSvc.OutputLevel=INFO']
-
-runArgs.preExec = ['rec.doTrigger=False;rec.doMuon=False',
- 'rec.doLArg=False',
- 'rec.doTile=False',
- 'rec.doInDet=False',
- 'rec.doCalo=False',
- 'rec.doPerfMon=True',
- 'rec.doDetailedPerfMon=True',
- 'DQMonFlags.doPixelMon=False',
- 'DQMonFlags.doSCTMon=False',
- 'DQMonFlags.doTRTMon=False',
- 'DQMonFlags.doTRTElectronMon=False',
- 'DQMonFlags.doInDetGlobalMon=False',
- 'DQMonFlags.doInDetAlignMon=False',
- 'DQMonFlags.doInDetPerfMon=False',
- 'DQMonFlags.doLArMon=False',
- 'DQMonFlags.doCaloMon=False',
- 'DQMonFlags.doTileMon=False',
- 'DQMonFlags.doEgammaMon=False',
- 'DQMonFlags.doMissingEtMon=False',
- 'DQMonFlags.doJetMon=False',
- 'DQMonFlags.doTauMon=False',
- 'DQMonFlags.doJetTagMon=False',
- 'DQMonFlags.doMuonRawMon=False',
- 'DQMonFlags.doMuonSegmentMon=False',
- 'DQMonFlags.doMuonTrackMon=False',
- 'DQMonFlags.doMuonAlignMon=False',
- 'DQMonFlags.doMuonPhysicsMon=False',
- 'DQMonFlags.doMuonCombinedMon=False',
- 'DQMonFlags.doLucidMon=True']
-
-runArgs.geometryVersion = 'ATLAS-GEONF-08-00-00'
-
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/share/run.lucidMoni.sh b/ForwardDetectors/LUCID/LUCID_Monitoring/share/run.lucidMoni.sh
deleted file mode 100755
index a6ebaf32a88af836ba4895b616c2ab2e96fb5083..0000000000000000000000000000000000000000
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/share/run.lucidMoni.sh
+++ /dev/null
@@ -1 +0,0 @@
-athena.py args.ESDtoAOD.lucid.py RecJobTransforms/skeleton.ESDtoAOD.py -s | tee run.lucidMoni.out
diff --git a/HLT/Trigger/TrigControl/TrigPSC/python/TrigPSCPythonDbSetup.py b/HLT/Trigger/TrigControl/TrigPSC/python/TrigPSCPythonDbSetup.py
index 8e6dc2b06160a42199182941253a1f8806fd5ac9..0d1a0691e24b9a3296ae4d71926a3e2631e1d5cb 100644
--- a/HLT/Trigger/TrigControl/TrigPSC/python/TrigPSCPythonDbSetup.py
+++ b/HLT/Trigger/TrigControl/TrigPSC/python/TrigPSCPythonDbSetup.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
###############################################################
## @file TrigPSCPythonDbSetup.py
@@ -42,4 +42,4 @@ if not flags.Trigger.Online.useOnlineTHistSvc:
from TriggerJobOpts.TriggerHistSvcConfig import setTHistSvcOutput
output = []
setTHistSvcOutput(output)
- setattr(iProperty("THistSvc"), "Output", output)
+ iProperty("THistSvc").Output = output
diff --git a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
index ac7647a35bad265e38b78e3c737355a7a1de48e3..ffbdd6680fa244cdbc3289e0a6b1c77f27243809 100755
--- a/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
+++ b/HLT/Trigger/TrigControl/TrigPSC/share/TrigPSCPythonSetup.py
@@ -5,8 +5,6 @@
## @brief Python setup for online running (similar to athena.py)
## @author Werner Wiedenmann <Werner.Wiedenmann@cern.ch>
###############################################################
-import builtins
-printfunc = getattr(builtins,'print')
### setup from a .pkl file
from TrigPSC import PscConfig
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
index 217f9a19d7dff64a51b49df83b5f8ef114ce1a29..6bc3c718c52f1e9800e32a415e7c8f18a0dffe9f 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -82,19 +82,19 @@ def getHltROBDataProviderSvc(flags, name='ROBDataProviderSvc'):
svc.MonTool = GenericMonitoringTool(flags, 'MonTool', HistPath='HLTFramework/'+name)
svc.MonTool.defineHistogram('TIME_ROBReserveData', path='EXPERT', type='TH1F',
title='Time to reserve ROBs for later retrieval;time [mu s]',
- xbins=100, xmin=0, xmax=1000),
+ xbins=100, xmin=0, xmax=1000)
svc.MonTool.defineHistogram('NUMBER_ROBReserveData', path='EXPERT', type='TH1F',
title='Number of reserved ROBs for later retrieval;number',
- xbins=100, xmin=0, xmax=500),
+ xbins=100, xmin=0, xmax=500)
svc.MonTool.defineHistogram('TIME_ROBRequest', path='EXPERT', type='TH1F',
title='Time for ROB retrievals;time [mu s]',
- xbins=400, xmin=0, xmax=200000),
+ xbins=400, xmin=0, xmax=200000)
svc.MonTool.defineHistogram('NUMBER_ROBRequest', path='EXPERT', type='TH1F',
title='Number of retrieved ROBs;number',
- xbins=100, xmin=0, xmax=1000),
+ xbins=100, xmin=0, xmax=1000)
svc.MonTool.defineHistogram('TIME_CollectAllROBs', path='EXPERT', type='TH1F',
title='Time for retrieving complete event data;time [mu s]',
- xbins=400, xmin=0, xmax=200000),
+ xbins=400, xmin=0, xmax=200000)
svc.MonTool.defineHistogram('NUMBER_CollectAllROBs', path='EXPERT', type='TH1F',
title='Number of received ROBs for collect call;number',
xbins=100, xmin=0, xmax=2500)
diff --git a/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py b/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py
index 79db48d6862719eaf01d42f6e62612b77dbda219..d527fd530c22d96bd6ae4d74d7540d6ff219e93d 100644
--- a/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py
+++ b/HLT/Trigger/TrigTransforms/TrigTransform/python/trigRecoExe.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# @brief: Trigger executor to call base transforms
# @details: Based on athenaExecutor with some modifications
@@ -259,7 +259,7 @@ class trigRecoExecutor(athenaExecutor):
with open(mergeBSFileList, 'w') as BSFileList:
for fname in inputFiles:
BSFileList.write(f'{fname}\n')
- except (IOError, OSError) as e:
+ except OSError as e:
raise trfExceptions.TransformExecutionException(trfExit.nameToCode('TRF_OUTPUT_FILE_ERROR'),
f'Got an error when writing list of BS files to {mergeBSFileList}: {e}')
diff --git a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
index 635131bd0a25a12a9cd21c4dcf0f4dff7ec9df54..f22d5cde0971e5008fbbd08eb6e41d7a9d748c73 100644
--- a/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
+++ b/InnerDetector/InDetRecTools/InDetTestPixelLayer/src/InDetTestPixelLayerTool.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
*/
#include "AthenaBaseComps/AthAlgTool.h"
@@ -557,6 +557,14 @@ InDet::InDetTestPixelLayerTool::getPixelLayerParameters(
{
//// Cylinder bigger than the b-layer ////
ATH_MSG_DEBUG("Trying to extrapolate to pixelLayer");
+
+ if(std::abs(trackpar->position().z())>10000.){
+ ATH_MSG_DEBUG("Pathological track parameter well outside of detector");
+ ATH_MSG_DEBUG("Propagator might have issue with this, discarding");
+ ATH_MSG_VERBOSE("dumping track parameters " << *trackpar);
+ return false;
+ }
+
Amg::Transform3D surfTrans;
surfTrans.setIdentity();
Trk::CylinderSurface BiggerThanPixelLayerSurface(surfTrans, m_outerRadius, 10000.0);
diff --git a/InnerDetector/InDetValidation/InDetTruthVertexValidation/CMakeLists.txt b/InnerDetector/InDetValidation/InDetTruthVertexValidation/CMakeLists.txt
index a9fb8042519e083a686332a47226d9a14e800752..a252875c75526e9b9644805786723375f2c37dea 100644
--- a/InnerDetector/InDetValidation/InDetTruthVertexValidation/CMakeLists.txt
+++ b/InnerDetector/InDetValidation/InDetTruthVertexValidation/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( InDetTruthVertexValidation )
@@ -34,9 +34,6 @@ if( NOT XAOD_STANDALONE )
LINK_LIBRARIES ${extra_libs} GaudiKernel xAODTracking AthenaBaseComps AsgTools InDetTruthVertexValidationLib )
endif()
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-
if( XAOD_STANDALONE )
atlas_add_executable( VertexTruthMatchTest
util/VertexTruthMatchTest.cxx
diff --git a/InnerDetector/InDetValidation/InDetTruthVertexValidation/share/VertexTruthMatch_jobOptions.py b/InnerDetector/InDetValidation/InDetTruthVertexValidation/share/VertexTruthMatch_jobOptions.py
deleted file mode 100644
index 4e54cdd4ea3bd47dce8b2589dda10984238482bc..0000000000000000000000000000000000000000
--- a/InnerDetector/InDetValidation/InDetTruthVertexValidation/share/VertexTruthMatch_jobOptions.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
-
-# Set up the file reading:
-FNAME = "/afs/cern.ch/atlas/project/PAT/xAODs/r5591/mc14_8TeV.117050.PowhegPythia_P2011C_ttbar.recon.AOD.e1727_s1933_s1911_r5591/AOD.01494882._111853.pool.root.1"
-
-import AthenaPoolCnvSvc.ReadAthenaPool
-ServiceMgr.EventSelector.InputCollections = [ FNAME ]
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-from InDetTruthVertexValidation.InDetTruthVertexValidationConf import InDetVertexTruthMatchTool
-tool = InDetVertexTruthMatchTool()
-tool.OutputLevel=DEBUG
-ToolSvc += tool
-
-# Add the test algorithm:
-from InDetTruthVertexValidation.InDetTruthVertexValidationConf import InDetVertexTruthMatchAlgorithm
-alg = InDetVertexTruthMatchAlgorithm()
-theJob += alg
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 100
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 1000000
diff --git a/LArCalorimeter/LArSamplesMon/CMakeLists.txt b/LArCalorimeter/LArSamplesMon/CMakeLists.txt
index dc0e3cd6d979c4b5da2987110a320f03add61f8c..b12ba44a05fb9acc12132f3c5165008ff3b4c9a9 100644
--- a/LArCalorimeter/LArSamplesMon/CMakeLists.txt
+++ b/LArCalorimeter/LArSamplesMon/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 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( LArSamplesMon )
@@ -29,8 +29,3 @@ atlas_add_executable( LCE_CellList
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} LArCafJobsLib LArSamplesMonLib )
-# Install files from the package:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
-atlas_install_scripts( share/LCE_postprocessing.py )
-
diff --git a/LArCalorimeter/LArSamplesMon/python/LArSamplesMonConfig.py b/LArCalorimeter/LArSamplesMon/python/LArSamplesMonConfig.py
deleted file mode 100644
index 833467f64856665c46aa343ef50f7df84a8bcb2e..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArSamplesMon/python/LArSamplesMonConfig.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-
-# -*- coding: utf-8 -*-
-from LArCafJobs.LArCafJobsConfig import DefaultShapeDumperTool
-from LArSamplesMon.LArSamplesMonConf import LArShapeCompleteMaker
-
-class DefaultLArShapeCompleteMaker(LArShapeCompleteMaker) :
-
- def __init__(self, name = 'LArShapeCompleteMaker',
- shapeErrorFileName = '', outputFileName = '', outputTemplateFileName = '',
- outputKey = '', nSamples = 5, nPhases = 17, iPhase = 8) :
- super(LArShapeCompleteMaker, self).__init__(name)
-
- from LArCabling.LArCablingAccess import LArOnOffIdMapping
- LArOnOffIdMapping()
-
- from AthenaCommon.AppMgr import ToolSvc
- theDumperTool = DefaultShapeDumperTool(doShape=False)
- ToolSvc += theDumperTool
-
- self.ShapeErrorFileName = shapeErrorFileName
- self.OutputFileName = outputFileName
- self.OutputTemplateFileName = outputTemplateFileName
- self.OutputKey = outputKey
- self.NSamples = nSamples
- self.NPhases = nPhases
- self.IPhase = iPhase
diff --git a/LArCalorimeter/LArSamplesMon/share/LCE_postprocessing.py b/LArCalorimeter/LArSamplesMon/share/LCE_postprocessing.py
deleted file mode 100755
index 3efa2ae6440c5e7fa395adced68d0041e673fe2e..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArSamplesMon/share/LCE_postprocessing.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/env python
-
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-
-import sys,os,subprocess,tempfile
-import subprocess
-from string import *
-from LArCafJobs.GetLBsToIgnore import getLBsToIgnore
-
-#eoscmd="/afs/cern.ch/project/eos/installation/0.3.84-aquamarine/bin/eos.select"
-eoscmd="eos "
-
-if __name__=="__main__":
- if len(sys.argv)<2 or not sys.argv[1].isdigit():
- print("Usage: %s <runnumber> {outputfile}" % sys.argv[0])
- sys.exit(-1)
-
-
- runnumber=int(sys.argv[1])
- if len(sys.argv)>2:
- outputFile=sys.argv[2]
- else:
- outputFile="LCE_CellList_%i.txt" % runnumber
-
- if not os.access(os.path.dirname(outputFile),os.W_OK):
- print("ERROR, no write access to output text file",outputFile)
- sys.exit(-1)
-
-
- #1. Try find input file on eos
- #model path name: /eos/atlas/atlascerngroupdisk/det-larg/Tier0/temp/data15_cos/calibration_LArCellsEmpty/00265083/data15_cos.00265083.calibration_LArCellsEmpty.recon.NTUP_SAMPLESMON.c840/data15_cos.00265083.calibration_LArCellsEmpty.recon.NTUP_SAMPLESMON.c840._0001.1
- dustbin=open("/dev/null")
- #dustbin=sys.stdout
-
- path=None
- #for projectTag in ("data15_comm","data15_cos","data15_13TeV","data15_1beam","data15_5TeV","data15_hi"):
- for projectTag in ("data22_comm","data22_cos","data22_13TeV","data22_1beam","data22_900GeV","data22_hip8TeV","data22_hip5TeV","data22_calib"):
- print("Probing with project tag", projectTag)
- #Could alternativlgy get project tag from TDAQ Database
- #castorpath="/castor/cern.ch/grid/atlas/caf/atlcal/perm/lar/LArCAF/%s/calibration_LArCellsEmpty/%8.8i" % (projectTag,runnumber)
- eospath="/eos/atlas/atlascerngroupdisk/det-larg/Tier0/perm/%s/calibration_LArCellsEmpty/%8.8i/" % (projectTag,runnumber)
- #cmd=[eoscmd,"ls", eospath]
- #cmd=["env -i bash -l -c '"+eoscmd+" ls "+eospath+"'"]
- cmd = eoscmd+" ls "+eospath
- print(cmd)
- #process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=dustbin)
- #eosoutput = process.communicate()
- sRes = subprocess.getstatusoutput(cmd)
- print(sRes[1])
- output = sRes[1].split('\n')
- #post-process eos output to split at linebreaks
- #output=[]
- #for o in eosoutput:
- # if o is not None: output+=o.split()
-
- found=False
- #if (process.returncode==0):
- if (sRes[0] == 0):
- print("output: ", output)
- for d1 in output:
- if d1.find("NTUP_SAMPLESMON")!=-1:
- eospath+="/"+d1
- found=True
- break
- pass
- if not found:
- print("Directory for LCE output of run %i not found on eos" % runnumber)
- sys.exit(-1)
-
- #cmd=[eoscmd,"ls", eospath]
- cmd = eoscmd+" ls "+eospath
- #cmd=["env -i bash -l -c '"+eoscmd+" ls "+eospath+"'"]
- print("Checking path ",eospath)
- #process1 = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=dustbin)
- #eosoutput = process1.communicate()
- sRes = subprocess.getstatusoutput(cmd)
- print(sRes[1])
- output = sRes[1].split('\n')
- #output=[]
- #for o in eosoutput:
- # if o is not None: output+=o.split()
-
- #if (process.returncode==0):
- if (sRes[0] == 0):
- for d2 in output:
- print(d2)
- if d2 is not None and d2.find("NTUP_SAMPLESMON")!=-1:
- filename=d2
- path="root://eosatlas/"+eospath+"/"+filename
- break
- pass
- pass
- if path is not None: break
- pass
- pass
-
- #dustbin.close()
- if path is not None:
- print("Found project Tag",projectTag)
- print("Input file ",path)
- else:
- print("LCE output of run %i not found on eos" % runnumber)
- sys.exit(-1)
-
-
- workdir=tempfile.mkdtemp()
- LCEFile=workdir+"/"+filename
- #cmd=[eoscmd,"cp ",path,LCEFile]
- cmd=eoscmd+" cp "+path+" "+LCEFile
- #print(cmd)
- #copyprocess=subprocess.Popen(cmd)#,stdout=subprocess.PIPE,stderr=subprocess.STDOUT)
- #output=copyprocess.communicate()
- sRes = subprocess.getstatusoutput(cmd)
- #if (process.returncode!=0 or not os.access(LCEFile,os.R_OK)):
- if (sRes[0] != 0 or not os.access(LCEFile,os.R_OK)):
- print("ERROR, failed to copy LCE ntuple to local directory")
- #print(output)
- sys.exit(-1)
- pass
-
-
- #2. Get LBs to ignore:
- requireStableBeam=projectTag.endswith("TeV")
- bulk=False
- badLBs=getLBsToIgnore(runnumber,True,bulk,requireStableBeam)
- (badLBsF,badLBsFN)=tempfile.mkstemp(text=True)
- #print(badLBsF,badLBsFN)
- os.write(badLBsF,str.encode(', '.join([ str(i) for i in sorted(badLBs) ])))
- os.write(badLBsF,str.encode("\n"))
- os.close(badLBsF)
- print(badLBsFN)
-
-
- #3. symlink LArIdTree.root
- #if not os.access("LarIdTree.root",os.F_OK):
- # os.symlink("/afs/cern.ch/user/l/larmon/public/LarIdTree.root","LarIdTree.root")
-
- print("Running LCE_CellList",LCEFile,outputFile,badLBsFN)
-
- sc=subprocess.call(["LCE_CellList",LCEFile,outputFile,badLBsFN])
-
- os.remove(badLBsFN)
- os.remove(LCEFile)
diff --git a/LArCalorimeter/LArSamplesMon/share/larShapeCompleteSnippet.py b/LArCalorimeter/LArSamplesMon/share/larShapeCompleteSnippet.py
deleted file mode 100644
index 5b4a2bcbb1f7a6cb798cd851050371c5b6c3c492..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArSamplesMon/share/larShapeCompleteSnippet.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-
-include("LArCalibProcessing/LArCalib_Flags.py")
-
-shapeErrorFileName = os.path.join(os.getenv('TMPDIR'), 'Shape/corr_ALL.root')
-outputTemplateFileName = os.path.join(os.getenv('TMPDIR'), 'Shape/samples_template.root')
-outputFileName = os.path.join(os.getenv('TMPDIR'), 'Shape/larShape.root')
-
-# RunNumber trigger IOV if reading from COOL is enabled
-if not 'RunNumber' in dir():
- RunNumber = '0000000'
-
-if not 'ChannelSelection' in dir():
- # Read all
- ChannelSelection = " "
- ## Example to read only cool for Barrel C : Strips->Back
- #ChannelSelection = "<channelSelection>0,35:66</channelSelection>"
-
-from string import *
-def DBConnectionFile(sqlitefile):
- return "sqlite://;schema="+sqlitefile+";dbname=COMP200"
-
-LArPhysFolderOutputTag = LArCalib_Flags.tagSuffix
-
-if not 'OutputDB' in dir():
- OutputDB = LArCalib_Flags.OutputDB
-
-if 'OutputSQLiteFile' in dir():
- OutputDB = DBConnectionFile(OutputSQLiteFile)
-
-if not 'OutputObjectSpecShape' in dir():
- OutputObjectSpecShape = "LArShapeComplete#LArResiduals#"+ LArCalib_Flags.LArShapeFolder+"5samples"
- OutputObjectSpecTagShape = LArCalibFolderTag(LArCalib_Flags.LArShapeFolder+"/Residuals/5samples",LArPhysFolderOutputTag)
-
-WriteIOV = LArCalib_Flags.WriteIOV
-IOVBegin = int(RunNumber)
-IOVEnd = LArCalib_Flags.IOVEnd
-
-OutputShapePoolFileDir = os.getenv('TMPDIR')
-OutputShapePoolFileName = "Shape/LArShapePhys.pool.root"
-
-
-###########################################################################
-# Print summary
-###########################################################################
-
-OFCLog = logging.getLogger( "OFCLog" )
-OFCLog.info( " ======================================================== " )
-OFCLog.info( " *** LAr OFC summary *** " )
-OFCLog.info( " ======================================================== " )
-OFCLog.info( " RunNumber = "+str(RunNumber) )
-OFCLog.info( " OutputShapePoolFullFileName = "+OutputShapePoolFileDir+"/"+OutputShapePoolFileName )
-OFCLog.info( " OutputObjectSpecShape = "+str(OutputObjectSpecShape) )
-OFCLog.info( " IOVBegin = "+str(IOVBegin) )
-OFCLog.info( " IOVEnd = "+str(IOVEnd) )
-OFCLog.info( " LArCalibOutputDB = "+OutputDB )
-OFCLog.info( " ======================================================== " )
-
-###########################################################################
-#
-# Global settings
-#
-###########################################################################
-
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-## get a handle to the ApplicationManager, to the ServiceManager and to the ToolSvc
-from AthenaCommon.AppMgr import (theApp, ServiceMgr as svcMgr,ToolSvc)
-
-#include("LArCalibProcessing/LArCalib_MinimalSetup.py")
-
-from LArSamplesMon.LArSamplesMonConfig import DefaultLArShapeCompleteMaker
-lscm = DefaultLArShapeCompleteMaker('LArShapeCompleteMaker', shapeErrorFileName, outputFileName, outputTemplateFileName)
-lscm.OutputLevel = DEBUG
-topSequence += lscm
-
-
-###########################################################################
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-
-if os.path.exists(OutputShapePoolFileDir+"/"+OutputShapePoolFileName):
- os.remove(OutputShapePoolFileDir+"/"+OutputShapePoolFileName)
-OutputConditionsAlgShape = OutputConditionsAlg("OutputConditionsAlgShape",OutputShapePoolFileDir+"/"+OutputShapePoolFileName,
- [OutputObjectSpecShape],[OutputObjectSpecTagShape],WriteIOV)
-OutputConditionsAlgShape.Run1 = IOVBegin
-if IOVEnd>0:
- OutputConditionsAlgShape.Run2 = IOVEnd
-
-svcMgr.IOVDbSvc.dbConnection = OutputDB
-
-svcMgr.IOVDbSvc.DBInstance=''
-
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.OutputLevel = DEBUG
-svcMgr.IOVRegistrationSvc.RecreateFolders = False
-
-###########################################################################
-# Use EventSelector to select IOV #
-###########################################################################
-
-from McEventSelector.McEventSelectorConf import McEventSelector
-svcMgr += McEventSelector("LArEventSelector")
-svcMgr.LArEventSelector.RunNumber = int(RunNumber)
-svcMgr.LArEventSelector.EventsPerRun = 1
-svcMgr.LArEventSelector.FirstEvent = 1
-svcMgr.LArEventSelector.InitialTimeStamp = 0
-svcMgr.LArEventSelector.TimeStampInterval = 1
-
-##########################################################################
-# don't remove otherwise infinite loop #
-##########################################################################
-
-theApp.EvtMax = 1
-
-###########################################################################
-
-svcMgr.MessageSvc.OutputLevel = WARNING
-svcMgr.MessageSvc.defaultLimit = 10000
-svcMgr.MessageSvc.Format = "% F%20W%S%7W%R%T %0W%M"
-
-svcMgr+=CfgMgr.AthenaEventLoopMgr(OutputLevel = VERBOSE)
-
-from AthenaCommon.AppMgr import theAuditorSvc
-from AthenaCommon.ConfigurableDb import getConfigurable
-theAuditorSvc += getConfigurable("MemStatAuditor")(OutputLevel = DEBUG)
-theAuditorSvc += getConfigurable("ChronoAuditor")()
-theAuditorSvc += getConfigurable("NameAuditor")()
-
-svcMgr.MessageSvc.enableSuppression = False
-
-###########################################################################
diff --git a/LArCalorimeter/LArSamplesMon/share/makeLArShapeComplete.py b/LArCalorimeter/LArSamplesMon/share/makeLArShapeComplete.py
deleted file mode 100644
index 81265d4cc12728fe61f7edd7839e260da6379d80..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArSamplesMon/share/makeLArShapeComplete.py
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-
-import commands
-
-###########################################################################
-#
-# <Marco.Delmastro@cern.ch>
-# <Nicolas.Berger@cern.ch>
-#
-# Store LArShapeComplete object for residuals in a POOL file
-#
-###########################################################################
-
-include("RecJobTransforms/UseOracle.py")
-include("LArCalibProcessing/LArCalib_Flags.py")
-#include("LArConditionsCommon/LArIdMap_comm_jobOptions.py")
-
-###########################################################################
-# Input selection (Autocorr, PhysWave)
-###########################################################################
-
-shapeErrorFileName = os.path.join(os.getenv('TMPDIR'), 'Shape/corr_ALL.root')
-outputTemplateFileName = os.path.join(os.getenv('TMPDIR'), 'Shape/samples_template.root')
-outputFileName = os.path.join(os.getenv('TMPDIR'), 'Shape/larShape.root')
-
-# RunNumber trigger IOV if reading from COOL is eneabled
-if not 'RunNumber' in dir():
- RunNumber = '0000000'
-
-if not 'ChannelSelection' in dir():
- # Read all
- ChannelSelection = " "
- ## Example to read only cool for Barrel C : Strips->Back
- #ChannelSelection = "<channelSelection>0,35:66</channelSelection>"
-
-from string import *
-def DBConnectionFile(sqlitefile):
- return "sqlite://;schema="+sqlitefile+";dbname=COMP200"
-
-print dir(LArCalib_Flags)
-
-#njpb LArPhysFolderOutputTag = LArCalib_Flags.tagSuffix
-LArPhysFolderOutputTag = '-UPD3-01'
-
-if not 'OutputDB' in dir():
- OutputDB = LArCalib_Flags.OutputDB
-
-if 'OutputSQLiteFile' in dir():
- OutputDB = DBConnectionFile(OutputSQLiteFile)
-
-if not 'OutputObjectSpecShape' in dir():
- OutputObjectSpecShape = "LArShapeComplete#LArResiduals#"+ LArCalib_Flags.LArShapeFolder+"5samples"
- OutputObjectSpecTagShape = LArCalibFolderTag(LArCalib_Flags.LArShapeFolder+"/Residuals/5samples",LArPhysFolderOutputTag)
-
-WriteIOV = LArCalib_Flags.WriteIOV
-IOVBegin = int(RunNumber)
-IOVEnd = LArCalib_Flags.IOVEnd
-
-OutputShapePoolFileDir = os.getenv('TMPDIR')
-OutputShapePoolFileName = "Shape/LArShapePhys.pool.root"
-
-
-###########################################################################
-# Print summary
-###########################################################################
-
-OFCLog = logging.getLogger( "OFCLog" )
-OFCLog.info( " ======================================================== " )
-OFCLog.info( " *** LAr OFC summary *** " )
-OFCLog.info( " ======================================================== " )
-OFCLog.info( " RunNumber = "+str(RunNumber) )
-OFCLog.info( " OutputShapePoolFullFileName = "+OutputShapePoolFileDir+"/"+OutputShapePoolFileName )
-OFCLog.info( " OutputObjectSpecShape = "+str(OutputObjectSpecShape) )
-OFCLog.info( " IOVBegin = "+str(IOVBegin) )
-OFCLog.info( " IOVEnd = "+str(IOVEnd) )
-OFCLog.info( " LArCalibOutputDB = "+OutputDB )
-OFCLog.info( " ======================================================== " )
-
-###########################################################################
-#
-# Global settings
-#
-###########################################################################
-
-include("AthenaCommon/Atlas_Gen.UnixStandardJob.py")
-
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-## get a handle to the ApplicationManager, to the ServiceManager and to the ToolSvc
-from AthenaCommon.AppMgr import (theApp, ServiceMgr as svcMgr,ToolSvc)
-
-include("LArCalibProcessing/LArCalib_MinimalSetup.py")
-
-#from AthenaCommon.DetFlags import DetFlags
-#DetFlags.Calo_setOn()
-
-from LArSamplesMon.LArSamplesMonConfig import DefaultLArShapeCompleteMaker
-lscm = DefaultLArShapeCompleteMaker('LArShapeCompleteMaker', shapeErrorFileName, outputFileName, outputTemplateFileName)
-lscm.OutputLevel = DEBUG
-topSequence += lscm
-
-###########################################################################
-# #
-# Input conditions data (AutoCorr, CaliWave) for COOL and/or POOL #
-# #
-###########################################################################
-
-include("AthenaPoolCnvSvc/AthenaPool_jobOptions.py")
-include("LArCondAthenaPool/LArCondAthenaPool_joboptions.py")
-
-from IOVDbSvc.CondDB import conddb
-
-## define the DB Gobal Tag :
-#svcMgr.IOVDbSvc.GlobalTag = LArCalib_Flags.globalFlagDB
-svcMgr.IOVDbSvc.GlobalTag = 'COMCOND-REPPT-008-00'
-#svcMgr.IOVDbSvc.GlobalTag = 'COMCOND-ES1PT-005-04'
-#svcMgr.IOVDbSvc.GlobalTag = 'COMCOND-BLKPST-005-07'
-
-###########################################################################
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-
-if os.path.exists(OutputShapePoolFileDir+"/"+OutputShapePoolFileName):
- os.remove(OutputShapePoolFileDir+"/"+OutputShapePoolFileName)
-OutputConditionsAlgShape = OutputConditionsAlg("OutputConditionsAlgShape",OutputShapePoolFileDir+"/"+OutputShapePoolFileName,
- [OutputObjectSpecShape],[OutputObjectSpecTagShape],WriteIOV)
-OutputConditionsAlgShape.Run1 = IOVBegin
-if IOVEnd>0:
- OutputConditionsAlgShape.Run2 = IOVEnd
-
-svcMgr.IOVDbSvc.dbConnection = OutputDB
-
-svcMgr.IOVDbSvc.DBInstance=''
-
-from RegistrationServices.RegistrationServicesConf import IOVRegistrationSvc
-svcMgr += IOVRegistrationSvc()
-svcMgr.IOVRegistrationSvc.OutputLevel = DEBUG
-svcMgr.IOVRegistrationSvc.RecreateFolders = False
-
-###########################################################################
-# Use EventSelector to select IOV #
-###########################################################################
-
-from McEventSelector.McEventSelectorConf import McEventSelector
-svcMgr += McEventSelector("EventSelector")
-svcMgr.EventSelector.RunNumber = int(RunNumber)
-svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-svcMgr.EventSelector.InitialTimeStamp = 0
-svcMgr.EventSelector.TimeStampInterval = 1
-
-##########################################################################
-# don't remove otherwise infinite loop #
-##########################################################################
-
-theApp.EvtMax = 1
-
-###########################################################################
-
-svcMgr.MessageSvc.OutputLevel = WARNING
-svcMgr.MessageSvc.defaultLimit = 10000
-svcMgr.MessageSvc.Format = "% F%20W%S%7W%R%T %0W%M"
-
-svcMgr+=CfgMgr.AthenaEventLoopMgr(OutputLevel = VERBOSE)
-
-from AthenaCommon.AppMgr import theAuditorSvc
-from AthenaCommon.ConfigurableDb import getConfigurable
-theAuditorSvc += getConfigurable("MemStatAuditor")(OutputLevel = DEBUG)
-theAuditorSvc += getConfigurable("ChronoAuditor")()
-theAuditorSvc += getConfigurable("NameAuditor")()
-
-svcMgr.MessageSvc.enableSuppression = False
-
-###########################################################################
diff --git a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
index 66a54d1faf8f5c7b206edae8bcdc3af5a8874eff..7c96c0b0281642823ea28fbfff4b5f0c9841fbe7 100644
--- a/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
+++ b/LArCalorimeter/LArTest/LArCalibTest/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 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( LArCalibTest )
@@ -15,5 +15,4 @@ atlas_add_component( LArCalibTest
# Install files from the package:
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
-atlas_install_joboptions( share/*.py )
diff --git a/LArCalorimeter/LArTest/LArCalibTest/python/HECNoiseD3PDFlags.py b/LArCalorimeter/LArTest/LArCalibTest/python/HECNoiseD3PDFlags.py
deleted file mode 100644
index f3dbca58695cd0dcc4dbd0b308e074d2b43f045b..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTest/LArCalibTest/python/HECNoiseD3PDFlags.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-from AthenaCommon.JobProperties import JobProperty, JobPropertyContainer
-from AthenaCommon.JobProperties import jobproperties
-
-class FileName(JobProperty):
- statusOn = False
- allowedTypes = ['str']
- StoredValue = "HECNoiseD3PD.root"
- pass
-
-
-class HECNoiseD3PDFlags(JobPropertyContainer):
- pass
-
-jobproperties.add_Container(HECNoiseD3PDFlags)
-list_jobproperties = [
- FileName]
-
-for i in list_jobproperties:
- jobproperties.HECNoiseD3PDFlags.add_JobProperty(i)
- pass
-
-del list_jobproperties
-
-HECNoiseflags=jobproperties.HECNoiseD3PDFlags
diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py b/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
deleted file mode 100644
index ef7750f5882bdba3ff91f02f52956fb1e4695a79..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTest/LArCalibTest/share/DumpCaloBadChannels.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#No input file -> use MC event selector
-import AthenaCommon.AtlasUnixGeneratorJob
-
-from AthenaCommon.GlobalFlags import GlobalFlags
-GlobalFlags.DetGeo.set_commis()
-GlobalFlags.Luminosity.set_zero()
-GlobalFlags.DataSource.set_data()
-GlobalFlags.InputFormat.set_bytestream()
-
-from AthenaCommon.JobProperties import jobproperties
-jobproperties.Global.DetDescrVersion = "ATLAS-Comm-00-00-00"
-
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.Calo_setOff()
-DetFlags.ID_setOff()
-DetFlags.Muon_setOff()
-DetFlags.Truth_setOff()
-DetFlags.LVL1_setOff()
-DetFlags.digitize.all_setOff()
-
-#Set up GeoModel (not really needed but crashes without)
-from AtlasGeoModel import SetGeometryVersion
-from AtlasGeoModel import GeoModelInit
-
-#Get identifier mapping
-include( "LArConditionsCommon/LArIdMap_comm_jobOptions.py" )
-include( "LArIdCnv/LArIdCnv_joboptions.py" )
-
-include( "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" )
-include( "CaloConditions/CaloConditions_jobOptions.py" )
-
-#include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-
-theApp.EvtMax = 1
-
-svcMgr.EventSelector.RunNumber = 1
-#svcMgr.EventSelector.EventsPerRun = 1
-svcMgr.EventSelector.FirstEvent = 1
-#svcMgr.EventSelector.InitialTimeStamp = 0
-#svcMgr.EventSelector.TimeStampInterval = 5
-# svcMgr.EventSelector.MaxBadEvents = 0
-
-#
-# Provides ByteStreamInputSvc name of the data file to process in the offline context
-#
-
-## get a handle to the default top-level algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-## get a handle to the ApplicationManager, to the ServiceManager and to the ToolSvc
-from AthenaCommon.AppMgr import (theApp, ServiceMgr as svcMgr,ToolSvc)
-
-theApp.EvtMax=1
-
-## theByteStreamInputSvc=svcMgr.ByteStreamInputSvc
-## svcMgr.EventSelector.Input=["/home/wlampl/LArOFIter/ramp/inputs/daq.Ramp.0029146.No.Streaming.LB0000.EB-EMBA._0001.data"]
-
-
-
-from LArCalibTest.LArCalibTestConf import DumpCaloBadChannels
-theDumper=DumpCaloBadChannels()
-theDumper.FileName="list.txt"
-topSequence+=theDumper;
-
-
-
-svcMgr+=CfgMgr.AthenaEventLoopMgr(OutputLevel = WARNING)
-
-from AthenaCommon.AppMgr import theAuditorSvc
-from AthenaCommon.ConfigurableDb import getConfigurable
-theAuditorSvc += getConfigurable("MemStatAuditor")(OutputLevel = WARNING)
-theAuditorSvc += getConfigurable("ChronoAuditor")()
-theAuditorSvc += getConfigurable("NameAuditor")()
-
-
-###########################################################################
-
-svcMgr.DetectorStore.Dump=True
diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/HECD3PDFilter.py b/LArCalorimeter/LArTest/LArCalibTest/share/HECD3PDFilter.py
deleted file mode 100644
index 456d2e8dd53afe4a74b35016d046b99b7a357958..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTest/LArCalibTest/share/HECD3PDFilter.py
+++ /dev/null
@@ -1,17 +0,0 @@
-include('LArIdCnv/LArIdCnv_joboptions.py')
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from LArCalibTest.HECNoiseD3PDFlags import HECNoiseflags
-from LArCalibTest.HECNoiseD3PDMaker import HECNoiseD3PDMaker
-
-from LArRecUtils.LArRecUtilsConf import LArFlatConditionSvc
-theLArCondSvc=LArFlatConditionSvc(DoSuperCells=False,DoRegularCells=True)
-svcMgr+=theLArCondSvc
-svcMgr.ProxyProviderSvc.ProviderNames += [ "LArFlatConditionSvc" ]
-conddb.addFolder("LAR","/LAR/ElecCalibFlat/Pedestal")
-svcMgr.LArFlatConditionSvc.PedestalInput="/LAR/ElecCalibFlat/Pedestal"
-
-filAlg=HECNoiseD3PDMaker("HECNoiseFilter", NtupleFileName = HECNoiseflags.FileName())
-topSequence += filAlg
-
diff --git a/LArCalorimeter/LArTest/LArCalibTest/share/LArReadHadDMCoeff.py b/LArCalorimeter/LArTest/LArCalibTest/share/LArReadHadDMCoeff.py
deleted file mode 100755
index f0b2c25d2e8770e3c73ec1092229be5a00d68853..0000000000000000000000000000000000000000
--- a/LArCalorimeter/LArTest/LArCalibTest/share/LArReadHadDMCoeff.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from AthenaCommon.DetFlags import DetFlags
-DetFlags.Calo_setOff()
-DetFlags.ID_setOff()
-DetFlags.Muon_setOff()
-DetFlags.Truth_setOff()
-DetFlags.LVL1_setOff()
-DetFlags.digitize.all_setOff()
-
-include( "AthenaCommon/Atlas_Gen.UnixStandardJob.py" )
-
-include( "IdDictDetDescrCnv/IdDictDetDescrCnv_joboptions.py" )
-include( "CaloConditions/CaloConditions_jobOptions.py" )
-
-theApp.Dlls+=["LArCalibTest"]
-theApp.TopAlg+=["LArReadHadDMCoeffFile2"]
-LArReadHadDMCoeff=Algorithm("LArReadHadDMCoeffFile2")
-LArReadHadDMCoeff.HadDMCoeffFileName = "/afs/cern.ch/user/p/pospelov/public/HadDMCoeff2/HadDMCoeff2_11122007.txt"
-LArReadHadDMCoeff.CorrectionKey="HadDMCoeff2"
-
-# Number of events to be processed (default is 10)
-theApp.EvtMax = 1
-
-include( "AthenaPoolCnvSvc/AthenaPool_jobOptions.py" )
-
-include("CaloCondAthenaPool/CaloCondAthenaPool_joboptions.py")
-
-from RegistrationServices.OutputConditionsAlg import OutputConditionsAlg
-myOCA=OutputConditionsAlg("myOCA","HadDMCoeff2_11122007.pool.root")
-#myOCA.ObjectList = ["CaloHadDMCoeff2#HadDMCoeff2"]
-myOCA.ObjectList = ["CaloHadDMCoeff2#HadDMCoeff2#/CALO/HadCalibration/CaloDMCorr2"]
-myOCA.WriteIOV = True
-myOCA.OutputLevel= DEBUG
-myOCA.IOVTagList = [ "CaloHadDMCorr-002-00" ]
-
-# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-MessageSvc = Service( "MessageSvc" )
-MessageSvc.OutputLevel = INFO
-
-#DetectorStore = Service( "DetectorStore" )
-#DetectorStore.Dump = TRUE
-#DetectorStore.OutputLevel = INFO
-
-
-include( "IOVDbSvc/IOVDbSvc_jobOptions.py" )
-IOVDbSvc = Service( "IOVDbSvc" )
-
-IOVDbSvc.dbConnection = "impl=cool;techno=sqlite;schema=myDBHadDMCoeff200.db;X:OFLP200"
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/CMakeLists.txt b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/CMakeLists.txt
index e83f55bd99ec752affebb79558b03ed891b6b005..1389ab1837e842cbf18bf8f23afd3c73ec4dfa31 100644
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/CMakeLists.txt
+++ b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/CMakeLists.txt
@@ -22,6 +22,3 @@ atlas_add_component( MuonTGRecTools
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} MuonTGRecToolsLib AthLinks StoreGateLib GeneratorObjects MuonReadoutGeometry MuonStationIndexLib xAODTracking MuonDetDescrUtils MuonDigitContainer MuonCompetingRIOsOnTrack MuonLayerEvent MuonRIO_OnTrack MuonRecToolInterfaces MuonSimData MuonSimEvent RecoToolInterfaces TrkMaterialOnTrack TrkMeasurementBase TrkParameters TrkRIO_OnTrack MuonCombinedEvent )
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-
diff --git a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/share/MuonTGRec_jobOptions.py b/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/share/MuonTGRec_jobOptions.py
deleted file mode 100644
index f5d240b71a2620cf0bb08160232deb9053dc1d3b..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonReconstruction/MuonRecTools/MuonTGRecTools/share/MuonTGRec_jobOptions.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# muon active/passive geometry setup
-from MuonTrackingGeometry.ConfiguredMuonTrackingGeometry import MuonTrackingGeometryBuilder
-
-# atlas tracking geometry service
-from TrkDetDescrSvc.AtlasTrackingGeometrySvc import AtlasTrackingGeometrySvc
-
-# atlas tracking geometry builder
-from TrkDetDescrTools.TrkDetDescrToolsConf import Trk__GeometryBuilder
-MuonStandAloneGeometryBuilder = Trk__GeometryBuilder( name = "MuonStandAloneGeometryBuilder",
- MuonTrackingGeometryBuilder = MuonTrackingGeometryBuilder,
- InDetTrackingGeometry = False,
- CaloTrackingGeometry = False,
- MuonTrackingGeometry = True )
-
-ToolSvc += MuonStandAloneGeometryBuilder
-print MuonStandAloneGeometryBuilder
-
-# combined tracking geometry options
-from TrkDetDescrSvc.TrkDetDescrSvcConf import TrackingGeometrySvc
-MuonTrackingGeometrySvc = TrackingGeometrySvc( name ="MuonTrackingGeometrySvc",
- TrackingGeometryName = "MuonStandaloneTrackingGeometry",
- GeometryBuilder = MuonStandAloneGeometryBuilder,
- BuildGeometryFromTagInfo = True ,
- AssignMaterialFromCOOL = False)
-
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr += MuonTrackingGeometrySvc
-
-# the navigator Configurable way
-from TrkExTools.TrkExToolsConf import Trk__Navigator
-MuonTGNavigator = Trk__Navigator( name = 'MuonTGNavigator',
- TrackingGeometrySvc = MuonTrackingGeometrySvc
- )
-ToolSvc += MuonTGNavigator
-print MuonTGNavigator
-
-# Configurable way
-from TrkExTools.TrkExToolsConf import Trk__MaterialEffectsUpdator
-MuonTGMaterialUpdator = Trk__MaterialEffectsUpdator( name = "MuonTGMaterialUpdator"
- )
-ToolSvc += MuonTGMaterialUpdator
-print MuonTGMaterialUpdator
-
-from TrkExSTEP_Propagator.TrkExSTEP_PropagatorConf import Trk__STEP_Propagator
-MuonTGPropagator = Trk__STEP_Propagator( name = 'MuonTGPropagator' ,Tolerance=0.0001, MaterialEffects=True,IncludeBgradients=False)
-ToolSvc += MuonTGPropagator
-print MuonTGPropagator
-
-
-# assign it to the Extrapolator
-from TrkExTools.TrkExToolsConf import Trk__Extrapolator
-MuonTGExtrapolator = Trk__Extrapolator( name = 'MuonTGExtrapolator',
- Propagators = [ MuonTGPropagator ],
- Navigator = MuonTGNavigator,
- MaterialEffectsUpdators = [ MuonTGMaterialUpdator ]
- )
-ToolSvc += MuonTGExtrapolator
-print MuonTGExtrapolator
-
-#
-
-
-from MuonTGRecTools.MuonTGRecToolsConf import Muon__MuonTGMeasurementTool
-MuonTGMeasurementTool = Muon__MuonTGMeasurementTool( name = 'MuonTGMeasurementTool',
- TrackingGeometryName = 'MuonStandaloneTrackingGeometry' )
-ToolSvc += MuonTGMeasurementTool
-print MuonTGMeasurementTool
-
-
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/StgcRawDataMonitoring/python/StgcMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/StgcRawDataMonitoring/python/StgcMonitorAlgorithm.py
index f496ce38c6d70c8033c18ad7b07f59bb0beea481..256ef1de30657ab9ad0525851d0791f3b501142a 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/StgcRawDataMonitoring/python/StgcMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/StgcRawDataMonitoring/python/StgcMonitorAlgorithm.py
@@ -20,9 +20,6 @@ def sTgcMonitoringConfig(inputFlags,NSW_PadTrigKey=''):
# The following class will make a sequence, configure algorithms, and link
# them to GenericMonitoringTools
- from AthenaCommon.AppMgr import ServiceMgr
- ServiceMgr.Dump = False
-
from AthenaMonitoring import AthMonitorCfgHelper
helper = AthMonitorCfgHelper(inputFlags, 'StgcAthMonitorCfg')
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
index 45f46ad53195510a7930f3118e9ab1158520daad..1177beafd839efc14af59bfe07b76607b4b58b94 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/python/TgcRawDataMonitorAlgorithm.py
@@ -1441,9 +1441,6 @@ if __name__=='__main__':
flags.lock()
flags.dump()
- from AthenaCommon.AppMgr import ServiceMgr
- ServiceMgr.Dump = False
-
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg = MainServicesCfg(flags)
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
index 9d6a1633ee2ec2a6f165a14a4622887198c1775b..c42d62549768d063544cba7cd3390b2c9a090fe6 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
@@ -1591,11 +1591,11 @@ def MuonTrackConfig(flags, **kwargs):
title='Segments_AllCBMuons_etaphidir;#eta_{dir};#varphi_{dir}',
type='TH2F', path='Segments/CBMuons',
xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.15, ymax=3.15, opt='kAlwaysCreate')
- myGroup.defineHistogram('AllCBLargeSectorZ,AllCBLargeSectorR;Segments_AllCBMuons_rzpos_sectorLarge',
+ myGroup.defineHistogram('AllCBMuonLargeSectorZ,AllCBMuonLargeSectorR;Segments_AllCBMuons_rzpos_sectorLarge',
title='Segments_AllCBMuons_rzpos_sectorLarge;zPos[mm];r[mm]',
type='TH2F', path='Segments/CBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
- myGroup.defineHistogram('AllCBSmallSectorZ,AllCBSmallSectorR;Segments_AllCBMuons_rzpos_sectorSmall',
+ myGroup.defineHistogram('AllCBMuonSmallSectorZ,AllCBMuonSmallSectorR;Segments_AllCBMuons_rzpos_sectorSmall',
title='Segments_AllCBMuons_rzpos_sectorSmall;zPos[mm];r[mm]',
type='TH2F', path='Segments/CBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
@@ -1629,11 +1629,11 @@ def MuonTrackConfig(flags, **kwargs):
title='Segments_AllNonCBMuons_etaphidir;#eta_{dir};#varphi_{dir}',
type='TH2F', path='Segments/NonCBMuons',
xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.15, ymax=3.15, opt='kAlwaysCreate')
- myGroup.defineHistogram('AllNonCBLargeSectorZ,AllNonCBLargeSectorR;Segments_AllNonCBMuons_rzpos_sectorLarge',
+ myGroup.defineHistogram('AllNonCBMuonLargeSectorZ,AllNonCBMuonLargeSectorR;Segments_AllNonCBMuons_rzpos_sectorLarge',
title='Segments_AllNonCBMuons_rzpos_sectorLarge;zPos[mm];r[mm]',
type='TH2F', path='Segments/NonCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
- myGroup.defineHistogram('AllNonCBSmallSectorZ,AllNonCBSmallSectorR;Segments_AllNonCBMuons_rzpos_sectorSmall',
+ myGroup.defineHistogram('AllNonCBMuonSmallSectorZ,AllNonCBMuonSmallSectorR;Segments_AllNonCBMuons_rzpos_sectorSmall',
title='Segments_AllNonCBMuons_rzpos_sectorSmall;zPos[mm];r[mm]',
type='TH2F', path='Segments/NonCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
@@ -1667,11 +1667,11 @@ def MuonTrackConfig(flags, **kwargs):
title='Segments_CBMuons_etaphidir;#eta_{dir};#varphi_{dir}',
type='TH2F', path='Segments/CBMuons',
xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.15, ymax=3.15, opt='kAlwaysCreate')
- myGroup.defineHistogram('CBLargeSectorZ,CBLargeSectorR;Segments_CBMuons_rzpos_sectorLarge',
+ myGroup.defineHistogram('CBMuonLargeSectorZ,CBMuonLargeSectorR;Segments_CBMuons_rzpos_sectorLarge',
title='Segments_CBMuons_rzpos_sectorLarge;zPos[mm];r[mm]',
type='TH2F', path='Segments/CBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
- myGroup.defineHistogram('CBSmallSectorZ,CBSmallSectorR;Segments_CBMuons_rzpos_sectorSmall',
+ myGroup.defineHistogram('CBMuonSmallSectorZ,CBMuonSmallSectorR;Segments_CBMuons_rzpos_sectorSmall',
title='Segments_CBMuons_rzpos_sectorSmall;zPos[mm];r[mm]',
type='TH2F', path='Segments/CBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
@@ -1705,11 +1705,11 @@ def MuonTrackConfig(flags, **kwargs):
title='Segments_NonCBMuons_etaphidir;#eta_{dir};#varphi_{dir}',
type='TH2F', path='Segments/NonCBMuons',
xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.15, ymax=3.15, opt='kAlwaysCreate')
- myGroup.defineHistogram('NonCBLargeSectorZ,NonCBLargeSectorR;Segments_NonCBMuons_rzpos_sectorLarge',
+ myGroup.defineHistogram('NonCBMuonLargeSectorZ,NonCBMuonLargeSectorR;Segments_NonCBMuons_rzpos_sectorLarge',
title='Segments_NonCBMuons_rzpos_sectorLarge;zPos[mm];r[mm]',
type='TH2F', path='Segments/NonCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
- myGroup.defineHistogram('NonCBSmallSectorZ,NonCBSmallSectorR;Segments_NonCBMuons_rzpos_sectorSmall',
+ myGroup.defineHistogram('NonCBMuonSmallSectorZ,NonCBMuonSmallSectorR;Segments_NonCBMuons_rzpos_sectorSmall',
title='Segments_NonCBMuons_rzpos_sectorSmall;zPos[mm];r[mm]',
type='TH2F', path='Segments/NonCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
@@ -1743,11 +1743,11 @@ def MuonTrackConfig(flags, **kwargs):
title='Segments_NoTrig_CBMuons_etaphidir;#eta_{dir};#varphi_{dir}',
type='TH2F', path='Segments/NoTrigCBMuons',
xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.15, ymax=3.15, opt='kAlwaysCreate')
- myGroup.defineHistogram('NoTrigCBLargeSectorZ,NoTrigCBLargeSectorR;Segments_NoTrig_CBMuons_rzpos_sectorLarge',
+ myGroup.defineHistogram('NoTrigCBMuonLargeSectorZ,NoTrigCBMuonLargeSectorR;Segments_NoTrig_CBMuons_rzpos_sectorLarge',
title='Segments_NoTrig_CBMuons_rzpos_sectorLarge;zPos[mm];r[mm]',
type='TH2F', path='Segments/NoTrigCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
- myGroup.defineHistogram('NoTrigCBSmallSectorZ,NoTrigCBSmallSectorR;Segments_NoTrig_CBMuons_rzpos_sectorSmall',
+ myGroup.defineHistogram('NoTrigCBMuonSmallSectorZ,NoTrigCBMuonSmallSectorR;Segments_NoTrig_CBMuons_rzpos_sectorSmall',
title='Segments_NoTrig_CBMuons_rzpos_sectorSmall;zPos[mm];r[mm]',
type='TH2F', path='Segments/NoTrigCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
@@ -1781,11 +1781,11 @@ def MuonTrackConfig(flags, **kwargs):
title='Segments_NoTrig_NonCBMuons_etaphidir;#eta_{dir};#varphi_{dir}',
type='TH2F', path='Segments/NoTrigNonCBMuons',
xbins=27, xmin=-2.7, xmax=2.7, ybins=31, ymin=-3.15, ymax=3.15, opt='kAlwaysCreate')
- myGroup.defineHistogram('NoTrigNonCBLargeSectorZ,NoTrigNonCBLargeSectorR;Segments_NoTrig_NonCBMuons_rzpos_sectorLarge',
+ myGroup.defineHistogram('NoTrigNonCBMuonLargeSectorZ,NoTrigNonCBMuonLargeSectorR;Segments_NoTrig_NonCBMuons_rzpos_sectorLarge',
title='Segments_NoTrig_NonCBMuons_rzpos_sectorLarge;zPos[mm];r[mm]',
type='TH2F', path='Segments/NoTrigNonCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
- myGroup.defineHistogram('NoTrigNonCBSmallSectorZ,NoTrigNonCBSmallSectorR;Segments_NoTrig_NonCBMuons_rzpos_sectorSmall',
+ myGroup.defineHistogram('NoTrigNonCBMuonSmallSectorZ,NoTrigNonCBMuonSmallSectorR;Segments_NoTrig_NonCBMuons_rzpos_sectorSmall',
title='Segments_NoTrig_NonCBMuons_rzpos_sectorSmall;zPos[mm];r[mm]',
type='TH2F', path='Segments/NoTrigNonCBMuons',
xbins=220, xmin=-22000, xmax=22000, ybins=100, ymin=0, ymax=15000, opt='kAlwaysCreate')
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
index 280dcfffb9145df4d0c5f1ea18fb8bf8b4e1074e..b1125d79877388dc762e58c43f0a194cf85483de 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/src/MuonTrackMonitorAlgorithm.cxx
@@ -275,11 +275,11 @@ StatusCode MuonTrackMonitorAlgorithm::analyseLowLevelMuonFeatures(const std::st
auto MuonPtHi = Monitored::Scalar<float>((sIdentifier+"PtHi").c_str(), 0);
auto LumiBlockNumberOfMuonTracks = Monitored::Scalar<float>((sIdentifier+"LumiBlockNumberOfMuonTracks").c_str(), 0);
auto LumiBlockNumberOfSegments = Monitored::Scalar<float>((sIdentifier+"LumiBlockNumberOfSegments").c_str(), 0);
- auto MuonSector = Monitored::Scalar<float>((sIdentifier+"MuonSector").c_str(), 0);
- auto MuonCIndex = Monitored::Scalar<float>((sIdentifier+"MuonCIndex").c_str(), 0);
- auto MuonEta1 = Monitored::Scalar<float>((sIdentifier+"MuonEta1All").c_str(), 0);
- auto MuonPhi1 = Monitored::Scalar<float>((sIdentifier+"MuonPhi1All").c_str(), 0);
- auto MuonLumiBlock = Monitored::Scalar<float>((sIdentifier+"MuonLumiBlock").c_str(), 0);
+ auto MuonSector = Monitored::Scalar<float>((sIdentifier+"Sector").c_str(), 0);
+ auto MuonCIndex = Monitored::Scalar<float>((sIdentifier+"CIndex").c_str(), 0);
+ auto MuonEta1 = Monitored::Scalar<float>((sIdentifier+"Eta1All").c_str(), 0);
+ auto MuonPhi1 = Monitored::Scalar<float>((sIdentifier+"Phi1All").c_str(), 0);
+ auto MuonLumiBlock = Monitored::Scalar<float>((sIdentifier+"LumiBlock").c_str(), 0);
/// Loop over all muons
for(const auto muon : Muons) {
@@ -420,12 +420,12 @@ StatusCode MuonTrackMonitorAlgorithm::analyseCombinedTracks(const xAOD::MuonCon
fill(tool, NMuons, NMuonsTrig, NMuonsTrigCB, NMuonsTrigNonCB, NMuonsNoTrigCB, NMuonsNoTrigNonCB);
/// Fill low level Muon Information for each Muon
- ATH_CHECK (analyseLowLevelMuonFeatures("AllCB", vecAllCombinedMuons, evt) );
- ATH_CHECK (analyseLowLevelMuonFeatures("AllNonCB", vecAllNonCombinedMuons, evt) );
- ATH_CHECK (analyseLowLevelMuonFeatures("CB", vecCombinedMuons, evt) );
- ATH_CHECK (analyseLowLevelMuonFeatures("NonCB", vecNonCombinedMuons, evt) );
- ATH_CHECK (analyseLowLevelMuonFeatures("NoTrigCB", vecNoTrigCombinedMuons, evt) );
- ATH_CHECK (analyseLowLevelMuonFeatures("NoTrigNonCB", vecNoTrigNonCombinedMuons, evt) );
+ ATH_CHECK (analyseLowLevelMuonFeatures("AllCBMuon", vecAllCombinedMuons, evt) );
+ ATH_CHECK (analyseLowLevelMuonFeatures("AllNonCBMuon", vecAllNonCombinedMuons, evt) );
+ ATH_CHECK (analyseLowLevelMuonFeatures("CBMuon", vecCombinedMuons, evt) );
+ ATH_CHECK (analyseLowLevelMuonFeatures("NonCBMuon", vecNonCombinedMuons, evt) );
+ ATH_CHECK (analyseLowLevelMuonFeatures("NoTrigCBMuon", vecNoTrigCombinedMuons, evt) );
+ ATH_CHECK (analyseLowLevelMuonFeatures("NoTrigNonCBMuon", vecNoTrigNonCombinedMuons, evt) );
/// Fill the relevant Muon Information for each Muon
ATH_CHECK (FillMuonInformation("AllCB", vecAllCombinedMuons, pvtx, evt) );
diff --git a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/CMakeLists.txt b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/CMakeLists.txt
index 27589c960a943ada5b6906f4eabc9d4d11cd7a78..ac5330bb6fcfa7ab26b3ef6177d6531c5fdd6b0f 100644
--- a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/CMakeLists.txt
+++ b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/CMakeLists.txt
@@ -11,6 +11,3 @@ atlas_add_component( MuonSimHitToPrdTest
src/components/*.cxx
LINK_LIBRARIES AthenaBaseComps EventPrimitives GeoAdaptors Identifier GaudiKernel GeneratorObjects MuonReadoutGeometry MuonDigitContainer MuonIdHelpersLib MuonRDO MuonPrepRawData MuonSimEvent )
-# Install files from the package:
-atlas_install_joboptions( share/*.py )
-
diff --git a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/runNewCablingValidation.sh b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/runNewCablingValidation.sh
deleted file mode 100644
index 9d956595912557356e80cc1846e593be0fa26653..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/runNewCablingValidation.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-#ln -sf /afs/cern.ch/work/s/stefspa/atlas/sw/rpc/samples/rel17singleMuForCabling/geantinosHitsRel27_25k.pool.root ./HITS.pool.root
-ln -sf /afs/cern.ch/work/s/stefspa/atlas/sw/rpc/samples/rel17singleMuForCabling/SimulatedHitsFeet_25k.pool.root ./HITS.pool.root
-
-#Digi_trf.py inputHitsFile=HITS.pool.root maxEvents=100 geometryVersion=ATLAS-GEO-20-00-01 conditionsTag=OFLCOND-MC12-SDR-06 preExec='from AthenaCommon.DetFlags import DetFlags;DetFlags.ID_setOff();DetFlags.Calo_setOff();DetFlags.Muon_setOn();DetFlags.MDT_setOff();DetFlags.CSC_setOff();DetFlags.TGC_setOff();DetFlags.RPC_setOn();DetFlags.digitize.MDT_setOff();DetFlags.digitize.TGC_setOff();DetFlags.digitize.RPC_setOn();DetFlags.digitize.CSC_setOff();DetFlags.Truth_setOn()' postExec='from AthenaCommon.AppMgr import ServiceMgr as svcMgr;svcMgr.GeoModelSvc.IgnoreTagDifference=True' postInclude=NtupleFragmentTestCabOnly.py
-##
-Digi_trf.py inputHitsFile=HITS.pool.root maxEvents=-1 geometryVersion=ATLAS-GEO-20-00-01 conditionsTag=OFLCOND-MC12-SDR-06 preExec='from AthenaCommon.DetFlags import DetFlags;DetFlags.ID_setOff();DetFlags.Calo_setOff();DetFlags.Muon_setOn();DetFlags.MDT_setOff();DetFlags.CSC_setOff();DetFlags.TGC_setOff();DetFlags.RPC_setOn();DetFlags.digitize.MDT_setOff();DetFlags.digitize.TGC_setOff();DetFlags.digitize.RPC_setOn();DetFlags.digitize.CSC_setOff();DetFlags.Truth_setOn()' postExec='from AthenaCommon.AppMgr import ServiceMgr as svcMgr;svcMgr.GeoModelSvc.IgnoreTagDifference=True' postInclude=NtupleFragmentTestCabOnly.py
diff --git a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/setupRpcTestNtuple.py b/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/setupRpcTestNtuple.py
deleted file mode 100644
index c0fc38643932019a3ba91554080d9cb68e7e1769..0000000000000000000000000000000000000000
--- a/MuonSpectrometer/MuonValidation/MuonSimHitToPrdTest/share/setupRpcTestNtuple.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
-conddb.addOverride("/MDT/RTBLOB","MDTRT_Sim-R3SYM-01")
-conddb.addOverride("/MDT/T0BLOB","MDTT0_Sim-R3SYM-01")
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-from MuonRdoToPrepData.MuonRdoToPrepDataConf import RpcRdoToRpcPrepData
-RpcRdoToRpcPrepData = RpcRdoToRpcPrepData()
-RpcRdoToRpcPrepData.PrintPrepData = False
-topSequence+=RpcRdoToRpcPrepData
-
-from MuonSimHitToPrdTest.MuonSimHitToPrdTestConf import RPC_SimHitToPrdCBNTAlgo
-RPC_SimHitToPrdCBNTAlgo = RPC_SimHitToPrdCBNTAlgo()
-topSequence += RPC_SimHitToPrdCBNTAlgo
-RPC_SimHitToPrdCBNTAlgo.OutputLevel=INFO
-RPC_SimHitToPrdCBNTAlgo.doRPCRDO=True
-RPC_SimHitToPrdCBNTAlgo.doRPCPrep=True
-theApp.HistogramPersistency = "ROOT"
-from AthenaCommon.AppMgr import ServiceMgr
-ServiceMgr.NTupleSvc.Output = [ "FILE DATAFILE='RPCntuple.root' OPT='NEW'" ]
-
-
-ServiceMgr.MessageSvc.defaultLimit=99999999
-ServiceMgr.MessageSvc.Format = "% F%50W%S%7W%R%T %0W%M"
\ No newline at end of file
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/CMakeLists.txt b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/CMakeLists.txt
index d1afd0e5c9119ab3725fa5d344505856227dfe18..a933c9ba677f884cbf99f6786045306aada9f3e7 100644
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/CMakeLists.txt
+++ b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
# The name of the package:
atlas_subdir( AssociationUtils )
@@ -70,5 +70,4 @@ if( XAOD_STANDALONE )
endif()
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/share/OverlapRemovalTest_jobOptions.py b/PhysicsAnalysis/AnalysisCommon/AssociationUtils/share/OverlapRemovalTest_jobOptions.py
deleted file mode 100644
index 6e7dc532c2ceb523bbad0767e59d6ee8f5cedbf6..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/AnalysisCommon/AssociationUtils/share/OverlapRemovalTest_jobOptions.py
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# This job options file defines an Athena testing job for the OverlapRemovalTool
-#
-
-import os
-
-# Specify input file
-input_file = os.getenv('ASG_TEST_FILE_MC', '/afs/cern.ch/user/a/asgbase/patspace/xAODs/r6630/mc15_13TeV.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.recon.AOD.e3698_s2608_s2183_r6630_tid05352803_00/AOD.05352803._000242.pool.root.1')
-
-# Setup input
-import AthenaPoolCnvSvc.ReadAthenaPool
-ServiceMgr.EventSelector.InputCollections = [input_file]
-theApp.EvtMax = 10
-
-# Access the algorithm sequence
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Configure the tools using the helper module
-from AssociationUtils.config import recommended_tools
-bJetLabel = 'isBJet'
-orTool = recommended_tools(bJetLabel=bJetLabel)
-
-# Configure the test algorithm
-from AssociationUtils.AssociationUtilsConf import OverlapRemovalTestAlg
-alg = OverlapRemovalTestAlg('OverlapRemovalTestAlg',
- OverlapRemovalTool=orTool,
- BJetLabel=bJetLabel)
-
-# Add to the alg sequence
-theJob += alg
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/share/CalibrationDataUpdater_jobOptions.py b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/share/CalibrationDataUpdater_jobOptions.py
deleted file mode 100644
index d4bfc3c38c6fb6fb64ac5211f44e607f53c09017..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/CalibrationDataInterface/share/CalibrationDataUpdater_jobOptions.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#-----------------------------------------------------------------------------
-# Athena imports
-#-----------------------------------------------------------------------------
-from AthenaCommon.Constants import *
-from AthenaCommon.AppMgr import theApp
-from AthenaCommon.AppMgr import ServiceMgr
-#import AthenaPoolCnvSvc.ReadAthenaPool
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-
-#-----------------------------------------------------------------------------
-# Message Service
-#-----------------------------------------------------------------------------
-# Set output level threshold (2=DEBUG, 3=INFO, 4=WARNING, 5=ERROR, 6=FATAL )
-ServiceMgr.MessageSvc.OutputLevel = WARNING
-#import AthenaServices
-#AthenaServices.AthenaServicesConf.AthenaEventLoopMgr.OutputLevel = WARNING
-
-
-#-----------------------------------------------------------------------------
-# Input Datasets
-#-----------------------------------------------------------------------------
-#ServiceMgr.EventSelector.InputCollections = [ ]
-theApp.EvtMax = 0 # -1 means all events
-
-
-#-----------------------------------------------------------------------------
-# Algorithms
-#-----------------------------------------------------------------------------
-from CalibrationDataInterface.CalibrationDataInterfaceConf import Analysis__CalibrationDataUpdater as updater
-
-tagname = 'MyCalibV1'
-flavours = [ 'B', 'C', 'Light' ]
-folder = 'Cuts'
-jets = [ 'Antikt4H1Tower', 'Antikt4H1Topo', 'Antikt4LCTopo' ]
-OPs = [ 'Loose', 'Medium', 'Tight' ]
-taggers = [ 'SV0' ]
-inputcalibration = 'dummy'
-outputcalibration = 'mydummy'
-names = [ ]
-for jet in jets:
- for tagger in taggers:
- for OP in OPs:
- for flavour in flavours:
- inn = jet + '/' + tagger + '/' + OP + '/' + inputcalibration + '_Eff'
- out = tagger + '/' + jet + '/' + OP + '/' + flavour + '/' + outputcalibration + '_Eff'
- name = inn + '->' + out
- names.append(name)
- inn = jet + '/' + tagger + '/' + OP + '/' + inputcalibration + '_SF'
- out = tagger + '/' + jet + '/' + OP + '/' + flavour + '/' + outputcalibration + '_SF'
- name = inn + '->' + out
- names.append(name)
-
-theJob += updater('CalibUpdater',
- inputRootFile = 'perfcalibrations.root',
- DbRootFile = 'BTaggingPerformance'+tagname+'_'+folder+'.root',
- paramNames = names,
- overrideDefaults = False,
- OutputLevel = INFO)
-
-
-print theJob
-
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/CMakeLists.txt b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/CMakeLists.txt
index 20337574c3395e7a275b815806aa327584ed6fef..3b0284ea4dcdd0af8d400524bfa2d78698cf36b7 100644
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/CMakeLists.txt
+++ b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/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( xAODBTaggingEfficiency )
@@ -81,5 +81,4 @@ if( XAOD_STANDALONE )
endif()
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_runtime( share/*.root share/*.xml share/*.env )
diff --git a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/share/xAODBTaggingEfficiency_jobOptions.py b/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/share/xAODBTaggingEfficiency_jobOptions.py
deleted file mode 100644
index cd611970b63f7c2b49f920ad17f749ca41b64f60..0000000000000000000000000000000000000000
--- a/PhysicsAnalysis/JetTagging/JetTagPerformanceCalibration/xAODBTaggingEfficiency/share/xAODBTaggingEfficiency_jobOptions.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id$
-
-# copied from CPToolTests
-# filename taken from DevelopingCPToolsForxAOD twiki page (as of 9/05/14)
-FNAME= "/afs/cern.ch/work/k/krasznaa/public/xAOD/19.0.X_rel_4/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.AOD.19.0.X_rel_4.pool.root "
-
-
-import AthenaPoolCnvSvc.ReadAthenaPool
-ServiceMgr.EventSelector.InputCollections = [ FNAME ]
-
-# Access the algorithm sequence:
-from AthenaCommon.AlgSequence import AlgSequence
-theJob = AlgSequence()
-
-# Add the test algorithm:
-from xAODBTaggingEfficiency.xAODBTaggingEfficiencyConf import BTagToolTester
-alg = BTagToolTester()
-alg.BTaggingEfficiencyTool.TaggerName = 'MV1'
-alg.BTaggingEfficiencyTool.OperatingPoint = '0_8119'
-alg.BTaggingEfficiencyTool.JetAuthor = 'AntiKt4TopoEMJVF'
-alg.BTaggingEfficiencyTool.ScaleFactorFileName = 'testCDI.root'
-alg.BTaggingEfficiencyTool.EfficiencyFileName='testCDI.root'
-theJob += alg
-
-# Do some additional tweaking:
-from AthenaCommon.AppMgr import theApp
-theApp.EvtMax = 10
-ServiceMgr.MessageSvc.OutputLevel = INFO
-ServiceMgr.MessageSvc.defaultLimit = 1000000
diff --git a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
index f24887815d426b384c01d034878ae8fb71600271..add06c9f63daf1ce68f5730f1a13e2409b111084 100644
--- a/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
+++ b/Tracking/TrkFitter/TrkGaussianSumFilter/src/GaussianSumFitter.cxx
@@ -604,8 +604,13 @@ Trk::GaussianSumFitter::makePerigee(
pattern(0);
pattern.set(Trk::TrackStateOnSurface::Perigee);
+ if(std::abs(combinedPerigee->position().z())>10000.) {
+ ATH_MSG_WARNING("Pathological perigee well outside of detector!! Returning null instead");
+ return {};
+ }
+
if (std::abs(combinedPerigee->parameters()[Trk::qOverP]) > 1e8) {
- ATH_MSG_ERROR(
+ ATH_MSG_WARNING(
"makePerigee() about to return with 0 momentum!! Returning null instead");
return {};
}
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimAlgorithms/CMakeLists.txt b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimAlgorithms/CMakeLists.txt
index 2fc66b217ec3ca4a605221583123821a14c846a2..a50f75e3b425ebbb72ee5b88171cdb66956e2580 100644
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimAlgorithms/CMakeLists.txt
+++ b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimAlgorithms/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 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( FPGATrackSimAlgorithms )
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/CMakeLists.txt b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/CMakeLists.txt
index 665c95ecff7e012d4e55c912e9f39c58bb3799b7..10692ef6c155c6e0d1658bf5b2d6e29732e57958 100644
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/CMakeLists.txt
+++ b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/CMakeLists.txt
@@ -18,10 +18,7 @@ atlas_add_library( FPGATrackSimBanksLib
# Declare Gaudi component(s) in the package
atlas_add_component( FPGATrackSimBanks
src/components/*.cxx
- LINK_LIBRARIES FPGATrackSimBanksLib )
-
-# Install files from the package and run flake8 test:
-atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} --extend-extensions=ATL900,ATL901 )
+ LINK_LIBRARIES FPGATrackSimBanksLib )
#atlas_add_test( FPGATrackSimFitConstantBank_test
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/python/FPGATrackSimBankConfig.py b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/python/FPGATrackSimBankConfig.py
deleted file mode 100644
index 26d338f1434cb7321854652b05b60e175f6eeeae..0000000000000000000000000000000000000000
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/python/FPGATrackSimBankConfig.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-
-'''
-@author Riley Xu - rixu@cern.ch
-@date Feb 6th 2020
-@brief This file declares functions to make and configure the bank service.
-'''
-
-from FPGATrackSimBanks.FPGATrackSimBanksConf import FPGATrackSimBankSvc
-from FPGATrackSimConfTools import FPGATrackSimConfigCompInit
-
-import os
-
-def addBankSvc(mapTag, bankTag):
- '''
- Creates and returns a FPGATrackSimBankSvc object, configured with the supplied tag.
-
- This function adds the returned bank service
- instance to SvcMgr.
- '''
-
- from AthenaCommon.AppMgr import ServiceMgr
- MyFPGATrackSimBankSvc = FPGATrackSimBankSvc()
-
- _applyTag(MyFPGATrackSimBankSvc, mapTag, bankTag)
-
- if "EOS_MGM_URL_FPGATrackSim" in os.environ: # Set by the gitlab yaml
- _applyGitlabOverrides(MyFPGATrackSimBankSvc)
-
- ServiceMgr += MyFPGATrackSimBankSvc
-
- return MyFPGATrackSimBankSvc
-
-
-def _applyTag(MyFPGATrackSimBankSvc, mapTag, bankTag):
- '''
- Helper function that sets the filepaths of the BankSvc using the supplied tag.
- '''
-
- bankDir = bankTag['bankDir']
-
- filepaths = [
- 'constants_1st',
- 'constants_2nd',
- 'sectorBank_1st',
- 'sectorBank_2nd',
- 'sectorSlices'
- ]
- filelists = [
- 'constantsNoGuess_1st',
- 'constantsNoGuess_2nd',
- ]
-
- formats = {
- 'region': FPGATrackSimConfigCompInit.getRegionIndex(mapTag),
- 'regionName': mapTag['regionNames'][FPGATrackSimConfigCompInit.getRegionIndex(mapTag)],
- }
-
- for param in filepaths:
- if bankTag['formatted']:
- value = (bankDir + bankTag[param]).format(**formats)
- else:
- value = bankDir + bankTag[param]
- setattr(MyFPGATrackSimBankSvc, param, value)
-
- for param in filelists:
- if bankTag['formatted']:
- value = [(bankDir + path).format(**formats) for path in bankTag[param]]
- else:
- value = [bankDir + path for path in bankTag[param]]
- setattr(MyFPGATrackSimBankSvc, param, value)
-
-
-
-def _applyGitlabOverrides(MyFPGATrackSimBankSvc):
- '''
- Alters the filepaths for running on Gitlab CI
- '''
-
- # The non-root files need to be copied to the pwd
- for param in ['sectorBank_1st', 'sectorBank_2nd', 'constants_1st', 'constants_2nd']:
- filepath = getattr(MyFPGATrackSimBankSvc, param)
- newpath = os.path.basename(filepath)
-
- # This doesn't work for some reason, gets a file not found
- #import subprocess
- #subprocess.call(['xrdcp', '-f', "'" + os.environ["EOS_MGM_URL_FPGATrackSim"] + filepath + "'", "'" + newpath + "'"])
- setattr(MyFPGATrackSimBankSvc, param, newpath)
-
- for param in ['sectorSlices']:
- setattr(MyFPGATrackSimBankSvc, param, os.environ["EOS_MGM_URL_FPGATrackSim"] + getattr(MyFPGATrackSimBankSvc, param))
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/python/__init__.py b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/python/__init__.py
deleted file mode 100644
index 75ab742d2d963261339950bf83197e0b96381612..0000000000000000000000000000000000000000
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimBanks/python/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-
-__author__ = "Jahred Adelman, FPGATrackSim team"
-
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/CMakeLists.txt b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/CMakeLists.txt
index 424e6a29997661c879fe3b3dc377d83829dfe036..0d04d24e694e1dc348c8f60b389dc2f67052f24b 100755
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/CMakeLists.txt
+++ b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/CMakeLists.txt
@@ -35,10 +35,6 @@ atlas_add_test( FPGATrackSimRegionSlices_test
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} FPGATrackSimConfToolsLib )
-atlas_add_test( FPGATrackSimEventSelectionSvc_test
- SCRIPT python -m FPGATrackSimConfTools.FPGATrackSimConfigCompInit
- POST_EXEC_SCRIPT noerror.sh )
-
atlas_add_test( FPGATrackSimConfigFlags_test
SCRIPT python -m FPGATrackSimConfTools.FPGATrackSimConfigFlags
POST_EXEC_SCRIPT noerror.sh )
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/python/FPGATrackSimConfigCompInit.py b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/python/FPGATrackSimConfigCompInit.py
deleted file mode 100644
index a88cdecd9fc2b5cf31a8320c87200ae1b166a701..0000000000000000000000000000000000000000
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimConfTools/python/FPGATrackSimConfigCompInit.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-'''
-@author Riley Xu - riley.xu@cern.ch
-@date Feb 23rd 2021
-@brief This file declares functions to configure FPGATrackSimConfig components
-'''
-
-def getRegionIndex(map_tag):
- '''
- Note the region member of the tag is a string
- '''
- try:
- return int(map_tag['region'])
- except ValueError:
- return map_tag['regionNames'].index(map_tag['region'])
-
-def getRegionName(map_tag):
- return map_tag['regionNames'][getRegionIndex(map_tag)]
-
-def getSampleType(map_tag):
- return map_tag['sampleType']
-
-def getWithPU(map_tag):
- return map_tag['withPU']
-
-def addEvtSelSvc(map_tag,name=""):
- '''
- Creates and returns a FPGATrackSimEventSelectionSvc object, configured with the specified tags.
- This function adds the returned map service instance to SvcMgr.
- '''
- from AthenaCommon.Constants import INFO
-
- import FPGATrackSimConfTools.FPGATrackSimConfToolsConf as Config
- if name :
- ES = Config.FPGATrackSimEventSelectionSvc(name)
- else :
- ES = Config.FPGATrackSimEventSelectionSvc()
- ES.regionID = getRegionIndex(map_tag)
- ES.regions = map_tag['slices']
- ES.sampleType = getSampleType(map_tag)
- ES.withPU = getWithPU(map_tag)
- ES.OutputLevel=INFO
-
- from AthenaCommon.AppMgr import ServiceMgr
- #global ServiceMgr
- ServiceMgr += ES
- return ES
-
-
-if __name__=='__main__':
- from AthenaCommon.Logging import log
- from AthenaCommon.Constants import DEBUG
- log.setLevel(DEBUG)
-
- import FPGATrackSimConfTools.FPGATrackSimTagConfig as FPGATrackSimTagConfig
- tags = FPGATrackSimTagConfig.getTags(stage='bank')
- map_tag = tags['map']
- ES = addEvtSelSvc(map_tag)
- ES.sampleType="singleMuons"
-
- print(ES)
-
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimInput/CMakeLists.txt b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimInput/CMakeLists.txt
index b3704ce005b8a0f3c31fdb3fef9b579b27045843..a765636ad2bc5eb5c00c6de035dc46eb444b62db 100644
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimInput/CMakeLists.txt
+++ b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimInput/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
atlas_subdir( FPGATrackSimInput )
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/CMakeLists.txt b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/CMakeLists.txt
index 27f021534d67d5774d5bdb11e21eb250ac816a7f..5d17a56fe648971021ecba63312b22521e8d6a14 100644
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/CMakeLists.txt
+++ b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/CMakeLists.txt
@@ -23,9 +23,6 @@ atlas_add_component(
LINK_LIBRARIES FPGATrackSimMapsLib FPGATrackSimConfToolsLib
)
-# Install files from the package:
-atlas_install_python_modules( python/*.py )
-
# Tests in the package:
atlas_add_test( FPGATrackSimPlaneMap
SOURCES test/FPGATrackSimPlaneMap_test.cxx
diff --git a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/python/FPGATrackSimMapConfig.py b/Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/python/FPGATrackSimMapConfig.py
deleted file mode 100644
index fd8836316299556700c23e7df81ec76d706142ab..0000000000000000000000000000000000000000
--- a/Trigger/EFTracking/FPGATrackSim/FPGATrackSimMaps/python/FPGATrackSimMapConfig.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
-'''
-@author Riley Xu - rixu@cern.ch
-@date March 3rd 2020
-@brief This file declares functions to make and configure the map service.
-'''
-
-import os
-
-from PyJobTransforms.trfUtils import findFile
-from PyJobTransforms.trfLogger import msg
-
-from FPGATrackSimMaps.FPGATrackSimMapsConf import FPGATrackSimMappingSvc, FPGATrackSimHitFilteringTool
-import FPGATrackSimConfTools.FPGATrackSimConfigCompInit as FPGATrackSimConfig
-
-def findFileWithTest(datapath,filename):
- retv = findFile(datapath,filename)
- if retv is None:
- msg.info(datapath)
- raise OSError(2, "Couldn't find file", filename)
- return retv
-
-def addMapSvc(tag):
- '''
- Creates and returns a FPGATrackSimMapSvc object, configured with the specified tag.
-
- This function adds the returned map service instance to SvcMgr, and ALSO ADDS
- the EventSelectionSvc, which the map svc depends on
- '''
- FPGATrackSimConfig.addEvtSelSvc(tag)
-
- MyFPGATrackSimMappingSvc = FPGATrackSimMappingSvc()
-
- filepaths = [
- 'pmap',
- 'rmap',
- 'modulemap',
- 'subrmap',
- 'NNmap',
- ]
-
- formats = {
- 'region': FPGATrackSimConfig.getRegionIndex(tag),
- 'regionName': FPGATrackSimConfig.getRegionName(tag),
- }
-
- for param in filepaths:
- if tag['formatted']:
- path = tag[param].format(**formats)
- else:
- path = tag[param]
- setattr(MyFPGATrackSimMappingSvc, param, path)
-
- MyFPGATrackSimMappingSvc.mappingType = tag['mappingType']
- MyFPGATrackSimMappingSvc.layerOverride = tag['layerOverride']
-
- from AthenaCommon.AppMgr import ServiceMgr
- ServiceMgr += MyFPGATrackSimMappingSvc
-
- return MyFPGATrackSimMappingSvc
-
-
-
-def addHitFilteringTool(tag):
- '''
- Creates and adds the hit filtering tool to the tool svc
- '''
-
- HitFilteringTool = FPGATrackSimHitFilteringTool()
-
- for param in HitFilteringTool.__slots__:
- if param in tag:
- setattr(HitFilteringTool, param, tag[param])
-
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HitFilteringTool
-
- return HitFilteringTool
-
-
-
-def getNSubregions(tag):
- formats = {
- 'region': FPGATrackSimConfig.getRegionIndex(tag),
- 'regionName': FPGATrackSimConfig.getRegionName(tag),
- }
-
- if tag['formatted']:
- path = tag['subrmap'].format(**formats)
- else:
- path = tag['subrmap']
- path = findFile(os.environ['DATAPATH'], path)
-
- with open(path, 'r') as f:
- fields = f.readline().split()
- assert(fields[0] == 'towers')
- return int(fields[1])
-
-
-def _applyTag(MyFPGATrackSimMappingSvc, tag):
- '''
- Helper function that sets the filepaths of the MapSvc using the supplied tag
- '''
diff --git a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py
index 5a68618a3d5cd17c5d109c3ad9e59467da2867be..e1ef1c195faef39987ba5b8b52ac8a444a6e587c 100644
--- a/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py
+++ b/Trigger/TrigAlgorithms/TrigPartialEventBuilding/python/TrigPartialEventBuildingConfig.py
@@ -42,8 +42,7 @@ def getRegSelTools(flags, detNames):
if det not in _regSelToDetFlagMap:
raise RuntimeError('Cannot add detector "' + det + '" because it is not in _regSelToDetFlagMap')
detFlag = 'Enable'+_regSelToDetFlagMap[det]
- detFlagCont = getattr(flags, 'Detector')
- detEnabled = getattr(detFlagCont, detFlag)
+ detEnabled = getattr(flags.Detector, detFlag)
if not detEnabled:
_log.debug('addRegSelDets: skip adding detector "%s" because the flag Detector.%s is False', det, detFlag)
continue
diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py
index 26fbed9bde3502cee1dbb2b6aa59834e7d795004..de8d380221fc861527a817ba432182b03df77202 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/TrigCaloDataAccessConfig.py
@@ -128,15 +128,15 @@ if __name__ == "__main__":
mon.defineHistogram("TIME_locking_LAr_RoI",
path="EXPERT",
title="Time spent in unlocking the LAr collection",
- xbins=100, xmin=0, xmax=100 ),
+ xbins=100, xmin=0, xmax=100 )
mon.defineHistogram("roiROBs_LAr",
path="EXPERT",
title="Number of ROBs unpacked in RoI requests",
- xbins=20, xmin=0, xmax=20 ),
+ xbins=20, xmin=0, xmax=20 )
mon.defineHistogram("TIME_locking_LAr_FullDet",
path="EXPERT",
title="Time spent in unlocking the LAr collection",
- xbins=100, xmin=0, xmax=100 ),
+ xbins=100, xmin=0, xmax=100 )
mon.defineHistogram("roiEta_LAr,roiPhi_LAr",
type="TH2F",
path="EXPERT",
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt b/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt
index d1eb7d971837c0ea4ca7736ed244640e38dab94a..b0e879348844170ac0630e968e4da66d23d76ca2 100644
--- a/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/CMakeLists.txt
@@ -27,4 +27,4 @@ atlas_add_dictionary( EnhancedBiasWeighterDict
LINK_LIBRARIES EnhancedBiasWeighterLib )
# Install files from the package:
-atlas_install_scripts( share/RunEBWeightsComputation.py share/ExtractEBRunDetails.py share/MergeEBWeightsFiles.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
+atlas_install_scripts( share/RunEBWeightsComputation.py share/ExtractEBRunDetails.py share/MergeEBWeightsFiles.py share/ValidateEBMenu.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeightCompAlg.cxx b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeightCompAlg.cxx
index 8d872aec5254aafd2947b463c1654a33ed917da7..68fd1b5690855f4509c626850fe82fd58142d0f4 100644
--- a/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeightCompAlg.cxx
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/Root/EnhancedBiasWeightCompAlg.cxx
@@ -36,6 +36,7 @@ StatusCode EnhancedBiasWeightCompAlg::start() {
m_EBChainIds = std::vector<HLT::Identifier>();
m_EBChainIds = std::vector<HLT::Identifier>();
for (const TrigConf::Chain& chain : *hltMenuHandle){
+ if (chain.name() == "HLT_noalg_eb_L1All") continue; // this is a special chain
std::vector<std::string> streams = chain.streams();
if (std::find(streams.begin(), streams.end(), "EnhancedBias") != streams.end()){
auto chainId = HLT::Identifier(chain.name());
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/share/RunEBWeightsComputation.py b/Trigger/TrigCost/EnhancedBiasWeighter/share/RunEBWeightsComputation.py
index d58aa00d5b0395d20a2cda653b84c2d71a119d6f..ddf9fad0d3cafa2e66c8866f625240c3fcb6e73c 100755
--- a/Trigger/TrigCost/EnhancedBiasWeighter/share/RunEBWeightsComputation.py
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/share/RunEBWeightsComputation.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
from AthenaConfiguration.ComponentFactory import CompFactory
@@ -16,7 +16,7 @@ def ebComputingAlg(flags, itemsMap = {}):
ebAlg = CompFactory.EnhancedBiasWeightCompAlg()
ebAlg.ChainToItemMap = itemsMap
- ebAlg.OutputLevel = ConfigFlags.Exec.OutputLevel
+ ebAlg.OutputLevel = flags.Exec.OutputLevel
acc.addEventAlgo(ebAlg)
return acc
@@ -58,28 +58,33 @@ if __name__=='__main__':
log.setLevel(args.loglevel)
- from AthenaConfiguration.AllConfigFlags import ConfigFlags
- ConfigFlags.fillFromArgs(args.flags)
- ConfigFlags.Trigger.triggerConfig = 'DB'
- ConfigFlags.Exec.OutputLevel = args.loglevel
- ConfigFlags.Trigger.doNavigationSlimming = False
- ConfigFlags.lock()
+ # Set the Athena configuration flags
+ from AthenaConfiguration.AllConfigFlags import initConfigFlags
+ from AthenaConfiguration.TestDefaults import defaultGeometryTags
+ # verbosity defined in Control/AthenaCommon/python/Constants.py
+ flags = initConfigFlags()
+ flags.fillFromArgs(args.flags)
+ flags.Trigger.triggerConfig = 'DB'
+ flags.GeoModel.AtlasVersion = defaultGeometryTags.RUN3
+ flags.Exec.OutputLevel = args.loglevel
+ flags.Trigger.doNavigationSlimming = False
+ flags.lock()
# Initialize configuration object, add accumulator, merge, and run.
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
- cfg = MainServicesCfg(ConfigFlags)
+ cfg = MainServicesCfg(flags)
- isRunningFromAOD = True if len(ConfigFlags.Input.Collections) else False
+ isRunningFromAOD = True if len(flags.Input.Collections) else False
if isRunningFromAOD:
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
- cfg.merge(PoolReadCfg(ConfigFlags))
+ cfg.merge(PoolReadCfg(flags))
else:
from TriggerJobOpts.TriggerRecoConfig import TriggerRecoCfg
- cfg.merge(TriggerRecoCfg(ConfigFlags))
+ cfg.merge(TriggerRecoCfg(flags))
- configKeys = getConfigKeys(ConfigFlags.Input.Files)
+ configKeys = getConfigKeys(flags.Input.Files)
itemsMap = {} if args.skipHLTSeeds else readHLTSeeds(smk = configKeys["SMK"], db = configKeys["DB"])
- cfg.merge(ebComputingAlg(ConfigFlags, itemsMap))
+ cfg.merge(ebComputingAlg(flags, itemsMap))
eventLoop = CompFactory.AthenaEventLoopMgr()
eventLoop.EventPrintoutInterval = 1000
diff --git a/Trigger/TrigCost/EnhancedBiasWeighter/share/ValidateEBMenu.py b/Trigger/TrigCost/EnhancedBiasWeighter/share/ValidateEBMenu.py
new file mode 100755
index 0000000000000000000000000000000000000000..141dafa13a532704dac316ac846bb21cb397c63f
--- /dev/null
+++ b/Trigger/TrigCost/EnhancedBiasWeighter/share/ValidateEBMenu.py
@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
+#
+
+import json
+
+from AthenaCommon.Logging import logging
+log = logging.getLogger('ValidateEBMenu.py')
+
+
+def getL1Category(chainName):
+ return chainName.replace("HLT_noalg_L1", "L1_").replace("_noPS", "")
+
+
+if __name__=='__main__':
+ from argparse import ArgumentParser
+ parser = ArgumentParser()
+ parser.add_argument('--hltPsk', type=str, help='HLTPrescale.json file')
+ parser.add_argument('--l1Psk', type=str, help='HLTPrescale.json file')
+ args = parser.parse_args()
+
+ ebChains = [
+ "HLT_eb_low_L1RD2_FILLED", "HLT_eb_medium_L1RD2_FILLED",
+ "HLT_noalg_L1PhysicsHigh_noPS", "HLT_noalg_L1PhysicsVeryHigh_noPS",
+ "HLT_noalg_L1RD3_FILLED", "HLT_noalg_L1RD3_EMPTY",
+ "HLT_noalg_L1EMPTY_noPS", "HLT_noalg_L1FIRSTEMPTY_noPS",
+ "HLT_noalg_L1UNPAIRED_ISO_noPS", "HLT_noalg_L1UNPAIRED_NONISO_noPS"
+ ]
+
+ if not args.hltPsk or not args.l1Psk:
+ log.error("Prescale files are required!")
+ exit(-1)
+
+ with open(args.hltPsk) as f:
+ HLTPrescales = json.load(f)["prescales"]
+
+ with open(args.l1Psk) as f:
+ L1Prescales = json.load(f)["cutValues"]
+
+ from TriggerMenuMT.HLT.Menu.L1Seeds import getEBnoL1PSSeed
+ from TriggerMenuMT.HLT.CalibCosmicMon.EnhancedBiasChainConfiguration import l1seeds
+
+ alreadyProcessed = {}
+
+ for chainName in ebChains:
+ log.info(f"Processing chain {chainName}...")
+ hltPrescale = HLTPrescales[chainName]
+ if not hltPrescale:
+ log.error(f"Chain {chainName} not found in the HLT Prescales file")
+ continue
+
+ if not hltPrescale["enabled"]:
+ log.error(f"Chain {chainName} disabled in the HLT Prescales file")
+ continue
+
+ if "noalg" not in chainName: # randomly seeded chains
+ if "medium" in chainName:
+ currentSeeds = l1seeds["medium"]
+ else:
+ currentSeeds = l1seeds["low"]
+
+ for seedName in currentSeeds:
+ if seedName in alreadyProcessed:
+ log.error(f"Seed {seedName} is already part of eb chain {alreadyProcessed[seedName]}")
+ else:
+ alreadyProcessed[seedName] = chainName
+
+ l1Prescale = L1Prescales[seedName]
+ if not l1Prescale:
+ log.error(f"Seed {seedName} of chain {chainName} not found in the L1 Prescales file")
+ continue
+
+ if not l1Prescale["enabled"]:
+ log.error(f"Seed {seedName} of chain {chainName} is disabled in the L1 Prescales file")
+ continue
+
+ elif "_noPS" in chainName:
+ currentSeeds = getEBnoL1PSSeed([], getL1Category(chainName))
+ for seedName in currentSeeds:
+ if seedName in alreadyProcessed:
+ log.error(f"Seed {seedName} is already part of eb chain {alreadyProcessed[seedName]}")
+ else:
+ alreadyProcessed[seedName] = chainName
+
+ l1Prescale = L1Prescales[seedName]
+ if not l1Prescale:
+ log.error(f"Seed {seedName} of chain {chainName} not found in the L1 Prescales file")
+ continue
+
+ if not l1Prescale["enabled"]:
+ log.error(f"Seed {seedName} of chain {chainName} is disabled in the L1 Prescales file")
+ continue
+
+ if l1Prescale["cut"] != 1:
+ log.error(f"Seed {seedName} of chain {chainName} is prescaled in the L1 Prescales file (it is in no prescale category)")
+ continue
+ else:
+ # randoms
+ seedName = getL1Category(chainName)
+ l1Prescale = L1Prescales[seedName]
+ if not l1Prescale:
+ log.error(f"Seed {seedName} of chain {chainName} not found in the L1 Prescales file")
+ continue
+
+ if not l1Prescale["enabled"]:
+ log.error(f"Seed {seedName} of chain {chainName} is disabled in the L1 Prescales file")
+ continue
\ No newline at end of file
diff --git a/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx b/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
index 9929194753c417d5ebd4e2d153f8a3cbd3be4d47..afef98d3fcff443a71d810156bb047af8341016f 100644
--- a/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
+++ b/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.cxx
@@ -6,11 +6,13 @@
#include <GaudiKernel/StatusCode.h>
#include "AthLinks/ElementLinkVector.h"
#include "TrigConfHLTUtils/HLTUtils.h"
+#include "TrigNavStructure/Types.h"
#include "xAODTrigger/TrigPassBitsContainer.h"
#include "AthenaKernel/ClassID_traits.h"
#include "TrigNavStructure/TriggerElement.h"
#include "Run2ToRun3TrigNavConverterV2.h"
#include "TrigCompositeUtils/ChainNameParser.h"
+#include "TrigConfHLTData/HLTSequenceList.h"
#include "SpecialCases.h"
namespace TCU = TrigCompositeUtils;
@@ -349,10 +351,56 @@ StatusCode Run2ToRun3TrigNavConverterV2::execute(const EventContext &context) co
return StatusCode::SUCCESS;
}
+size_t Run2ToRun3TrigNavConverterV2::is2LegTopoChain(const TrigConf::HLTChain* ptrChain) const {
+ // chains of configs structure
+ // A B
+ // \/
+ // C
+ // where C is the output TE of sequence consuming A & B
+ // sometimes there are an additional leafs
+ // C
+ // |
+ // D
+ if ( not std::regex_match(ptrChain->name(), SpecialCases::isTopo) ) return 0;
+ size_t stepToConsider = 0;
+ const size_t sigsSize = ptrChain->signatures().size();
+ if ( sigsSize < 2 ) return 0;
+ for ( size_t step = sigsSize-1; step > 1; step --) {
+ if ( (ptrChain->signatures()[step-1])->outputTEs().size() == 2 and (ptrChain->signatures()[step])->outputTEs().size() == 1 ) {
+ stepToConsider = step;
+ break;
+ }
+ }
+ if ( stepToConsider == 0 ) return 0; // not a topo
+
+ //counting is right, need to see now if TEs are connected
+ auto finalTE = (ptrChain->signatures()[stepToConsider])->outputTEs()[0];
+ auto preFinalTEs = (ptrChain->signatures()[stepToConsider-1])->outputTEs();
+
+ auto finalSeq = m_configSvc->sequences().getSequence(finalTE->id());
+ std::set<HLT::te_id_type> tesInSeq;
+ std::set<HLT::te_id_type> tesInChain;
+
+ for ( auto te: finalSeq->inputTEs()) {
+ tesInSeq.insert(te->id());
+ }
+
+ for ( auto te: preFinalTEs) {
+ tesInChain.insert(te->id());
+ }
+
+ if (tesInSeq == tesInChain) {
+ return stepToConsider;
+ }
+ return 0;
+}
+
StatusCode Run2ToRun3TrigNavConverterV2::extractTECtoChainMapping(TEIdToChainsMap_t &allTEs, TEIdToChainsMap_t &finalTEs) const
{
- // port chains iteration code from previous version
+
ATH_CHECK(not m_configSvc->chains().empty());
+
+ // obtain map output TE -> input TE via sequences
for (auto ptrChain : m_configSvc->chains())
{
std::string chainName = ptrChain->name();
@@ -422,6 +470,7 @@ StatusCode Run2ToRun3TrigNavConverterV2::extractTECtoChainMapping(TEIdToChainsMa
if ( multiplicities.size() > 1 ) {
+ ATH_MSG_DEBUG(" this " << (is2LegTopoChain(ptrChain) ? "is": "is not") << " topological chain");
// the chain structure (in terms of multiplicities) may change along the way
// we'll assign legs only to these TEs of the steps that have identical multiplicity pattern
// e.g. for the chain: HLT_2g25_loose_g20 the multiplicities are: [2, 1]
diff --git a/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h b/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h
index e99179e77f513d3eca7101c2e18cadf7a7555c77..2ebce2f0557be797e8ae495679999c39ed4017e0 100644
--- a/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h
+++ b/Trigger/TrigEvent/TrigNavTools/src/Run2ToRun3TrigNavConverterV2.h
@@ -148,6 +148,8 @@ private:
std::function<void(const ConvProxy*)> m_chainIdsPrinter = [&](const ConvProxy* p){ for (auto id: p->passChains ) ATH_MSG_DEBUG("chain id " << id); };
std::function<void(const ConvProxy*)> m_teIDPrinter = [&](const ConvProxy* p){ ATH_MSG_DEBUG("TE id " << TrigConf::HLTUtils::hash2string(p->te->getId())); };
+ // return 0 if it is not tpological, else the step before topo merge
+ size_t is2LegTopoChain(const TrigConf::HLTChain* ptrChain ) const;
std::size_t getFeaSize(const ConvProxy &) const;
diff --git a/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h b/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h
index 7ca7e9d583b856848f3ce0f40ed81a1167bc9e59..a8447cf88f2b371e4a1d1d0b4a44f34453f7ccaf 100644
--- a/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h
+++ b/Trigger/TrigEvent/TrigNavTools/src/SpecialCases.h
@@ -9,5 +9,6 @@ namespace SpecialCases {
const std::regex egammaDiEtcut{".*etcut.*etcut.*"};
const std::regex egammaEtcut{".*etcut.*"};
const std::regex egammaCombinedWithEtcut{"HLT_(e|g).*_(e|g).*etcut.*"};
+ const std::regex isTopo{".*(Jpsi|Zee).*"};
}
\ No newline at end of file
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py
index afc7bf802c033bd5a821a267573ec3caae9ea423..ef4b5798a7c76d77527149953f61381a0810051d 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
import re
from TrigBjetHypo.TrigBjetMonitoringConfig import TrigBjetBtagHypoToolMonitoring
@@ -106,9 +106,7 @@ def decodeThreshold( threshold_btag ):
allowedTaggers = ["offperf", "dl1d", "gn182bb", "gn177bb", "gn175bb", "gn1","gn2"]
if tagger not in allowedTaggers:
log.debug("tagger = %s not amidst allowed taggers ",threshold_btag)
- assert False, "Can't recognize tagger during TrigBjetHypoTool configuration. Tagger = "+threshold_btag
- return None
-
+ raise RuntimeError("Can't recognize tagger during TrigBjetHypoTool configuration. Tagger = "+threshold_btag)
btagger = "GN120220813" # default tagger for boffperf chain monitoring
bbtagger = "dl1dbb20230314"
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoMonitoringConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoMonitoringConfig.py
index fe6919a918bc716caa9b22f80edbfe30469e7a27..abdabc33197b296b1f3b68f2ee0455d46045c0db 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoMonitoringConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmumuxComboHypoMonitoringConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -8,7 +8,7 @@ def TrigBmumuxComboHypoMonitoring(flags, name):
montool.defineHistogram('nDimuon', type='TH1F', path='EXPERT', title="number of fitted dimuon vertices", xbins=10, xmin=0, xmax=10)
montool.defineHistogram('nTrk', type='TH1F', path='EXPERT', title="number of merged tracks in extended RoIs", xbins=200, xmin=0, xmax=200)
montool.defineHistogram('nSelectedTrk', type='TH1F', path='EXPERT', title="number of tracks in vicinity of dimuon vertex", xbins=200, xmin=0, xmax=200)
- montool.defineHistogram('nBPhysObject', type='TH1F', path='EXPERT', title="number of fitted BPhysObjects", xbins=100, xmin=0, xmax=100),
+ montool.defineHistogram('nBPhysObject', type='TH1F', path='EXPERT', title="number of fitted BPhysObjects", xbins=100, xmin=0, xmax=100)
return montool
diff --git a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmuxComboHypoMonitoringConfig.py b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmuxComboHypoMonitoringConfig.py
index 268457ce137819484f79316b6c1c9836a76ed82b..1d59899ff32ea7b967cc77a75095dd0946b6889b 100644
--- a/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmuxComboHypoMonitoringConfig.py
+++ b/Trigger/TrigHypothesis/TrigBphysHypo/python/TrigBmuxComboHypoMonitoringConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -7,6 +7,6 @@ def TrigBmuxComboHypoMonitoring(flags, name):
montool.defineHistogram('nMuon', type='TH1F', path='EXPERT', title="number of muons", xbins=10, xmin=0, xmax=10)
montool.defineHistogram('nTrk', type='TH1F', path='EXPERT', title="number of tracks in extended RoIs", xbins=200, xmin=0, xmax=200)
- montool.defineHistogram('nBPhysObject', type='TH1F', path='EXPERT', title="number of fitted BPhysObjects", xbins=100, xmin=0, xmax=100),
+ montool.defineHistogram('nBPhysObject', type='TH1F', path='EXPERT', title="number of fitted BPhysObjects", xbins=100, xmin=0, xmax=100)
return montool
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
index bb0968ea8d24e2f16dad943ff0c846297117f7aa..dbbda7e18eee84012cb80d83c80fad6eeef55aad 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaFastElectronHypoTool.py
@@ -150,7 +150,7 @@ class TrigEgammaFastElectronHypoToolConfig:
monTool.defineHistogram('CaloPhi', type='TH1F', path='EXPERT', title="FastElectron Hypo #phi^{calo} ; #phi^{calo};Nevents", xbins=320, xmin=-3.2, xmax=3.2)
monTool.defineHistogram('d0Value', type="TH1F", path='EXPERT', title="FastElectron Hypo Track d0; d0 [mm]", xbins=100, xmin=-1, xmax=1)
if self.tool().DoRinger:
- monTool.defineHistogram('NNOutput',type='TH1F', path='EXPERT',title="NN Output; NN; Count", xbins=17,xmin=-8,xmax=+8),
+ monTool.defineHistogram('NNOutput',type='TH1F', path='EXPERT',title="NN Output; NN; Count", xbins=17,xmin=-8,xmax=+8)
monTool.HistPath = 'FastElectronHypo/'+self.__name
self.tool().MonTool = monTool
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py
index 7c975495090dabe382aea6ecb84ed598d6aa9ec6..8846b24d261db5501cf39ee6052cf8ad7042ec37 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionElectronHypoTool.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
from AthenaCommon.SystemOfUnits import GeV
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -276,9 +276,9 @@ class TrigEgammaPrecisionElectronHypoToolConfig:
if flags.Trigger.doValidationMonitoring:
- monTool.defineHistogram('ptcone20',type='TH1F',path='EXPERT',title= "PrecisionElectron Hypo ptcone20; ptcone20;", xbins=50, xmin=0, xmax=5.0),
- monTool.defineHistogram('relptcone20',type='TH1F',path='EXPERT',title= "PrecisionElectron Hypo; ptcone20/pt;", xbins=50, xmin=0, xmax=1),
- monTool.defineHistogram('ptvarcone20',type='TH1F',path='EXPERT',title= "PrecisionElectron Hypo ptvarcone20; ptvarcone20;", xbins=50, xmin=0, xmax=5.0),
+ monTool.defineHistogram('ptcone20',type='TH1F',path='EXPERT',title= "PrecisionElectron Hypo ptcone20; ptcone20;", xbins=50, xmin=0, xmax=5.0)
+ monTool.defineHistogram('relptcone20',type='TH1F',path='EXPERT',title= "PrecisionElectron Hypo; ptcone20/pt;", xbins=50, xmin=0, xmax=1)
+ monTool.defineHistogram('ptvarcone20',type='TH1F',path='EXPERT',title= "PrecisionElectron Hypo ptvarcone20; ptvarcone20;", xbins=50, xmin=0, xmax=5.0)
monTool.defineHistogram('relptvarcone20',type='TH1F',path='EXPERT',title= "PrecisionElectron Hypo; ptvarcone20/pt;", xbins=50, xmin=0, xmax=0.5)
monTool.defineHistogram('trk_d0', type="TH1F", path='EXPERT', title="PrecisionElectron Hypo Track d0; d0 [mm]", xbins=100, xmin=-1, xmax=1)
diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonCaloIsoHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonCaloIsoHypoTool.py
index b9a818dead533f36675de802e758d82adf87eda1..8084be8a9743f970fd9e371a8db1ecf674b40e80 100644
--- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonCaloIsoHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEgammaPrecisionPhotonCaloIsoHypoTool.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.SystemOfUnits import GeV
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
@@ -135,9 +135,9 @@ class TrigEgammaPrecisionPhotonCaloIsoHypoToolConfig:
xbins=13, xmin=-1.5, xmax=12.5, opt="kCumulative", xlabels=cuts)
if flags.Trigger.doValidationMonitoring:
- monTool.defineHistogram('etcone20',type='TH1F',path='EXPERT',title= "PrecisionPhotonCaloIso Hypo etcone20; etcone20;", xbins=50, xmin=0, xmax=5.0),
- monTool.defineHistogram('topoetcone20',type='TH1F',path='EXPERT',title= "PrecisionPhotonCaloIso Hypo; topoetcone20;", xbins=50, xmin=-10, xmax=10),
- monTool.defineHistogram('reletcone20',type='TH1F',path='EXPERT',title= "PrecisionPhotonCaloIso Hypo etcone20/et; etcone20/et;", xbins=50, xmin=-0.5, xmax=0.5),
+ monTool.defineHistogram('etcone20',type='TH1F',path='EXPERT',title= "PrecisionPhotonCaloIso Hypo etcone20; etcone20;", xbins=50, xmin=0, xmax=5.0)
+ monTool.defineHistogram('topoetcone20',type='TH1F',path='EXPERT',title= "PrecisionPhotonCaloIso Hypo; topoetcone20;", xbins=50, xmin=-10, xmax=10)
+ monTool.defineHistogram('reletcone20',type='TH1F',path='EXPERT',title= "PrecisionPhotonCaloIso Hypo etcone20/et; etcone20/et;", xbins=50, xmin=-0.5, xmax=0.5)
monTool.defineHistogram('reltopoetcone20',type='TH1F',path='EXPERT',title= "PrecisionPhotonCaloIso Hypo; topoetcone20/pt;", xbins=50, xmin=-0.5, xmax=0.5)
self.tool().MonTool = monTool
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
index 367742b6523a8aee7a85502b257b3fe5efc94391..82e84a61caacb75c92a4c2f31bd4c244ee89b89d 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
@@ -83,7 +83,9 @@ class TrigTauMonAlgBuilder:
else:
self.activate_truth = False
self.logger.debug('Using default monitoring configuration for collisions')
-
+
+ if self.helper.flags.DQ.Environment == "tier0":
+ self.do_alternative_eTAU_monitoring = True
# We don't have any configuration specific for Cosmics or HI (the HLT Tau Monitoring is disabled for this one)
# If we did, we could specify it here
@@ -658,7 +660,7 @@ class TrigTauMonAlgBuilder:
if 'eTAU' in trigger:
mon_group.defineHistogram('L1eFexRoIRCore', title='L1 eTAU RoI rCore Isolation; rCore Isolation; RoIs', xbins=250, xmin=0, xmax=1, opt='kAlwaysCreate')
mon_group.defineHistogram('L1eFexRoIRHad' , title='L1 eTAU RoI rHad Isolation; rHad Isolation; RoIs', xbins=250, xmin=0, xmax=1, opt='kAlwaysCreate')
- mon_group.defineHistogram('L1eFexRoIBDTScore' , title='L1 eTAU RoI BDT score; BDT Score; RoIs', xbins=250, xmin=0, xmax=1, opt='kAlwaysCreate')
+ mon_group.defineHistogram('L1eFexRoIBDTScore' , title='L1 eTAU RoI BDT score; BDT Score; RoIs', xbins=250, xmin=0, xmax=4096, opt='kAlwaysCreate')
elif 'cTAU' in trigger:
mon_group.defineHistogram('L1eFexRoIRCore', title='L1 eTAU RoI rCore Isolation; eTAU rCore Isolation; RoIs', xbins=250, xmin=0, xmax=1, opt='kAlwaysCreate')
@@ -667,7 +669,7 @@ class TrigTauMonAlgBuilder:
mon_group.defineHistogram('L1jFexRoIIso', title='L1 jTAU RoI Isolation; E_{T}^{jTAU Iso} [GeV]; RoIs', xbins=25, xmin=0, xmax=50, opt='kAlwaysCreate')
mon_group.defineHistogram('L1cTauMatchedRoIIso', title='L1 cTAU Isolation score; E_{T}^{jTAU Iso}/E_{T}^{eTAU}; RoIs', xbins=50, xmin=0, xmax=5, opt='kAlwaysCreate')
mon_group.defineHistogram('L1RoIcTauMatchedEtRatio', title='Et ratio between matched eTAU and jTAU RoIs; E_{T}^{jTAU}/E_{T}^{eTAU}; RoIs', xbins=40, xmin=0, xmax=4, opt='kAlwaysCreate')
- mon_group.defineHistogram('L1eFexRoIBDTScore' , title='L1 eTAU RoI BDT score; BDT Score; RoIs', xbins=250, xmin=0, xmax=1, opt='kAlwaysCreate')
+ mon_group.defineHistogram('L1eFexRoIBDTScore' , title='L1 eTAU RoI BDT score; BDT Score; RoIs', xbins=250, xmin=0, xmax=4096, opt='kAlwaysCreate')
elif 'jTAU' in trigger:
mon_group.defineHistogram('L1jFexRoIIso', title='L1 jTAU RoI Isolation; jTAU Isolation [GeV]; N RoI', xbins=25, xmin=0, xmax=50, opt='kAlwaysCreate')
diff --git a/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingMonitoring.py b/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingMonitoring.py
index 89e2ec36e5637643724e6e253779a51c9942c8f3..0cc4db27670514ce3acadba3f26ef5267d8855f3 100644
--- a/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingMonitoring.py
+++ b/Trigger/TrigSteer/HLTSeeding/python/HLTSeedingMonitoring.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
import math
@@ -9,7 +9,7 @@ def CTPUnpackingMonitoring(flags, maxItems, maxChains):
tool = GenericMonitoringTool(flags, 'MonTool')
tool.HistPath="HLTFramework/HLTSeeding"
tool.defineHistogram('TAVItems', path='EXPERT', type='TH1F', title='Number of active L1 TAV items;N Items;N Events',
- xbins=maxItems, xmin=0, xmax=maxItems),
+ xbins=maxItems, xmin=0, xmax=maxItems)
tool.defineHistogram('Chains', path='EXPERT', type='TH1F', title='Number of activated Chains;N Chains;N Events',
xbins=(maxChains//4 if maxChains>100 else maxChains), xmin=0, xmax=maxChains)
return tool
@@ -19,11 +19,11 @@ def RoIsUnpackingMonitoring(flags, prefix, maxCount, maxEta=3., phiOffset=0.,eta
tool = GenericMonitoringTool(flags, 'MonTool')
tool.HistPath = f'HLTFramework/HLTSeeding/RoIs_{prefix}'
tool.defineHistogram('count', path='EXPERT', type='TH1F', title=f'Number of {prefix} RoIs;N RoIs;N Events',
- xbins=maxCount, xmin=0, xmax=maxCount),
+ xbins=maxCount, xmin=0, xmax=maxCount)
tool.defineHistogram('eta', path='EXPERT', type='TH1F', title=f'{prefix} RoIs eta;eta;N RoIs',
- xbins=int(20*maxEta), xmin=-(maxEta-etaOffset), xmax=(maxEta+etaOffset)),
+ xbins=int(20*maxEta), xmin=-(maxEta-etaOffset), xmax=(maxEta+etaOffset))
tool.defineHistogram('phi', path='EXPERT', type='TH1F', title=f'{prefix} RoIs phi;phi;N RoIs',
- xbins=64, xmin=-(math.pi-phiOffset), xmax=(math.pi+phiOffset)),
+ xbins=64, xmin=-(math.pi-phiOffset), xmax=(math.pi+phiOffset))
tool.defineHistogram('eta,phi', path='EXPERT', type='TH2F', title=f'{prefix} RoIs eta-phi;eta;phi;N RoIs',
xbins=int(20*maxEta), xmin=-(maxEta-etaOffset), xmax=(maxEta+etaOffset),
ybins=64, ymin=-(math.pi-phiOffset), ymax=(math.pi+phiOffset))
diff --git a/Trigger/TrigT1/TrigGepPerf/python/GepPi0AlgConfig.py b/Trigger/TrigT1/TrigGepPerf/python/GepPi0AlgConfig.py
index 6ae5bc7e472bedc5c4ae40656cf8540bf438bc3d..476e8a0d33ac7f30b13c4d1ab87812ba077602fe 100644
--- a/Trigger/TrigT1/TrigGepPerf/python/GepPi0AlgConfig.py
+++ b/Trigger/TrigT1/TrigGepPerf/python/GepPi0AlgConfig.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
@@ -12,12 +12,11 @@ def GepPi0AlgCfg(
cfg = ComponentAccumulator()
-
alg = CompFactory.GepPi0Alg(name)
if caloCellsProducer == "EMB1CellsFromCaloCells":
- alg.caloCellsProducer = CompFactory.EMB1CellsFromCaloCells()
+ alg.caloCellsProducer = CompFactory.EMB1CellsFromCaloCells()
else:
- alg.caloCellsProducer == CompFactory.EMB1CellsFromCaloClusters()
+ alg.caloCellsProducer = CompFactory.EMB1CellsFromCaloClusters()
if OutputLevel is not None:
alg.OutputLevel = OutputLevel
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/python/BSMonitoringAlgorithm.py b/Trigger/TrigT1/TrigT1CTMonitoring/python/BSMonitoringAlgorithm.py
index fcc0269ef5478197efce8492b39e47a9e08fec80..4bd43dcd5f13abb7607b487d1ca4efcae49b81ab 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/python/BSMonitoringAlgorithm.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/python/BSMonitoringAlgorithm.py
@@ -1,6 +1,6 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
def BSMonitoringConfig(inputFlags):
'''Function to configure LVL1 BSMonitoring algorithm in the monitoring system.'''
@@ -728,9 +728,6 @@ if __name__=='__main__':
flags.lock()
#flags.dump() # print all the configs
- from AthenaCommon.AppMgr import ServiceMgr
- ServiceMgr.Dump = False
-
from AthenaConfiguration.MainServicesConfig import MainServicesCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg = MainServicesCfg(flags)
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py
index acda0958aeb00ecd504cca614f1f26e664403a2c..3de51f8f66d425ef125031c046ef1507620ce542 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py
@@ -10,8 +10,8 @@ def JetEfficiencyMonitoringConfig(flags):
result = ComponentAccumulator()
###########################################################################
- # Jet and particle flow config required for data POOL files
- if flags.Input.Format is Format.POOL and not flags.Input.isMC:
+ # Jet and particle flow config required for data POOL files except if is already an AOD
+ if flags.Input.Format is Format.POOL and not flags.Input.isMC and not any(["AOD" in a for a in flags.Input.ProcessingTags]):
from JetRecConfig.JetRecConfig import JetRecCfg
from JetRecConfig.StandardSmallRJets import AntiKt4EMPFlow
from JetRecConfig.JetConfigFlags import jetInternalFlags
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
index 8d99defd921665d8fed9065be178a10eea8ffe0b..f008df33fa522ee982191abd1cb6201d4cadf1ec 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/L1CaloPhase1Monitoring.py
@@ -91,6 +91,9 @@ if len(flags.Input.Files)>0:
flags.DQ.Environment = "user"
# triggerConfig should default to DB which is appropriate if running on data
if flags.Input.isMC: flags.Trigger.triggerConfig='FILE' # uses the generated L1Menu (see below)
+ elif flags.Trigger.triggerConfig=='INFILE':
+ # this happens with AOD data files, but this is incompatible with the setup of the LVL1ConfigSvc
+ flags.Trigger.triggerConfig="DB" # so force onto DB usage
# due to https://gitlab.cern.ch/atlas/athena/-/merge_requests/65253 must now specify geomodel explicitly if cant take from input file, but can autoconfigure it based on LHCPeriod set above
if flags.GeoModel.AtlasVersion is None:
@@ -241,9 +244,11 @@ if flags.DQ.doMonitoring:
cfg.merge(GfexMonitoringConfig(flags))
from TrigT1CaloMonitoring.GfexSimMonitorAlgorithm import GfexSimMonitoringConfig
cfg.merge(GfexSimMonitoringConfig(flags))
- # can't include efficiency monitoring because requires too many things we don't have
- # from TrigT1CaloMonitoring.JetEfficiencyMonitorAlgorithm import JetEfficiencyMonitoringConfig
- # cfg.merge(JetEfficiencyMonitoringConfig(flags))
+ # generally can't include efficiency monitoring because requires too many things we don't have
+ # but b.c. alg requires TrigDecisionTool, we activate it if DQ.useTrigger explicitly set
+ if flags.DQ.useTrigger:
+ from TrigT1CaloMonitoring.JetEfficiencyMonitorAlgorithm import JetEfficiencyMonitoringConfig
+ cfg.merge(JetEfficiencyMonitoringConfig(flags))
# input data monitoring
if flags.Trigger.L1.doCaloInputs and not flags.Input.isMC:
diff --git a/Trigger/TrigT1/TrigT1Monitoring/python/L1CaloL1TopoMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1Monitoring/python/L1CaloL1TopoMonitorAlgorithm.py
index 93ae0947034470f2d71326ded904974433f933c4..e2cf5272aa6dda1eb8f8b04ecc282f70c03e650a 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/python/L1CaloL1TopoMonitorAlgorithm.py
+++ b/Trigger/TrigT1/TrigT1Monitoring/python/L1CaloL1TopoMonitorAlgorithm.py
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
#
def L1CaloL1TopoMonitoringConfig(inputFlags):
'''Function to configure LVL1 L1CaloL1Topo algorithm in the monitoring system.'''
@@ -210,9 +210,6 @@ if __name__=='__main__':
flags.lock()
flags.dump() # print all the configs
- from AthenaCommon.AppMgr import ServiceMgr
- ServiceMgr.Dump = False
-
from AthenaConfiguration.MainServicesConfig import MainServicesSerialCfg
from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg
cfg = MainServicesSerialCfg()
diff --git a/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py b/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
index 013228a3f9d35714801c46b256f9cd1479900610..122aadf98caa290d61ba3224056bd0e7b849675d 100644
--- a/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
+++ b/Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
@@ -583,7 +583,6 @@ if __name__ == '__main__':
acc.merge(OutputStreamCfg(flags, 'AOD', ItemList=outputEDM))
# get rid of warning about propagating input attribute list ... since there is none
- # note it's odd that the AthenaCommon.globalflags input format property doesn't get updated appropriately by flags??
acc.getEventAlgo("EventInfoTagBuilder").PropagateInput = (flags.Input.Format != Format.BS)
diff --git a/Trigger/TrigT1/TrigT1TRT/CMakeLists.txt b/Trigger/TrigT1/TrigT1TRT/CMakeLists.txt
index 2659b4fa5289d5d7fc97af1560029bdd54e5f0d3..cdb82ef81eb908f048dd955f5c5b6f24d45f2ea6 100644
--- a/Trigger/TrigT1/TrigT1TRT/CMakeLists.txt
+++ b/Trigger/TrigT1/TrigT1TRT/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 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( TrigT1TRT )
@@ -10,6 +10,5 @@ atlas_add_component( TrigT1TRT
LINK_LIBRARIES AthenaBaseComps GaudiKernel InDetRawData TRT_ConditionsServicesLib TRT_ReadoutGeometry TrigConfInterfaces TrigConfL1Data TrigT1Interfaces PathResolver )
# Install files from the package:
-atlas_install_joboptions( share/*.py )
atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
atlas_install_data( share/*.json )
diff --git a/Trigger/TrigT1/TrigT1TRT/share/fastOR_thr_35_HI_OverrideTRTparameters.py b/Trigger/TrigT1/TrigT1TRT/share/fastOR_thr_35_HI_OverrideTRTparameters.py
deleted file mode 100644
index 7309aa0ad6fdf4d474ae9010ba80948a0f9bd7fd..0000000000000000000000000000000000000000
--- a/Trigger/TrigT1/TrigT1TRT/share/fastOR_thr_35_HI_OverrideTRTparameters.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration
-#########################################################
-# #
-# TRT_Digitization/postInclude.OverrideTRTparameters.py #
-# #
-# Overrride default settings in TRTDigSettings.cxx #
-# #
-# This is not a full list, just the parameters likely #
-# to be used in basic tuning... #
-# #
-# For a full list of overrridable parameters #
-# and a list of setttings used in the job: #
-# #
-# grep TRTDigSettings <job output> #
-# #
-#########################################################
-
-from AthenaCommon.AlgSequence import AlgSequence
-job = AlgSequence()
-from Digitization.DigitizationFlags import digitizationFlags
-trt = None
-if not digitizationFlags.doXingByXingPileUp() and hasattr(job, 'TRTDigitization'):
- #Back-compatibility for 17.X.Y.Z releases
- if hasattr(job.TRTDigitization, 'DigitizationTool'):
- trt = job.TRTDigitization.DigitizationTool
- else:
- trt = job.TRTDigitization
-else:
- from AthenaCommon.CfgGetter import getPublicTool
- trt = getPublicTool("TRTDigitizationTool")
-if None == trt:
- raise AttributeError("TRTDigitization(Tool) not found.")
-
-# Units are CLHEP: MeV, ns, mm
-# Xenon threshold tunes
-trt.Override_highThresholdBarShort = 0.00129875
-trt.Override_highThresholdBarLong = 0.00118775
-trt.Override_highThresholdECAwheels = 0.001185591
-trt.Override_highThresholdECBwheels = 0.001145376
-
-# Argon thresholds (July 2014 tuning from Artem) TRT_Digitization-01-00-09
-trt.Override_highThresholdBarShortArgon = 0.000468802
-trt.Override_highThresholdBarLongArgon = 0.000456754
-trt.Override_highThresholdECAwheelsArgon = 0.0006035
-trt.Override_highThresholdECBwheelsArgon = 0.00057375
-
-# Krypton thresholds
-trt.Override_highThresholdBarShortKrypton = 0.003070
-trt.Override_highThresholdBarLongKrypton = 0.002900
-trt.Override_highThresholdECAwheelsKrypton = 0.003150
-trt.Override_highThresholdECBwheelsKrypton = 0.003020
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index d4963ccbf8f6562f923e21bc927c74d119322c79..7d3543168b2aff429129d7cb41b95e43e3f6ffb9 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -22077,7 +22077,7 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU12IM_3J12:
2: 15
3: 15
4: 3
-HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M_3jJ30:
+HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU20M_3jJ30:
eventCount: 0
stepCounts:
0: 8
@@ -22085,10 +22085,10 @@ HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M_3jJ30:
2: 7
3: 7
stepFeatures:
- 0: 33
- 1: 32
- 2: 27
- 3: 27
+ 0: 24
+ 1: 23
+ 2: 19
+ 3: 19
4: 5
HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
eventCount: 0
@@ -22103,7 +22103,7 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
2: 11
3: 11
4: 3
-HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M:
+HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU30M:
eventCount: 0
stepCounts:
0: 8
@@ -22111,10 +22111,10 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M:
2: 7
3: 7
stepFeatures:
- 0: 30
- 1: 28
- 2: 23
- 3: 23
+ 0: 21
+ 1: 20
+ 2: 17
+ 3: 17
4: 5
HLT_mu14_mu14_idperf_50invmAB130_L12MU8F:
eventCount: 0
@@ -22136,7 +22136,7 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_TAU12IM_XE35:
3: 13
4: 1
5: 1
-HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_eTAU20M_jXE70:
+HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_cTAU20M_jXE70:
eventCount: 1
stepCounts:
0: 6
@@ -22146,10 +22146,10 @@ HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_eTAU20M_jXE70:
4: 1
5: 1
stepFeatures:
- 0: 22
- 1: 22
- 2: 22
- 3: 22
+ 0: 17
+ 1: 17
+ 2: 17
+ 3: 17
4: 1
5: 1
HLT_mu20_2mu4noL1_L1MU14FCH:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 6cd99a7934ac9daffe85421c193d20b72a83a136..c09dff3be8d0456f3ad9b1d5ae353507738a21c5 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -8505,7 +8505,7 @@ HLT_mu14_idtp_L1MU8F:
1: 2
HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU12IM_3J12:
eventCount: 0
-HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M_3jJ30:
+HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU20M_3jJ30:
eventCount: 0
HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
eventCount: 0
@@ -8514,12 +8514,12 @@ HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_TAU20IM:
stepFeatures:
0: 2
1: 1
-HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M:
+HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU30M:
eventCount: 0
stepCounts:
0: 1
stepFeatures:
- 0: 3
+ 0: 2
1: 1
HLT_mu14_mu14_idperf_50invmAB130_L12MU8F:
eventCount: 0
@@ -8527,7 +8527,7 @@ HLT_mu14_mu14_idtp_idZmumu_L12MU8F:
eventCount: 0
HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_TAU12IM_XE35:
eventCount: 0
-HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_eTAU20M_jXE70:
+HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_cTAU20M_jXE70:
eventCount: 0
stepCounts:
0: 1
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index c4a870fb4980da7d50dc52ea829546548cc1a419..481b138585cc68d3f9d96767827a8fe7779bb758 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -61,7 +61,7 @@ def createTriggerFlags(doTriggerRecoFlags):
flags.addFlag('Trigger.enableL1CaloLegacy', True,
help='enable Run-2 L1Calo simulation and/or decoding')
- flags.addFlag('Trigger.enableAsyncIO', False,
+ flags.addFlag('Trigger.enableAsyncIO', True,
help='enable HltAsyncEventLoopMgr instead of HltEventLoopMgr')
# L1MuonSim category
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py
index 5e2eda585fe74e60fdd8d7954316bf2c8ec87ab6..dd440aaf0e7505d863609ba1b10afbe74b623305 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/CommonSequences/TLABuildingSequences.py
@@ -24,7 +24,7 @@ def addTLAStep(flags, chain, chainDict):
log.debug("addTLAStep: processing signature: %s", cPart['signature'] )
# call the sequence from their respective signatures
- tlaSequencesList.append(functools.partial(getTLASignatureSequence, flags, chainDict=chainDict, chainPart=cPart)), #signature=cPart['signature'])),
+ tlaSequencesList.append(functools.partial(getTLASignatureSequence, flags, chainDict=chainDict, chainPart=cPart))
log.debug("addTLAStep: About to add a step with: %d parallel sequences.", len(tlaSequencesList))
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/ChainMerging.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/ChainMerging.py
index 79b3238ce57faac7a1fc253b0d3f1ba7aa70f009..cddae9130dd130d065a5e5c8a81a7baf560b8792 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/ChainMerging.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Config/Utility/ChainMerging.py
@@ -647,8 +647,8 @@ def zip_longest_parallel(AllSteps, multiplicity, fillvalue=None):
value = fillvalue
values.append(value)
if int(multiplicity[i]) > 1 and value == fillvalue:
- for i in range(int(multiplicity[i]-1)):
- values.append(value)
+ values.extend([fillvalue]*int(multiplicity[i]-1))
+
yield tuple(values)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetHIConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetHIConfig.py
index 4eb40d5b5b3541f6e7a6db0113e0fdc7211994ae..108d95acce953027e5a48aed58002c1b19c2ee7d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetHIConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Jet/JetHIConfig.py
@@ -324,9 +324,9 @@ def HLTMakeModulatorTool(mod_key, **kwargs):
stdJetModifiers[label] = JetModifier(
"HIUEModulatorTool",
tname,
- DoV2 = getattr(mod, 'DoV2'),
- DoV3 = getattr(mod, 'DoV3'),
- DoV4 = getattr(mod, 'DoV4'),
+ DoV2 = mod.DoV2,
+ DoV3 = mod.DoV3,
+ DoV4 = mod.DoV4,
EventShapeKey=mod_key)
return mod
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
index 053a29fb86e63bfdac67748395a9b68d4f816e34..15f271333237bc8eb0783884b94167981288047d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/L1Seeds.py
@@ -116,7 +116,7 @@ def getEBnoL1PSSeed(l1items, l1seedname):
'L1_eEM18L_MU8F','L1_eEM26M', 'L1_eEM26T', 'L1_eEM28M','L1_2eEM10L_MU8F', 'L1_2eEM18M',
'L1_eEM24L_3eEM12L',
'L1_eEM18M_2eTAU20M_jJ55_3jJ30','L1_eEM18M_2eTAU20M_jXE70','L1_eEM18M_2eTAU20M',
- 'L1_MU8F_eTAU20M_jJ55_2jJ30','L1_MU8F_eTAU20M_jXE70','L1_MU8F_eTAU20M',
+ 'L1_MU8F_eTAU20M_jJ55_2jJ30','L1_MU8F_eTAU20M',
'L1_4J15', 'L1_jJ160', 'L1_XE50', 'L1_2jJ40_jXE110',
'L1_eTAU80', 'L1_eTAU140', 'L1_eTAU30M_2eTAU20M_jJ55_2jJ50_3jJ30','L1_eTAU30M_2eTAU20M_jXE70','L1_eTAU30M_2jJ50_jXE90',
'L1_MU14FCH', 'L1_MU18VFCH', 'L1_MU8F_3jJ50', 'L1_MU8F_2jJ50', 'L1_MU10BOM',
@@ -165,12 +165,14 @@ def getL1LowLumi():
'L1_TAU60', 'L1_eTAU30M_2eTAU20M_jJ55_2jJ50_3jJ30',
'L1_EM15HI_2TAU12IM_XE35',
'L1_MU8F_eTAU20M_jXE70',
+ 'L1_MU8F_cTAU20M_jXE70',
'L1_TAU20_2TAU12_XE35',
'L1_eTAU30M_2eTAU20M_jXE70',
'L1_EM15HI_2TAU12IM', 'L1_EM15HI_2TAU12IM_J25_3J12',
'L1_EM15HI_TAU40_2TAU15',
'L1_MU8F_eTAU20M_jJ55_2jJ30',
'L1_MU8F_eTAU20M',
+ 'L1_MU8F_cTAU20M',
'L1_J75', 'L1_4J15',
'L1_XE50', 'L1_3J25p0ETA23',
'L1_3J40', 'L1_2jJ40_jXE110',
@@ -190,7 +192,9 @@ def getL1BKeePrimary():
'L1_MU14FCH',
'L1_MU8F_2MU5VF',
'L1_MU8F_eTAU30M', # legacy 'L1_MU8F_TAU20IM'
+ 'L1_MU8F_cTAU30M',
'L1_MU8F_eTAU20M_3jJ30', # legacy 'L1_MU8F_TAU12IM_3J12'
+ 'L1_MU8F_cTAU20M_3jJ30',
'L1_jXE100', # legacy 'L1_XE50',
#'L1_eTAU60_2cTAU20M_jXE80', # legacy 'L1_TAU40_2TAU12IM_XE40', TriggerMenuMT:L1Seeds ERROR L1 item L1_eTAU60_2cTAU20M_jXE80 from L1_BKeePrimary seeds is not in current L1 menu
'L1_eEM18M_2eTAU20M_jXE70', # legacy 'L1_EM15VHI_2TAU12IM_XE35'
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 09346a32908d64dab2fa69566139433a5de6daca..907ec5aaf9993fbdd99a93df32c233a859eb286a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/P1_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/P1_run3_v1.py
@@ -254,7 +254,7 @@ def addCommonP1Signatures(chains):
# L1 calo streamers
ChainProp(name='HLT_noalg_l1calo_L1J400', l1SeedThresholds=['FSNOSEED'], stream=['L1Calo'], groups=JetStreamersGroup+['BW:Other']+SupportLegGroup),
-
+ ChainProp(name='HLT_noalg_l1calo_L1gJ400p0ETA25', l1SeedThresholds=['FSNOSEED'], stream=['L1Calo'], groups=JetStreamersGroup+['BW:Other']+SupportPhIGroup),
# Cosmic calo stream
ChainProp(name='HLT_noalg_L1RD1_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo','express'],groups=['RATE:Calibration','BW:Detector']),
ChainProp(name='HLT_noalg_L1jJ60p30ETA49_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['CosmicCalo'],groups=['RATE:Cosmic_Calo','RATE:Calibration','BW:Jet']+SupportPhIGroup),
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 6faa61329e74a89a9af9566ad960c28cf61ab5ae..b4ca66dc1b8eb647c6e2f8a163c917b5e8dee534 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
@@ -2180,7 +2180,7 @@ def setupMenu(menu_name):
# ATR-25512
ChainProp(name='HLT_e9_lhvloose_L1eEM5_mu23_mu8noL1_L1MU18VFCH', l1SeedThresholds=['eEM5','MU18VFCH','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaMuonGroup),
-
+
#ATR-27251, Phase-I
ChainProp(name='HLT_g35_loose_mu15_mu2noL1_L1eEM28M', l1SeedThresholds=['eEM28M','MU5VF','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaMuonGroup),
ChainProp(name='HLT_g35_tight_icalotight_mu15noL1_mu2noL1_L1eEM28M', l1SeedThresholds=['eEM28M','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+EgammaMuonGroup),
@@ -2197,10 +2197,10 @@ def setupMenu(menu_name):
ChainProp(name='HLT_mu20_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','TAU8'], stream=[PhysicsStream], groups=PrimaryLegGroup+MuonTauGroup),
# ATR 25512
ChainProp(name='HLT_mu23_ivarloose_tau20_mediumRNN_tracktwoMVA_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','TAU8'], stream=[PhysicsStream], groups=PrimaryLegGroup+MuonTauGroup),
-
- ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M', l1SeedThresholds=['MU8F','eTAU20M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
- ChainProp(name='HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_eTAU20M_3jJ30', l1SeedThresholds=['MU8F','eTAU20M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
-
+
+ ChainProp(name='HLT_mu14_ivarloose_tau35_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU30M', l1SeedThresholds=['MU8F','cTAU30M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
+ ChainProp(name='HLT_mu14_ivarloose_tau25_mediumRNN_tracktwoMVA_03dRAB_L1MU8F_cTAU20M_3jJ30', l1SeedThresholds=['MU8F','cTAU20M'], stream=[PhysicsStream], groups=PrimaryPhIGroup+MuonTauGroup),
+
# ATR-27546
ChainProp(name='HLT_mu26_ivarmedium_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU14FCH', l1SeedThresholds=['MU14FCH','PROBEcTAU30M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup),
ChainProp(name='HLT_mu26_ivarmedium_tau30_mediumRNN_tracktwoMVA_probe_L1cTAU30M_03dRAB_L1MU18VFCH', l1SeedThresholds=['MU18VFCH','PROBEcTAU30M'], stream=[PhysicsStream], groups=TagAndProbePhIGroup+SingleMuonGroup),
@@ -2219,7 +2219,7 @@ def setupMenu(menu_name):
# tau + met
ChainProp(name='HLT_tau60_mediumRNN_tracktwoMVA_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1eTAU60_2eTAU20M_jXE80', l1SeedThresholds=['eTAU60','eTAU20M','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+TauMETGroup),
ChainProp(name='HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1eEM18M_2eTAU20M_jXE70', l1SeedThresholds=['eEM18M','eTAU20M','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+TauMETGroup),
- ChainProp(name='HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_eTAU20M_jXE70', l1SeedThresholds=['MU8F','eTAU20M','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+TauMETGroup),
+ ChainProp(name='HLT_mu14_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1MU8F_cTAU20M_jXE70', l1SeedThresholds=['MU8F','cTAU20M','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryPhIGroup+TauMETGroup),
# T&P alignement-based tau chains (ATR-23150)
# Legacy tau+X chains with muon L1
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py
index 0e15ca6940892ccd98288eb96cae25dccbbf3ae1..885f499de3ea165cbd1c1e4e0b0c967505c4223a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/MinBias/MinBiasMenuSequences.py
@@ -25,15 +25,15 @@ def SPCountHypoToolGen(chainDict):
hypo.pixCLMax = 150 # TODO revisit tightening those
hypo.sctSPMax = 150 # as above
if "sp_pix" in chainDict["chainName"]:
- hypo.pixCL = int(chainDict["chainParts"][0]["hypoSPInfo"].strip("pix"))
+ hypo.pixCL = int(chainDict["chainParts"][0]["hypoSPInfo"].removeprefix("pix"))
if "sp_vpix" in chainDict["chainName"]:
hypo.pixCL = -1 # Remove any cut on mininum number of Pixel and SCT SpacePoints
hypo.sctSP = -1
- hypo.pixCLMax = int(chainDict["chainParts"][0]["hypoSPInfo"].strip("vpix"))
+ hypo.pixCLMax = int(chainDict["chainParts"][0]["hypoSPInfo"].removeprefix("vpix"))
if "nototpix" in chainDict["chainName"]:
hypo.pixCL = -1 # Remove any cut on mininum number of Pixel and SCT SpacePoints
hypo.sctSP = -1
- hypo.pixCLnoToT = int(chainDict["chainParts"][0]["hypoSPInfo"].strip("nototpix"))
+ hypo.pixCLnoToT = int(chainDict["chainParts"][0]["hypoSPInfo"].removeprefix("nototpix"))
return hypo
@@ -89,7 +89,7 @@ def MbtsHypoToolGen(flags, chainDict):
def TrigZVertexHypoToolGen(chainDict):
hypo = CompFactory.TrigZVertexHypoTool(chainDict["chainName"])
if "pusup" in chainDict["chainName"]:
- hypo.minWeight = int(chainDict["chainParts"][0]["pileupInfo"].strip("pusup"))
+ hypo.minWeight = int(chainDict["chainParts"][0]["pileupInfo"].removeprefix("pusup"))
else:
hypo.minWeight = -1 # pass always
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
index 3439e826f98deb63d4e0176c0255e7a43aa39b3e..576f4e02c9a9a42d0bcd7a407b58b7689aa63631 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
@@ -557,16 +557,20 @@ class ItemDef:
#Phase-I mixed tau
MenuItem('L1_eEM18M_2eTAU20M' ).setLogic( d.eEM18M & d.eTAU20M.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU8F_eTAU20M' ).setLogic( d.MU8F & d.eTAU20M & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_MU8F_cTAU20M' ).setLogic( d.MU8F & d.cTAU20M & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU8F_eTAU20M_jJ55_2jJ30' ).setLogic( d.MU8F & d.eTAU20M & d.jJ55 & d.jJ30.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU8F_eTAU20M_3jJ30' ).setLogic( d.MU8F & d.eTAU20M & d.jJ30.x(3) & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_MU8F_cTAU20M_3jJ30' ).setLogic( d.MU8F & d.eTAU20M & d.jJ30.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_eEM18M_2eTAU20M_jJ55_3jJ30' ).setLogic( d.eEM18M & d.eTAU20M.x(2) & d.jJ55 & d.jJ30.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU8F_eTAU30M' ).setLogic( d.MU8F & d.eTAU30M & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_MU8F_cTAU30M' ).setLogic( d.MU8F & d.cTAU30M & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU30M_2eTAU20M_jJ55_2jJ50_3jJ30').setLogic( d.eTAU30M & d.eTAU20M.x(2) & d.jJ55 & d.jJ50.x(2) & d.jJ30.x(3) & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU35M_2eTAU30M' ).setLogic( d.eTAU35M & d.eTAU30M.x(2) & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU30M_2jJ50_jXE90' ).setLogic( d.eTAU30M & d.jJ50.x(2) & d.jXE90 & physcond).setTriggerType( TT.calo )
MenuItem('L1_eEM18M_2eTAU20M_jXE70' ).setLogic( d.eEM18M & d.eTAU20M.x(2) & d.jXE70 & physcond).setTriggerType( TT.calo )
MenuItem('L1_eEM18M_2eTAU20M_4jJ30' ).setLogic( d.eEM18M & d.eTAU20M.x(2) & d.jJ30.x(4) & physcond).setTriggerType( TT.calo )
MenuItem('L1_MU8F_eTAU20M_jXE70' ).setLogic( d.MU8F & d.eTAU20M & d.jXE70 & physcond).setTriggerType( TT.calo )
+ MenuItem('L1_MU8F_cTAU20M_jXE70' ).setLogic( d.MU8F & d.cTAU20M & d.jXE70 & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU30M_2eTAU20M_jXE70' ).setLogic( d.eTAU30M & d.eTAU20M.x(2) & d.jXE70 & physcond).setTriggerType( TT.calo )
MenuItem('L1_eTAU60_2eTAU20M_jXE80' ).setLogic( d.eTAU60 & d.eTAU20M.x(2) & d.jXE80 & physcond).setTriggerType( TT.calo )
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 84d7f359cca1aabf1ae40faa2f9d33307a028566..c158441b57f7080672f85cc082b28baf99aaa393 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
@@ -78,10 +78,13 @@ def defineMenu():
#Phase-I
'L1_eEM18M_2eTAU20M',
'L1_MU8F_eTAU20M',
+ 'L1_MU8F_cTAU20M',
'L1_MU8F_eTAU20M_jJ55_2jJ30',
'L1_MU8F_eTAU20M_3jJ30',
+ 'L1_MU8F_cTAU20M_3jJ30',
'L1_eEM18M_2eTAU20M_jJ55_3jJ30',
'L1_MU8F_eTAU30M',
+ 'L1_MU8F_cTAU30M',
'L1_eEM18M_2eTAU20M_4jJ30',
# combined tau - jet
@@ -91,6 +94,7 @@ def defineMenu():
'L1_eEM18M_2eTAU20M_jXE70',
'L1_eTAU30M_2jJ50_jXE90',
'L1_MU8F_eTAU20M_jXE70',
+ 'L1_MU8F_cTAU20M_jXE70',
'L1_eTAU30M_2eTAU20M_jXE70',
'L1_eTAU60_2eTAU20M_jXE80',