Commits · bd0de12360254bd044d80a971357e61aa941839e · Elemer Nagy / athena

Sep 11, 2018

fixed typo · bd0de123
Rachael Ann Creager authored 6 years ago
```
Former-commit-id: 0c3d023fa2cdd97702322781ba6fe2758687805e
```
bd0de123

Merge branch '21.2-TAT-Summer2018RecommendationsJetID' into '21.2' · 41abbf66

TauAnalysisTools: New systematics for tau ID and electron veto

See merge request atlas/athena!14118

Former-commit-id: 64de1b451af613b577c39020797fc77c5dacdb73

41abbf66

Merge branch '21.2-directIO-art-updating-21.2' into '21.2' · 43206032

Nils Erik Krumnack authored 6 years ago

DirectIOART: updating 21.2

See merge request atlas/athena!14112

Former-commit-id: ea61d10a499b1655a869c2ec9f64f0ca342198ed

43206032

Merge branch 'patch-64' into '21.2' · c1452f2a

Nils Erik Krumnack authored 6 years ago

Fixes for NTUP_PILEUP generating

See merge request atlas/athena!14088

Former-commit-id: 794b9ff7478b1930a742a3140ac1dc85236ab526

c1452f2a

fix the initialization of AnaToolHandle tools · 5f5aa4cc
David Kirchmeier authored 6 years ago
```
Former-commit-id: 49fb542d51968b603a92ee64437cd5aac0c1b6b0
```
5f5aa4cc

Merge branch '21.2-HIGG2D1' into '21.2' · 80ed071f

Emmanuel Le Guirriec authored 6 years ago

Add GSFTracksCPDetailedContent to HIGG2D1SlimmingHelper

See merge request atlas/athena!14106

Former-commit-id: 0b6694c981b3a4fb7a0e1a4aa2e7f70db6d5b8a6

80ed071f

Merge branch 'revert-cfbe4d54' into '21.2' · 0890e74f

Emmanuel Le Guirriec authored 6 years ago

Revert "Merge branch 'AthFileFix-21.2-20180910' into '21.2'"

See merge request atlas/athena!14115

Former-commit-id: 87290e92337494144320d42ecc27cb213d542cff

0890e74f

new systematics for tau ID and electron veto · dd8bba5c
David Kirchmeier authored 6 years ago
```
Former-commit-id: 7740f9add5a20fbb341aa842b8beadfa95fd53e3
```
dd8bba5c

Merge branch 'HIGG3D1_size_reduction' into '21.2' · 3e2cb7dc

Emmanuel Le Guirriec authored 6 years ago

HIGG3D1 derivation format size reduction

See merge request atlas/athena!14098

Former-commit-id: e08ec9f66612566ddbc12e071e398ad45f932892

3e2cb7dc

Revert "Merge branch 'AthFileFix-21.2-20180910' into '21.2'" · 12da599e
Attila Krasznahorkay authored 6 years ago
```
This reverts merge request !14084

Former-commit-id: deafbb6be2ff46f3451a43f3bcf0d54e174581d5
```
12da599e
Updating 21.2 · 1bc0c41a
Florian Christoph Fischer authored 6 years ago
```
Former-commit-id: adb4d1632edff57657155e58d461b92423b9299b
```
1bc0c41a
Add GSFTracksCPDetailedContent to HIGG2D1SlimmingHelper · d80fbd65
Susumu Oda authored 6 years ago
```
Former-commit-id: 8abd8518a34022ef498c39c409493b4e34564411
```
d80fbd65

Sep 10, 2018

Merge branch '21.2-update-FTAG2' into '21.2' · 08fc5f68

Emmanuel Le Guirriec authored 6 years ago

remove IDTP, change muon selection in FTAG2

See merge request atlas/athena!14094

Former-commit-id: d84ec826ca19ca5daf4bc51b2e82ddff918ec4be

08fc5f68

Merge branch '21.2-miochoa-fix-top-crash-2018-09-10' into '21.2' · 997ea0d7

Emmanuel Le Guirriec authored 6 years ago

removing name change for track based subjets (not needed atm)

See merge request atlas/athena!14097

Former-commit-id: d222afdc8610b658136152db4e3573cbfe6a0af5

997ea0d7

