Skip to content
Snippets Groups Projects

Fix: Save Pixel & Strip Clusters to AOD for Phase-II Geometry

Merged Christof Sauer requested to merge csauer/athena:trackless-studies-phase2 into main
All threads resolved!

This draft of a MR resolves an issue related to saving Pixel and Strip clusters to AOD files when using samples based on the ATLAS Phase-II geometry. The problem arises due to:

  • Container name differences: Pixel/Strip cluster container names differ between Phase-I and Phase-II, but are currently hardcoded;
  • Different preparation functions: The process for preparing Pixel/Strip clusters for AOD varies between the two geometries.

Changes & Fixes

  • Introduced two new flags to specify Pixel/Strip container names, defaulting to the current naming convention;
  • Added a switch to detect the geometry version and import the correct preparation functions accordingly.

These changes are minimal and have been tested successfully with both Run 3 and Run 4 samples.

Merge request reports

Pipeline #10116724 passed

Pipeline passed for 61a1d3d9 on csauer:trackless-studies-phase2

Approval is optional

Merged by Tadej NovakTadej Novak 1 month ago (Feb 3, 2025 11:19am UTC)

Merge details

  • Changes merged into main with bc360659 (commits were squashed).
  • Deleted 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
  • Dan Guest
  • Dan Guest
  • Christof Sauer added 1 commit

    added 1 commit

    • c4b9e2bc - Thanks for the suggestions. I agree: this looks better.

    Compare with previous version

  • Christof Sauer added 1 commit

    added 1 commit

    • 6c5beb54 - Fixed indentation; changed pixel/strip container names

    Compare with previous version

  • Christof Sauer resolved all threads

    resolved all threads

  • Christof Sauer marked this merge request as ready

    marked this merge request as ready

  • This merge request affects 3 packages:

    • PhysicsAnalysis/JetTagging/JetHitAssociation
    • PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
    • PhysicsAnalysis/JetTagging/JetTagConfig

    Affected files list will not be printed in this case

    Adding @bdong ,@ligang ,@lidiaz ,@dguest ,@robouque ,@svanstro as watchers

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

  • :x: CI Result FAILURE (hash 6c5beb54)

    Athena AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :o: :white_check_mark:
    tests :no_entry_sign: :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: AthAnalysis: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output (remote access info)

  • Christof Sauer added 1 commit

    added 1 commit

    • 62007078 - Standardized Pixel/Strip container names across all instances

    Compare with previous version

  • This merge request affects 3 packages:

    • PhysicsAnalysis/JetTagging/JetHitAssociation
    • PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
    • PhysicsAnalysis/JetTagging/JetTagConfig

    Affected files list will not be printed in this case

    Adding @robouque ,@bdong ,@lidiaz ,@dguest ,@ligang ,@svanstro as watchers

  • :white_check_mark: CI Result SUCCESS (hash 62007078)

    Athena AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :warning: :white_check_mark:
    tests :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view. Check the JIRA CI status board for known problems
    :warning: Athena: number of compilation errors 0, warnings 1
    :white_check_mark: AthAnalysis: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output (remote access info)

  • Christof Sauer added 1 commit

    added 1 commit

    • d64639a9 - Removed unused import to eliminate compiler warning

    Compare with previous version

  • This merge request affects 3 packages:

    • PhysicsAnalysis/JetTagging/JetHitAssociation
    • PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
    • PhysicsAnalysis/JetTagging/JetTagConfig

    Affected files list will not be printed in this case

    Adding @robouque ,@svanstro ,@dguest ,@lidiaz ,@bdong ,@ligang as watchers

  • :white_check_mark: CI Result SUCCESS (hash d64639a9)

    Athena AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark:
    tests :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: AthAnalysis: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output (remote access info)

  • Christof Sauer resolved all threads

    resolved all threads

  • Christof Sauer added 1 commit

    added 1 commit

    • eab9c93e - Apply 1 suggestion(s) to 1 file(s)

    Compare with previous version

  • This merge request affects 3 packages:

    • PhysicsAnalysis/JetTagging/JetHitAssociation
    • PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging
    • PhysicsAnalysis/JetTagging/JetTagConfig

    Affected files list will not be printed in this case

    Adding @bdong ,@ligang ,@dguest ,@robouque ,@lidiaz ,@svanstro as watchers

  • Christof Sauer resolved all threads

    resolved all threads

  • :white_check_mark: CI Result SUCCESS (hash eab9c93e)

    Athena AthAnalysis
    externals :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark:
    make :white_check_mark: :white_check_mark:
    tests :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: AthAnalysis: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output (remote access info)

  • Christof Sauer added 1 commit

    added 1 commit

    • 61a1d3d9 - Replaced Pixel/Strip container flags by automated configuration based on geometry version

    Compare with previous version

  • This merge request affects 2 packages:

    • PhysicsAnalysis/JetTagging/JetHitAssociation
    • PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging

    Affected files list will not be printed in this case

    Adding @bdong ,@svanstro ,@lidiaz ,@dguest ,@robouque ,@ligang as watchers

  • Christof Sauer resolved all threads

    resolved all threads

  • :white_check_mark: CI Result SUCCESS (hash 61a1d3d9)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :white_check_mark:
    tests :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
    :pencil: For experts only: Jenkins output (remote access info)

  • merged

  • Tadej Novak mentioned in commit bc360659

    mentioned in commit bc360659

  • Please register or sign in to reply
    Loading