Former-commit-id: 1ee2ebd4910426e829e035f288784b9c537f2cde

Former-commit-id: edbc45fb096674888118406c33b15bd8bc2cfdf1

Revert "Merge branch 'ATLASRECTS-4241' into '21.0'"

See merge request atlas/athena!7301

Former-commit-id: c61e6633d92cf7da8ed86ebfc6db85a2485218f4

This reverts merge request !6822

Former-commit-id: 0b89aea1d09c6eede365029b9a549e1751f8da53

Protection against division by zero  (ATLASRECTS-4205)

See merge request atlas/athena!5998

Former-commit-id: 2ee482c0e0d336b9fe0dc75ab8ce38e257aa566a

Manual sweep of !3231 from 'master' into '21.0': BeamEffects: Fix typos in cmake file; add missing test reference file.

See merge request atlas/athena!7179

Former-commit-id: d843430d784e6f67cc0f7e21fd4ce780e438ebeb

Added PseudoTrack Monitoring for SplitReco for FastChain

See merge request atlas/athena!7176

Former-commit-id: e99f24666d3e53e4680998baf2fe48bc292b4886

Update on VrtSecInclusive

See merge request atlas/athena!7153

Former-commit-id: c18fc6d3847942dad08284bc1a00b65b06f95279

Sweeping !6968 from 21.2 to 21.0.
Fix container key name in TrigEgammaMatching for isolated photons

See merge request atlas/athena!7145

Former-commit-id: dc922c1e2d311ce67d0482f4484bca3c96683462

correcting configuration of METMaker for PFlow in physics validation

See merge request atlas/athena!7123

Former-commit-id: 29a18378085818fe186dbd2991174673b7fc817f

Resolve JVT bug in MET physics validation code

See merge request atlas/athena!7072

Former-commit-id: 3722d83c608045e623c51261c48d8f846d997bfa

Philipp Mogg authored 7 years ago and James Beacham committed 7 years ago

Former-commit-id: 044049cf5bc22b99afeb0569f8d8518973d1df3b

Merge branch 'warn.LArG4H6SD-20171202' into 'master'

See merge request atlas/athena!7087

Former-commit-id: 646b21c1eb707131f67ee8a1ae804de5679d451d

Fix to crash in GSF MultiStateCombiner (ATLASRECTS-4241)

See merge request atlas/athena!6822

Former-commit-id: 12e392543f3561cf8da70004961093f64801b6f6

Anthony Morley authored 7 years ago and James Beacham committed 7 years ago

Former-commit-id: b3a22d9f5ec10799da263e376c4e14dc757ee084

Sweeping !6821 from master to 21.0.
G4AtlasApps: Fix ctest tests.

See merge request atlas/athena!7143

Former-commit-id: 914388fba98675a310c0685e09b26b09f868ad05

Merge branch 'test.G4AtlasApps-20171125' into 'master'

See merge request atlas/athena!7128

Former-commit-id: 00e349a7b47f9bbcc09b69f78802e037108cca59

Ignoring skipEvents in Event Service jobs

See merge request atlas/athena!7101

Former-commit-id: e6f0f2a58ea59e1c4e497e86035c40f2cb9f4ebe

Fixing the SuppressRedFactor in CaloMontoring webdisplay

See merge request atlas/athena!7088

Former-commit-id: c81fa68f6aa22b6ac0c85351a2fdbf79232a50fa

Fix crash in DAOD_TRKIDVALID due to multiple instances of xAODTruth building

See merge request atlas/athena!7080

Former-commit-id: 213886d335c0569ea0e43d4846382f9fd231c5dc

Manual sweep of !6433 from 'master' to '21.0': TRT_G4Utilities: Comply with ATLAS naming conventions.

See merge request atlas/athena!7005

Former-commit-id: 32b2b7ac16754b9e824c18167483f09e0b81937a

Manual sweep of !6415 from 'master' in '21.0': TRT_TR_Process: Comply with ATLAS naming conventions.

See merge request atlas/athena!7010

Former-commit-id: 6911b143919c46392274359689c97faecbb6dd6d

Manual sweep of !6413 from 'master' into '21.0': InDetSimEvent: Comply with ATLAS naming conventions.

See merge request atlas/athena!7009

Former-commit-id: 653cd688d905aae61f5d2d5c8ae0bfd2037b0a5e

AthDataquality: Standalone DataQuality project

See merge request atlas/athena!6877

Former-commit-id: eecdaa44621911c6496b34a271e665eea1a11377

Update of Cosmic Ray and Cavern Background Simulation Configuration (ATLASSIM-3214)

See merge request atlas/athena!6843

Former-commit-id: a0c92c0318a36ccdbeb4136a6ce917d755c615a0

Bug fix in LArFEBMon (LArMonTools package)

See merge request atlas/athena!6722

Former-commit-id: 00293924af4b964f2b6a4f906dc9832c4ad0a6cf

removing FastCaloSimParamAlg from the algorithm sequence

See merge request atlas/athena!7127

Former-commit-id: 952b40e126f7736df743f304d96237f19da02874

Remove LArG4ShowerLibData package

See merge request atlas/athena!7103

Former-commit-id: 74694280ce76899941af6424a6514b192d6b79cf

Fix AtlasPyFwdBwdPorts installation in AthSimulation (ATLINFR-2114)

See merge request atlas/athena!7011

Former-commit-id: 018a4564e9429167f99475226511e1002a3375b2

BeamEffects: Fix typos in cmake file; add missing test reference file.

See merge request !3231


Former-commit-id: ea47b6ce

Former-commit-id: 444fb90a75166e716a094b02f9292a08c7b1707f

Pulling in changes from `PATJobTransforms-00-06-10`. Part of the
fixes for ATLASSIM-3214. This should allow cosmics and cavern
background simulation jobs to be run using AthenaMP.


Former-commit-id: 4d78f40008094cba63cf0f875b82ddf09bbf68a1

In ATLASSIM-3214 the naming of TrackRecord input/output file arguments was discussed
and it was agreed to use `inputEVNT_TRFile` and `outputEVNT_TRFile` for all
simulation jobs which either read in or write out TrackRecord files. These
new names were agreed with the AMI developers. (The old names having been too
long.)
This commit pulls in changes from `SimuJobTransforms-00-33-03`, `SimuJobTransforms-00-33-04`
and `SimuJobTransforms-00-33-05`.
It also pulls in corresponding updates to the syntax or RTT and ART jobs.

+	* python/simTrfArgs.py : Only input TR and output TR, not separate cosmic
+	/ cavern TR files
+	* python/SimTransformUtils.py : Adding a sub-step to deal with jobs that
+	write out TRs and jobs that read in TRs separately
+	* share/skeleton.EVGENtoHIT_ISF.py : updating to configure only based on
+	TR file requirements and whether beam config is cosmic, rather than using
+	type of TR file as a hint
+	* share/skeleton.EVGENtoHIT_MC12.py : updating to configure only based on
+	TR file requirements and whether beam config is cosmic, rather than using
+	type of TR file as a hint
+	* scripts/AtlasG4_tf.py : updating list of input arguments
+	* scripts/Sim_tf.py : updating list of input arguments
+	* Tagging: SimuJobTransforms-00-33-03


Former-commit-id: f015a48aa6ba345486dde39b1b1570459d236054

Feature vrt sec inclusive new features integrated 21.0

See merge request atlas-phys-susy-secondary-vertex/athena!9

Former-commit-id: 598de2af453d07907becd23c69f151d1efae4acc

Nils Erik Krumnack authored 7 years ago and Atlas Nightlybuild committed 7 years ago

Fix container key name in TrigEgammaMatching for isolated photons

See merge request atlas/athena!6968

(cherry picked from commit 9c729a5a [formerly 16a29caa9323892a419d68ef0b0f22c007e7225a])

66489325 Fix key name in TrigEgammaMAtching

Former-commit-id: 287540876a80073b2ea714a8783468d17572c672

Vakhtang Tsulaia authored 7 years ago and Atlas Nightlybuild committed 7 years ago

G4AtlasApps: Fix ctest tests.

See merge request atlas/athena!6821

(cherry picked from commit daf4c63c [formerly 1d423771e9dc72a17e81d960a0211ac5a2831eef])

6037d84e G4AtlasApps: Fix ctest tests.

Former-commit-id: 27bbc9f0a0f4c0920ab2e5bbefaac19f0946e55e

G4AtlasApps: Fix ctest tests.

See merge request atlas/athena!6821

(cherry picked from commit daf4c63c [formerly 1d423771])

6037d84e G4AtlasApps: Fix ctest tests.

Former-commit-id: 1a80c729

in the single particle G4 production to be used in FastCaloSimV2
The FastCaloSimParamAlg introduces bug, see ATLASSIM-3521


Former-commit-id: ca20886ac78dd543d54f0ad6090b4a88d0dd1d09

Merge remote branch 'origin/feature-VrtSecInclusive-newFeaturesIntegrated-21.0' into feature-VrtSecInclusive-newFeaturesIntegrated-21.0


Former-commit-id: cf20ef5366e8b5c0a329c9e9ef7704c52bfc4fab

Former-commit-id: 0b0b96f086c6f6d850615555d524f65c3359b73e