Merge branch 'ATR-phase1flag' into 'master' (158f7b6d) · Commits · Julian Blumenthal / athena

Commit 158f7b6d authored 3 years ago by Johannes Elmsheuser

Merge branch 'ATR-phase1flag' into 'master'

split enableL1Phase1 flag (ATR-23110)

See merge request atlas/athena!41960

parents 3f48cc01 73dea3c8

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py 4 additions, 2 deletions

...l/TrigExamples/TrigExPartialEB/python/MTCalibPebConfig.py
HLT/Trigger/TrigControl/TrigExamples/TrigExPartialEB/share/MTCalibPeb.py 2 additions, 1 deletion

...gControl/TrigExamples/TrigExPartialEB/share/MTCalibPeb.py
MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCablingConfig.py 2 additions, 2 deletions

...ometer/MuonCnv/MuonCnvExample/python/MuonCablingConfig.py
MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py 1 addition, 1 deletion

MuonSpectrometer/MuonConfig/python/MuonCablingConfig.py
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py 2 additions, 2 deletions

...AnalysisTriggerAlgs/python/AnalysisTriggerAlgsCAConfig.py
PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py 2 additions, 2 deletions

...r/AnalysisTriggerAlgs/python/AnalysisTriggerAlgsConfig.py
Simulation/Digitization/share/LVL1Digitization.py 1 addition, 1 deletion

Simulation/Digitization/share/LVL1Digitization.py
Trigger/TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig.py 1 addition, 1 deletion

.../TrigAlgorithms/TrigL2MuonSA/python/TrigL2MuonSAConfig.py
Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py 19 additions, 13 deletions

Trigger/TrigSteer/L1Decoder/python/L1DecoderConfig.py
Trigger/TrigT1/L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py 3 additions, 3 deletions

.../L1Topo/L1TopoSimulation/python/L1TopoSimulationConfig.py
Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py 1 addition, 1 deletion

.../TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py 1 addition, 1 deletion

.../share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py 2 additions, 2 deletions

Trigger/TrigT1/TrigT1CTP/python/CTPSimulationConfig.py
Trigger/TrigT1/TrigT1ResultByteStream/python/TrigT1ResultByteStreamConfig.py 7 additions, 7 deletions

...T1ResultByteStream/python/TrigT1ResultByteStreamConfig.py
Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_rerunL1Only_phase1_build.py 2 additions, 1 deletion

...est/test/test_trig_data_v1Dev_rerunL1Only_phase1_build.py
Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_phase1_build.py 2 additions, 1 deletion

...gerTest/test/test_trig_mc_v1Dev_L1SimOnly_phase1_build.py
Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_slice_muon_phase1_build.py 1 addition, 1 deletion

...erTest/test/test_trig_mc_v1Dev_slice_muon_phase1_build.py
Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1MuonSimulationConfigOldStyle.py 5 additions, 5 deletions

...TriggerJobOpts/python/Lvl1MuonSimulationConfigOldStyle.py
Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py 49 additions, 20 deletions

...iggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py
Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py 7 additions, 7 deletions

Trigger/TriggerCommon/TriggerJobOpts/python/Modifiers.py

with 114 additions and 74 deletions

Please register or to comment

Admin message

Merge branch 'ATR-phase1flag' into 'master'