2025-03-24: merge of 24.0 into main
Several conflicts have been resolved
-
DataQuality/DataQualityUtils/src/MonitoringFile.cxx
triggered by !78752 (merged) (@sroe) and !78738 (merged) (@wlampl). The conflict was resolved in favor of 24.0 -
InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/src/VertexDecoratorAlg.cxx
triggered by 77262 (@gfrattar) and 78662 (@tstreble). The conflict was resolved in favor of 24.0
Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh
Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh
Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh
Tools/TrfTestsART/test/test_trf_data22_hybrid_ca.sh
Tools/TrfTestsART/test/test_trf_data22_mt_ca.sh
Tools/TrfTestsART/test/test_trf_data23_mt_ca.sh
@elmsheus, these are on your territory. I resolved all conflicts in favor of 24.0. Please confirm that you are OK with this.
The following MRs have been excluded from this sweep:
- !78694 (merged) IsolationSelection: Remove isAssociatedToEG decoration. Analysis, sweep:ignore
- !78711 (merged) MM Trigger Simulation: complete removal of AGDD dependencies MuonSpectrometer, Trigger, sweep:ignore
- !77884 (merged) Fix of the Muon Spectrometer slow particle (MuGirlStau) reconstruction chain (temporary/flag-enabled) MuonSpectrometer, Reconstruction, Run2-DataReco-output-changed, Run2-MCReco-output-changed, Run3-DataReco-output-changed, Run3-MCReco-output-changed, Tools, sweep:ignore
This sweep contains the following MRs:
- !78744 (merged) Update Models Path on Egamma Signature Trigger, TriggerMenu, changes-trigger-counts
- !78724 (merged) HLT NNJVT variable handling in AODSLIM Trigger, TriggerEDM
- !78706 (merged) Update L1Calo dq algorithm (L1Calo_BinsDiffFromStripMedian) and config DQ, L1Calo, Trigger
- !78737 (merged) TrigT2CaloCommon: fix memory leak in TrigCaloDataAccessSvc Trigger
- !78717 (merged) Allow folder tags to be overriden using the dbOverrides argument DQ, L1Calo, Trigger
- !78731 (merged) ATR-29896: new TLA DIPZ candidates Trigger, TriggerMenu
- !78721 (merged) Move g-2 tau chains to the Physics menu Trigger, TriggerMenu
- !78725 (merged) ATR-30800: Rename GN2X working points JetEtmiss, Trigger, TriggerJet, TriggerMenu, changes-trigger-counts
- !78742 (merged) TrkMaterialProvider: fix memory leak in TrkMaterialProviderTool Tracking
- !78738 (merged) Histogram merging: Fix HLT use-case DQ
- !78722 (merged) More accurate silica absorption length ForwardDetectors, Simulation
- !78712 (merged) AthenaConfiguration.TestDefaults Adding 100 event HITS and RDO_BKG inputs for MC23d tests Core, Digitization, Overlay, Reconstruction, Simulation
- !78726 (merged) Add gen particle pid and status to output ForwardDetectors, Simulation
- !78709 (merged) ATR-30985: Swap the chains seeded by L1_MU8F_cTAU30M Trigger, TriggerMenu, changes-trigger-counts
- !78714 (merged) Reproducibilty of LArCoverageMonAlg Calorimeter, DQ, LAr
- !78707 (merged) Update conditions tag in RecJobTransformTests Reconstruction
- !78685 (merged) TrigP1Test: drop Trigger.Offline.SA.Muon.runCommissioningChain in DB test Trigger
- !78670 (merged) Add config file we use in online LAr mon DQ, LAr
- !78698 (merged) update IDGlobal han configs for YETS2025 DQ
- !78697 (merged) eflowRec: replace Decorator with WriteDecorHandle JetEtmiss, Reconstruction
- !78686 (merged) TrfTestsART : update conditions tag Tools
- !78684 (merged) TileCalibBlobObjs: Add new Tile DQ status (HalfGain) Tile
- !78681 (merged) add cool folder for stgc as built reading MuonSpectrometer
- !78673 (merged) Updates conditions tag Reconstruction, Tools
- !78674 (merged) TrigValidation: update bulk global conditions tag in ART tests Trigger
- !78668 (merged) LArShapeDumper+DataQualityUtils: backport cppcheck fixes DQ, LAr
- !78069 (merged) RoiWriter+EndOfEventROIConfirmerAlg: construct handle from key Trigger
- !78071 (merged) HLTEDMCreator: optimize creation of handles and their keys Trigger
- !78658 (merged) updating jfex thresholds for 2025 (ATR-30896) L1Calo, Trigger, TriggerMenu, changes-trigger-counts
- !78565 (merged) AFP DQM-algo: SiT efficiency auto-check DQ, ForwardDetectors
- !78662 (merged) Fix GNNHS VertexDecoratorAlg failure (ATLASRECTS-8178) InnerDetector
- !78660 (merged) ATR-30971: Menu changes for egamma trigger 2025 Trigger, TriggerMenu, changes-trigger-counts
- !78503 (merged) ATR-30808: Add online monitoring for GN2X bjet trigger chains to jet monitoring code JetEtmiss, Trigger, TriggerJet, TriggerMenu
Edited by Vakhtang Tsulaia
Merge request reports
Activity
Filter activity
Please register or sign in to reply