Commits · 21.2-UpdateJES-new · Kuan-Yu Lin / athena

18 Sep, 2019 4 commits
- Merge remote-tracking branch 'upstream/21.2' into 21.2-UpdateJES-new · ab319b48
  Kuan-Yu Lin authored Sep 18, 2019
  
  ab319b48
- Revert "Merge branch 'dev/BJetThinningOff' into '21.2'" · 13ec4d14
  Oana Vickey Boeriu authored Sep 18, 2019
```
This reverts merge request !26282
```
  13ec4d14
- Merge branch 'UpdatedHIGG5D3forNewBTag' into '21.2' · 2ac27396
  Oana Vickey Boeriu authored Sep 18, 2019
```
Update PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py

See merge request atlas/athena!26637
```
  2ac27396
- Merge branch 'vnovikbracnh' into '21.2' · c70479d5
  Oana Vickey Boeriu authored Sep 18, 2019
```
Adding of HLT_xAOD__JetContainer_a4tcemsubjesFS and HLT_xAOD__JetContainer_a4tcemsubjesISFS collections into JETM3

See merge request atlas/athena!26633
```
  c70479d5
17 Sep, 2019 12 commits
- Merge branch '21.2-PyUtils-Coral-gcc7-fix' into '21.2' · ad27ce93
  Nils Erik Krumnack authored Sep 17, 2019
```
PyUtils: Update coral attribute method workaround for gcc7.

See merge request atlas/athena!26635
```
  ad27ce93
- Merge branch 'AT-btag-shallow-copy-support' into '21.2' · e0c210b6
  Nils Erik Krumnack authored Sep 17, 2019
```
Support for re-trained b-tagging jet shallow-copy containers in AT

See merge request atlas/athena!26445
```
  e0c210b6
- Merge branch 'sh_grid_tools_options' into '21.2' · beab63a0
  Nils Erik Krumnack authored Sep 17, 2019
```
add extra options for reading files/datasets from the grid

See merge request atlas/athena!26619
```
  beab63a0
- Merge branch 'cp_alg_test_timeout' into '21.2' · a024d865
  Nils Erik Krumnack authored Sep 17, 2019
```
increasing the timeout on all CP algorithm tests

See merge request atlas/athena!26618
```
  a024d865
- Update PhysicsAnalysis/DerivationFramework/DerivationFrameworkHiggs/share/HIGG5D3.py · f2e4d365
  Antonio Giannini authored Sep 17, 2019
  
  f2e4d365
- PyUtils: Update coral attribute method workaround for gcc7. · e69a90d6
  scott snyder authored Sep 02, 2018
```
Fixes file peeker crash with gcc7.

Former-commit-id: 1f682835d8ac5d81a51fcc9093d3578cb68a45f5
```
  e69a90d6
- Remove workaround for b-tagging on unsupported jet collections. · 9e5e420a
  Oliver Majersky authored Sep 17, 2019
  
  9e5e420a
- HLT_xAOD__JetContainer_a4tcemsubjesFS and... · 92844725
  Valiantsin Novik authored Sep 17, 2019
```
HLT_xAOD__JetContainer_a4tcemsubjesFS and HLT_xAOD__JetContainer_a4tcemsubjesISFS collections are added into JETM3
```
  92844725
- Update version.txt · eba51ed7
  Eirik Gramstad authored Sep 17, 2019
  
  eba51ed7
- Merge branch 'dev/BJetThinningOff' into '21.2' · 9ae6474d
  Oana Vickey Boeriu authored Sep 17, 2019
```
Turning off b-jet thinning for data18/mc16e. Temporary fix.

See merge request atlas/athena!26282
```
  9ae6474d
- Turning off b-jet thinning for data18/mc16e. Temporary fix. · 0825d4b9
  Alvaro Lopez Solis authored Sep 17, 2019 and Oana Vickey Boeriu committed Sep 17, 2019
  
  0825d4b9
- add missing variable definition · ed819b69
  Nils Krumnack authored Sep 16, 2019
  
  ed819b69
16 Sep, 2019 12 commits
- add extra options for reading files/datasets from the grid · d41a2966
  Nils Krumnack authored Sep 16, 2019
```
Requested by Nikiforos Nikiforou, I expanded the pattern for valid
dataset names and added the option to specify options for selecting
the source when reading datasets directly from the grid.
```
  d41a2966
- increase test timeout · 5ee769eb
  Nils Krumnack authored Sep 16, 2019
  
  5ee769eb
