Skip to content
Snippets Groups Projects

Indet sync 21.0 trig mc to master

Merged Jiri Masik requested to merge jmasik/athena:indet-sync-21.0-TrigMC-to-master into master

synchronize merge requests from the InnerDetector domain made in 21.1/21.0-TrigMC related to ATR-19009

The request is a cherry-pick of several merge requests which are present in the 21.1 releases but did not make it into the master. They were identified as having InnerDetector label and were not related to the P1 ID monitoring.

There are also some further updates mostly to remove compilation warnings (variable naming convention)

Edited by Jiri Masik

Merge request reports

Pipeline #651425 passed

Pipeline passed for d9f00752 on jmasik:indet-sync-21.0-TrigMC-to-master

Approval is optional

Merged by Adam Edward BartonAdam Edward Barton 6 years ago (Jan 11, 2019 11:52am UTC)

Merge details

  • Changes merged into master with a7e97f16.
  • Did not delete the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • This merge request affects 17 packages:

    • InnerDetector/InDetCalibAlgs/TRT_CalibAlgs
    • InnerDetector/InDetDetDescr/PixelCabling
    • InnerDetector/InDetExample/InDetTrigRecExample
    • InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils
    • InnerDetector/InDetRecTools/SiClusterizationTool
    • InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk
    • InnerDetector/InDetRecTools/TRT_ElectronPidTools
    • InnerDetector/InDetRecTools/TRT_TrackHoleSearch
    • InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk
    • InnerDetector/InDetSimUtils/TRT_TR_Process
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder
    • Tracking/TrkAlignment/TrkAlgebraUtils
    • Trigger/TrigAlgorithms/TrigFastTrackFinder
    • Trigger/TrigTools/TrigInDetConf
    • Trigger/TrigValidation/TrigInDetValidation
    • Trigger/TriggerCommon/TriggerMenu

    Adding @sutt ,@oda ,@hartj as watchers

  • :negative_squared_cross_mark: CI Result FAILURE

    Athena AthSimulation
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :o: :white_check_mark:
    required tests :o: :white_check_mark:
    optional tests :cloud: :white_check_mark:

    Full details available at NICOS MR-20091-2018-12-21-16-25
    :o: Athena: number of compilation errors 5, warnings 1
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    For experts only: Jenkins output [CI-MERGE-REQUEST 31814] (for remote access see the FAQ for MR reviewers)

  • Jiri Masik marked as a Work In Progress

    marked as a Work In Progress

  • Jiri Masik changed the description

    changed the description

  • Jiri Masik added 2 commits

    added 2 commits

    • 5d047c88 - Revert "Merge branch 'rel210' into '21.0'"
    • 3934ed93 - fix compilation problems

    Compare with previous version

  • Jiri Masik added 254 commits

    added 254 commits

    Compare with previous version

  • Jiri Masik unmarked as a Work In Progress

    unmarked as a Work In Progress

  • This merge request affects 15 packages:

    • InnerDetector/InDetCalibAlgs/TRT_CalibAlgs
    • InnerDetector/InDetExample/InDetTrigRecExample
    • InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils
    • InnerDetector/InDetRecTools/SiClusterizationTool
    • InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk
    • InnerDetector/InDetRecTools/TRT_ElectronPidTools
    • InnerDetector/InDetRecTools/TRT_TrackHoleSearch
    • InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk
    • InnerDetector/InDetSimUtils/TRT_TR_Process
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder
    • Tracking/TrkAlignment/TrkAlgebraUtils
    • Trigger/TrigAlgorithms/TrigFastTrackFinder
    • Trigger/TrigValidation/TrigInDetValidation
    • Trigger/TriggerCommon/TriggerMenu

    Adding @sutt ,@oda ,@hartj as watchers

  • Jiri Masik added 1 commit

    added 1 commit

    • c1bc7511 - add a sequenceFlavour "noFTFxAODCnv" to suppress running of the FastTrackFinder…

    Compare with previous version

  • This merge request affects 16 packages:

    • InnerDetector/InDetCalibAlgs/TRT_CalibAlgs
    • InnerDetector/InDetExample/InDetTrigRecExample
    • InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils
    • InnerDetector/InDetRecTools/SiClusterizationTool
    • InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk
    • InnerDetector/InDetRecTools/TRT_ElectronPidTools
    • InnerDetector/InDetRecTools/TRT_TrackHoleSearch
    • InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk
    • InnerDetector/InDetSimUtils/TRT_TR_Process
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder
    • Tracking/TrkAlignment/TrkAlgebraUtils
    • Trigger/TrigAlgorithms/TrigFastTrackFinder
    • Trigger/TrigTools/TrigInDetConf
    • Trigger/TrigValidation/TrigInDetValidation
    • Trigger/TriggerCommon/TriggerMenu

    Adding @sutt ,@oda ,@hartj as watchers

  • Jiri Masik added 1 commit

    added 1 commit

    • d9f00752 - remove obsolete TrigFastTrackFinderMT_Config.py

    Compare with previous version

  • This merge request affects 16 packages:

    • InnerDetector/InDetCalibAlgs/TRT_CalibAlgs
    • InnerDetector/InDetExample/InDetTrigRecExample
    • InnerDetector/InDetRecTools/InDetMultipleVertexSeedFinderUtils
    • InnerDetector/InDetRecTools/SiClusterizationTool
    • InnerDetector/InDetRecTools/SiCombinatorialTrackFinderTool_xk
    • InnerDetector/InDetRecTools/TRT_ElectronPidTools
    • InnerDetector/InDetRecTools/TRT_TrackHoleSearch
    • InnerDetector/InDetRecTools/TRT_TrackSegmentsTool_xk
    • InnerDetector/InDetSimUtils/TRT_TR_Process
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat
    • InnerDetector/InDetTrigRecAlgs/InDetTrigPriVxFinder
    • Tracking/TrkAlignment/TrkAlgebraUtils
    • Trigger/TrigAlgorithms/TrigFastTrackFinder
    • Trigger/TrigTools/TrigInDetConf
    • Trigger/TrigValidation/TrigInDetValidation
    • Trigger/TriggerCommon/TriggerMenu

    Adding @sutt ,@oda ,@hartj as watchers

  • :negative_squared_cross_mark: CI Result FAILURE

    Athena AthSimulation
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :o: :white_check_mark:
    required tests :o: :white_check_mark:
    optional tests :cloud: :white_check_mark:

    Full details available at NICOS MR-20091-2019-01-08-18-54
    :o: Athena: number of compilation errors 1, warnings 5
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    For experts only: Jenkins output [CI-MERGE-REQUEST 32004] (for remote access see the FAQ for MR reviewers)

  • :negative_squared_cross_mark: CI Result FAILURE

    Athena AthSimulation
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :o: :white_check_mark:
    required tests :o: :white_check_mark:
    optional tests :cloud: :white_check_mark:

    Full details available at NICOS MR-20091-2019-01-08-20-25
    :o: Athena: number of compilation errors 1, warnings 5
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    For experts only: Jenkins output [CI-MERGE-REQUEST 32007] (for remote access see the FAQ for MR reviewers)

  • Author Developer

    Hi, the build failure is in a package MdtCalib which should be independent of the changes in this MR. Is it some infrastructure problem? cheers Jiri

  • :negative_squared_cross_mark: CI Result FAILURE

    Athena AthSimulation
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :o: :white_check_mark:
    required tests :o: :white_check_mark:
    optional tests :cloud: :white_check_mark:

    Full details available at NICOS MR-20091-2019-01-08-21-34
    :o: Athena: number of compilation errors 1, warnings 5
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    For experts only: Jenkins output [CI-MERGE-REQUEST 32008] (for remote access see the FAQ for MR reviewers)

  • All pipelines started this afternoon fail with this error. I suppose it's coming from !20182 (merged)

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