Skip to content
Snippets Groups Projects
This project is mirrored from https://gitlab.cern.ch/atlas/athena.git. Pull mirroring updated .
  1. Jul 16, 2023
  2. Jul 15, 2023
    • Vakhtang Tsulaia's avatar
      Bumped references from v1 to v2 in three derivation tests · 31c150b2
      Vakhtang Tsulaia authored
      Affected tests:
      * DerivationRun2Data_PHYS
      * DerivationRun2MC_PHYS
      * DerivationRun3MC_PHYS
      31c150b2
    • Vakhtang Tsulaia's avatar
      Fixed compilation problems · ed698eff
      Vakhtang Tsulaia authored
      Affected packages:
      * Calorimeter/CaloRecGPU
      * PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth
      ed698eff
    • Vakhtang Tsulaia's avatar
    • Vakhtang Tsulaia's avatar
      Merge remote-tracking branch 'upstream/23.0' into sweep_23.0_main_2023-07-14 · d6c135f7
      Vakhtang Tsulaia authored
      Conflicts:
      * Calorimeter/CaloRecGPU/CMakeLists.txt
      * Calorimeter/CaloRecGPU/CaloRecGPU/StandaloneDataIO.h
      * Calorimeter/CaloRecGPU/src/CaloCellsCounterCPU.cxx
      * Calorimeter/CaloRecGPU/src/CaloCellsCounterGPU.cxx
      
      Conflict generated by the use of ^M character in 23.0. Fixed manually by propagating
      the changes from 23.0 into main
      
      * Calorimeter/CaloRecGPU/tools/plotter/ClusterPlotter.h
      * Calorimeter/CaloRecGPU/tools/plotter/TimePlotter.h
      * Calorimeter/CaloRecGPU/tools/plotter/clusterplotter.cxx
      
      These files no longer exist in main. Did not propagate changes
      
      * Generators/TruthUtils/TruthUtils/AtlasPID.h
      
      Trivial conflict. Fixed manually
      
      * InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx
      
      Manual resolution of the conflict caused by !64184 (main) and !64289 (23.0)
      
      * InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh
      
      Kept the 23.0 version which drops execution of two steps in a test
      
      * PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/CMakeLists.txt
      * PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthMetaDataWriter.cxx
      
      Conflicting identical implementations in two branches. Kept the main version unchanged.
      d6c135f7
  3. Jul 14, 2023
Loading