2023-09-19: merge of 23.0 into main

Conflicts:

1. Calorimeter/CaloRec/python/CaloConfigFlags.py. Caused by !65810 (merged) in main and !65694 (merged) in 23.0. Manually resolved the conflict by keeping additions from both branches. CC @stapiaar and @mhodgkin for info.
2. ForwardDetectors/ZDC/ZdcAnalysis/Root/ZdcLEDAnalysisTool.cxx. Same code, different formatting. Kept the main version.
3. Generators/Hijing_i/src/Hijing.cxx. Kept the main version with minor formatting changes. CC @ewelina for info
4. Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py. Manually resolved conflicts on the line which calls flags.addFlag() for Trigger.Jet.LowPtFilter. CC @khoo and @fwinkl for info

Excluded from the sweep:

• !65684 (merged) Merge branch '23.0-McEventCollection_p7-TP-Convertors' into '23.0' Generators (as discussed here)

This sweep contains the following MRs:

• !65864 (merged) Zdc led ntuple ForwardDetectors
• !65879 (merged) Bug fixed how to calculate SCT Coverage DQ histogram DQ, InnerDetector
• !65693 (merged) PFlow reconstruction in Heavy-Ions conditions JetEtmiss, Reconstruction
• !65876 (merged) CpmSimMonitorAlgorithm: Fix simulation errors in the CP system due to disabled hadronic inputs during heavy ion running DQ, Trigger
• !65863 (merged) Only run Pixel, SCT and TRT conversion to xAOD for TIDE preselected events. Derivation, InnerDetector
• !65829 (merged) Allow for lower MinFinalPtCut in combinatorial track finder if needed InnerDetector, Tracking
• !65858 (merged) egammaCheckEnergyDepositTool: create separate cfg and tune selection for UPC Egamma, Reconstruction, Tracking
• !65866 (merged) no tau/met monitoring for HI mode Reconstruction
• !65872 (merged) Fix unprotected division in RpdSubtractCentroidTool ForwardDetectors, frozen-tier0-violating
• !65832 (merged) Added config to run V0 secondary vertex finder in reco InnerDetector, Tracking
• !65768 (merged) ZDC: monitoring for LED events ForwardDetectors
• !65818 (merged) Switch off caching for RPC and TGC RDO To PRD decoding MuonSpectrometer, Trigger
• !65816 (merged) Update tracking CA configs extension for primary pass ITk, InnerDetector, Tracking
• !65815 (merged) MC reconstruction for HI: TruthJets JetEtmiss, Reconstruction
• !65811 (merged) Disable SCT/Pixel seeding for standalone Pixel/SCT pass InnerDetector, Tracking
• !65812 (merged) TileCal: minor fix in BadCellsFromCOOL.py Tile
• !65793 (merged) Rm seemingly un-needed HIP300 flag Tracking
• !65689 (merged) Preventing HIModulator to schedule "NULL" as eventshapekey JetEtmiss, Reconstruction, Trigger, TriggerMenu
• !65776 (merged) disable forward electron DQM if those are not reconstructed DQ, Egamma, Reconstruction
• !65745 (merged) ZDC: Enable "LHCf" functional form for 2023 analysis ForwardDetectors
• !65773 (merged) Ppr/PPM/CPMMonitoring: Fix wrong variable type for event numbers and bug related to mismatch-event-counter DQ, Trigger
• !65763 (merged) Introduce a HIP tracking mode Reconstruction, Tracking
• !65750 (merged) TrigMonTHistSvc: add extra lock in deReg method Trigger
• !65735 (merged) TrigOnlineMonitor: fix remaining ALFA LB histogram Trigger
• !65321 (merged) SCT heavyions webdisplay config cleanup DQ, InnerDetector
• !65710 (merged) ZdcAnalysis: Fix clang warnings. ForwardDetectors
• !65706 (merged) Trigger Menu updates for HI (ATR-28019) Trigger, TriggerMenu
• !65694 (merged) Tuning Heavy-Ion reconstruction and AOD output Calorimeter, JetEtmiss, Reconstruction
• !65705 (merged) Lower HLT jet clustering threshold by default for HI menu Trigger, changes-trigger-counts
• !65663 (merged) wrong word count in ZDC LUCROD decoding demoted to WARNING ForwardDetectors
• !65679 (merged) No CaloCalTopoClusters in HImode Calorimeter, Reconstruction
• !65697 (merged) Changes to ZdcLEDAnalysis ForwardDetectors
• !65677 (merged) Adding missing overlay chain in HI menu Trigger, TriggerMenu, changes-trigger-counts
• !65700 (merged) Added ZDC LED calibration triggers to the Cosmics menu Trigger, TriggerMenu
• !65674 (merged) Merge branch 'hijing-fix-rel23-ATLHI-483-v2' into 'main' Generators
• !65691 (merged) fix to LG,HG scales in ZdcAnalysisTool ForwardDetectors
• !65690 (merged) Modifications to ZdcNtuple to include RPD centroid information ForwardDetectors
• !65676 (merged) Merge branch 'hijing-fix-rel23-ATLHI-483/main' into 'main' Generators
• !65646 (merged) Tracking config updates for UPC pixel pass InnerDetector, Tracking

