Skip to content
Snippets Groups Projects

InnerDetector: Sweep changes for strip endcap polar co-ordinates from 21.9

Merged James Smith requested to merge jlsmith/athena:dev/master/PCintegration into master
All threads resolved!

This is a manual sweep of the changes from !46959 (merged).

A bug fix with the order of co-ordinates in DetectorDescription/ReadoutGeometryBase/src/SolidStateDetectorElementBase.cxx was also made.

Standard tests RunUpgradeTests.log were run with all tests passing. There were a number of warnings, mostly concerning geometry differences, BTag and TruthParticleAuxContainers.

DCube plots comparing the outputs in the cartesian and polar case vs an unmodified version of Athena are available at [cartesian plots] and [polar plots]. The cartesian plots are identical; the polar plots have differences for ITkStrip/m_h_globalX, ITkStrip/m_h_globalY, and ITkStrip/m_h_globalXY.

h1r_c50c73f8-16bc-4a11-aa51-116ad83a3a0d

h1d_7aff0e23-9b78-4315-a3b2-cd582aac525a

h1r_8c94b1c3-de4b-4eec-9012-96461661d8ac

h1d_4f734520-41a9-457a-8782-10ed88465ae1

I can't see any systematic difference here, more like a constant noise term. I'll investigate these numbers and where the difference comes from.

However, this is only in the polar case, which is never used unless a flag is manually added to the ITk Layouts, so this will not affect any existing workflows. Therefore I'd like to move forward with this MR.

This is part of ATLITKSW-42.

Tags: @nstyles @hhayward @tadej @pagessin

Edited by James Smith

Merge request reports

Pipeline #4104828 passed

Pipeline passed for de98a8c2 on jlsmith:dev/master/PCintegration

Approval is optional

Merged by Frank WinklmeierFrank Winklmeier 2 years ago (Jun 16, 2022 12:13pm UTC)

Merge details

  • Changes merged into master with e7a20225 (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
  • James Smith changed the description

    changed the description

  • James Smith added 1150 commits

    added 1150 commits

    Compare with previous version

  • James Smith marked this merge request as ready

    marked this merge request as ready

  • This merge request affects 2 packages:

    • DetectorDescription/ReadoutGeometryBase
    • InnerDetector/InDetDetDescr/SCT_ReadoutGeometry

    Affected files list will not be printed in this case

    Adding @goetz ,@stavrop ,@sroe ,@rbianchi ,@jojungge as watchers

  • :white_check_mark: CI Result SUCCESS (hash 4899f8ba)

    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:
    required tests :white_check_mark: :white_check_mark: :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: :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 53047]

  • Changing labels while the open thread is unresolved. As an additional comment, many introduced variables could be named such to respect ATLAS recommended naming conventions. See: http://atlas-computing.web.cern.ch/atlas-computing/projects/qa/draft_guidelines.html#org720328f

    Anyway being this a sweep is probably not worth doing it here. Otherwise changes look good.

    Sergio (L2)

  • James Smith resolved all threads

    resolved all threads

  • James Smith added 1179 commits

    added 1179 commits

    • 4899f8ba...f30174db - 1175 commits from branch atlas:master
    • 693c1a8e - Add strip frame <--> beam frame conversions from 21.9
    • e5cca0ed - Swept changes to use PC
    • 9484484b - Fix bug in hitLocalToLocal specialisation
    • af7e2c71 - Add comments explaining co-ordinate flips

    Compare with previous version

  • Author Developer

    Rebased and added some comments. Will let CI run then should be good to merge.

  • This merge request affects 2 packages:

    • DetectorDescription/ReadoutGeometryBase
    • InnerDetector/InDetDetDescr/SCT_ReadoutGeometry

    Affected files list will not be printed in this case

    Adding @goetz ,@stavrop ,@sroe ,@rbianchi ,@jojungge as watchers

  • :white_check_mark: CI Result SUCCESS (hash af7e2c71)

    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:
    required tests :white_check_mark: :white_check_mark: :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: :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 54228]

  • Kira Abeling
  • Kira Abeling
  • I know this is a sweep but if it's not too much work it would be great if the two minor points could be addressed.

    Kira (L1)

  • James Smith added 1 commit

    added 1 commit

    • de98a8c2 - Added some std:: to math functions

    Compare with previous version

  • James Smith resolved all threads

    resolved all threads

  • This merge request affects 2 packages:

    • DetectorDescription/ReadoutGeometryBase
    • InnerDetector/InDetDetDescr/SCT_ReadoutGeometry

    Affected files list will not be printed in this case

    Adding @goetz ,@stavrop ,@sroe ,@rbianchi ,@jojungge as watchers

  • :white_check_mark: CI Result SUCCESS (hash de98a8c2)

    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:
    required tests :white_check_mark: :white_check_mark: :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: :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 54294]

  • Looks good. Approved

    Sergei L1

  • mentioned in commit e7a20225

  • Please register or sign in to reply
    Loading