Sweep 21.3.25 into 21.9

This MR sweeps all the changes between 21.3.24 and 21.3.25.

For more details see here: https://gitlab.cern.ch/atlas/athena/-/tags/release%2F21.3.25

I would like to ask @jojungge to help with the muon review as there were some conflicts there.

@tstreble, if this can be related to ITk can you check TrackVertexAssociationTool changes as there were also some conflicts?

ERROR: precompile check found files with names differing by letter case:

Simulation/SimulationJobOptions/share/specialConfig/preInclude.Rhadrons.py Simulation/SimulationJobOptions/share/specialConfig/preInclude.RHadrons.py

WARNING: big files (>100K) are found in the changeset

168K in file Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx

1800K in file DataQuality/ZLumiScripts/scripts/Pandas_scripts/plotting/AtlasStyle/AtlasExample.C

108K in file Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx

128K in file MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationTypeBuilder.cxx

152K in file MuonSpectrometer/MuonDigitization/RPC_Digitization/src/RpcDigitizationTool.cxx

This merge request affects 69 packages. Since this is a long list, it will not be printed.

Adding @jchapman ,@ademaria ,@kwhalen ,@cohm ,@vmartin ,@okumura ,@carquin ,@afaulkne ,@xiaozhon ,@jojungge ,@markowen ,@mvanadia ,@ykeisuke ,@schaarsc ,@ggach ,@goetz ,@pjacka ,@emily ,@yoyamagu ,@sroe ,@szambito ,@ahasib ,@mhodgkin ,@malconad ,@tadej ,@aroepe ,@rbianchi ,@hoide ,@zmarshal ,@rosati ,@dshope ,@mfauccig ,@ssnyder ,@battagl ,@junpei ,@maklein ,@solodkov ,@bcarlson ,@akraszna ,@stsuno ,@lshan ,@leejr ,@sutt ,@fsforza ,@wleight ,@iriu ,@oducu ,@nakahama ,@harkusha ,@gartoni ,@oabouzei ,@pavol ,@jmontejo ,@amorley as watchers

added 21.9 Analysis Build Calorimeter Core DQ Derivation Digitization EDM Egamma ForwardDetectors Generators ITk InnerDetector JetEtmiss MuonSpectrometer Reconstruction Simulation Tau Tile Tools Trigger TriggerMenu review-pending-level-1 labels

Thanks for the notification. The updates of the TrackVertexAssociationTool look fine for me. FYI @ncalace

CI Result FAILURE (hash c1e6b168)

	Athena
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 2, warnings 103
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 32789]

added review-user-action-required label and removed review-pending-level-1 label

added 1 commit

• 6f3cc561 - Fix compilation after merge

Compare with previous version

ERROR: precompile check found files with names differing by letter case:

Simulation/SimulationJobOptions/share/specialConfig/preInclude.Rhadrons.py Simulation/SimulationJobOptions/share/specialConfig/preInclude.RHadrons.py

WARNING: big files (>100K) are found in the changeset

168K in file Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx

1800K in file DataQuality/ZLumiScripts/scripts/Pandas_scripts/plotting/AtlasStyle/AtlasExample.C

108K in file Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx

128K in file MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationTypeBuilder.cxx

This merge request affects 68 packages. Since this is a long list, it will not be printed.

Adding @jchapman ,@ademaria ,@kwhalen ,@cohm ,@vmartin ,@okumura ,@carquin ,@afaulkne ,@xiaozhon ,@jojungge ,@markowen ,@mvanadia ,@ykeisuke ,@schaarsc ,@ggach ,@goetz ,@pjacka ,@emily ,@yoyamagu ,@sroe ,@szambito ,@ahasib ,@mhodgkin ,@malconad ,@tadej ,@aroepe ,@rbianchi ,@hoide ,@zmarshal ,@rosati ,@dshope ,@mfauccig ,@ssnyder ,@battagl ,@junpei ,@maklein ,@solodkov ,@bcarlson ,@akraszna ,@stsuno ,@lshan ,@leejr ,@sutt ,@fsforza ,@wleight ,@iriu ,@oducu ,@nakahama ,@harkusha ,@gartoni ,@oabouzei ,@pavol ,@jmontejo ,@amorley as watchers

