adjustment for Run-3 geometries

See merge request atlas/athena!10658

Former-commit-id: 75c8a4057236a8bea68a5158a5594212e7129fdd

NSW geometry auto-config for digitization and reconstruction

See merge request atlas/athena!10725

Former-commit-id: 8c1c2776c54e60f53ba03296c6da409b5ce2825f

mods of NSWAGDDTool to write blob for NSW layouts (ATLASSIM-3636)

See merge request atlas/athena!10665

Former-commit-id: 34eabb97331c24fbd6fdb9c0bacaae234e4da768

use module hash to identify NSW PrepData and RawData

See merge request atlas/athena!10696

Former-commit-id: 7745e93f3298a300e7e7e9d154232772c3f6d87e

The NSWAGDDTool is building the NSW geometry. In simulation there
was the simulation flag "SimulateNewSmallWheel" while no such
flag was in place for digitization/reconstrution and postIncludes
had to be used. With the availability of "RUN3" in the AtlasCommon
table it is now possible to use this string for digitization and
reconstruction jobs to trigger the building of the NSW geometry.
This merge request is taking care of that.


Former-commit-id: a9b81e65b9569161bb639c58e646e08890c3b129

Merge tag 'release/21.0.68' into '21.3' branch

See merge request atlas/athena!10680

Former-commit-id: 72abcc7bb1ce53a5772987fc241ff36a16edfb8a

Up to now the detectorelement hash is used to identify the NSW
PrepData and RawData. It is more advicable to use module hashes.
This merge request applies the according modifications. As the
data collections aren't really used yet it's possible to just
change the converters rather than doing a schema evolution.


Former-commit-id: 8f979d7fe493d2ad0d74d58399b48509c7125b3c

Former-commit-id: 4d6af513d66d6834073eed4100ca33f3f9b74be8

`21.0.68` is the latest Tier0 release to be used in prompt reconstruction. It's FT0-violating.
It includes the 'big trigger MR' !10012 (21.1.26 candidate (plus MBTS) ➜ 21.0) and other
Change-trigger-counts MR (!10117).

