Skip to content
Snippets Groups Projects

Add uncalibrated measurement link to calibrated one

Merged Tomasz Bold requested to merge tbold/athena:mtj-add-el-to-uncalibrated-measurement into master
All threads resolved!

This MR adds EL from TrackMeasurements to UncalibratedMeasurement Unfortunately the unit test does not compile due to invalidity of conversion from const EL to cont ptr (it should work). Hope that I can drag experts to this when it is part of an MR.

Tagging FI @pagessin @wolter @cvarni @toyamaza

Edited by Tomasz Bold

Merge request reports

Pipeline #4546653 passed

Pipeline passed for 4f7019d3 on tbold:mtj-add-el-to-uncalibrated-measurement

Approval is optional

Merged by Edward MoyseEdward Moyse 2 years ago (Sep 29, 2022 2:13pm UTC)

Merge details

  • Changes merged into master with beeee08b (commits were squashed).
  • 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
  • Tomasz Bold added 1 commit

    added 1 commit

    Compare with previous version

  • This merge request affects 2 packages:

    • Event/xAOD/xAODMeasurementBase
    • Event/xAOD/xAODTracking

    Affected files list will not be printed in this case

    Adding @amorley ,@akraszna as watchers

  • Tomasz Bold marked this merge request as draft

    marked this merge request as draft

  • :pencil: :scissors: CI integration tests for projects Athena,AthGeneration,AnalysisBase,AthAnalysis are cancelled because of compilation error(s)

  • :x: CI Result FAILURE (hash f16c78e8)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :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: :white_check_mark:
    make :o: :white_check_mark: :o: :o: :o: :white_check_mark:
    tests :o: :white_check_mark: :o: :o: :o: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :o: Athena: number of compilation errors 1, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :o: AthGeneration: number of compilation errors 1, warnings 5
    :o: AnalysisBase: number of compilation errors 1, warnings 107
    :o: AthAnalysis: number of compilation errors 1, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59175]

    • Resolved by Tomasz Bold

      Error is

      /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODTracking/test/xAODTracking_MultiTrajectoryBackends_test.cxx: In member function 'void {anonymous}::TrackMeasurementsLinksToUncalibratedMeasurement::test_method()':
      /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODTracking/test/xAODTracking_MultiTrajectoryBackends_test.cxx:118:97: error: no matching function for call to 'ElementLink<DataVector<xAOD::StripCluster_v1> >::ElementLink(xAOD::StripCluster_v1*&)'
        118 |         m->setUncalibratedMeasurementLink(ElementLink<xAOD::StripClusterContainer>(stripCluster1)); // skipping intentionally 1st element
  • Tomasz Bold added 1 commit

    added 1 commit

    • 283708ba - Added inheritance declarations between Pixel/Strip Cluster &...

    Compare with previous version

  • Tomasz Bold marked this merge request as ready

    marked this merge request as ready

  • This merge request affects 3 packages:

    • Event/xAOD/xAODInDetMeasurement
    • Event/xAOD/xAODMeasurementBase
    • Event/xAOD/xAODTracking

    Affected files list will not be printed in this case

    Adding @amorley ,@akraszna ,@stsuno ,@lshan ,@battagl as watchers

  • :pencil: :scissors: CI integration tests for projects AthGeneration,AnalysisBase are cancelled because of compilation error(s)

    • Resolved by Tomasz Bold

      :x: CI Result FAILURE (hash 283708ba)

      Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
      externals :white_check_mark: :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: :white_check_mark:
      make :white_check_mark: :white_check_mark: :o: :o: :white_check_mark: :white_check_mark:
      tests :o: :white_check_mark: :white_check_mark: :white_check_mark: :o: :white_check_mark:

      Full details available on this CI monitor view. Check the JIRA CI status board for known problems
      :white_check_mark: Athena: number of compilation errors 0, warnings 0
      :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
      :o: AthGeneration: number of compilation errors 1, warnings 3
      :o: AnalysisBase: number of compilation errors 1, warnings 90
      :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
      :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
      :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59263]

  • Tomasz Bold added 1 commit

    added 1 commit

    • b4e718b5 - Shorted names in new tracking EDM, fixed inheritance declarations for...

    Compare with previous version

  • This merge request affects 3 packages:

    • Event/xAOD/xAODInDetMeasurement
    • Event/xAOD/xAODMeasurementBase
    • Event/xAOD/xAODTracking

    Affected files list will not be printed in this case

    Adding @amorley ,@akraszna ,@stsuno ,@lshan ,@battagl as watchers

  • added JetEtmiss label

  • :pencil: :scissors: CI integration tests for projects AthGeneration,AnalysisBase are cancelled because of compilation error(s)

  • :x: CI Result FAILURE (hash b4e718b5)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :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: :white_check_mark:
    make :white_check_mark: :white_check_mark: :o: :o: :white_check_mark: :white_check_mark:
    tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :white_check_mark: Athena: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :o: AthGeneration: number of compilation errors 1, warnings 3
    :o: AnalysisBase: number of compilation errors 1, warnings 87
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59302]

    • Resolved by Tomasz Bold

      Hi @tbold, the compilation issue is the following:

      In file included from /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODTracking/Root/TrackMeasurementsAuxContainer_v1.cxx:4:
      /var/lib/jenkins/workspace/CI-MERGE-REQUEST-CC7/master/Event/xAOD/xAODTracking/xAODTracking/versions/TrackMeasurementsAuxContainer_v1.h:8:10: fatal error: xAODMeasurementBase/UncalibratedMeasurementContainer.h: No such file or directory
          8 | #include "xAODMeasurementBase/UncalibratedMeasurementContainer.h"
            |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  • Changing label to review-user-action-required until the discussions are resolved. Clara (L1)

  • Tomasz Bold added 1 commit

    added 1 commit

    • 1e17f7cd - Added MeasurementBase in other projects, simpler test name

    Compare with previous version

  • This merge request affects 5 packages:

    • Event/xAOD/xAODInDetMeasurement
    • Event/xAOD/xAODMeasurementBase
    • Event/xAOD/xAODTracking
    • Projects/AnalysisBase
    • Projects/AthGeneration

    Affected files list will not be printed in this case

    Adding @amorley ,@akraszna ,@stsuno ,@krumnack ,@lshan ,@battagl ,@rbianchi as watchers

  • :pencil: :scissors: CI integration tests for projects AnalysisBase are cancelled because of compilation error(s)

  • :x: CI Result FAILURE (hash 1e17f7cd)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :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: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :o: :white_check_mark: :white_check_mark:
    tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :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
    :o: AnalysisBase: number of compilation errors 2, warnings 23
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59367]

  • Author Developer

    Unfortunately there are further "unsatisfied" dependencies in the AnalysisBase project. Trying to fixe them. But this looks like a snowball type issue. I guess we need to refactor UncalibratedMeasurement. I have an idea that instead of the hash that api could just use unsigned int? In the end it is all it is.

    We have type agnostic EL in trigger: https://gitlab.cern.ch/atlas/athena/-/blob/master/Event/xAOD/xAODTrigger/xAODTrigger/versions/TrigComposite_v1.h#L106 could use this approach to decouple xAODTracking from xAODMeasurementBase.

    Edited by Tomasz Bold
  • Moving this back to review-user-action-required until the issues are resolved.

    Jason (L1)

  • Tomasz Bold mentioned in merge request !57056 (merged)

    mentioned in merge request !57056 (merged)

  • Tomasz Bold added 589 commits

    added 589 commits

    Compare with previous version

  • This merge request affects 4 packages:

    • Event/xAOD/xAODInDetMeasurement
    • Event/xAOD/xAODTracking
    • Projects/AnalysisBase
    • Projects/AthGeneration

    Affected files list will not be printed in this case

    Adding @amorley ,@akraszna ,@stsuno ,@krumnack ,@lshan ,@battagl ,@rbianchi as watchers

  • :white_check_mark: CI Result SUCCESS (hash 4f7019d3)

    Athena AthSimulation AthGeneration AnalysisBase AthAnalysis DetCommon
    externals :white_check_mark: :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: :white_check_mark:
    make :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:
    tests :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :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
    :white_check_mark: DetCommon: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 59511]

  • Looks good from analysis release viewpoint, only change to analysis packages is modified package list of AnalysisBase which was discussed in a thread with @akraszna - approving

    Giovanni (AR)

  • CI looks good. L1

  • Tomasz Bold resolved all threads

    resolved all threads

  • merged

  • Edward Moyse mentioned in commit beeee08b

    mentioned in commit beeee08b

  • Please register or sign in to reply
    Loading