2025-03-28: merge of 24.0 into main
There were several conflicts related to !74020 (merged). The resolutions were mostly obvious and trivial. Still, it would be good it @bdong double-checked that the results look OK. Here is a list of files with conflicts:
InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/ElectronsLoader.h
InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/IParticlesLoader.h
InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/JetsLoader.h
InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/MuonsLoader.h
InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/PhotonsLoader.h
InnerDetector/InDetRecTools/InDetGNNHardScatterSelection/InDetGNNHardScatterSelection/TracksLoader.h
PhysicsAnalysis/JetTagging/FlavorTagDiscriminants/Root/DL2.cxx
PhysicsAnalysis/JetTagging/FlavourTaggingTests/CMakeLists.txt
Reconstruction/tauRecTools/Root/TauGNN.cxx
Reconstruction/tauRecTools/tauRecTools/TauGNN.h
The following MRs have been excluded from the sweep:
- !78857 (merged) Back-porting bugfix to 24.0 DQ, sweep:ignore
- !78869 (merged) sTgcReadoutElement - Fix debug compile failure MuonSpectrometer (because it generated a conflict caused by marking !78710 (merged) as sweep:ignore)
This sweep contains the following MRs:
- !78866 (merged) ATR-31014 : Moving flavour-neutral TLA chains from Dev to Physics Trigger, TriggerMenu
- !78871 (merged) Fix access to receiver database, add optional legacy ROD support L1Calo, Trigger
- !78875 (merged) PixelCalib - Updating default and error handle InnerDetector
- !78868 (merged) RecJobTransformTest-exec-bit-data22_900GeV_splash - chmod back to 755 (exec bit lost in the webIDE renaming) Reconstruction
- !74020 (merged) [AFT-730] Split GNN application from FlavorTagDiscriminants into a new package Analysis, BTagging, Build, Derivation, Egamma, InnerDetector, JetEtmiss, Reconstruction, Tau, Tracking, Trigger, TriggerMenu
- !78853 (merged) AFP DQM algo for sync check DQ
- !78849 (merged) RpcRawDataMonitoring//GetLBInfoFromCOOL: Reduce the number of db-connections DQ, MuonSpectrometer
- !78847 (merged) Remove stgc internal alignment tag MuonSpectrometer
- !78585 (merged) ATR-30999: implementing boosted ditau trigger chains - DiTauRec part Reconstruction, Tau, Trigger
Edited by Vakhtang Tsulaia
Merge request reports
Activity
Filter activity
Please register or sign in to reply