marked this merge request as ready

changed title from Draft: 2023-09-19: merge of UNKNOWN into main to 2023-09-19: merge of 23.0 into main

Jenkins please retry a build

This merge request affects 28 packages:

• Calorimeter/CaloRec
• DataQuality/DataQualityConfigurations
• ForwardDetectors/ZDC/ZdcAnalysis
• ForwardDetectors/ZDC/ZdcCnv/ZdcByteStream
• ForwardDetectors/ZDC/ZdcMonitoring
• ForwardDetectors/ZDC/ZdcNtuple
• ForwardDetectors/ZDC/ZdcRec
• ForwardDetectors/ZDC/ZdcUtils
• Generators/Hijing_i
• HLT/Trigger/TrigControl/TrigServices
• HLT/Trigger/TrigMonitoring/TrigOnlineMonitor
• InnerDetector/InDetConfig
• InnerDetector/InDetMonitoring/SCT_Monitoring
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet
• Reconstruction/HeavyIonRec/HIJetRec
• Reconstruction/HeavyIonRec/HIRecConfig
• Reconstruction/Jet/JetRecConfig
• Reconstruction/RecoAlgs/TrackParticleAssociationAlgs
• Reconstruction/eflowRec
• Reconstruction/egamma/egammaCaloTools
• Reconstruction/egamma/egammaPerformance
• Reconstruction/egamma/egammaTools
• TileCalorimeter/TileCalib/TileCalibAlgs
• Tracking/TrkConfig
• Trigger/TrigT1/TrigT1CaloMonitoring
• Trigger/TrigValidation/TriggerTest
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @fpastore ,@ggonella ,@vmartin ,@okumura ,@carquin ,@wiedenma ,@ademaria ,@jcatmore ,@dossantn ,@iouri ,@goetz ,@bouhova ,@pavol ,@sroe ,@mhodgkin ,@serodrig ,@thompson ,@shanisch ,@lidiaz ,@battagl ,@martindl ,@dshope ,@miochoa ,@gavrilen ,@solodkov ,@emmat ,@malconad ,@stsuno ,@fwinkl ,@gipezzul ,@cantel ,@sutt ,@iriu ,@harkusha ,@calpigia ,@lshan as watchers

added Calorimeter DQ Derivation Egamma ForwardDetectors Generators ITk InnerDetector JetEtmiss Reconstruction Tile Tracking Trigger TriggerMenu analysis-review-required changes-trigger-counts full-unit-tests main review-pending-level-1 labels

WARNING: big files (>100K) are found in the changeset

156K in file DataQuality/DataQualityConfigurations/config/SCT/heavyions_run.config

changed the description

CI Result FAILURE (hash 7a29fedd)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 78144]

The same failures in the AnalysisBase tests seen in the latest nightly 2023-09-19T0220

mentioned in commit 36ef0b1e

merged

added sweep:ignore label