Skip to content

Daily merge of 23.0 into main

Vakhtang Tsulaia requested to merge tsulaia/athena:sweep_23.0_main_2023-07-14 into main

Conflicts

  • Calorimeter/CaloRecGPU/CMakeLists.txt
  • Calorimeter/CaloRecGPU/CaloRecGPU/StandaloneDataIO.h
  • Calorimeter/CaloRecGPU/src/CaloCellsCounterCPU.cxx
  • Calorimeter/CaloRecGPU/src/CaloCellsCounterGPU.cxx

These files were touched by !64255 (merged) (tag @averbyts). We get this conflict because in 23.0 the files in CaloRecGPU contain ^M characters, and in main don't. As a result, every time a single line is changed in some file in 23.0 the entire file gets marked for conflict during the sweep. The conflicts were resolved by manual propagation of 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 the main. Discarded the 23.0 updates.

  • Generators/TruthUtils/TruthUtils/AtlasPID.h

Trivial conflicts. Resolved manually. The most recent update in 23.0 in !64321 (merged) (tag @averbyts)

  • InnerDetector/InDetRecAlgs/SiSpacePointFormation/src/SiTrackerSpacePointFinder.cxx

Conflicting changes in 23.0 (!64289 (merged) @christos) and main (!64184 (merged) @tstreble). Here is the conflict:

<<<<<<< HEAD
  SG::WriteHandle<SpacePointOverlapCollection> spacepointoverlapCollection;
  if(m_overlap){
    spacepointoverlapCollection = SG::WriteHandle<SpacePointOverlapCollection>( m_spacepointoverlapCollectionKey, ctx );
    ATH_CHECK( spacepointoverlapCollection.record( std::make_unique<SpacePointOverlapCollection>() ) );
    ATH_MSG_DEBUG( "Container '" << spacepointoverlapCollection.name() << "' initialised" );
  }
=======
  SG::WriteHandle<SpacePointOverlapCollection> spacepointoverlapCollection(
      m_spacepointoverlapCollectionKey, ctx);
  ATH_CHECK(spacepointoverlapCollection.record(
      std::make_unique<SpacePointOverlapCollection>()));

  if (dataItemsSCT) {
    // if we have a DataPool it will own the elements                                                                                                                 
    spacepointoverlapCollection.ptr()->clear(SG::VIEW_ELEMENTS);
  }
  ATH_MSG_DEBUG("Container '" << spacepointoverlapCollection.name()
                              << "' initialised");
>>>>>>> upstream/23.0

Resolved manually into

  SG::WriteHandle<SpacePointOverlapCollection> spacepointoverlapCollection;
  if(m_overlap){
    spacepointoverlapCollection = SG::WriteHandle<SpacePointOverlapCollection>( m_spacepointoverlapCollectionKey, ctx );
    ATH_CHECK( spacepointoverlapCollection.record( std::make_unique<SpacePointOverlapCollection>() ) );
    if (dataItemsSCT) {
      // if we have a DataPool it will own the elements                                                                                                               
      spacepointoverlapCollection.ptr()->clear(SG::VIEW_ELEMENTS);
    }
    ATH_MSG_DEBUG( "Container '" << spacepointoverlapCollection.name() << "' initialised" );
  }

@christos and @tstreble could you please confirm that the resolution looks OK to you?

  • InnerDetector/InDetValidation/InDetPhysValMonitoring/test/test_ttbarPU40_reco.sh

The most recent change in 23.0 by !62730 (merged) (tag @keli). Kept the 23.0 version.

  • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/CMakeLists.txt
  • PhysicsAnalysis/DerivationFramework/DerivationFrameworkMCTruth/src/TruthMetaDataWriter.cxx

Conflicting, but identical changes, in 23.0 (!64241 (merged) tag @maszyman) and master (!62582 (merged) tag @zmarshal). Kept the master/main version.

Also, manually merged changes in Projects/AthAnalysis/package_filters.txt as discussed here

Finally, this sweep contains the following MRs:

Merge request reports