2022-11-08: Daily sweep of 22.0 into master

Conflicts:

• InnerDetector/InDetConfig/python/InDetPrepRawDataFormationConfig.py (taken 22.0)
• LArCalorimeter/LArMonitoring/src/LArDigitalTriggMonAlg.h (taken master)

/cc @tstreble @ekay

added sweep:from 22.0 label

This merge request affects 16 packages:

• Event/xAOD/xAODTrigL1Calo
• InnerDetector/InDetConfig
• MuonSpectrometer/MuonCnv/MuonTGC_CnvTools
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• PhysicsAnalysis/JetTagging/FlavorTagDiscriminants
• PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
• Trigger/TrigAlgorithms/TrigFastTrackFinder
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigHypothesis/TrigEgammaHypo
• Trigger/TrigMonitoring/TrigCaloMonitoring
• Trigger/TrigSteer/DecisionHandling
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos
• Trigger/TrigT1/TrigT1CaloSim
• Trigger/TrigT1/TrigT1Monitoring
• Trigger/TrigTools/TrigInDetConfig
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @cgrefe ,@joheinri ,@ggonella ,@orlando ,@carquin ,@jmharris ,@jojungge ,@dguest ,@goetz ,@apsallid ,@sroe ,@paulama ,@pscholer ,@oliveirg ,@thompson ,@shanisch ,@cjmeyer ,@rosati ,@dbakshig ,@duperrin ,@stavrop ,@mvozak ,@gavrilen ,@serodrig ,@jodafons ,@cmorenom ,@bcarlson ,@akraszna ,@safarzad ,@malconad ,@asonay ,@bernius ,@damazio ,@bdong ,@gipezzul ,@lidiaz ,@sutt ,@amorley ,@wleight ,@iriu ,@nagano ,@fernando ,@tamartin ,@calfayan ,@ademaria ,@eegidiop as watchers

added Analysis BTagging DQ Derivation EDM Egamma InnerDetector JetEtmiss MuonSpectrometer Trigger TriggerID TriggerMenu analysis-review-required master review-pending-level-1 labels

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

340K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

CI Result FAILURE (hash 49aed8ba)

	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
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 61561]

added 1 commit

• b83a4413 - Fix incorrect merge

Compare with previous version

This merge request affects 16 packages:

• Event/xAOD/xAODTrigL1Calo
• InnerDetector/InDetConfig
• MuonSpectrometer/MuonCnv/MuonTGC_CnvTools
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• PhysicsAnalysis/JetTagging/FlavorTagDiscriminants
• PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
• Trigger/TrigAlgorithms/TrigFastTrackFinder
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigHypothesis/TrigEgammaHypo
• Trigger/TrigMonitoring/TrigCaloMonitoring
• Trigger/TrigSteer/DecisionHandling
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos
• Trigger/TrigT1/TrigT1CaloSim
• Trigger/TrigT1/TrigT1Monitoring
• Trigger/TrigTools/TrigInDetConfig
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @cgrefe ,@joheinri ,@ggonella ,@orlando ,@carquin ,@jmharris ,@jojungge ,@dguest ,@goetz ,@apsallid ,@sroe ,@paulama ,@pscholer ,@oliveirg ,@thompson ,@shanisch ,@cjmeyer ,@rosati ,@dbakshig ,@duperrin ,@stavrop ,@mvozak ,@gavrilen ,@serodrig ,@jodafons ,@cmorenom ,@bcarlson ,@akraszna ,@safarzad ,@malconad ,@asonay ,@bernius ,@damazio ,@bdong ,@gipezzul ,@lidiaz ,@sutt ,@amorley ,@wleight ,@iriu ,@nagano ,@fernando ,@tamartin ,@calfayan ,@ademaria ,@eegidiop as watchers

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

340K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

CI Result FAILURE (hash b83a4413)

	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
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 61573]

Hi @tadej the error is the following:

