This reverts commit 4d36a592.

pixel module retrieval for tracking geometry in the updated pixel ID scheme

See merge request atlas/athena!24285

Sweeping !24200 from 21.3 to 21.9.
Remove double `;` from NSW primary numbers `.xml` file to avoid error in ExpressionEvaluator

See merge request atlas/athena!24281

21.9 skip pixel hitPattern filling for ITK

See merge request atlas/athena!24151

Sweeping !24170 from master to 21.9.
Fix maximum number of strips for LM2 and SM2 NSW micromega chambers

See merge request atlas/athena!24230

Sweeping !24173 from 21.3 to 21.9.
Ensure G4AtlasApps/jobOptions.G4Cosmic.py writes out some events

See merge request atlas/athena!24235

John Derek Chapman authored Jun 17, 2019 and Atlas Nightlybuild committed Jun 18, 2019

Remove double `;` from NSW primary numbers `.xml` file to avoid error in ExpressionEvaluator

See merge request atlas/athena!24200

(cherry picked from commit d0f67a9c)

71aaa711 Remove double `;` from NSW primary numbers `.xml` file to avoid error in ExpressionEvaluator

21.9: configuration updates for InclinedAlternative layout option

See merge request atlas/athena!23962

Merge release/21.3.14 into 21.9 branch

See merge request atlas/athena!24147

John Derek Chapman authored Jun 14, 2019 and Atlas Nightlybuild committed Jun 16, 2019

Ensure G4AtlasApps/jobOptions.G4Cosmic.py writes out some events

See merge request atlas/athena!24173

(cherry picked from commit 03fe3c82)

50ef179b Increase the number of events run by jobOptions.G4Cosmic.py so we get some events hitting ATLAS

Frank Winklmeier authored Jun 14, 2019 and Atlas Nightlybuild committed Jun 16, 2019

Fix maximum number of strips for LM2 and SM2 NSW micromega chambers

See merge request atlas/athena!24170

(cherry picked from commit c0882895)

69cd6b7c Fix maximim number of strips for LM2 and SM2 NSW micromega chambers

21.9: Temporary fix for ITK pixel cabling to skip validity checks

See merge request atlas/athena!23775

skip pixel hitPattern filling for ITK, which anyway isn't reliable; new info objects should be used instead

add step 3.0 (InclinedAlternative) test

See merge request atlas/athena!24113

This merge request merges the changes from the ~"21.3" branch between [release/21.3.13](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.13)
and [release/21.3.14](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.14) (including the changes from the ~"21.0"
branch between [release/21.0.95](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.95)
and [release/21.0.97](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.97)) into the ~"21.9" branch.
This is done via a merge of [release/21.3.14](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.14).
(Last ~"21.3" release to be merged into ~"21.9" was
[release/21.3.13](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.13).)

[release/21.0.96](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.96) is a Tier0 release. It alters the output of heavy ion production jobs.
[release/21.0.97](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.97) is a Tier0 release. It is FT0-preserving.
[release/21.3.14](https://gitlab.cern.ch/atlas/athena/tags/release/21.3.14) is otherwise FT0-preserving.

Here is the full diff between https://gitlab.cern.ch/atlas/athena/compare/release/21.3.13...release/21.3.14

NB The changes in !22913 (which were part of [release/21.0.96](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.96)). Have been
left out of this merge due to conflicts with the existing code in ~"21.9".

Manual sweep of !22495 from 21.0 to 21.9: Removing MadGraphModels package from 21.0

See merge request atlas/athena!24102

Removing MadGraphModels package from 21.0

See merge request atlas/athena!22495

updating geometry in ART tests

See merge request atlas/athena!24045

Updating the SimulationTier0Test reference file for 21.9 after !22885 was merged

See merge request atlas/athena!24007

Sweeping !23970 from master to 21.3.
Add ImportError to check_log patterns

See merge request atlas/athena!24028

Walter Lampl authored Jun 06, 2019 and Atlas Nightlybuild committed Jun 07, 2019

Add ImportError to check_log patterns

See merge request atlas/athena!23970

(cherry picked from commit bddec603)

7843f0cb Add ImportError to check_log patterns

new algorithm to deal with ROBDataAccess to produce calo cells

See merge request atlas/athena!22907

New ART tests to check AOD for new L1Calo simulation in 21.3

See merge request atlas/athena!23990

Fill histograms in jet trigger monitoring for jFex jets

See merge request atlas/athena!23993

Fix in the MM digit converter

See merge request atlas/athena!23892