Skip to content
Snippets Groups Projects

IDAlignmentMonitoring resolving some conflicts

Merged IDAlignmentMonitoring resolving some conflicts
martis/athena:R22_IDAM_2 into master
Merged Salvador Marti I Garcia requested to merge martis/athena:R22_IDAM_2 into master

This is a fresh MR. However it is the continuation of MR !39273 (closed) as it was giving some conflicts. I tried to resolve the conflicts and placed this new MR

Edited by Matthew Feickert

Merge request reports

Pipeline #2197217 passed

Stage: external

    Pipeline passed for d54555ee on martis:R22_IDAM_2

    Merged by Johannes ElmsheuserJohannes Elmsheuser 4 years ago (Dec 25, 2020 6:12pm 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
    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

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

      :pencil: 120K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx

      :pencil: 324K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      This merge request affects 1 package:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring

      This merge request affects 3 files:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h

      Adding @goetz ,@jajimene ,@martis ,@sroe as watchers

    • ATLAS Robot added DQ InnerDetector master review-pending-level-1 labels

      added DQ InnerDetector master review-pending-level-1 labels

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      :negative_squared_cross_mark: CI Result FAILURE (hash 40063540)

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

      Full details available on this CI monitor view
      :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
      :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
      :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25648]

    • Salvador Marti I Garcia added 1 commit

      added 1 commit

      Compare with previous version

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

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

      :pencil: 120K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx

      :pencil: 324K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      This merge request affects 1 package:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring

      This merge request affects 3 files:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h

      Adding @goetz ,@jajimene ,@martis ,@sroe as watchers

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      :negative_squared_cross_mark: CI Result FAILURE (hash 3d75a150)

      Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
      externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :warning:
      required tests :o: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      optional tests :cloud: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

      Full details available on this CI monitor view
      :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
      :warning: AthAnalysis: number of compilation errors 0, warnings 1
      :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25654]

    • Salvador Marti I Garcia added 1 commit

      added 1 commit

      • 8a3219dd - keep debugging IDAlignMonResiduals

      Compare with previous version

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

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

      :pencil: 120K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx

      :pencil: 324K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      This merge request affects 1 package:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring

      This merge request affects 3 files:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h

      Adding @goetz ,@jajimene ,@martis ,@sroe as watchers

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      :negative_squared_cross_mark: CI Result FAILURE (hash 8a3219dd)

      Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
      externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      required tests :o: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

      Full details available on this CI monitor view
      :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
      :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
      :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25669]

    • Salvador Marti I Garcia added 1 commit

      added 1 commit

      • 60c6e71a - debugging around m_hTotalTrack->Fill

      Compare with previous version

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

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

      :pencil: 120K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx

      :pencil: 324K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      This merge request affects 1 package:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring

      This merge request affects 3 files:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h

      Adding @goetz ,@jajimene ,@martis ,@sroe as watchers

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      :negative_squared_cross_mark: CI Result FAILURE (hash 60c6e71a)

      Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
      externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      required tests :o: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

      Full details available on this CI monitor view
      :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
      :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
      :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25672]

    • Salvador Marti I Garcia added 1 commit

      added 1 commit

      • e66643a3 - suspecting h->Fill(0.) Very strange

      Compare with previous version

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

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

      :pencil: 120K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx

      :pencil: 324K in file InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      This merge request affects 1 package:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring

      This merge request affects 3 files:

      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonGenericTracks.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.cxx
      • InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/src/IDAlignMonResiduals.h

      Adding @goetz ,@jajimene ,@martis ,@sroe as watchers

    • ATLAS Robot
      ATLAS Robot @atlasbot ·
      Developer

      :negative_squared_cross_mark: CI Result FAILURE (hash e66643a3)

      Athena AthSimulation AthGeneration AnalysisBase AthAnalysis
      externals :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      cmake :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      required tests :o: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
      optional tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

      Full details available on this CI monitor view
      :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
      :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
      :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25674]

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