Daily merge of 22.0 into master, Nov 1st 2022

Revert the following MRs:

!57892 (merged) Conflicts !57965 (merged) Conflicts and the description says it's acutally back-ported from master

This merge request affects 44 packages:

• AtlasTest/CITest
• Calorimeter/CaloMonitoring
• Control/AthenaMonitoring
• DataQuality/DataQualityConfigurations
• Event/xAOD/xAODEventInfoCnv
• Event/xAOD/xAODTrigL1Calo
• ForwardDetectors/ZDC/ZdcAnalysis
• ForwardDetectors/ZDC/ZdcNtuple
• ForwardDetectors/ZDC/ZdcRec
• InnerDetector/InDetConditions/PixelConditionsAlgorithms
• InnerDetector/InDetConfig
• InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv
• InnerDetector/InDetMonitoring/TRTMonitoringRun3
• MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
• MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools
• MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring
• MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet
• PhysicsAnalysis/PhysicsValidation/PhysValMonitoring
• Simulation/FastSimulation/FastChainPileup
• Simulation/SimuJobTransforms
• Simulation/Tests/ISF_Validation
• Simulation/Tests/ISF_ValidationMT
• Tools/Campaigns
• Tools/FullChainTransforms
• Tools/PROCTools
• Trigger/TrigAlgorithms/TrigLongLivedParticles
• Trigger/TrigAlgorithms/TrigMuonEF
• Trigger/TrigAnalysis/TrigDecisionMaker
• Trigger/TrigAnalysis/TrigDecisionTool
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigConfiguration/TrigConfData
• Trigger/TrigCost/EnhancedBiasWeighter
• Trigger/TrigHypothesis/TrigLongLivedParticlesHypo
• Trigger/TrigMonitoring/TrigIDtrkMonitoring
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream
• Trigger/TrigT1/L1Topo/L1TopoAlgorithms
• Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CaloMonitoring
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigInDetValidation
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@cgrefe ,@jmharris ,@ggonella ,@vmartin ,@nagano ,@carquin ,@fwinkl ,@okumura ,@ademaria ,@jojungge ,@jcatmore ,@ahaas ,@goetz ,@apsallid ,@pavol ,@tkharlam ,@sroe ,@hartj ,@mark ,@paulama ,@pscholer ,@oliveirg ,@thompson ,@shanisch ,@tadej ,@ssnyder ,@martindl ,@rosati ,@dshope ,@stavrop ,@battagl ,@serodrig ,@mvozak ,@cmorenom ,@aporeba ,@akraszna ,@malconad ,@stsuno ,@asonay ,@bernius ,@gipezzul ,@lidiaz ,@sutt ,@amorley ,@wleight ,@iriu ,@orlando ,@rbielski ,@tamartin ,@calfayan ,@calpigia ,@lshan as watchers

added Analysis Calorimeter Core DQ Derivation EDM ForwardDetectors InnerDetector JetEtmiss MuonSpectrometer Overlay Simulation Test Tools Trigger TriggerMenu analysis-review-required changes-trigger-counts master review-pending-level-1 labels

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

116K in file MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackFitter.cxx

152K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

324K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

188K in file DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config

CI integration tests for projects Athena,AnalysisBase,AthAnalysis are cancelled because of compilation error(s)

CI Result FAILURE (hash b3244763)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
NEW: project list is tailored to contain projects affected by code changes
Athena: number of compilation errors 3, warnings 44
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 2, warnings 2
AthAnalysis: number of compilation errors 2, warnings 3
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 61159]

Hey from the one failure relating to @smh [!57803 (diffs)] I would imagine (I think I wrote it there) that you want to pick the ctx change on the TRTRawDataProvider he did.

For the other 2 failures not sure I have any clue ...

added 3 commits

• d403506f - Revert TrigDecisionTool to what is in master
• 09e77967 - Revert "Merge branch '22.0' into '22.0'"
• 5bfd837c - TRTRawDataProvider: Prefer version in 22.0 branch

Compare with previous version

This merge request affects 41 packages:

