Migrate MUCTPI EDM changes from 21.3
Migrate developments from 21.3 for the new MUCTPI in the L1Muon chain
Merge request reports
Activity
added 4146 commits
-
e00bb639...9e417a04 - 4137 commits from branch
atlas:master
- 51ff7e0a - migrate EDM changes from 21.3
- 324bf87c - move MuCTPICTP interface to vector, and add/retrieve CTP words bitwise
- 6c33a246 - interface with l1menu; check tgc flags; check rpc roi excl list
- ed89c985 - fix compilation errors
- f4302422 - check MSP side for l1topo inputs
- 1aa42360 - ad doLVL1PhaseI flag to TriggerFlags.py
- 33c04653 - add new L1Muon simulation to python config files
- 7af34ae9 - changes to Lvl1SimulationConfig.py for scheduling new muctpi
- 4bda5a69 - Merge branch 'MUCTPI_EDM_migration' of...
Toggle commit list-
e00bb639...9e417a04 - 4137 commits from branch
mentioned in merge request !33608 (merged)
added 4233 commits
-
4bda5a69...ac6c952e - 4229 commits from branch
atlas:master
- 6674416f - fix merge conflicts
- fc6d3d57 - move MuCTPI_RDO to TrigT1MuctpiBits to resolve cyclic dependency in interfaces
- 7fe65343 - fix compilation errors
- 2144bcbf - add run3 bit to MuonRoI xAOD
Toggle commit list-
4bda5a69...ac6c952e - 4229 commits from branch
added 2438 commits
-
2144bcbf...354f9255 - 2434 commits from branch
atlas:master
- 5df952ca - port overlap removal code to athena
- ee040a27 - add overlap removal code to muctpi sim
- 45364a50 - fix conflicts and merge with master
- 372a77c9 - update format of overlap xml reader to latest; move TCG/RPCRecRoiSvc to switch...
Toggle commit list-
2144bcbf...354f9255 - 2434 commits from branch
- Resolved by Aaron James Armbruster
- Resolved by Aaron James Armbruster
Hi @junpei
Thanks for catching this. Indeed, CAND_HIGHEST_PT_SHIFT should be 22 and not 25. 25 corresponds to the DAQ word for run 2 and not the LVL2 word that should be used here. I'll make the change in MuCTPI_Bits and double check to make sure there aren't other similar discrepancies.
We discussed the possibility of having a MuonRoI_v2 but wanted to keep everything under v1, and extend the methods to be able to switch between the different formats. This is so that we can reprocess run 2 data in R22 without conflicts in the xAOD versioning.
Cheers, Aaron
added 6111 commits
-
372a77c9...83d89cdb - 6101 commits from branch
atlas:master
- d0f4a82d - a few small fixes to data format
- 214d479a - start to incorporate RecMuonRoiSvc in muctpi sim
- 0a7eed60 - disable RecMuonRoiSvc in MUCTPI until it's fixed
- 31fd65b0 - Merge remote-tracking branch 'upstream/master' into MUCTPI_EDM_migration
- b5e59531 - Merge remote-tracking branch 'upstream/master' into MUCTPI_EDM_migration
- 25c99294 - typo in TP; remove unneeded deps in config
- 2ce4f414 - fix bug in recroisvc
- 3bd5ecab - Merge remote-tracking branch 'upstream/master' into MUCTPI_EDM_migration
- 0d6c4687 - interface MUCTPI with MuonRecRoiTool
- c92923ba - Merge branch 'master' of https://gitlab.cern.ch:8443/atlas/athena into MUCTPI_EDM_migration
Toggle commit list-
372a77c9...83d89cdb - 6101 commits from branch
- Resolved by Aaron James Armbruster
- Resolved by Aaron James Armbruster
This merge request affects 13 packages:
- Event/xAOD/xAODTrigger
- Simulation/Digitization
- Trigger/TrigConfiguration/TrigConfMuctpi
- Trigger/TrigT1/TrigT1CTMonitoring
- Trigger/TrigT1/TrigT1CTP
- Trigger/TrigT1/TrigT1Interfaces
- Trigger/TrigT1/TrigT1MuctpiBits
- Trigger/TrigT1/TrigT1MuctpiPhase1
- Trigger/TrigT1/TrigT1MuonRecRoiTool
- Trigger/TrigT1/TrigT1RPCRecRoiSvc
- Trigger/TrigT1/TrigT1Result
- Trigger/TrigT1/TrigT1TGCRecRoiSvc
- Trigger/TriggerCommon/TriggerJobOpts
Affected files list will not be printed in this case
Adding @jchapman ,@kwhalen ,@orlando ,@cmorenom ,@mark ,@tamartin ,@akraszna ,@asonay ,@vpascuzz ,@afaulkne as watchers
added DQ Digitization EDM Simulation Trigger master review-pending-level-1 labels
CI Result FAILURE Athena AthSimulation AthGeneration AnalysisBase externals cmake make N/A N/A N/A N/A required tests N/A N/A N/A N/A optional tests N/A N/A N/A N/A Due to problems in externals build or cmake configuration the job is stopped, results are not available on the ATLAS CI monitor 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
For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 24658] - Resolved by Aaron James Armbruster