Skip to content
Snippets Groups Projects

Migrate MUCTPI EDM changes from 21.3

Merged Aaron James Armbruster requested to merge armbrust/athena:MUCTPI_EDM_migration into master

Migrate developments from 21.3 for the new MUCTPI in the L1Muon chain

Edited by Aaron James Armbruster

Merge request reports

Pipeline #2187022 passed

Pipeline passed for a30203c8 on armbrust:MUCTPI_EDM_migration

Merged by Frank WinklmeierFrank Winklmeier 4 years ago (Dec 18, 2020 11:25am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • 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

  • Hi @armbrust,

    Do you have an update here?

    Cheers,

    Stewart

  • 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

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • Aaron James Armbruster resolved all threads

    resolved all threads

  • Aaron James Armbruster unmarked as a Work In Progress

    unmarked as a Work In Progress

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

    :pencil: 100K in file Trigger/TrigT1/TrigT1CTMonitoring/src/BSMonitoring.cxx

  • 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

  • :negative_squared_cross_mark: CI Result FAILURE

    Athena AthSimulation AthGeneration AnalysisBase
    externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :o: :white_check_mark: :white_check_mark: :white_check_mark:
    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

    :exclamation: Due to problems in externals build or cmake configuration the job is stopped, results are not available on the ATLAS CI monitor :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 24658]

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading