2025-02-19: merge of 24.0 into main
The following MR-s have been ignored during the sweep:
- !77870 (merged) Backport !72290 (merged) from main to 24.0: Fix IOV metadata configuration in CommonSimulationSteering Core, Simulation, sweep:ignore (@jchapman)
- !77855 (merged) Modifying NRPC RDO EDM, MuonSpectrometer, sweep:ignore (@rosati)
- !77847 (merged) FTAG OnnxUtil and OnnxOutput class renaming to SaltModel and SaltModelOutput Analysis, BTagging, Derivation, InnerDetector, JetEtmiss, Reconstruction, Tau, sweep:ignore (@robouque)
- !77882 (merged) Changed reference locations for 24.0 egamma validation Egamma, Reconstruction, sweep:ignore (@drousso)
The following conflicts were generated during the sweep
- Related to !77766 (merged)
Simulation/G4Atlas/G4AtlasAlg/python/G4AtlasAlgConfig.pySimulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.pySimulation/ISF/ISF_Config/python/ISF_MainConfig.py
@jchapman, I resolved the conflicts manually. Mostly in favor of 24.0, but not everywhere. Could you please confirm that the final resolution looks reasonable to you? Thanks.
- Related to !77855 (merged)
Simulation/Tests/DigitizationTests/test/test_Digi_tf_mc23a_presampling_variable.shSimulation/Tests/DigitizationTests/test/test_Digi_tf_mc23a_presampling_variable_TruthOnly.shSimulation/Tests/DigitizationTestsMT/test/test_Digi_tf_mc23a_MP_presampling_reproducibility.shSimulation/Tests/OverlayTests/test/test_MCOverlay_MC23a_ttbar.shSimulation/Tests/OverlayTestsMT/test/test_MCOverlay_MT_ttbar_Run3_8threads.shSimulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_Run3_ST_vs_MT.shSimulation/Tests/OverlayTestsMT/test/test_MCOverlay_ttbar_ST_vs_MT_Muon_NSW.sh
@jchapman, here again, I resolved the conflicts in favor of 24.0. @tstreble may not agree with this, though. Could you please have a look at the resolution and confirm that it is OK? Otherwise, please send me your suggestions for further changes. Thanks.
This sweep contains the following MRs:
- !77709 (merged) Make eFEX tau BDT configurable L1Calo, Trigger, TriggerMenu, changes-trigger-counts
- !77895 (merged) SimCoreTests: update test_AtlasG4_ZDCSimTest to use ATLAS-R2-2016-01-03-00 Simulation
- !77892 (merged) Digitization/Overlay ART: Use OFLCOND-MC23-SDR-RUN3-08 rather than OFLCOND-MC21-SDR-RUN3-10 Digitization, Overlay, Simulation
- !77891 (merged) Simulation ART: Use OFLCOND-MC23-SDR-RUN3-08 rather than OFLCOND-MC23-SDR-RUN3-01 Digitization, Simulation
- !77879 (merged) Found bug in D3PDMaker/CaloD3PDObject and CaloCellFilterAlgCfg.py Analysis
- !77867 (merged) Implement Dev menu-specific TauID inferences for the HLT Tau reconstruction Tau, Trigger, TriggerMenu
- !77817 (merged) Use defaultConditionsTags.RUN3_MC instead of OFLCOND-MC23-SDR-RUN3-05 Calorimeter, Digitization, Egamma, L1Calo, Reconstruction, Simulation, Tools, Trigger
- !77766 (merged) Patches to FastCaloSim configurations Simulation
- !77832 (merged) Update cmake_newanalysisalg.py - make skeleton script work with MT Tools
Edited by Vakhtang Tsulaia