2025-03-19: merge of 24.0 into main

This sweep contains the following MRs:

• !78564 (merged) Fixing LAr CAF processing LAr
• !78601 (merged) Add NNJvt variables to Trigger EDM Trigger, TriggerEDM
• !78484 (merged) Rewrite DQM histogram merging DQ
• !78603 (merged) fixing MuonSort and MET/jXE sort implementations to resolve VAEAD mismatches Trigger, changes-trigger-counts
• !78113 (merged) adding cabing shifts correction for sTGC MuonSpectrometer, Run3-DataReco-output-changed, Tools
• !78625 (merged) TileSimAlgs: Simulate in-time pulse in Tile Pulse Simulator with given probability Digitization, Tile
• !78610 (merged) use default conditions tag in CA configuration step [ATLASSIM-7442] Simulation
• !78631 (merged) LeptonTaggers: Lock decorations from NonPromptLeptonVertexingAlg. Analysis
• !78618 (merged) Development of muon-in-jet chains for HH4b - ATR-30799 Trigger, TriggerMenu, changes-trigger-counts
• !78584 (merged) Added check on the number of allowed custom ComboHypo violating the CF rule (ATR-30464) Trigger, TriggerMenu
• !78605 (merged) Correct cell size for ITk Egamma, Reconstruction
• !78607 (merged) TriggerJobOpts: move to CONDBR2- HLTP-2025-01 as new default Trigger

changed the description

added 2 commits

• d63d3ba8 - Revert "Merge branch 'decorHandle.LeptonTaggers-20250318' into '24.0'"
• 3959e8f5 - Revert "Merge branch 'decorHandle.PhotonVertexSelection-20250318' into '24.0'"

Compare with previous version

added 3 commits

• 617043e9 - Merge remote-tracking branch 'upstream/24.0' into sweep_24.0_main_2025-03-19
• 5e42b75f - LArShapeDumper: cppcheck fix [uninitMemberVar]
• f05e121b - DataQualityUtils: fix potential nullptr deref (cppcheck)

Compare with previous version

changed the description

added full-unit-tests label

marked this merge request as ready

@wlampl can you check my cppcheck fixes here please? !78657 (f05e121b)

This merge request affects 14 packages:

• DataQuality/DataQualityUtils
• LArCalorimeter/LArCafJobs
• LArCalorimeter/LArSamplesMon
• MuonSpectrometer/MuonConfig
• Simulation/G4Atlas/G4AtlasAlg
• TileCalorimeter/TileSimAlgs
• Trigger/TrigSteer/TrigOutputHandling
• Trigger/TrigT1/L1Topo/L1TopoAlgorithms
• Trigger/TrigT1/L1Topo/L1TopoSimulationUtils
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigP1Test
• Trigger/TriggerCommon/TrigEDMConfig
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @fwinkl ,@cmorenom ,@salderwe ,@cantel ,@slai ,@jmcgowan ,@fpastore ,@harkusha ,@jmharris ,@solodkov ,@martindl ,@ademaria ,@apsallid ,@iouri ,@gipezzul ,@pscholer ,@iriu ,@paulama ,@shanisch ,@stavrop ,@okuprash ,@vmartin ,@ggonella ,@tamartin ,@will ,@okumura ,@jojungge ,@bernius ,@mvozak ,@lidiaz ,@kluit ,@stelzer ,@orlando ,@asonay ,@pavol ,@oliveirg ,@jchapman ,@sutt as watchers

added DQ Digitization LAr MuonSpectrometer Simulation Tile Trigger TriggerEDM TriggerMenu changes-trigger-counts main review-pending-level-1 labels

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

320K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref

520K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

156K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py

added Run3-DataReco-output-changed label

CI Result FAILURE (hash f05e121b)

	Athena	AthSimulation	AthAnalysis	DetCommon
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
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output (remote access info)

resolved all threads

Not sure why but there are differences in the muon and track container. -L1

added review-user-action-required label and removed review-pending-level-1 label

resolved all threads

added review-pending-level-1 label

removed review-user-action-required label

added 1 commit

• faef6a9d - Update CI references

Compare with previous version

This merge request affects 16 packages:

• DataQuality/DataQualityUtils
• LArCalorimeter/LArCafJobs
• LArCalorimeter/LArSamplesMon
• MuonSpectrometer/MuonConfig
• Simulation/G4Atlas/G4AtlasAlg
• TileCalorimeter/TileSimAlgs
• Tools/PROCTools
• Tools/WorkflowTestRunner
• Trigger/TrigSteer/TrigOutputHandling
• Trigger/TrigT1/L1Topo/L1TopoAlgorithms
• Trigger/TrigT1/L1Topo/L1TopoSimulationUtils
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigP1Test
• Trigger/TriggerCommon/TrigEDMConfig
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @pscholer ,@okumura ,@iriu ,@shanisch ,@jmcgowan ,@sutt ,@tamartin ,@paulama ,@ggonella ,@kluit ,@pagessin ,@lidiaz ,@cmorenom ,@will ,@okuprash ,@bernius ,@vmartin ,@jmharris ,@orlando ,@jchapman ,@solodkov ,@slai ,@gipezzul ,@pavol ,@asonay ,@mvozak ,@martindl ,@fwinkl ,@apsallid ,@iouri ,@fpastore ,@oliveirg ,@salderwe ,@stavrop ,@harkusha ,@stelzer ,@jojungge ,@cantel ,@ademaria as watchers

added Tools label

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

520K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

320K in file Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref

156K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py

mentioned in merge request !78668 (merged)

CI Result SUCCESS (hash faef6a9d)

	Athena	AthSimulation	AthGeneration	AthAnalysis	DetCommon
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
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output (remote access info)

merged

mentioned in commit ed99ed4e