The release [release/21.0.68](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.68)
was built from the tag [nightly/21.0/2018-04-11T2155](https://gitlab.cern.ch/atlas/athena/tags/nightly/21.0/2018-04-11T2155)

This is the list of merge requests that were included since
the previous release [release/21.0.67](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.67):
 * !10346 : Sweeping !10306 from 21.2 to 21.0.
 * !10344 : Sweeping !10290 from 21.1-dev to 21.0.
 * !10327 : 21.0 trig prescale mon new
 * !10323 : Allowing to set the mobility parameters for pixel (ATLASSIM-3516)
 * !10318 : Updating JetTagging code: new plots for 2018 DQ in han config
 * !10307 : DerivationFrameworkL1Calo Updates for 2018 data taking
 * !10294 : Make use of memory efficient 2D histos for lateral shape simulation
 * !10280 : Add AFPProton to xAODForward package
 * !10352 : LAr cell mon cosmics jobO fix
 * !10254 : Update of offline tau monitoring
 * !10224 : synchronized PathResolver with 21.2
 * !10134 : Trigger MET monitoring update
 * !10234 : Sweeping !10184 from 21.3 to 21.0.
 * !10239 : Changes for the RadiationMapsMaker:
 * !10296 : adding pyAMI dependency
 * !10301 : Tidying of InDetSimUtils packages
 * !10316 : Syntax update for interfaces and base classes of LAr Calculator Services
 * !10317 : Update of AFP monitoring
 * !10116 : ART implementation for egamma reconstruction: bugs corrected, statistics increased, new features added, new histograms.
 * !10226 : Rewrite of CaloCellMon (finally)
 * !10218 : Memory overwrite fix in CaloBaselineMon
 * !10250 : Copied updated ant tests from master to 21.0 (ATLASSIM-3607)
 * !10256 : Commiting work in progress HAN config. Full update to reflect chains now added…
 * !10164 : DQ b-tagging: new plots and improvements
 * !9234 : Add extra flags for configurations using Fatras
 * !10223 : Add new TrackParticleTruth persistent classes using HepMcParticleLink_p2
 * !10117 : memory allocation fix for ATR-17891
 * !10141 : ART version 0.9.5
 * !10174 : updates mr-2018-01 to pixel athena monitoring code
 * !10225 : Updates of HLT han config for first collisions
 * !10200 : Fix dcube.py search paths for new Athena install locations
 * !10173 : Update version.txt
 * !10130 : Updated DCUBE Post-processing to run from ATLAS SW directory
 * !9861 : 21.0 jet trig mon development
 * !10031 : Add io-reinit to LumiBlock metadata algorithm to reset state.
 * !10012 : Update T0 to 21.1.26 candidate (plus MBTS) 22 march 18
 * !9934 : Update of online monitoring for 2018 tau triggers
 * !9885 : ATR-17870, adding new MBTS inputs as thresholds in the L1 menu
 * !9791 : Sweeping !9365 from 21.0 to 21.1.
 * !9828 : Add parameter to set decision requiring single or double proton tag
 * !9815 : moving MR9251 to 21.1: ART TrigP1Test PS with TRIGGERDBART (ATR-16799,ATR-15781)
 * !9858 : Physics_pp_v7 menu fixes: ATR-17864
 * !9843 : Sweeping !9784 from 21.0 to 21.1.
 * !9838 : Sweeping !9760 from 21.0 to 21.1.
 * !9825 : ATR-17820 moving e5_lhmedium_nod0 from MC to Physics
 * !9824 : 21.1 online jet monitoring
 * !9795 : Remove obsolete L2Star muon chains
 * !9803 : Removed tau run-1 chains from MC menu: ATR-17807
 * !9816 : Update version.txt
 * !9794 : Use the phi roi containment by default
 * !9747 : Adding variable tag_MV2c10_hybrid to monitoring
 * !9786 : Resubmitting MR 9783 to 21.1
 * !9766 : Support for combinations of 2017/2018 algorithms in tau triggers
 * !9756 : ATR-17591: modify eta-phi range in FTK L1Topo algo; ATR-17838: remove L1seed…
 * !9751 : Update TrigHLTJetHypoConfig.py to remove verbose output
 * !9613 : add new L1Topo streamers to Physics_pp_v7 (ATR-17812)
 * !9719 : ATR-17818, moving etcut BeeK chains from MC to physics for validation during startup
 * !9711 : change RATE:SinglePhoton to RATE:MultiPhoton (ATR-17820)
 * !9706 : New tau chains for 2018: ATR-17807
 * !9682 : Revert "Merge branch '21.1_ATR-17815' into '21.1'"
 * !9683 : move razor chains to MC and TLA analysis chains to physics
 * !9687 : Update online monitoring for egamma
 * !9638 : Muon HLT FTK monitoring fix (ATR-17777)
 * !9488 : ATR-17554 Units and logic fixes to DijetCondition.cxx from B Carlson, allow invariant masses > 999.
 * !9664 : Sweeping !9543 from 21.0 to 21.1.
 * !9643 : Fix lhmedium for trigger e/gamma
 * !9648 : Casting eta() to int to appropriately select the Eta window in L1Topo algorithm
 * !9652 : Update prepareOnlineTriggerConfig.py to call more recent trigger tool version.
 * !9611 : MET trigger updates
 * !9642 : ATR-17818, ATR-17819 Bphys additions for L1Topo validation (startup)
 * !9616 : ATR-17691 adding trimmed large-R jet chain with mass cut for 2018 primaries
 * !7605 : Move to boost for erf_inv calculation
 * !8959 : Optimisation of straightLineDistanceEstimate
 * !9045 : Replace pow(x,0.5) with sqrt in InDetVKalVxInJetTool
 * !9280 : fix _run_number variable in forTileRODMap Modifier.
 * !9567 : Clean up of muon trigger online histograms (ATR-17777)
 * !9568 : adding bXemu chains (ATR-17640)
 * !9514 : Moving 4mu4-analysis chains: ATR-17808
 * !9564 : ATR-17811, addd j35_gsc45_boffperf_split_L1J15 in the Physics pp v7 menu
 * !9577 : Revert "Merge branch 'smaller_spacepoints' into '21.0'" -- revert in 21.1 ATR-17803
 * !9582 : Update config.yaml to enable sweep in 21.1
 * !9583 : Sweeping !9516 from master to 21.1.
 * !9464 : ATR-17769: Menu changes to allow TRT and no-TRT chains to run in parallel
 * !9509 : Moved new bTauTight chains to Physics: ATR-17617
 * !9510 : Move new b-jet chains with hybrid WP: ATR-17676
 * !9581 : Fix JiveXMLServer in AthenaP1
 * !9523 : Open 21.1 2018-03-08
 *  ---- : Conflicts:; Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py

Link to the full diff between [release/21.0.68](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.68) and
[release/21.0.67](https://gitlab.cern.ch/atlas/athena/tags/release/21.0.67)
is available at
https://gitlab.cern.ch/atlas/athena/compare/release/21.0.67...release/21.0.68

Former-commit-id: 2ad47d68f2dad48b633533aaaa147ce12c47533e

Sweeping !10306 from 21.2 to 21.3.
Returns proper correction code of the apply corrected copy method.

See merge request atlas/athena!10347

Former-commit-id: b84d1b842629953ccdbdec9ed6645294f1711595

introduce "RUN3" string as alternative to NSW simflag

See merge request atlas/athena!10664

Former-commit-id: 4ab5498b903f93546d562ba32d95d85a891dfe70

This merge request includes all coded needed in order to produce
and upload the NSW geometry AGDD XML file to the database. The
XercesParser was adjusted to remove all comments from the XML
and adjustments in the WritePREsqlFile method of the NSWAGDDTool
and MuonAGDDTool will remove blank lines in the DB blob. The
MuonAGDDToolHelper was modified to be used by both AGDDTools to
retrieve the blob from the database. The NSWAGDDTool is extended
to be capable of using this functionality of the helper. The
AmdcAth_GeometryTasks.py script is modified and now aware of the
new scripts NSWAGDD_BlobProduction.py and NSWAGDD_BlobCheck.py
used to upload and check the database tables. The script to
generate the SQL files (ProduceSql.sh) was changed to recognize
the NSWD PreSql properly. Finally a new layout stations.v2.00.xml
is uploaded. It includes the current best description of the
NSW including dead material (like JD and Hub). It is not yet
linked as default in NSW_StationDescription.xml to avoid
complications, but used in ATLAS-R3-2012-00-00-00.


Former-commit-id: 304fc2e503a53daf14768b9694b9728470cf9543

To simulate the NSW it is currently needed to set the simflag
"SimulateNewSmallWheel" to be true. This is a manual action.
In the future all jobs (including simulation jobs) should
get this configuration automatically form the geometry, more
precisely from the run period encoded in the AtlasCommon
table. A first layout with this table filled properly is
now in place. Therefore this MR introduces the "RUN3" string
as alternative to the simflag. Once it is more established
the simflag can be removed.


Former-commit-id: 1576d08a1650ff449ecdc32e2485df79abde2b3c

resolving confusion and bugs introduced in NSW_Sim

See merge request atlas/athena!10601

Former-commit-id: 5baa834df700443a5c83aea57a82151f6f6ed6ea

writing AGDD geometry blob for DB from amdc_simrec (ATLASSIM-3636)

See merge request atlas/athena!10542

Former-commit-id: 65dd70e54f8786b63dc631d477815dc7b7069f59

The table AtlasCommon attached to each layout features a column
to determine the run period. Up to now only the strings "RUN1",
"RUN2" and "RUN4" exist on the database. "RUN3" isn't used there
yet, but will be part of the future NSW layouts. The inner
detector is for now the main client of this flag and treated
"RUN3" like "RUN4", i.e. with ITk upgrade. "RUN3" will however
certainly not have the ITk. Therefore the code is adusted to treat
"RUN3" similar to "RUN2" rather than "RUN4". Once the NSW layout
is in place "RUN3" will be actively used by the muon system.


Former-commit-id: fa0414e0c91039114e3a8ddc6d493ce4580dc4d7

Adding a new variable to validation tree: inside bounds, checks if hit is in active volume

See merge request atlas/athena!10488

Former-commit-id: 4b575a95d305d03cf830697827a8af57ee243e4f

Previous merge requests modified existing geometry files rather
than introducing new ones and increment the version number. This
merge requests fixing confusions introduced due to that. Moreover,
there was a bug: Instead of ";" it was "," which separated
arguments. The parser complained about it, but as the job
didn't crash.


Former-commit-id: 819c979543133ac5985406eb1e22d6b2e6d7fb52

Former-commit-id: b22b3b78f0083a608fe1ce2595b3c25f085d4ff4

Former-commit-id: 44195fd4d985b5768900b53cf0ea91f62faf8ff6

This merge request is a follow-up on !10413 and uses the new
infrastructure to write data base blobs with AGDD. In this
merge request the MuonAGDDTool was extended in order to write
the blob from AGDD part of the amdc_simrec file parsed by
AmdcAth. In principle this is *not* needed and there is no
dependecy on AMDB. The MuonAGDDTool could also be configured
to write the blob from any XML file. To not modify the workflow
too much this isn't done (yet). Previously the blob was written
by AmdcDbSvcMakerFromAmdc and the corresponding PreSql file for
uploading was done by AmdcDb2Sql. Now both is done within the
MuonAGDDTool. To streamline the creation of the geometry
a set of python files was added. They allow for the creation
AMDB and AGDD Sql files and tables/blobs separately in a
very fast job.

Comment to shifter: There are unavoidable couts as in these
places the ATH_MSG macros are not available. Please refrain
commenting on that.


Former-commit-id: af907a99dfbfe4d57d634670560f9c1c12846493

Merge '21.0.67' into '21.3' branch

See merge request atlas/athena!10284

Former-commit-id: 2fe81a1d2c960d70467001beac9cb5a39663833a

Incorporate latest ART tests for Digitization into 21.3 (ATLASSIM-3607)

See merge request atlas/athena!10354

Former-commit-id: baced2440e1ef3ded8a2c1284138673f71208667

Former-commit-id: 95909aaa9a301df9bef49228d8b9e1a0cd5bbf9e

infrastructure to write XML geometry with AGDD (ATLASSIM-3636)

See merge request atlas/athena!10413

Former-commit-id: af10c73d70652b65563c4eb033025b13e2d6d68a

This is a first MR to eventually allow the inheriting AGDD tools
to write their XML geometry description into a dedicated output
file. With some code following in a separate MR the corresponding
SQL files will be created to load the XML blob to the DB.

Comments to the shifter:

1/ Please don't suggest to remove the comment in XercesParser.cxx
It took some time to find it in the web and i would like to save
this time for future developers.

2/ Please don't propose to use a smart pointer in XercesParser.cxx
As the pointer is used by the external Xerces software i am not
sure how it would react on this change and don't wanna try out.

3/ Please don't ask if the cout can be avoided. AGDD is a software
written to operate outside the Athena, too. To introduce the Athena
logger would lead to a unnecessary dependency and destroy this
possibility.


Former-commit-id: 07f0f3f4f95f486b7e19878a35d93b81a23fb80c

Sweeping !10306 from 21.2 to 21.0.
Returns proper correction code of the apply corrected copy method.

See merge request atlas/athena!10346

Former-commit-id: 1561bcfc

Sweeping !10290 from 21.1-dev to 21.0.
Add a tighter CP recomendation tau requirement to the tracks filters

See merge request atlas/athena!10344

Former-commit-id: 85ed844c

21.0 trig prescale mon new

See merge request atlas/athena!10327

Former-commit-id: c01ae052

Allowing to set the mobility parameters for pixel (ATLASSIM-3516)

See merge request atlas/athena!10323

Former-commit-id: ce371727

Updating JetTagging code: new plots for 2018 DQ in han config

See merge request atlas/athena!10318

Former-commit-id: c645eb4d

DerivationFrameworkL1Calo Updates for 2018 data taking

See merge request atlas/athena!10307

Former-commit-id: b67ca777

Make use of memory efficient 2D histos for lateral shape simulation

See merge request atlas/athena!10294

Former-commit-id: 689908a9

Add AFPProton to xAODForward package

See merge request atlas/athena!10280

Former-commit-id: c445585f

LAr cell mon cosmics jobO fix

See merge request atlas/athena!10352

Former-commit-id: 34d40f17

Walter Lampl authored 6 years ago and Tamara Vazquez Schroeder committed 6 years ago

Former-commit-id: e78e1696c832799ac7ed0353d3e11e8d2456ab61

Fix InnerDetector/InDetDigitization/FastSiDigitization PileUpTool interfaces

See merge request atlas/athena!10283

Former-commit-id: f9a942a0e080c3eec46221b7ff3450fd8c642b49

Restored path for 21.3 reference sets


Former-commit-id: 487d6445cb59b0420f10ac9158bc0fdd4a8e2a8d

Former-commit-id: a8f2d75a

  Just copied files from master branch. No change to any executable or
  settings. Should not chnage output. Allows the RTT tests to be turned off
  freeing up resources


Former-commit-id: a2ef3b2423474682f22d7601bc3ab5695256bbea