Skip to content
  • Adam Edward Barton's avatar
    Merge remote-tracking branch 'upstream/24.0' into sweep_24.0_main_2024-10-28 · 2ef44996
    Adam Edward Barton authored
    Conflicts:
    	Calorimeter/CaloRec/python/CaloRecoConfig.py
    	MuonSpectrometer/MuonConfig/python/MuonConfigUtils.py
    	Projects/AthSimulation/version.txt
    	Projects/Athena/version.txt
    	Projects/DetCommon/version.txt
    	Projects/VP1Light/version.txt
    	Reconstruction/RecExample/RecExRecoTest/python/CaloReco_RAW_data22_13p6TeV.py
    	Reconstruction/RecExample/RecExRecoTest/python/CaloTopoClusterReco_ESDMC21.py
    	Reconstruction/RecExample/RecExRecoTest/python/EGammaReco_RAW_data22_13p6TeV.py
    	Reconstruction/RecExample/RecExRecoTest/python/METReco_ESDMC21.py
    	Reconstruction/RecExample/RecExRecoTest/python/MuonReco_RAW_data22_13p6TeV.py
    	Reconstruction/RecExample/RecExRecoTest/python/TauReco_RAW_data22_13p6TeV.py
    	Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_ESDMC21.py
    	Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_RAW_data22_13p6TeV.py
    	Reconstruction/egamma/egammaValidation/test/test_electron_Run4.sh
    	Reconstruction/eg...
    2ef44996