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:
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/components/MuonCondAlg_entries.cxxMuonSpectrometer/MuonDetDescr/MuonReadoutGeometry/MuonReadoutGeometry/MuonDetectorManager.hMuonSpectrometer/MuonPhaseII/MuonConditions/MuonAlignmentDataR4/MuonAlignmentDataR4/sTgcAlignmentStore.h
Kept the main version:
MuonSpectrometer/MuonConfig/python/MuonConfigFlags.pyMuonSpectrometer/MuonConfig/python/MuonGeometryConfig.pyMuonSpectrometer/MuonPhaseII/MuonConditions/MuonCondAlgR4/src/ActsMuonAlignCondAlg.cxx
Kept the 24.0 version:
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