2025-03-26: merge of 24.0 into main

We have several conflicts on this sweep.

The first set of conflicts was generated by !78710 (merged), cc @pscholer. It was not always obvious how to resolve the conflicts, so I had to use my "educated guess". Most likely, I did something wrong here, so please check the results of the conflict resolutions. As a general note/guideline, I think it would be much more straightforward to mark such complex MR-s in 24.0 as sweep:ignore so that they will be excluded from daily sweeps, and then apply relevant changes directly to main in a separate MR.

Anyway, here is a list of conflicting files from this MR and how I approached to the resolution of conflicts.

Manual resolution:

1. MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/components/MuonCondAlg_entries.cxx
2. MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorManager.h
3. MuonSpectrometer/MuonPhaseII/MuonConditions/MuonAlignmentDataR4/MuonAlignmentDataR4/sTgcAlignmentStore.h

Kept the main version:

1. MuonSpectrometer/MuonConfig/python/MuonConfigFlags.py
2. MuonSpectrometer/MuonConfig/python/MuonGeometryConfig.py
3. MuonSpectrometer/MuonPhaseII/MuonConditions/MuonCondAlgR4/src/ActsMuonAlignCondAlg.cxx

Kept the 24.0 version:

1. MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/src/sTgcReadoutElement.cxx

One last conflict was on the file PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo/python/L1CALOCore.py triggered by !78790 (merged), cc @thompson. Again, I used the "educated guess" approach to resolve the conflict manually. Most likely the result is wrong. Please double check.

This sweep contains the following MRs:

• !78798 (merged) replace EmptyMenuSequenceCfg with createEmptyMenuSequenceCfg Trigger, TriggerMenu
• !78813 (merged) LArCelldeadOTXAlg : improve protection and possibly fixing ATR-30998 LAr
• !78774 (merged) ATR-30086: Move GNTau triggers to the Physics Menu (and add missing tau T&P) Tau, Trigger, TriggerMenu, changes-trigger-counts
• !78827 (merged) remove not necessary but problematic algorithm DQ
• !78793 (merged) Fix Typo In xAODEgammaBuilder [ATLASEG-424] Egamma, Reconstruction, Run2-DataReco-output-changed, Run2-MCReco-output-changed, Run3-DataReco-output-changed, Run3-MCReco-output-changed
• !78683 (merged) activate the sTGC T0 calibration MuonSpectrometer, Run3-DataReco-output-changed, frozen-tier0-violating
• !78794 (merged) Move JetTagMonitoring to using GN2 Analysis, BTagging, DQ, JetEtmiss
• !78790 (merged) Updates of L1CALO derivation for 2025 Derivation, L1Calo
• !78710 (merged) Cleanup of the sTGC as built model ACTS, MuonSpectrometer, Upgrade
• !78824 (merged) Fix definition of TRT extension in IDPVM (sweep to 24.0) InnerDetector, PhysValidation
• !78779 (merged) do not do anything in dead otx tool if no LAr cell LAr, Reconstruction
• !78800 (merged) MdtDriftCircleOnTrack switch MC message to debug level MuonSpectrometer

marked this merge request as ready

changed the description

added full-unit-tests label

This merge request affects 17 packages:

• DataQuality/DataQualityConfigurations
• LArCalorimeter/LArCellRec
• MuonSpectrometer/MuonAlignment/MuonAlignmentData
• MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg
• MuonSpectrometer/MuonConfig
• MuonSpectrometer/MuonDetDescr/MuonGeoModel
• MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
• MuonSpectrometer/MuonPhaseII/MuonConditions/MuonAlignmentDataR4
• MuonSpectrometer/MuonPhaseII/MuonConditions/MuonCondAlgR4
• MuonSpectrometer/MuonReconstruction/MuonRIO_OnTrackCreators/MdtDriftCircleOnTrackCreator
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkL1Calo
• PhysicsAnalysis/JetTagging/JetTagMonitoring
• Reconstruction/egamma/egammaAlgs
• Trigger/TrigAlgorithms/TrigTauRec
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigP1Test
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @tbold ,@mvozak ,@vmartin ,@martindl ,@jojungge ,@sutt ,@cvarni ,@pscholer ,@goetz ,@hrussell ,@jbeaucam ,@gipezzul ,@markowen ,@wleight ,@robouque ,@apsallid ,@slai ,@salderwe ,@kluit ,@adbailey ,@toyamaza ,@ddicroce ,@jmcgowan ,@amelo ,@ggonella ,@ligang ,@xiaozhon ,@okumura ,@pavol ,@stavrop ,@ademaria ,@emmat ,@pagessin ,@lidiaz ,@lstocker ,@shanisch ,@iriu ,@jcatmore as watchers

added ACTS Analysis BTagging DQ Derivation Egamma JetEtmiss L1Calo LAr MuonSpectrometer Reconstruction Tau Trigger TriggerMenu Upgrade changes-trigger-counts main review-pending-level-1 labels

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

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

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

496K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

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

changed the description

CI integration tests for projects Athena are cancelled because of compilation error(s)

CI Result FAILURE (hash a18f9a15)

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

OK, CI failures were expected. @pscholer, please advise how to proceed. Thanks

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

@pscholer, any feedback? Unless there is some easy way to fix these issues properly, I would suggest we mark your MR !78710 (merged) as sweep:ignore, exclude it from the sweep, and then you cherry-pick your changes from 24.0 into main in a separate MR, and address the conflicts as needed. What do you think? Thanks

resolved all threads

closed

mentioned in merge request !78862 (merged)