athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2020-06-04T03:03:25+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/33338Sweeping !33226 from 21.0 to master.
Added NTruthParticles option to FCS_Ntup_tf2020-06-04T03:03:25+02:00Atlas NightlybuildSweeping !33226 from 21.0 to master.
Added NTruthParticles option to FCS_Ntup_tfAdded NTruthParticles option to FCS_Ntup_tf
See merge request atlas/athena!33226Added NTruthParticles option to FCS_Ntup_tf
See merge request atlas/athena!33226https://gitlab.cern.ch/atlas/athena/-/merge_requests/33230Sweeping !33185 from 21.0 to master.
Fix precision of cell energy (ATLASSIM-4...2020-05-30T03:02:05+02:00Atlas NightlybuildSweeping !33185 from 21.0 to master.
Fix precision of cell energy (ATLASSIM-4584)Fix precision of cell energy (ATLASSIM-4584)
See merge request atlas/athena!33185Fix precision of cell energy (ATLASSIM-4584)
See merge request atlas/athena!33185https://gitlab.cern.ch/atlas/athena/-/merge_requests/33136Merge 21.0.113 into 21.32020-08-12T03:05:17+02:00Tadej Novaktadej.novak@cern.chMerge 21.0.113 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release [release/21.0.113](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.113) and the previous release [release/21.0.112](https://gitlab.c...This merge request merges all the changes that were made to the ~"21.0" branch between the release [release/21.0.113](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.113) and the previous release [release/21.0.112](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.112).
Below is the full list of merge requests that were included between these two tags:
- !32710: Add FCal sampling fraction tools to CaloSamplingFractionAnalysis (ATLASSIM-4439)
- !32808: Allow the resetting of the gen particle momentum in ISF only at start of event
- !32892: LAr Calorimeter Signal FeedThroughs detailed geometry implemented in rel 21
- !32915: Simulation CMake Warning Fixes
- !32862: Sweeping !32836 from master to 21.0. egammaValidation: binning change
- !32885: Update art compare syntax for simulation ART jobs
- !32494: Switching diff-root checks in ISF_Validation ART jobs to semi-detailed output
- !32686: Sweeping !32660 from master to 21.0. PROCTools: Update RunTier0Tests to look for the new nightly area
- !32721: Bug fix for crashes in TFCSEnergyAndHitGAN
- !32737: Dropped logging level severity from FATAL to ERROR for G4Exception (ATLMCPROD-8120)
Link to the full diff between [release/21.0.113](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.113) and [release/21.0.112](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.112) is available at https://gitlab.cern.ch/atlas/athena/compare/release/21.0.112...release/21.0.113https://gitlab.cern.ch/atlas/athena/-/merge_requests/33089Sweeping !32979 from 21.0 to master.
Improve LAr sampling fraction calculatio...2020-05-23T03:04:07+02:00Atlas NightlybuildSweeping !32979 from 21.0 to master.
Improve LAr sampling fraction calculation with feedback from GuillaumeImprove LAr sampling fraction calculation with feedback from Guillaume
See merge request atlas/athena!32979Improve LAr sampling fraction calculation with feedback from Guillaume
See merge request atlas/athena!32979https://gitlab.cern.ch/atlas/athena/-/merge_requests/33070Merge branch '21.0-fcal-sampling-fraction' into '21.0'2020-05-22T03:02:44+02:00Joseph CarterMerge branch '21.0-fcal-sampling-fraction' into '21.0'Add FCal sampling fraction tools to CaloSamplingFractionAnalysis (ATLASSIM-4439)
See merge request atlas/athena!32710
This patch resolves the conflicts when sweeping atlas/athena!32710 into master.Add FCal sampling fraction tools to CaloSamplingFractionAnalysis (ATLASSIM-4439)
See merge request atlas/athena!32710
This patch resolves the conflicts when sweeping atlas/athena!32710 into master.https://gitlab.cern.ch/atlas/athena/-/merge_requests/33046Manual sweep of !32808 from 21.0 into master: Allow the resetting of the gen ...2020-05-22T03:03:46+02:00John Derek ChapmanManual sweep of !32808 from 21.0 into master: Allow the resetting of the gen particle momentum in ISF only at start of eventAllow the resetting of the gen particle momentum in ISF only at start of event
See merge request atlas/athena!32808Allow the resetting of the gen particle momentum in ISF only at start of event
See merge request atlas/athena!32808https://gitlab.cern.ch/atlas/athena/-/merge_requests/32911update latest changes from 21.02020-08-12T03:05:18+02:00Salvador Marti I Garciasalvador.marti@cern.chupdate latest changes from 21.0Porting some updates of InDetPerformanceMonitoring from 21.0 plus a bug fix (fill TRT 3D histos) in InDetAlignmentMonitoringPorting some updates of InDetPerformanceMonitoring from 21.0 plus a bug fix (fill TRT 3D histos) in InDetAlignmentMonitoringhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32828Sweeping !32721 from 21.0 to master.
Bug fix for crashes in TFCSEnergyAndHitGAN2020-05-16T03:02:26+02:00Atlas NightlybuildSweeping !32721 from 21.0 to master.
Bug fix for crashes in TFCSEnergyAndHitGANBug fix for crashes in TFCSEnergyAndHitGAN
See merge request atlas/athena!32721Bug fix for crashes in TFCSEnergyAndHitGAN
See merge request atlas/athena!32721https://gitlab.cern.ch/atlas/athena/-/merge_requests/32817Merge 21.0.112 into 21.32020-08-12T03:05:18+02:00John Derek ChapmanMerge 21.0.112 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.112](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.112) and the previous release
[release/21.0.111](https://gitlab.c...This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.112](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.112) and the previous release
[release/21.0.111](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.111).
Below is the full list of merge requests that were included between these two tags:
* !32401 : defining new R3LargeD0 tracking mode for R21
* !32437 : Crosstalk parameterization and update of the eta-gap recovery for radiation damage simulation (ATLASSIM-4526)
* !32419 : Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)
* !29912 : Add lwtnn for pixel clustering NNs
* !31530 : Update ART test to use the latest parametrization to fix ATLASSIM-4474
* !32063 : Sweeping !32000 from 21.3 to 21.0.
* !32310 : Fixing ISF_ProtonAFIIGeant4Selector configuration (ATLASSIM-4518)
Link to the full diff between [release/21.0.112](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.112) and
[release/21.0.111](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.111)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.111...release/21.0.112https://gitlab.cern.ch/atlas/athena/-/merge_requests/32491Manual sweep of !32419 from 21.0 to 21.3: Fix ISF bug affecting ATLFASTII job...2020-05-25T08:05:22+02:00John Derek ChapmanManual sweep of !32419 from 21.0 to 21.3: Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)
See merge request atlas/athena!32419
(cherry picked from commit 6d9ab47b0e302f7c00ff12024cfc3df808d0ee75)
2a9a02e0 Attempt to fix issue seen in ATLPHYSVAL-630Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)
See merge request atlas/athena!32419
(cherry picked from commit 6d9ab47b0e302f7c00ff12024cfc3df808d0ee75)
2a9a02e0 Attempt to fix issue seen in ATLPHYSVAL-630https://gitlab.cern.ch/atlas/athena/-/merge_requests/32484Sweeping !32419 from 21.0 to master.
Fix ISF bug affecting ATLFASTII job (ATL...2020-05-17T03:02:18+02:00Atlas NightlybuildSweeping !32419 from 21.0 to master.
Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)
See merge request atlas/athena!32419Fix ISF bug affecting ATLFASTII job (ATLPHYSVAL-630)
See merge request atlas/athena!32419https://gitlab.cern.ch/atlas/athena/-/merge_requests/32460Sweeping !32310 from 21.0 to master.
Fixing ISF_ProtonAFIIGeant4Selector conf...2020-04-30T03:02:36+02:00Atlas NightlybuildSweeping !32310 from 21.0 to master.
Fixing ISF_ProtonAFIIGeant4Selector configuration (ATLASSIM-4518)Fixing ISF_ProtonAFIIGeant4Selector configuration (ATLASSIM-4518)
See merge request atlas/athena!32310Fixing ISF_ProtonAFIIGeant4Selector configuration (ATLASSIM-4518)
See merge request atlas/athena!32310https://gitlab.cern.ch/atlas/athena/-/merge_requests/32366Merge 21.0.111 into 21.32020-05-25T08:05:22+02:00John Derek ChapmanMerge 21.0.111 into 21.3This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.111](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.111) and the previous release
[release/21.0.110](https://gitlab...This merge request merges all the changes that were made to the ~"21.0" branch between the release
[release/21.0.111](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.111) and the previous release
[release/21.0.110](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.110).
Below is the full list of merge requests that were included between these two tags:
* !31918 : EventInfo (version 2) Update, 21.0 branch (2020.04.10.)
* !29415 : Update exp interpolation beta in TFCS1DFunctionTemplateHelpers.h
* !31744 : FastCaloSimGANsimulation
* !31916 : Sweeping !31856 from 21.3 to 21.0.
* !31707 : Enable the CTPSimulation to force using BCID for BGRP evaluation in MC
* !31746 : PROCTools: Update q221 T0 reference ESD and AOD files
* !31527 : Address issue with negative hit energies seen in ATLASSIM-4474
* !31562 : Adding protection for NaN in TFCSCenterPositionCalculation (ATLASSIM-4474)
* !31714 : FastCaloSim: give TFCSEnergyInterpolationSpline the option to just scale the simulated energy
* !31491 : Adding extra ART tests for testing Tracking overlay
* !30715 : TileCal: Improvements in macro and python scripts
* !30845 : Allow more flexible options to retry simulation chains
* !31037 : ATR-21109: Disable test MET chains for release 21 bulk MC production ~"frozen-tier0-violating"
* !31243 : Bug fix of the hole information in PIXELVALID (ATLASRECTS-5367)
* !31106 : Adjust error messages such that max file size is printed.
Link to the full diff between [release/21.0.111](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.111) and
[release/21.0.110](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.110)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.110...release/21.0.111https://gitlab.cern.ch/atlas/athena/-/merge_requests/32118Manual sweep of FastCaloSim_EnergyAndHitGAN into master2020-06-25T12:32:40+02:00Michael Duehrssen-DeblingManual sweep of FastCaloSim_EnergyAndHitGAN into masterManual sweep of MR !31744 into masterManual sweep of MR !31744 into masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32036Manual sweep from 21.0 to 21.3: Adding protection for NaN in TFCSCenterPositi...2020-05-25T08:05:24+02:00John Derek ChapmanManual sweep from 21.0 to 21.3: Adding protection for NaN in TFCSCenterPositionCalculation (ATLASSIM-4474)Adding protection for NaN in TFCSCenterPositionCalculation (ATLASSIM-4474)
See merge request atlas/athena!31562
(cherry picked from commit cb4a5321d11c75841eccc7678a2bcc3d9007f315)
f10ef640 Adding protection for NaN in TFCSCenterPosit...Adding protection for NaN in TFCSCenterPositionCalculation (ATLASSIM-4474)
See merge request atlas/athena!31562
(cherry picked from commit cb4a5321d11c75841eccc7678a2bcc3d9007f315)
f10ef640 Adding protection for NaN in TFCSCenterPositionCalculationhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/32035Manual sweep from 21.0 to 21.3: Address issue with negative hit energies seen...2020-05-25T08:05:24+02:00John Derek ChapmanManual sweep from 21.0 to 21.3: Address issue with negative hit energies seen in ATLASSIM-4474Address issue with negative hit energies seen in ATLASSIM-4474
See merge request atlas/athena!31527
(cherry picked from commit ddb6130a31e6226ab79db424d31a0e85eb5ea758)
64a54777 Address issue with negative hit energies seen in ATLASSI...Address issue with negative hit energies seen in ATLASSIM-4474
See merge request atlas/athena!31527
(cherry picked from commit ddb6130a31e6226ab79db424d31a0e85eb5ea758)
64a54777 Address issue with negative hit energies seen in ATLASSIM-4474
cc81632e ATLASSIM-4474: improve printout
3eb9d2cd ATLASSIM-4474: change fabs to std::abshttps://gitlab.cern.ch/atlas/athena/-/merge_requests/31819Sweeping !31746 from 21.0 to master.
PROCTools: Update q221 T0 reference ESD ...2020-04-09T03:02:04+02:00Atlas NightlybuildSweeping !31746 from 21.0 to master.
PROCTools: Update q221 T0 reference ESD and AOD filesPROCTools: Update q221 T0 reference ESD and AOD files
See merge request atlas/athena!31746PROCTools: Update q221 T0 reference ESD and AOD files
See merge request atlas/athena!31746https://gitlab.cern.ch/atlas/athena/-/merge_requests/31769Sweeping !31562 from 21.0 to master.
Adding protection for NaN in TFCSCenterP...2020-04-08T03:02:40+02:00Atlas NightlybuildSweeping !31562 from 21.0 to master.
Adding protection for NaN in TFCSCenterPositionCalculation (ATLASSIM-4474)Adding protection for NaN in TFCSCenterPositionCalculation (ATLASSIM-4474)
See merge request atlas/athena!31562Adding protection for NaN in TFCSCenterPositionCalculation (ATLASSIM-4474)
See merge request atlas/athena!31562https://gitlab.cern.ch/atlas/athena/-/merge_requests/31768Sweeping !31491 from 21.0 to master.
Adding extra ART tests for testing Track...2020-04-08T03:01:58+02:00Atlas NightlybuildSweeping !31491 from 21.0 to master.
Adding extra ART tests for testing Tracking overlayAdding extra ART tests for testing Tracking overlay
See merge request atlas/athena!31491Adding extra ART tests for testing Tracking overlay
See merge request atlas/athena!31491https://gitlab.cern.ch/atlas/athena/-/merge_requests/31767Sweeping !31527 from 21.0 to master.
Address issue with negative hit energies...2020-04-08T03:02:37+02:00Atlas NightlybuildSweeping !31527 from 21.0 to master.
Address issue with negative hit energies seen in ATLASSIM-4474Address issue with negative hit energies seen in ATLASSIM-4474
See merge request atlas/athena!31527Address issue with negative hit energies seen in ATLASSIM-4474
See merge request atlas/athena!31527