Skip to content
Snippets Groups Projects

Add CA version of TrigInDetValidation_AODtoTrkNtuple and update ART step

Merged Add CA version of TrigInDetValidation_AODtoTrkNtuple and update ART step
longjon/athena:TIDA_AODtoNtup_CA-24023 into main
All threads resolved!
Merged Jonathan Long requested to merge longjon/athena:TIDA_AODtoNtup_CA-24023 into main
All threads resolved!

This adds a CA version of TrigInDetValidation_AODtoTrkNtuple to make the TIDA track ntuple. I think I have everything ported except the message limit isn't getting set for the TrigR3Mon alg.

I have also updated the ART steps to run this CA config. Part of this was converting options that were previously passed with '-c' to custom arguments. This hopefully fixes the ntuple step.

cc: @sutt

Edited by Jonathan Long

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Lucy Lewitt
  • Lucy Lewitt
  • Lucy Lewitt
  • Lucy Lewitt
  • Lucy Lewitt
  • Lucy Lewitt
    Lucy Lewitt @llewitt ·
    Developer

    Couple of points to address, hopefully nothing too arduous :smile:. L1

  • Lucy Lewitt added review-user-action-required label and removed review-pending-level-1 label

    added review-user-action-required label and removed review-pending-level-1 label

  • Jonathan Long added 1 commit

    added 1 commit

    • 7b3a0252 - Address some L1 comments, change to init flags

    Compare with previous version

  • Jonathan Long resolved all threads

    resolved all threads

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigValidation/TrigInDetValidation

    This merge request affects 1 file:

    • Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetValidation_AODtoTrkNtuple_CA.py

    Adding @keli ,@hartj ,@okumura ,@bkerridg ,@martindl ,@mvozak ,@vmartin ,@nagano ,@sutt as watchers

  • ATLAS Robot added review-pending-level-1 label and removed review-user-action-required label

    added review-pending-level-1 label and removed review-user-action-required label

  • Jonathan Long marked this merge request as draft

    marked this merge request as draft

  • Jonathan Long removed review-pending-level-1 label

    removed review-pending-level-1 label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 7b3a0252)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :warning:
    tests :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 4817]

  • Jonathan Long added 1 commit

    added 1 commit

    • 2d9405a5 - * Setup TrigInDetArtSteps to run new CA config for TIDA ntuple making

    Compare with previous version

  • Jonathan Long marked this merge request as ready

    marked this merge request as ready

  • Jonathan Long changed title from Draft: Add CA version of TrigInDetValidation_AODtoTrkNtuple to Add CA version of TrigInDetValidation_AODtoTrkNtuple and update ART step

    changed title from Draft: Add CA version of TrigInDetValidation_AODtoTrkNtuple to Add CA version of TrigInDetValidation_AODtoTrkNtuple and update ART step

  • Jonathan Long changed the description

    changed the description

  • Jonathan Long added review-pending-level-1 label

    added review-pending-level-1 label

  • Lucy Lewitt
    Lucy Lewitt @llewitt ·
    Developer

    Looks like you've picked up a conflict :(.

  • Jonathan Long added 545 commits

    added 545 commits

    • 2d9405a5...a59151c4 - 536 commits from branch atlas:main
    • dee923c6 - Start CA transition for TrigInDetValidation_AODtoTrkNtuple_CA.py
    • 9d35bff3 - Copy CA file to share
    • 44656fb1 - Schedule algs properly, cleanup
    • 0a25a020 - Revert chains
    • 164a210e - Clean-up more and add message limit, there is still a limit on trigr3mon
    • 1011b839 - Revert file
    • 68c5ab17 - Address some L1 comments, change to init flags
    • d0e6e8ed - * Setup TrigInDetArtSteps to run new CA config for TIDA ntuple making
    • 3aa98392 - Redo updates

    Compare with previous version

    Toggle commit list
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigValidation/TrigInDetValidation

    This merge request affects 10 files:

    • Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
    • Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetValidation_AODtoTrkNtuple_CA.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_tier0_pu40.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bphys.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_ellrt_staustau.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tauLRT_staustau.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py

    Adding @hartj ,@vmartin ,@bkerridg ,@sutt ,@okumura ,@nagano ,@mvozak ,@martindl ,@keli as watchers

  • Jonathan Long
    Jonathan Long @longjon ·
    Author Developer

    Ok, since Mark said the tests were failing I went ahead and also updated the ART step to run this new config file. Sorry for the extra updates mid MR. I had to rebase to pull a change that caused a conflict.

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 3aa98392)

    Athena
    externals :white_check_mark:
    cmake :white_check_mark:
    make :warning:
    tests :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
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 4826]

  • Vakhtang Tsulaia
    Vakhtang Tsulaia @tsulaia ·
    Developer

    Please add one missing copyright statement to clear the warning. Thanks.

  • Vakhtang Tsulaia added review-user-action-required label

    added review-user-action-required label

  • Jonathan Long added 1 commit

    added 1 commit

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Trigger/TrigValidation/TrigInDetValidation

    This merge request affects 10 files:

    • Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetArtSteps.py
    • Trigger/TrigValidation/TrigInDetValidation/python/TrigInDetValidation_AODtoTrkNtuple_CA.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_all_ttbar_tier0_pu40.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_bphys.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_ellrt_staustau.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_fslrt_rhadron.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_minbias.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_mulrt_staustau.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tauLRT_staustau.py
    • Trigger/TrigValidation/TrigInDetValidation/test/test_trigID_tau_ztautau_pu46.py

    Adding @sutt ,@nagano ,@hartj ,@bkerridg ,@okumura ,@vmartin ,@keli ,@mvozak ,@martindl as watchers

  • ATLAS Robot removed review-user-action-required label

    removed review-user-action-required label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 87f4532f)

    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 [CI-MERGE-REQUEST-EL9 4844]

  • Frank Winklmeier removed review-pending-level-1 label

    removed review-pending-level-1 label

  • Frank Winklmeier added review-approved label

    added review-approved label

  • Frank Winklmeier mentioned in commit 2d06ea89

    mentioned in commit 2d06ea89

  • Frank Winklmeier merged

    merged

    • Please register or sign in to reply