split enableL1Phase1 flag (ATR-23110)

This is to split the enableL1Phase1 flag into enableL1MuonPhase1 and enableL1CaloPhase1 to allow the phase1 development in parallel. Also related to ATR-19328, ATR-23071

@fwinkl @rbielski @wiedenma @smh @stelzer @masato @armbrust , can you please check these changes are OK?

added 1 commit

• bd295a1d - one more missing occurrence of enableL1Phase1

Compare with previous version

added 38 commits

• bd295a1d...e8569102 - 36 commits from branch atlas:master
• efd60b2e - trying to resolve conflicts
• d39450f6 - trying to resolve conflicts

Compare with previous version

added 1 commit

• 5a81c059 - trying to resolve conflicts

Compare with previous version

added 1 commit

• 7f435cc6 - trying to fix errors in L1TriggerResultMaker

Compare with previous version

changed the description

added 1 commit

• cf910253 - fix and -> or

Compare with previous version

@dzanzi, the flag is also in https://gitlab.cern.ch/atlas/athena/-/blob/master/Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py since my MR this morning.

added 1 commit

• 1cabf25f - fixing flag in L1TopoSimulationConfig

Compare with previous version

thanks Aaron! should be fixed. Do this MR look good to you?

added 57 commits

• 1cabf25f...b3a8609a - 56 commits from branch atlas:master
• ca5a27cb - Merge remote-tracking branch 'upstream/master' into ATR-phase1flag

Compare with previous version

changed the description

Jenkins please retry a build

This merge request affects 14 packages:

• HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB
• MuonSpectrometer/MuonCnv/MuonCnvExample
• MuonSpectrometer/MuonConfig
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• Simulation/Digitization
• Trigger/TrigAlgorithms/TrigL2MuonSA
• Trigger/TrigSteer/L1Decoder
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CTMonitoring
• Trigger/TrigT1/TrigT1CTP
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TriggerTest
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@rosati ,@vmartin ,@okumura ,@fwinkl ,@wiedenma ,@cmorenom ,@bernius ,@asonay ,@jojungge ,@afaulkne ,@sutt ,@dzanzi ,@wleight ,@kwhalen ,@orlando ,@tamartin ,@hrussell ,@rbielski as watchers

added Analysis DQ Digitization MuonSpectrometer Simulation Trigger TriggerMenu master labels

CI Result SUCCESS (hash ca5a27cb)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
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 30697]

added 164 commits

• ca5a27cb...90611e41 - 161 commits from branch atlas:master
• f5053bf8 - Merge remote-tracking branch 'upstream/master' into ATR-phase1flag
• 331fad4e - Merge remote-tracking branch 'upstream/master' into ATR-phase1flag
• cfefe56c - adding L1Topo sim

Compare with previous version

added 52 commits

• cfefe56c...63fa2bdd - 51 commits from branch atlas:master
• 2ef1b491 - Merge remote-tracking branch 'upstream/master' into ATR-phase1flag

Compare with previous version

Jenkins please retry a build

This merge request affects 14 packages:

• HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB
• MuonSpectrometer/MuonCnv/MuonCnvExample
• MuonSpectrometer/MuonConfig
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• Simulation/Digitization
• Trigger/TrigAlgorithms/TrigL2MuonSA
• Trigger/TrigSteer/L1Decoder
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CTMonitoring
• Trigger/TrigT1/TrigT1CTP
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TriggerTest
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@rosati ,@vmartin ,@okumura ,@fwinkl ,@wiedenma ,@cmorenom ,@bernius ,@asonay ,@jojungge ,@afaulkne ,@sutt ,@dzanzi ,@wleight ,@kwhalen ,@orlando ,@tamartin ,@hrussell ,@rbielski as watchers

mentioned in merge request !41943 (closed)

changed the description

CI Result SUCCESS (hash 2ef1b491)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
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 30899]

added 41 commits

• 2ef1b491...9a8109fd - 40 commits from branch atlas:master
• c08db675 - Merge remote-tracking branch 'upstream/master' into ATR-phase1flag

Compare with previous version

added 1 commit

• 31d0efd7 - disable L1Topo Phase1 sim for now

Compare with previous version

marked this merge request as ready

This merge request affects 14 packages:

• HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB
• MuonSpectrometer/MuonCnv/MuonCnvExample
• MuonSpectrometer/MuonConfig
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• Simulation/Digitization
• Trigger/TrigAlgorithms/TrigL2MuonSA
• Trigger/TrigSteer/L1Decoder
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CTMonitoring
• Trigger/TrigT1/TrigT1CTP
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TriggerTest
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@rosati ,@vmartin ,@okumura ,@fwinkl ,@wiedenma ,@cmorenom ,@bernius ,@asonay ,@jojungge ,@afaulkne ,@sutt ,@dzanzi ,@wleight ,@kwhalen ,@orlando ,@tamartin ,@hrussell ,@rbielski as watchers

added review-pending-level-1 label

resolved all threads

added 1 commit

• 91c03286 - small fix

Compare with previous version

This merge request affects 14 packages:

• HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB
• MuonSpectrometer/MuonCnv/MuonCnvExample
• MuonSpectrometer/MuonConfig
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• Simulation/Digitization
• Trigger/TrigAlgorithms/TrigL2MuonSA
• Trigger/TrigSteer/L1Decoder
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CTMonitoring
• Trigger/TrigT1/TrigT1CTP
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TriggerTest
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@rosati ,@vmartin ,@okumura ,@fwinkl ,@wiedenma ,@cmorenom ,@bernius ,@asonay ,@jojungge ,@afaulkne ,@sutt ,@dzanzi ,@wleight ,@kwhalen ,@orlando ,@tamartin ,@hrussell ,@rbielski as watchers

marked this merge request as draft

CI Result SUCCESS (hash 91c03286)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
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 30978]

CI Result SUCCESS (hash 31d0efd7)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
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 30977]

added 49 commits

• 91c03286...ebc3af9f - 47 commits from branch atlas:master
• 65b2b5c0 - Merge remote-tracking branch 'upstream/master' into ATR-phase1flag
• f9464c9b - further fixes

Compare with previous version

marked this merge request as ready

This merge request affects 14 packages:

• HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB
• MuonSpectrometer/MuonCnv/MuonCnvExample
• MuonSpectrometer/MuonConfig
• PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs
• Simulation/Digitization
• Trigger/TrigAlgorithms/TrigL2MuonSA
• Trigger/TrigSteer/L1Decoder
• Trigger/TrigT1/L1Topo/L1TopoSimulation
• Trigger/TrigT1/TrigT1CTMonitoring
• Trigger/TrigT1/TrigT1CTP
• Trigger/TrigT1/TrigT1ResultByteStream
• Trigger/TrigValidation/TriggerTest
• Trigger/TriggerCommon/TriggerJobOpts
• Trigger/TriggerCommon/TriggerMenuMT

Affected files list will not be printed in this case

Adding @jchapman ,@rosati ,@vmartin ,@okumura ,@fwinkl ,@wiedenma ,@cmorenom ,@bernius ,@asonay ,@jojungge ,@afaulkne ,@sutt ,@dzanzi ,@wleight ,@kwhalen ,@orlando ,@tamartin ,@hrussell ,@rbielski as watchers

CI Result SUCCESS (hash f9464c9b)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
required tests
optional tests

Full details available on this CI monitor view
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 31026]

added review-approved label and removed review-pending-level-1 label

merged

mentioned in commit 158f7b6d

added sweep:ignore label