added review-pending-level-1 label and removed review-user-action-required label

Muon changes look sane to me.

CI Result FAILURE (hash 6f3cc561)

	Athena
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 1, warnings 103
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 32856]

added 1 commit

• 62aa3ee1 - Fix compilation after merge

Compare with previous version

ERROR: precompile check found files with names differing by letter case:

Simulation/SimulationJobOptions/share/specialConfig/preInclude.Rhadrons.py Simulation/SimulationJobOptions/share/specialConfig/preInclude.RHadrons.py

WARNING: big files (>100K) are found in the changeset

168K in file Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool.cxx

1800K in file DataQuality/ZLumiScripts/scripts/Pandas_scripts/plotting/AtlasStyle/AtlasExample.C

108K in file Trigger/TrigMonitoring/TrigTauMonitoring/src/HLTTauMonTool_bookHistograms.cxx

128K in file MuonSpectrometer/MuonDetDescr/MuonTrackingGeometry/src/MuonStationTypeBuilder.cxx

This merge request affects 68 packages. Since this is a long list, it will not be printed.

Adding @jchapman ,@ademaria ,@kwhalen ,@cohm ,@vmartin ,@okumura ,@carquin ,@afaulkne ,@xiaozhon ,@jojungge ,@markowen ,@mvanadia ,@ykeisuke ,@schaarsc ,@ggach ,@goetz ,@pjacka ,@emily ,@yoyamagu ,@sroe ,@szambito ,@ahasib ,@mhodgkin ,@malconad ,@tadej ,@aroepe ,@rbianchi ,@hoide ,@zmarshal ,@rosati ,@dshope ,@mfauccig ,@ssnyder ,@battagl ,@junpei ,@maklein ,@solodkov ,@bcarlson ,@akraszna ,@stsuno ,@lshan ,@leejr ,@sutt ,@fsforza ,@wleight ,@iriu ,@oducu ,@nakahama ,@harkusha ,@gartoni ,@oabouzei ,@pavol ,@jmontejo ,@amorley as watchers

CI Result FAILURE (hash 62aa3ee1)

	Athena
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
Athena: number of compilation errors 1, warnings 103
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 32869]

@tadej I'm seeing this build failure in eflowrecs:

In file included from /build2/ci-builds/21.9/Athena/install/GAUDI/21.9.19/InstallArea/x86_64-centos7-gcc62-opt/include/GaudiKernel/AlgTool.h:17:0,
                 from /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/21.9/Control/AthenaBaseComps/AthenaBaseComps/AthAlgTool.h:19,
                 from /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/21.9/Reconstruction/eflowRec/eflowRec/eflowObjectCreatorTool.h:18,
                 from /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/21.9/Reconstruction/eflowRec/src/eflowObjectCreatorTool.cxx:15:
/build2/ci-builds/21.9/Athena/install/GAUDI/21.9.19/InstallArea/x86_64-centos7-gcc62-opt/include/GaudiKernel/ToolHandle.h: In instantiation of 'IAlgTool* ToolHandle<T>::get() const [with T = CP::ITrackVertexAssociationTool]':
/var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/21.9/Reconstruction/eflowRec/src/eflowObjectCreatorTool.cxx:510:1:   required from here
/build2/ci-builds/21.9/Athena/install/GAUDI/21.9.19/InstallArea/x86_64-centos7-gcc62-opt/include/GaudiKernel/ToolHandle.h:197:32: error: cannot convert 'CP::ITrackVertexAssociationTool*' to 'IAlgTool*' in return
     return GaudiHandle<T>::get();

I perused the changes from this MR and I don't think that this MR is responsible, but it's causing some downstream failures in the tests (e.g. the unit tests). Can you investigate?

-- L1