athena merge requestshttps://gitlab.cern.ch/atlas/athena/-/merge_requests2019-06-10T03:02:32+02:00https://gitlab.cern.ch/atlas/athena/-/merge_requests/23817Sweeping !21497 from 21.0 to master.Add functionality for weighted hits in th...2019-06-10T03:02:32+02:00Atlas NightlybuildSweeping !21497 from 21.0 to master.Add functionality for weighted hits in the lateral shape simulationAdd functionality for weighted hits in the lateral shape simulation
See merge request atlas/athena!21497Add functionality for weighted hits in the lateral shape simulation
See merge request atlas/athena!21497https://gitlab.cern.ch/atlas/athena/-/merge_requests/23336Merge 21.0.97 into 21.3 branch2019-05-12T00:47:33+02:00John Derek ChapmanMerge 21.0.97 into 21.3 branchThis commit merges all the changes that were made to the ~"21.0" branch between the
[release/21.0.97](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.97) release and the
previous release [release/21.0.96](https://gitlab.cern.ch/atl...This commit merges all the changes that were made to the ~"21.0" branch between the
[release/21.0.97](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.97) release and the
previous release [release/21.0.96](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.96).
Below is a full list of the merge requests accepted between these two tags:
* !22608 : Check against corrupted secondPCA file (ATLASSIM-4141)
* !23157 : Merge branch 'data-overlay' into '21.3'
* !23140 : Update to the latest version of FastCalosimV2 parametrization (ATLASSIM-4164)
* !23144 : Fixing RHadron Hadronic Interactions and Stop/Sbottoms
* !22970 : Physics Validation Jet monitoring substructure added
* !22697 : InDetPerformanceMonitor. IDAlignment validation ntuples with more variables and default alignment constants.
* !23042 : add file to correct 2018PbPb filtering
* !23056 : Add data19 and data20 cosmics projects to autoconfiguration
* !22863 : added new flags to steer content of DAOD_IDPIXLUMI
* !22913 : TrigTauMonitoring fix to handle AODSLIM content
* !22938 : Manual CP of MR!22811
* !22942 : Manual CP of !21847
Link to the full diff between [release/21.0.97](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.97) and
[release/21.0.96](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.96)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.96...release/21.0.97https://gitlab.cern.ch/atlas/athena/-/merge_requests/23319Sweeping !23259 from 21.0 to master.
Better state reset in EventSelector::rei...2019-05-14T03:02:19+02:00Atlas NightlybuildSweeping !23259 from 21.0 to master.
Better state reset in EventSelector::reinit()Better state reset in EventSelector::reinit()
See merge request atlas/athena!23259Better state reset in EventSelector::reinit()
See merge request atlas/athena!23259https://gitlab.cern.ch/atlas/athena/-/merge_requests/23227Sweeping !22608 from 21.0 to master.
Check against corrupted secondPCA file (...2019-05-09T03:02:22+02:00Atlas NightlybuildSweeping !22608 from 21.0 to master.
Check against corrupted secondPCA file (ATLASSIM-4141)Check against corrupted secondPCA file (ATLASSIM-4141)
See merge request atlas/athena!22608Check against corrupted secondPCA file (ATLASSIM-4141)
See merge request atlas/athena!22608https://gitlab.cern.ch/atlas/athena/-/merge_requests/23226Sweeping !23157 from 21.0 to master.
Merge branch 'data-overlay' into '21.3'2019-05-08T03:02:50+02:00Atlas NightlybuildSweeping !23157 from 21.0 to master.
Merge branch 'data-overlay' into '21.3'Merge branch 'data-overlay' into '21.3'
See merge request atlas/athena!23157Merge branch 'data-overlay' into '21.3'
See merge request atlas/athena!23157https://gitlab.cern.ch/atlas/athena/-/merge_requests/23182Sweeping !23144 from 21.0 to 21.3.
Fixing RHadron Hadronic Interactions and S...2019-05-15T14:46:03+02:00Atlas NightlybuildSweeping !23144 from 21.0 to 21.3.
Fixing RHadron Hadronic Interactions and Stop/SbottomsFixing RHadron Hadronic Interactions and Stop/Sbottoms
See merge request atlas/athena!23144Fixing RHadron Hadronic Interactions and Stop/Sbottoms
See merge request atlas/athena!23144https://gitlab.cern.ch/atlas/athena/-/merge_requests/23181Sweeping !23140 from 21.0 to master.
Update to the latest version of FastCalo...2019-05-07T03:02:26+02:00Atlas NightlybuildSweeping !23140 from 21.0 to master.
Update to the latest version of FastCalosimV2 parametrization (ATLASSIM-4164)Update to the latest version of FastCalosimV2 parametrization (ATLASSIM-4164)
See merge request atlas/athena!23140Update to the latest version of FastCalosimV2 parametrization (ATLASSIM-4164)
See merge request atlas/athena!23140https://gitlab.cern.ch/atlas/athena/-/merge_requests/23116Sweeping !22970 from 21.0 to master.
Physics Validation Jet monitoring substr...2019-05-03T03:02:50+02:00Atlas NightlybuildSweeping !22970 from 21.0 to master.
Physics Validation Jet monitoring substructure addedPhysics Validation Jet monitoring substructure added
See merge request atlas/athena!22970Physics Validation Jet monitoring substructure added
See merge request atlas/athena!22970https://gitlab.cern.ch/atlas/athena/-/merge_requests/23115Sweeping !23056 from 21.0 to 21.3.
Add data19 and data20 cosmics projects to ...2019-05-15T14:44:55+02:00Atlas NightlybuildSweeping !23056 from 21.0 to 21.3.
Add data19 and data20 cosmics projects to autoconfigurationAdd data19 and data20 cosmics projects to autoconfiguration
See merge request atlas/athena!23056Add data19 and data20 cosmics projects to autoconfiguration
See merge request atlas/athena!23056https://gitlab.cern.ch/atlas/athena/-/merge_requests/23114Sweeping !23056 from 21.0 to master.
Add data19 and data20 cosmics projects t...2019-05-03T03:03:21+02:00Atlas NightlybuildSweeping !23056 from 21.0 to master.
Add data19 and data20 cosmics projects to autoconfigurationAdd data19 and data20 cosmics projects to autoconfiguration
See merge request atlas/athena!23056Add data19 and data20 cosmics projects to autoconfiguration
See merge request atlas/athena!23056https://gitlab.cern.ch/atlas/athena/-/merge_requests/23058Sweeping !22913 from 21.0 to 21.3.
TrigTauMonitoring fix to handle AODSLIM co...2019-05-15T14:46:14+02:00Atlas NightlybuildSweeping !22913 from 21.0 to 21.3.
TrigTauMonitoring fix to handle AODSLIM contentTrigTauMonitoring fix to handle AODSLIM content
See merge request atlas/athena!22913TrigTauMonitoring fix to handle AODSLIM content
See merge request atlas/athena!22913https://gitlab.cern.ch/atlas/athena/-/merge_requests/23004latest 21.0 changes to RadiationMapsMaker (particle spectra) ported to master2019-05-01T03:02:41+02:00Sven Menkelatest 21.0 changes to RadiationMapsMaker (particle spectra) ported to mastermanual port of merged MR !22833 from 21.0 to mastermanual port of merged MR !22833 from 21.0 to masterhttps://gitlab.cern.ch/atlas/athena/-/merge_requests/23003latest 21.0 changes to RadiationMapsMaker (particle spectra) for 21.92019-05-03T09:16:02+02:00Sven Menkelatest 21.0 changes to RadiationMapsMaker (particle spectra) for 21.9see merged MR !22833 from 21.0see merged MR !22833 from 21.0https://gitlab.cern.ch/atlas/athena/-/merge_requests/22922Manual sweep of !22691 from 21.0 into master: Add new G4FastCaloTest simulat...2019-04-30T03:02:22+02:00John Derek ChapmanManual sweep of !22691 from 21.0 into master: Add new G4FastCaloTest simulator configurationAdd new G4FastCaloTest simulator configuration
See merge request atlas/athena!22691Add new G4FastCaloTest simulator configuration
See merge request atlas/athena!22691https://gitlab.cern.ch/atlas/athena/-/merge_requests/22918Merge 21.0.96 into 21.3 branch2019-04-25T16:46:16+02:00John Derek ChapmanMerge 21.0.96 into 21.3 branchThis merge request merges the changes which went into the ~"21.0" branch between the [release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95)
and [release/21.0.96](https://gitlab.cern.ch/atlas/athena/tags/release/21.0....This merge request merges the changes which went into the ~"21.0" branch between the [release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95)
and [release/21.0.96](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.96) tags into the ~"21.3" branch.
This is the list of merge requests that were included since
the previous release [release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95):
* !22856 : PixelGeoModel: comment unused flexDensity variable to avoid compiler warning
* !22860 : fixed some warnings in PixelRadDamDigitization
* !22260 : Updates to R-Hadron simulation for stable particles
* !22778 : Sweeping !22721 from 21.3 to 21.0.
* !22833 : RadiationMapsMaker: energy spectra
* !22715 : Cherry-pick fixes in trigger test exec scripts
* !22691 : Add new G4FastCaloTest simulator configuration
* !22558 : Update for 2018 PbPb overlay configuration
* !22659 : Sweeping !22586 from 21.3 to 21.0.
* !22579 : Sweeping !22537 from 21.3 to 21.0.
* !21530 : Fix LArG4Identifier assignment for hits from step in Back Outer Barrette
* !22077 : Added photon Russian Roulette
* !22123 : better memory management in Geo2G4Svc
* !22129 : minor fixes TileCalibBlobPython package
* !22305 : 21.0-ART_test-InDetPhysValMonitoring
* !22379 : Sweeping !22165 from master to 21.0.
* !22495 : Removing MadGraphModels package from 21.0
* !22514 : Use InDetSCT_ConditionsSummarySvc, use groupSize in SCTRationNoiseMonTool (ATLASRECTS-4839)
* !22315 : 21.0 fcs debugging histograms
* !22337 : Fixing unused variable warning reported in ATLASSIM-4125
* !22161 : For Forward-Compatibility port reading of RootTreeIndexContainer
* !22193 : Improving tracking for High Pt B hadrons
* !22230 : Fix configuration issues with ATLFASTII_QS simulator
* !22182 : test_MC16_ATLFASTIIF_ttbar ART job should run on grid not as part of ART build
* !22167 : improved Geantino weighting for density averaging in RadiationMapsMaker
* !22146 : Update to RHadron Mass Spectrum for Spin Issue
* !22111 : adds logical volume printout as well
* !22053 : Extend ISF configuration to allow Quasi-stable particle simulation in ATLFASTII jobs
* !21766 : Egamma ART: Adding cluster plots and modifying plotting macro
* !21943 : Sweeping !21781 from 21.2 to 21.0.
* !21959 : Sweeping !21757 from 21.3 to 21.0.
* !22032 : 21.0 RHadron consistency
* !22035 : Sweeping !21996 from master to 21.0.
* !22054 : timeout variables in h2000 TileCal calibration ntuple
* !22078 : Add MC16 Simulation ART jobs
* !22081 : Switch off FastChainPileup ART jobs for 21.0 branch
Link to the full diff between [release/21.0.96](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.96) and
[release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.95...release/21.0.96https://gitlab.cern.ch/atlas/athena/-/merge_requests/22859Sweeping !22260 from 21.0 to 21.3.
Updates to R-Hadron simulation for stable ...2019-04-26T11:10:40+02:00Atlas NightlybuildSweeping !22260 from 21.0 to 21.3.
Updates to R-Hadron simulation for stable particlesUpdates to R-Hadron simulation for stable particles
See merge request atlas/athena!22260Updates to R-Hadron simulation for stable particles
See merge request atlas/athena!22260https://gitlab.cern.ch/atlas/athena/-/merge_requests/22858Sweeping !22260 from 21.0 to 21.9.
Updates to R-Hadron simulation for stable ...2019-04-29T11:39:42+02:00Atlas NightlybuildSweeping !22260 from 21.0 to 21.9.
Updates to R-Hadron simulation for stable particlesUpdates to R-Hadron simulation for stable particles
See merge request atlas/athena!22260Updates to R-Hadron simulation for stable particles
See merge request atlas/athena!22260https://gitlab.cern.ch/atlas/athena/-/merge_requests/22857Sweeping !22260 from 21.0 to master.
Updates to R-Hadron simulation for stabl...2019-04-23T03:02:01+02:00Atlas NightlybuildSweeping !22260 from 21.0 to master.
Updates to R-Hadron simulation for stable particlesUpdates to R-Hadron simulation for stable particles
See merge request atlas/athena!22260Updates to R-Hadron simulation for stable particles
See merge request atlas/athena!22260https://gitlab.cern.ch/atlas/athena/-/merge_requests/22742Sweeping !22558 from 21.0 to master.
Update for 2018 PbPb overlay configuration2019-04-18T03:02:27+02:00Atlas NightlybuildSweeping !22558 from 21.0 to master.
Update for 2018 PbPb overlay configurationUpdate for 2018 PbPb overlay configuration
See merge request atlas/athena!22558Update for 2018 PbPb overlay configuration
See merge request atlas/athena!22558https://gitlab.cern.ch/atlas/athena/-/merge_requests/22549Sweeping !21530 from 21.0 to master.
Fix LArG4Identifier assignment for hits ...2019-04-12T03:02:11+02:00Atlas NightlybuildSweeping !21530 from 21.0 to master.
Fix LArG4Identifier assignment for hits from step in Back Outer BarretteFix LArG4Identifier assignment for hits from step in Back Outer Barrette
See merge request atlas/athena!21530Fix LArG4Identifier assignment for hits from step in Back Outer Barrette
See merge request atlas/athena!21530