Remove LCTopoJets and associated containers from HIGG3D1 format · 35827d63
David Richard Shope authored 6 years ago
```
Former-commit-id: 7b2d0f03385e8bfa20a21bd5ceed476e684aa4c2
```
35827d63
removing name change for track based subjets (not needed atm) · 51488f32
Ines Ochoa authored 6 years ago
```
Former-commit-id: d4f5253f72ceb1dfcf7a9c3ca511c9545719fa0f
```
51488f32
Add trigger list and trigger skimming to HIGG3D1 · 07a3d661
David Richard Shope authored 6 years ago
```
Former-commit-id: 7219aaeaa5e1028278419913472c986b8576a518
```
07a3d661

Merge branch '21.2-AnalysisTopJER' into '21.2' · d108660c

Nils Erik Krumnack authored 6 years ago

AnalysisTop - Updating to support new JER configuration

See merge request atlas/athena!14078

Former-commit-id: 7a876590a1369cfd883aec2871a3cc29a330f66a

d108660c

Merge branch 'AthFileFix-21.2-20180910' into '21.2' · 6674d412

Nils Erik Krumnack authored 6 years ago

AthFile Fix, 21.2 branch (2018.09.10.)

See merge request atlas/athena!14084

Former-commit-id: cfbe4d549230e930a832958c0b74ca946e4e6f8a

6674d412

remove IDTP, change muon selection in FTAG2 · 64bcaac5
Rachael Ann Creager authored 6 years ago
```
Former-commit-id: 2c512e8ed68b469d035380d55b4dc5a7e746eae0
```
64bcaac5
Update generatePRW.py - fix issue with datasets that end with r tag (new format) · 8be72582
Will Buttinger authored 6 years ago
```
Former-commit-id: 525ea48e8556b42e0705a44ea6ae214fe0ba4b9d
```
8be72582

Merge branch '21.2-deletemergedfiles' into '21.2' · a35a1ef1

Emmanuel Le Guirriec authored 6 years ago

Implementation of new feature for Archive_tf (ATLASJT-383)

See merge request atlas/athena!14050

Former-commit-id: b16ae22201f8f59d0f0a591f734a8a4769695f91

a35a1ef1

Tighten HIGG3D1 inclusive track thinning to DAOD taskforce recommendation · 623c7734
David Richard Shope authored 6 years ago
```
Former-commit-id: 2f92417b4d9260fdf747be880d3869f938d49907
```
623c7734

Update generatePRW_jobOptions.py - had to remove the default period... · d6807b1b

Will Buttinger authored 6 years ago

Update generatePRW_jobOptions.py - had to remove the default period assignments for config file generating.

Former-commit-id: 55489ba93c8815327dd34f2eb2fd26abd41c6d76

d6807b1b

Merge branch '21.2-miochoa-FTAG5-ExKtGA-v1-2018-09-05' into '21.2' · 7e7dcf66

Emmanuel Le Guirriec authored 6 years ago

adding ghosttrack association for ExKt, fixing bugs from previous commit

See merge request atlas/athena!14081

Former-commit-id: b37b22a191e068751fd41dd96dc632d8b66c68c0

7e7dcf66

Tidying code for merge review · b3bbc119
Ian Allan Connelly authored 6 years ago
```
Former-commit-id: 479dd07fc92d1c929ca9fee2e345d85a09140ef6
```
b3bbc119

PyUtils: Fix length inconsistency in SetSize call. · 2dc2f13e

scott snyder authored 6 years ago and

Attila Krasznahorkay committed 6 years ago

The pythonization of TFile::root was calling the SetSize method
on a PyROOT buffer object.  The argument that SetSize takes is the
number of elements in the buffer, where the size of each element
depends on how the buffer was created.  Here, however, we were
passing to SetSize a number of bytes.

The buffer elements we were seeing were void*, which have size 8.
So the buffer size was getting misset by a factor of 8.
This was leading to a crash in the input file peeker.

This crash was however only observed in the muRunData test of TrigUpgradeTest,
and only when it was run with --stdcmalloc and MALLOC_CHECK_=3.
It's a bit a mystery why this apparently long-standing bug hasn't 
caused problems before.



Former-commit-id: 5f553898f3b4118e8ce47eb78932349b750e2054

