Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
  • athena athena
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Jira
    • Jira
  • Merge requests 159
    • Merge requests 159
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Repository
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • atlasatlas
  • athenaathena
  • Merge requests
  • !41922

Merge 21.0.123 into 21.3

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged John Derek Chapman requested to merge jchapman/athena:Sweep21.0.123into21.3 into 21.3 Mar 24, 2021
  • Overview 4
  • Commits 1
  • Pipelines 1
  • Changes 83

This merge request merges all the changes that were made to the 21.0 branch between the release release/21.0.123 and the previous release release/21.0.122.

Below is the full list of merge requests that were included between these two tags:

  • !41115 (merged) : Revert "Merge branch 'mhodgkin_HIPFlowJetClusters' into '21.0'"
  • !40881 (merged) : Adding TP Separation for LUCID_SimHitCollection to 21.0
  • !40983 (merged) : Fix ReSimulation ART job (ATLASSIM-4959)
  • !40977 (merged) : Change art diff to run only on successful reco
  • !40968 (merged) : fix zero integral error in PDFcreator::getRand()
  • !40912 (merged) : Do not simulate particles that fail extrapolation to ID-Calo surface
  • !40671 (merged) : Adjust CaloCluster links to charged PFO for HI reprocessing
  • !40797 (merged) : Ensure that the PDGTable.MeV file is only copied locally once during the simulation configuration.
  • !40807 (merged) : libpng Fix, 21.0 branch (2021.02.18.)
  • !40785 (merged) : AFP Webdisplay: Config files updated with new histograms [rel 21]
  • !40788 (merged) : add the missing algorithm header
  • !39958 (merged) : FastCaloSim Gaussian Correlated Fluctuations
  • !40611 (merged) : Update AF3 parametrization file for run 2 re-processing
  • !40442 (merged) : Minor tidying of SimEventFilter
  • !40598 (merged) : Fix test_ReSimulation.sh (ATLASSIM-5083)
  • !40578 (merged) : Fix numerical instability in verbose output for quasi stable particle simulation
  • !40493 (merged) : fixing seg fault when jets don't have btagging aux info
  • !40534 (merged) : Remove legacy codes in ISF_FastCaloSimParametrization
  • !40446 (merged) : Added electron/muon comparison plot
  • !40459 (merged) : Fix FCS pieciewise linear interpolation lookup at edges
  • !40338 (merged) : FastCaloSim: add mechanism to better clean up the AuxInfo in the simulation state
  • !40388 (merged) : Update TestBeam_tf.py to use addSimIOTrfArgs
  • !40456 (merged) : Changes so that ReSim_tf.py runs in AthenaMP
  • !40340 (merged) : Adding Benedtto/LHCC scripts
  • !40268 (merged) : Sweeping !40069 (merged) from 21.0-mc16d to 21.0.
  • !40394 (merged) : Turn off diff-pool in AF3 tests (ATLASSIM-5045)

Link to the full diff between release/21.0.123 and release/21.0.122 is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.122...release/21.0.123

Edited Mar 25, 2021 by John Derek Chapman
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: Sweep21.0.123into21.3