Skip to content
Snippets Groups Projects

21.0 add tfcs energy interpolation histogram

Merged 21.0 add tfcs energy interpolation histogram
bwinter/athena:21.0-addTFCSEnergyInterpolationHistogram into 21.0
Merged Benedict Tobias Winter requested to merge bwinter/athena:21.0-addTFCSEnergyInterpolationHistogram into 21.0

Add functionality to determine the total energy to be deposited for a particle in FastCaloSim based on histograms that serve as lookup tables. Planned use case is for low energy hadrons.

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
  • Ben Bruers
  • Ben Bruers added review-pending-level-2 label and removed review-pending-level-1 label

    added review-pending-level-2 label and removed review-pending-level-1 label

  • Benedict Tobias Winter added 4 commits

    added 4 commits

    • 046dbe07...5bad106f - 3 commits from branch atlas:21.0
    • 6b8dcea4 - Merge remote-tracking branch 'upstream/21.0' into 21.0-addTFCSEnergyInterpolationHistogram

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent

    This merge request affects 4 files:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationHistogram.cxx

    Adding @jchapman ,@pjacka ,@mfauccig ,@xiaozhon ,@ahasib ,@vpascuzz ,@tadej ,@schaarsc as watchers

  • ATLAS Robot added review-pending-level-1 label and removed review-pending-level-2 label

    added review-pending-level-1 label and removed review-pending-level-2 label

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash 6b8dcea4)

    Athena AthDataQuality AthSimulation
    externals :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark:
    make :warning: :warning: :warning:
    required tests :o: :white_check_mark: :o:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :warning: Athena: number of compilation errors 0, warnings 163
    :warning: AthDataQuality: number of compilation errors 0, warnings 1
    :warning: AthSimulation: number of compilation errors 0, warnings 7
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25046]

  • Abhishek Nag
    Abhishek Nag @abnag ·

    Please address the CI errors and compilation warnings. (L1)

  • Abhishek Nag 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

  • Tadej Novak
    Tadej Novak @tadej ·
    Developer

    Jenkins please retry a build

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent

    This merge request affects 4 files:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationHistogram.cxx

    Adding @jchapman ,@pjacka ,@mfauccig ,@xiaozhon ,@ahasib ,@vpascuzz ,@tadej ,@schaarsc 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

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 6b8dcea4)

    Athena AthDataQuality AthSimulation
    externals :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark:
    make :warning: :white_check_mark: :white_check_mark:
    required tests :white_check_mark: :white_check_mark: :white_check_mark:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :warning: Athena: number of compilation errors 0, warnings 2
    :white_check_mark: AthDataQuality: number of compilation errors 0, warnings 0
    :white_check_mark: AthSimulation: number of compilation errors 0, warnings 0
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25145]

  • S
    Sergei Rosliakov @seroslia1 ·

    Hi @bwinter, please solve all threads

  • Sergei Rosliakov 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

  • B
    Benedict Tobias Winter @bwinter ·
    Author Developer

    Yes, It's on the todo list for today. Thank you for the reminder

  • Benedict Tobias Winter added 6 commits

    added 6 commits

    • 6b8dcea4...334c3922 - 4 commits from branch atlas:21.0
    • 7ddd1df2 - Merge remote-tracking branch 'upstream/21.0' into 21.0-addTFCSEnergyInterpolationHistogram
    • c5f1bb7b - implementing comments

    Compare with previous version

  • B
    Benedict Tobias Winter @bwinter ·
    Author Developer

    Jenkins please retry a build

    Edited by Benedict Tobias Winter
  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent

    This merge request affects 4 files:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationHistogram.cxx

    Adding @jchapman ,@pjacka ,@mfauccig ,@xiaozhon ,@ahasib ,@vpascuzz ,@tadej ,@schaarsc 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

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :negative_squared_cross_mark: CI Result FAILURE (hash c5f1bb7b)

    Athena AthDataQuality AthSimulation
    externals :white_check_mark: :white_check_mark: :white_check_mark:
    cmake :white_check_mark: :white_check_mark: :white_check_mark:
    make :warning: :warning: :warning:
    required tests :white_check_mark: :white_check_mark: :o:
    optional tests :white_check_mark: :white_check_mark: :white_check_mark:

    Full details available on this CI monitor view
    :warning: Athena: number of compilation errors 0, warnings 163
    :warning: AthDataQuality: number of compilation errors 0, warnings 1
    :warning: AthSimulation: number of compilation errors 0, warnings 7
    :pencil: For experts only: Jenkins output [CI-MERGE-REQUEST-CC7 25244]

  • B
    Benedict Tobias Winter @bwinter ·
    Author Developer

    There must be an unaccounted change in the reference like last week. The branch was updated to 21.0 when implementing the comments

  • Benedict Tobias Winter added 4 commits

    added 4 commits

    • c5f1bb7b...71b488b8 - 2 commits from branch atlas:21.0
    • 7fd57998 - Merge remote-tracking branch 'upstream/21.0' into 21.0-addTFCSEnergyInterpolationHistogram
    • 958d7091 - undo implementation of one comment (root macro coding standard)

    Compare with previous version

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    This merge request affects 1 package:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent

    This merge request affects 4 files:

    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/CMakeLists.txt
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/LinkDef.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/ISF_FastCaloSimEvent/TFCSEnergyInterpolationHistogram.h
    • Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimEvent/src/TFCSEnergyInterpolationHistogram.cxx

    Adding @jchapman ,@pjacka ,@mfauccig ,@xiaozhon ,@ahasib ,@vpascuzz ,@tadej ,@schaarsc as watchers

  • ATLAS Robot
    ATLAS Robot @atlasbot ·
    Developer

    :white_check_mark: CI Result SUCCESS (hash 958d7091)

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

  • Pavol Strizenec
    Pavol Strizenec @pavol ·
    Developer

    Looks fine now, approving.

    Pavol [as L2 MR shifter]

  • Pavol Strizenec added review-approved label and removed review-pending-level-1 label

    added review-approved label and removed review-pending-level-1 label

  • R
    Rachid Mazini @rmazini ·
    Developer

    There is one unresolved thread left before this MR is approved. Please confirm. Thanks, Rachid

  • Pavol Strizenec resolved all threads

    resolved all threads

  • Pavol Strizenec
    Pavol Strizenec @pavol ·
    Developer

    Sorry, I forgot to resolve, it's o.k., could be merged.

    pavol [as L2 MR shifter]

  • Rachid Mazini mentioned in commit f96b9017

    mentioned in commit f96b9017

  • Rachid Mazini merged

    merged

  • Atlas Nightlybuild added sweep:done label

    added sweep:done label

  • Atlas Nightlybuild picked the changes into the branch cherry-pick-f96b9017903-master with commit 058ae3f4

    picked the changes into the branch cherry-pick-f96b9017903-master with commit 058ae3f4

  • Rachid Mazini mentioned in commit 058ae3f4

    mentioned in commit 058ae3f4

  • Atlas Nightlybuild mentioned in merge request !39337 (merged)

    mentioned in merge request !39337 (merged)

  • A
    Atlas Nightlybuild @atnight ·
    Maintainer

    Sweep summary
    successful:

    • master

    (see https://aiatlas154.cern.ch/jenkins/job/auto_git_sweeps/1374/console for details)

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