Traceback (most recent call last):
  File "/cvmfs/sft.cern.ch/lcg/releases/LCG_101_ATLAS_26/Python/3.9.6/x86_64-centos7-gcc11-opt/lib/python3.9/runpy.py", line 197, in _run_module_as_main
    return _run_code(code, main_globals, None,
  File "/cvmfs/sft.cern.ch/lcg/releases/LCG_101_ATLAS_26/Python/3.9.6/x86_64-centos7-gcc11-opt/lib/python3.9/runpy.py", line 87, in _run_code
    exec(code, run_globals)
  File "/build2/ci-builds/master/Athena/build/Athena/x86_64-centos7-gcc11-opt/python/TrigInDetConfig/TrigInDetConfig.py", line 447, in <module>
    acc.merge( trigInDetPrecisionTrackingCfg( ConfigFlags, signatureName="Electron" , in_view=True) )
  File "/build2/ci-builds/master/Athena/build/Athena/x86_64-centos7-gcc11-opt/python/TrigInDetConfig/TrigInDetConfig.py", line 426, in trigInDetPrecisionTrackingCfg
    acc.merge(TRTExtrensionBuilderCfg(flags))
  File "/build2/ci-builds/master/Athena/build/Athena/x86_64-centos7-gcc11-opt/python/TrigInDetConfig/TrigInDetConfig.py", line 363, in TRTExtrensionBuilderCfg
    acc.merge( TrigTRTRIOMakerCfg(flags) )
  File "/build2/ci-builds/master/Athena/build/Athena/x86_64-centos7-gcc11-opt/python/InDetConfig/InDetPrepRawDataFormationConfig.py", line 244, in TrigTRTRIOMakerCfg
    from InDetConfig.TRTPreProcessing import TRT_DriftCircleToolCfg
ImportError: cannot import name 'TRT_DriftCircleToolCfg' from 'InDetConfig.TRTPreProcessing' (/build2/ci-builds/master/Athena/build/Athena/x86_64-centos7-gcc11-opt/python/InDetConfig/TRTPreProcessing.py)

-- L1

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

added 1 commit

• 76dbb8b7 - Fix TRT_DriftCircleToolCfg import for trigger

Compare with previous version

This merge request affects 16 packages:

• Event/xAOD/xAODTrigL1Calo
• InnerDetector/InDetConfig
• MuonSpectrometer/MuonCnv/MuonTGC_CnvTools
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• PhysicsAnalysis/JetTagging/FlavorTagDiscriminants
• PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
• Trigger/TrigAlgorithms/TrigFastTrackFinder
• Trigger/TrigAnalysis/TrigInDetAnalysisExample
• Trigger/TrigHypothesis/TrigEgammaHypo
• Trigger/TrigMonitoring/TrigCaloMonitoring
• Trigger/TrigSteer/DecisionHandling
• Trigger/TrigT1/L1CaloFEX/L1CaloFEXAlgos
• Trigger/TrigT1/TrigT1CaloSim
• Trigger/TrigT1/TrigT1Monitoring
• Trigger/TrigTools/TrigInDetConfig
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @cgrefe ,@joheinri ,@ggonella ,@orlando ,@carquin ,@jmharris ,@jojungge ,@dguest ,@goetz ,@apsallid ,@sroe ,@paulama ,@pscholer ,@oliveirg ,@thompson ,@shanisch ,@cjmeyer ,@rosati ,@dbakshig ,@duperrin ,@stavrop ,@mvozak ,@gavrilen ,@serodrig ,@jodafons ,@cmorenom ,@bcarlson ,@akraszna ,@safarzad ,@malconad ,@asonay ,@bernius ,@damazio ,@bdong ,@gipezzul ,@lidiaz ,@sutt ,@amorley ,@wleight ,@iriu ,@nagano ,@fernando ,@tamartin ,@calfayan ,@ademaria ,@eegidiop as watchers

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

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

340K in file Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run3_v1.py

CI Result SUCCESS (hash 76dbb8b7)

	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
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 61596]

merged

mentioned in commit 92bdf8ad

added sweep:ignore label