Skip to content
Snippets Groups Projects

Replacement InDetBSErrContainer with IDCInDetBSErrContainer (ATLASRECTS-4971)

Merged Soshi Tsuno requested to merge stsuno/athena:atlasrects-4971.v3 into master

InDetBSErrContainer was not tread-safe.

Instead, The IDCInDetBSErrContainer is prepared.

Basically, this means PixelByteStreamErrorsTool is not necessary anymore and the BS error information can be directly accessed through IDCInDetBSErrContainer.

There is some extension of the original IDCInDetBSErrContainer which only stored "module-level information. But it is now expanded to FE-level information.

Edited by Soshi Tsuno

Merge request reports

Pipeline #1916564 passed

Pipeline passed for 35284026 on stsuno:atlasrects-4971.v3

Merged by Vakhtang TsulaiaVakhtang Tsulaia 4 years ago (Sep 7, 2020 3:32pm 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
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • Tomasz Bold
  • :negative_squared_cross_mark: CI Result FAILURE (hash 9c6c0a60)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :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:
    make :o: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :cloud: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :o: Athena: number of compilation errors 1, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :white_check_mark: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 15767]

  • Soshi Tsuno added 375 commits

    added 375 commits

    • 9c6c0a60...bf898282 - 372 commits from branch atlas:master
    • 70c6f609 - little update, mainly fix compiler error
    • ea9dfbf5 - Merge remote-tracking branch 'upstream/master' into atlasrects-4971.v3
    • 627448a5 - fix compiler error.

    Compare with previous version

  • This merge request affects 9 packages:

    • InnerDetector/InDetCalibAlgs/PixelCalibAlgs
    • InnerDetector/InDetConditions/InDetConditionsSummaryService
    • InnerDetector/InDetConditions/PixelConditionsData
    • InnerDetector/InDetConditions/PixelConditionsTools
    • InnerDetector/InDetConditions/SCT_ConditionsTools
    • InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD
    • InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv
    • InnerDetector/InDetExample/InDetRecExample
    • InnerDetector/InDetMonitoring/PixelMonitoring

    Adding @goetz ,@ibragimo ,@stsuno ,@kzoch ,@oda ,@battagl ,@sroe as watchers

  • :negative_squared_cross_mark: CI Result FAILURE (hash 627448a5)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :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:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :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: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 15955]

  • Hi @stsuno, if no further implementations are required from your side and everyone involved is happy with the MR, could you please mark the related threads as resolved and resolve the rest? Please then feel free to return the label back and the MR will be ready for review. Thanks, L1

  • Soshi Tsuno added 343 commits

    added 343 commits

    • 627448a5...8f05efa3 - 341 commits from branch atlas:master
    • 4a205741 - reflect comments in MR.
    • 7f141bdc - Merge remote-tracking branch 'upstream/master' into atlasrects-4971.v3

    Compare with previous version

  • This merge request affects 10 packages:

    • InnerDetector/InDetCalibAlgs/PixelCalibAlgs
    • InnerDetector/InDetConditions/InDetConditionsSummaryService
    • InnerDetector/InDetConditions/PixelConditionsData
    • InnerDetector/InDetConditions/PixelConditionsTools
    • InnerDetector/InDetConditions/SCT_ConditionsTools
    • InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD
    • InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv
    • InnerDetector/InDetExample/InDetRecExample
    • InnerDetector/InDetMonitoring/PixelMonitoring
    • InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation

    Adding @goetz ,@ibragimo ,@stsuno ,@kzoch ,@oda ,@battagl ,@sroe as watchers

  • :negative_squared_cross_mark: CI Result FAILURE (hash 7f141bdc)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :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:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :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: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 16088]

  • Changing label to review-user-action-required until the discussions are resolved. Clara (L1)

  • Soshi Tsuno resolved all threads

    resolved all threads

  • Author Contributor

    Hello, Can we merge? Cheers, Soshi

  • Hi @stsuno, just FYI (and for the future) I learned today that we also need to change the label (just resolving all threads is not sufficient for proceeding with MR).

  • Hi, please have a look at

    q431 Digest Diff with exit code: 1 Fri Jun 26 17:20:19 CEST 2020 The xAODDigest diff failed! The output (>) differs from the reference (<) The q431 TEST WARNING! q431xAODDigestTest returned code 2

    Magdalena (L1 shifter)

  • Author Contributor

    Hello,

    This MR will change q431, because the ByteStreamError is applied to the FE-level, which was module level before.

    Also, the old container is not filled now, thus, the ESD size is also different from the reference.

    We need to update the reference.

    Cheers, Soshi

  • This merge request affects 10 packages:

    • InnerDetector/InDetCalibAlgs/PixelCalibAlgs
    • InnerDetector/InDetConditions/InDetConditionsSummaryService
    • InnerDetector/InDetConditions/PixelConditionsData
    • InnerDetector/InDetConditions/PixelConditionsTools
    • InnerDetector/InDetConditions/SCT_ConditionsTools
    • InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD
    • InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv
    • InnerDetector/InDetExample/InDetRecExample
    • InnerDetector/InDetMonitoring/PixelMonitoring
    • InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation

    Adding @goetz ,@ibragimo ,@stsuno ,@kzoch ,@oda ,@battagl ,@sroe as watchers

  • :negative_squared_cross_mark: CI Result FAILURE (hash 7f141bdc)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :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:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :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: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 16804]

  • This merge request affects 10 packages:

    • InnerDetector/InDetCalibAlgs/PixelCalibAlgs
    • InnerDetector/InDetConditions/InDetConditionsSummaryService
    • InnerDetector/InDetConditions/PixelConditionsData
    • InnerDetector/InDetConditions/PixelConditionsTools
    • InnerDetector/InDetConditions/SCT_ConditionsTools
    • InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD
    • InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv
    • InnerDetector/InDetExample/InDetRecExample
    • InnerDetector/InDetMonitoring/PixelMonitoring
    • InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation

    Adding @goetz ,@ibragimo ,@stsuno ,@kzoch ,@oda ,@battagl ,@sroe as watchers

  • :negative_squared_cross_mark: CI Result FAILURE (hash 7f141bdc)

    Athena AthSimulation AnalysisBase AthGeneration
    externals :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:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    required tests :o: :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :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: AnalysisBase: number of compilation errors 0, warnings 0
    :white_check_mark: AthGeneration: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 17013]

  • Soshi Tsuno added 1133 commits

    added 1133 commits

    Compare with previous version

  • This merge request affects 11 packages:

    • InnerDetector/InDetCalibAlgs/PixelCalibAlgs
    • InnerDetector/InDetConditions/InDetConditionsSummaryService
    • InnerDetector/InDetConditions/PixelConditionsData
    • InnerDetector/InDetConditions/PixelConditionsTools
    • InnerDetector/InDetConditions/SCT_ConditionsTools
    • InnerDetector/InDetEventCnv/InDetPrepRawDataToxAOD
    • InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv
    • InnerDetector/InDetExample/InDetRecExample
    • InnerDetector/InDetMonitoring/PixelMonitoring
    • InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation
    • Tools/PROCTools

    Adding @goetz ,@amete ,@ibragimo ,@stsuno ,@kzoch ,@oda ,@battagl ,@sroe as watchers

  • added Tools label

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