2dc2f13e

adding ghosttrack association for ExKt, fixing bugs from previous commit · dcabdb55
Ines Ochoa authored 6 years ago
```
Former-commit-id: f12dcf7cc44721854c612543a7a1e2cb5eddb763
```
dcabdb55

Sep 09, 2018

Merge branch '21.2_extend_JVT' into '21.2' · ba75c297

Emmanuel Le Guirriec authored 6 years ago

Extended central JVT recommendations to eta 2.5 and pT 120 GeV

See merge request atlas/athena!13961

Former-commit-id: 8fa5d45caa55adbbb3263f576356011413a4bb6d

ba75c297

Adding configuration options for new JER · cdee8524
Ian Allan Connelly authored 6 years ago
```
Former-commit-id: 5a789e6f83329d04fc09e686482498aa2ecc0400
```
cdee8524

Merge branch 'AthenaMP_SharedIO_FixHang' into '21.2' · 743dff92

Emmanuel Le Guirriec authored 6 years ago

Fix SharedWriter hanging after failure to write object that is too large.

See merge request atlas/athena!14055

Former-commit-id: 21dd1085d5b13c524b5c7edbb4ed4eeef59d292c

743dff92

Sep 08, 2018
- Merge branch 'OptimizeBPHY15v1' into '21.2' · ac24ee2d
  Emmanuel Le Guirriec authored 6 years ago
  
  Optimize BPHY15 See merge request atlas/athena!14040 Former-commit-id: 8caaddab174c03adc083b43db90de48ed5f84498
  ac24ee2d
- Merge branch '21.2-miochoa-FTAG5-ExKtGA-v1-2018-09-05' into '21.2' · 3e1d2dd8
  Emmanuel Le Guirriec authored 6 years ago
  
  ExKt collections with Ghost track association for b-tagging (FTAG5) See merge request atlas/athena!14030 Former-commit-id: 8778d41678eef3febbb9980b6e1e190b2c3b846e
  3e1d2dd8
- ExKt collections with Ghost track association for b-tagging (FTAG5) · 1fcf3af6
  Ines Ochoa authored 6 years ago and Emmanuel Le Guirriec committed 6 years ago
  
  Former-commit-id: 0d710ac44e3fc84937a732c9db36efc8fbb1eb67
  1fcf3af6
Sep 07, 2018
- Merge branch '21.2-remove-AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2SubJets' into '21.2' · c977b32e
  Emmanuel Le Guirriec authored 6 years ago
  
  removed AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2SubJets from FullListOfSmartContainers See merge request atlas/athena!14053 Former-commit-id: 068e86278f13246f382f35cdc9deb2af7608f6f8
  c977b32e
- Fix SharedWriter hanging after failure to write object that is too large. · cba9fb1e
  Peter van Gemmeren authored 6 years ago
  
  Former-commit-id: 3814a5c61a71b3b5ff5964d37ebcd7b39104430b
  cba9fb1e
- removed AntiKt10LCTopoTrimmedPtFrac5SmallR20ExCoM2SubJets from FullListOfSmartContainers · 7afc7643
  Rachael Ann Creager authored 6 years ago
  
  Former-commit-id: c3a874bbdeaf2d9b0fc50d820978d6af43e02754
  7afc7643
- Merge branch '21.2-ElectronSmartSlimmingUpdate-2018-09-06' into '21.2' · 0619592b
  Emmanuel Le Guirriec authored 6 years ago
  
  Added one more isolation variable to electron smart slimming list See merge request atlas/athena!14045 Former-commit-id: 6e54462a6492bea0da69911139da678f5a62cad2
  0619592b
- Added one more isolation variable to the electron smart slimming list as requested here · 9094545a
  Giovanni Marchiori authored 6 years ago
  
  https://its.cern.ch/jira/browse/ATLEGAMDPD-95?focusedCommentId=2234324&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-2234324 Former-commit-id: 4a9088a18df39c694586af8000bbb7d069282f2d
  9094545a
Sep 06, 2018
- Update version.txt · 9e405b0f
  Andrew Mehta authored 6 years ago
  
  Former-commit-id: b10c6e6deff58f11e6125a989e780a914fe428d1
  9e405b0f