• AtlasTest/CITest
• Calorimeter/CaloMonitoring
• Control/AthenaMonitoring
• DataQuality/DataQualityConfigurations
• Event/xAOD/xAODEventInfoCnv
• Event/xAOD/xAODTrigL1Calo
• ForwardDetectors/ZDC/ZdcNtuple
• InnerDetector/InDetConditions/PixelConditionsAlgorithms
• InnerDetector/InDetConfig
• InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv
• InnerDetector/InDetMonitoring/TRTMonitoringRun3
• MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
• MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools
• MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring
• MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet
• PhysicsAnalysis/PhysicsValidation/PhysValMonitoring
• Simulation/FastSimulation/FastChainPileup
• Simulation/SimuJobTransforms
• Simulation/Tests/ISF_Validation
• Simulation/Tests/ISF_ValidationMT
• Tools/Campaigns
• Tools/FullChainTransforms
• Tools/PROCTools
• Trigger/TrigAlgorithms/TrigLongLivedParticles
• Trigger/TrigAlgorithms/TrigMuonEF
• Trigger/TrigAnalysis/TrigDecisionMaker
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigConfiguration/TrigConfData
• Trigger/TrigCost/EnhancedBiasWeighter
• Trigger/TrigHypothesis/TrigLongLivedParticlesHypo
• Trigger/TrigMonitoring/TrigIDtrkMonitoring
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream
• Trigger/TrigT1/L1Topo/L1TopoAlgorithms
• Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CaloMonitoring
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigInDetValidation
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@cgrefe ,@jmharris ,@ggonella ,@vmartin ,@nagano ,@carquin ,@fwinkl ,@okumura ,@ademaria ,@jojungge ,@jcatmore ,@ahaas ,@goetz ,@apsallid ,@pavol ,@tkharlam ,@sroe ,@hartj ,@mark ,@paulama ,@pscholer ,@oliveirg ,@thompson ,@shanisch ,@tadej ,@ssnyder ,@martindl ,@rosati ,@dshope ,@stavrop ,@battagl ,@serodrig ,@mvozak ,@cmorenom ,@aporeba ,@akraszna ,@malconad ,@stsuno ,@asonay ,@bernius ,@gipezzul ,@lidiaz ,@sutt ,@amorley ,@wleight ,@iriu ,@orlando ,@rbielski ,@tamartin ,@calfayan ,@calpigia ,@lshan as watchers

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

116K in file MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackFitter.cxx

152K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

324K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

188K in file DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config

added Run3-MCOverlay-output-changed label

CI Result FAILURE (hash 5bfd837c)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
NEW: project list is tailored to contain projects affected by code changes
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 61191]

changed title from Daily merge of 22.0 into master, Oct 3st 2022 to Daily merge of 22.0 into master, Oct 1st 2022

added 1 commit

• 00df1d5e - update reference file

Compare with previous version

This merge request affects 42 packages:

• AtlasTest/CITest
• Calorimeter/CaloMonitoring
• Control/AthenaMonitoring
• DataQuality/DataQualityConfigurations
• Event/xAOD/xAODEventInfoCnv
• Event/xAOD/xAODTrigL1Calo
• ForwardDetectors/ZDC/ZdcNtuple
• InnerDetector/InDetConditions/PixelConditionsAlgorithms
• InnerDetector/InDetConfig
• InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv
• InnerDetector/InDetMonitoring/TRTMonitoringRun3
• MuonSpectrometer/MuonDetDescr/MuonReadoutGeometry
• MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools
• MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring
• MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring
• PhysicsAnalysis/DerivationFramework/DerivationFrameworkInDet
• PhysicsAnalysis/PhysicsValidation/PhysValMonitoring
• Simulation/FastSimulation/FastChainPileup
• Simulation/SimuJobTransforms
• Simulation/Tests/ISF_Validation
• Simulation/Tests/ISF_ValidationMT
• Tools/Campaigns
• Tools/FullChainTransforms
• Tools/PROCTools
• Tools/WorkflowTestRunner
• Trigger/TrigAlgorithms/TrigLongLivedParticles
• Trigger/TrigAlgorithms/TrigMuonEF
• Trigger/TrigAnalysis/TrigDecisionMaker
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigConfiguration/TrigConfData
• Trigger/TrigCost/EnhancedBiasWeighter
• Trigger/TrigHypothesis/TrigLongLivedParticlesHypo
• Trigger/TrigMonitoring/TrigIDtrkMonitoring
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXByteStream
• Trigger/TrigT1/L1Topo/L1TopoAlgorithms
• Trigger/TrigT1/L1Topo/L1TopoOnlineMonitoring
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CaloMonitoring
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TrigAnalysisTest
• Trigger/TrigValidation/TrigInDetValidation
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@cgrefe ,@jmharris ,@ggonella ,@vmartin ,@nagano ,@carquin ,@fwinkl ,@okumura ,@ademaria ,@jojungge ,@jcatmore ,@ahaas ,@goetz ,@apsallid ,@pavol ,@tkharlam ,@sroe ,@hartj ,@mark ,@paulama ,@pscholer ,@oliveirg ,@thompson ,@shanisch ,@tadej ,@ssnyder ,@martindl ,@rosati ,@dshope ,@stavrop ,@battagl ,@serodrig ,@mvozak ,@cmorenom ,@aporeba ,@akraszna ,@malconad ,@stsuno ,@asonay ,@bernius ,@gipezzul ,@lidiaz ,@sutt ,@amorley ,@wleight ,@iriu ,@orlando ,@rbielski ,@tamartin ,@calfayan ,@calpigia ,@lshan as watchers

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

116K in file MuonSpectrometer/MuonReconstruction/MuonTrackMakers/MuonTrackMakerTools/MuonTrackSteeringTools/src/MooTrackFitter.cxx

152K in file Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py

324K in file Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref

188K in file DataQuality/DataQualityConfigurations/config/L1Calo/collisions_run.config

CI Result SUCCESS (hash 00df1d5e)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
NEW: project list is tailored to contain projects affected by code changes
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 61205]

Success finally ....

merged

mentioned in commit 4928cb18

added sweep:ignore label