- increase test timeout · 5485a0f3
  Nils Krumnack authored Sep 16, 2019
  
  5485a0f3
- increase test timeout · 5de0104b
  Nils Krumnack authored Sep 16, 2019
  
  5de0104b
- increase test timeout · 26daaa40
  Nils Krumnack authored Sep 16, 2019
  
  26daaa40
- increase test timeout · 9d462224
  Nils Krumnack authored Sep 16, 2019
  
  9d462224
- increase test timeout · 30118602
  Nils Krumnack authored Sep 16, 2019
  
  30118602
- increase test timeout · ed8f23e0
  Nils Krumnack authored Sep 16, 2019
  
  ed8f23e0
- increase test timeout · 711fccea
  Nils Krumnack authored Sep 16, 2019
  
  711fccea
- Merge branch 'cherry-pick-b7cf5918-21.2' into '21.2' · 29794ccc
  Nils Erik Krumnack authored Sep 16, 2019
```
Sweeping !26548 from master to 21.2.
PerfMonComps: Drop lshosts call that is used to gather host information

See merge request atlas/athena!26580
```
  29794ccc
- Merge branch '21.2' into '21.2' · 9017a4ad
  Nils Erik Krumnack authored Sep 16, 2019
```
Add RNN tauID to AnalysisTop

See merge request atlas/athena!26511
```
  9017a4ad
- fix substructure config · 459904bf
  Boyang Li authored Sep 16, 2019 and Nils Erik Krumnack committed Sep 16, 2019
```
fix tau SF map

fix const map

fix const map

fix const map

fix const map

fix const map

fix bracket

try map insertion

try map insertion
```
  459904bf
14 Sep, 2019 1 commit

Merge branch 'master-disable-lshosts-check' into 'master' · 17ea468f

Adam Edward Barton authored Sep 13, 2019 and

Atlas Nightlybuild committed Sep 14, 2019

PerfMonComps: Drop lshosts call that is used to gather host information

See merge request atlas/athena!26548

(cherry picked from commit b7cf5918)

5f440776 Stop gathering host information using lshosts

17ea468f

13 Sep, 2019 5 commits
- Update version.txt · 23ffd625
  Eirik Gramstad authored Sep 13, 2019
  
  23ffd625
- Merge branch 'miochoa-VRlinks-20190726' into '21.2' · 54cb1dc9
  Oana Vickey Boeriu authored Sep 13, 2019
```
tools to link VR jets to any large-R jet collection

See merge request atlas/athena!25449
```
  54cb1dc9
- tools to link VR jets to any large-R jet collection · fadcc8db
  Ines Ochoa authored Sep 13, 2019 and Oana Vickey Boeriu committed Sep 13, 2019
  
  fadcc8db
- Merge branch 'miochoa-FTAG5fix-20190808' into '21.2' · 7409eda5
  Oana Vickey Boeriu authored Sep 13, 2019
```
removing akt2 smart collection in FTAG5

See merge request atlas/athena!25542
```
  7409eda5
- removing akt2 smart collection in FTAG5 · dd201ebf
  Ines Ochoa authored Sep 13, 2019 and Oana Vickey Boeriu committed Sep 13, 2019
  
  dd201ebf
12 Sep, 2019 6 commits
- Merge branch 'JetUtilsFix' into '21.2' · f680d9ca
  Nils Erik Krumnack authored Sep 12, 2019
```
Ignore ROOT dictionnary warning in unit tests (ATLASG-1507)

See merge request atlas/athena!26538
```
  f680d9ca
- Merge branch 'cherry-pick-3fcb33ec-21.2' into '21.2' · 05f91e01
  Nils Erik Krumnack authored Sep 12, 2019
```
Sweeping !26444 from master to 21.2.
Updating diff_root_files.py to look for 'EventInfoAux.'Closes ATLASRECTS-5115

See merge request atlas/athena!26520
```
  05f91e01
- Update version.txt · 12315d15
  Andrew Mehta authored Sep 12, 2019
  
  12315d15
- Update version.txt · 4ada48c2
  Andrew Mehta authored Sep 12, 2019
  
  4ada48c2
- Update version.txt · e06d89e9
  Andrew Mehta authored Sep 12, 2019
  
  e06d89e9
- Ignore ROOT dictionnary warning in unit tests (ATLASG-1507) · b8f39fb7
  Pierre Antoine Delsart authored Sep 12, 2019
  
  b8f39fb7