Commits · e6f78f014fb700f36db85763485e93b4e376d79b · Lawrence Davou Christopher / athena

Nov 20, 2018

Merge branch 'overlay/CI-settings' into 'master' · e6f78f01

Walter Lampl authored 6 years ago

Update Overlay Tier-0 test AMI tag

See merge request atlas/athena!16059

Former-commit-id: 7234d7197113b38000d18945fd215d702147ea12

e6f78f01

Merge branch 'newjo' into 'master' · c5db682e

Walter Lampl authored 6 years ago

New JO menu accumulator generating flow

See merge request atlas/athena!16033

Former-commit-id: 73c7237c9305bd8e7376076d0f40ca91fe02ba0f

c5db682e

Merge branch 'cherry-pick- [formerly 9f7c08b276]-master' into 'master' · 04b3df96

Walter Lampl authored 6 years ago

Sweeping !15782 from 21.0 to master.
Fix FCS standalone compilation errors and warnings

See merge request atlas/athena!16041

Former-commit-id: 4ef758966cd16ce8e8ccb8f98cdab654ab2d72ae

04b3df96

Merge branch 'mhodgkin_maxFileSize_master' into 'master' · d0c3923b

Walter Lampl authored 6 years ago

Fix conflict in RecoUtils.py such that we can mergre this into master.

See merge request atlas/athena!16001

Former-commit-id: 825a908ba26a603cdd2477d8f710669ce432728e

d0c3923b

Merge branch 'master-egammaTrackingConfigFix' into 'master' · 587766e8

Walter Lampl authored 6 years ago

update configuration due to NnClusterizationFactory change

See merge request atlas/athena!16004

Former-commit-id: 6c7f58c09ba655b897043cb3b1a70b9174b69600

587766e8

Merge branch 'reset.AthenaKernel-20181117' into 'master' · ceca9651

Walter Lampl authored 6 years ago

AthenaKernel+StoreGate+TrigDecisionTool: Clean up IResetable::reset().

See merge request atlas/athena!16034

Former-commit-id: 0622cae505aaa9b451a91b518019de91be6a8f93

ceca9651

Merge branch 'iconftool' into 'master' · 88bd67a2

Walter Lampl authored 6 years ago

Use global module paths in iconfTool

See merge request atlas/athena!16035

Former-commit-id: 28c88d9e6dd42ce263d8505aadb01a973fcf25e9

88bd67a2

Merge branch 'MO-master-RPCdatadecode-newconfig' into 'master' · 741a8da3

Walter Lampl authored 6 years ago

Add new config accumulator based configuration for decoding RPC hits

See merge request atlas/athena!15247

Former-commit-id: 8c43d62134955f9015c993e2120850f07e89c91b

741a8da3

Merge branch 'using.TrigHLTJetHypo-20181118' into 'master' · 4c8c4e05

Walter Lampl authored 6 years ago

TrigHLTJetHypo: Fix placement of using declarations.

See merge request atlas/athena!16045

Former-commit-id: b437c8fc88dbdb055fe8eaf56043d941ca5c84e2

4c8c4e05

Merge branch 'master-ringerDecoratorsFix' into 'master' · 1e8c201f

Walter Lampl authored 6 years ago

fix dependency propagation for CaloRinger

See merge request atlas/athena!15935

Former-commit-id: 7d96de05

1e8c201f

Nov 19, 2018

Merge branch 'cherry-pick- [formerly d521a21ab0]-master' into 'master' · 4bfc6694

Walter Lampl authored 6 years ago

Sweeping !15938 from 21.3 to master.
Apply sTGCSimHit in MuonFastDigitization(ATLASSIM-3755)

See merge request atlas/athena!16031

Former-commit-id: ed558238c388feb39087bebbae9517d9c80836da

4bfc6694

Merge branch 'HLT-dynamic-bitset' into 'master' · 0df42778

Walter Lampl authored 6 years ago

Improvements in HLTResultMT

See merge request atlas/athena!15982

Former-commit-id: 982a74964c5f4b9884d3ad38ea9d801e1fdd3596

0df42778

Merge branch 'const1.TileByteStream-20181114' into 'master' · 2dfd802f

Walter Lampl authored 6 years ago

TileByteStream+TrigT2CaloCommon: Working to make TileROD_Decoder interfaces const.

See merge request atlas/athena!15897

Former-commit-id: 03bf6c55539159f9dbfb9ce3f005bf767f7a29bc

2dfd802f

TileByteStream+TrigT2CaloCommon: Working to make TileROD_Decoder interfaces const. · 754ca3d8
Scott Snyder authored 6 years ago and Walter Lampl committed 6 years ago
```
Former-commit-id: 6a02112fd7bf8e4a36ebfca7e6a769f6404e9472
```
754ca3d8

Merge branch 'master-sct-rdbsc-rcbst-coding-guidlines' into 'master' · 0f9c81a5

Walter Lampl authored 6 years ago

SCT_RawDataByteStreamCnv: Updating SCTRawContByteStreamTool according to ATLAS Coding Guidelines

See merge request atlas/athena!15887

Former-commit-id: c87698afb0989ba6f36e7a9bc182ab29ce0e2c7b

0f9c81a5

Merge branch 'MT_v2' into 'master' · fddbd39e

Walter Lampl authored 6 years ago

Tau MT migration to data handles

See merge request atlas/athena!14966

Former-commit-id: 1c6ff26a

fddbd39e

Merge branch 'ArtMuonDevelopment' into 'master' · a0cb016e

Walter Lampl authored 6 years ago

Add art-include Lines in ART Tests of MooPerformance

See merge request atlas/athena!16038

Former-commit-id: 5eebc335

a0cb016e

Merge branch 'config.SCT_Cabling-20181116' into 'master' · fc67ade2

Walter Lampl authored 6 years ago

SCT_Cabling: Fix configuration to be compatible with upstream changes.

See merge request atlas/athena!16007

Former-commit-id: 64eb0da7b6eec30c9e3fdcb689b2660625b56c35

fc67ade2

Merge branch 'pair.LArRawConditions-20181118' into 'master' · c7adc921

Walter Lampl authored 6 years ago

LArRawConditions: Tweak selection rules for gcc 8.2.1.

See merge request atlas/athena!16043

Former-commit-id: 41275db07d007003e508f738330629e5ef872fee

c7adc921

Merge branch 'export.ISF_Algorithms-20181117' into 'master' · 9d035ab4

Walter Lampl authored 6 years ago

ISF_Algorithms: Tests which define components need ENABLE_EXPORTS.

See merge request atlas/athena!16020

Former-commit-id: 26857bcbb6595d7d3c49b48249c37013fbdaa415

9d035ab4

Merge branch 'hltconfig' into 'master' · 3613cf72

Walter Lampl authored 6 years ago

HTLCFConfig refactoring

See merge request atlas/athena!16032

Former-commit-id: bd678d7a845d5e19c29a0b93e45cbcb9bda358af

3613cf72

Merge branch 'export.TileConditions-20181117' into 'master' · ca9dbc23

Walter Lampl authored 6 years ago

TileConditions: Tests which define components need ENABLE_EXPORTS.

See merge request atlas/athena!16019

Former-commit-id: bdb954bab5f0fb1020eb4ecfcb9b659b405e8af5

ca9dbc23

Merge branch 'LArHVMgr_mtx' into 'master' · fc5f90f5

Walter Lampl authored 6 years ago

Locks for geometry

See merge request atlas/athena!16006

Former-commit-id: 6b44752f0e2fe7e75e318f87882e4a4d957af8e5

fc5f90f5

Merge branch 'export.TrkEventTPCnv-20181117' into 'master' · 015a345d

Walter Lampl authored 6 years ago

TrkEventTPCnv: Tests which define components need ENABLE_EXPORTS.

See merge request atlas/athena!16022

Former-commit-id: cddb8631b57038f635f9faf4963da6d8b1332df7

015a345d

Merge branch '22.0-coverity-ActsGeometry' into 'master' · 91299794

Walter Lampl authored 6 years ago

22.0-coverity-ActsGeometry

See merge request atlas/athena!16005

Former-commit-id: 8fbdee5161808f25160f32107055ec4857776b4a

91299794

22.0-coverity-ActsGeometry · da361bcf
Shaun Roe authored 6 years ago and Walter Lampl committed 6 years ago
```
Former-commit-id: e4b5c163
```
da361bcf

Merge branch 'aod-esd-writing-new-jo' into 'master' · 136d326e

Walter Lampl authored 6 years ago

Aod esd writing new jo

See merge request atlas/athena!15948

Former-commit-id: 47cf38abb8ae0c38ec3c8fc4c944b5ba9b14ac8a

136d326e

Merge branch 'export.ISF_Services-20181117' into 'master' · ac427c62

Walter Lampl authored 6 years ago

ISF_Services: Tests which define components need ENABLE_EXPORTS.

See merge request atlas/athena!16021

Former-commit-id: 8cd29f72bc587104a375528b508cfbaeaf0fee6f

ac427c62

Remove commitInterval setting code, which I added back by mistake. · bbb1da04
Mark Hodgkinson authored 6 years ago
```
Former-commit-id: 905e3e62c3f20af79e6847b69c425df8f97e23e2
```
bbb1da04

Merge branch 'export.TileRecAlgs-20181117' into 'master' · 0009b17d

Walter Lampl authored 6 years ago

TileRecAlgs: Tests which define components need ENABLE_EXPORTS.

See merge request atlas/athena!16018

Former-commit-id: 3be5807e7e8eb78277979f322ccfd48fee1dfda9

0009b17d

TileRecAlgs: Tests which define components need ENABLE_EXPORTS. · 5d4736b7
Scott Snyder authored 6 years ago and Walter Lampl committed 6 years ago
```
Former-commit-id: 29e64564c1914efdf43bd04fbd55db40773944ca
```
5d4736b7

Merge branch 'extendIOV.DataModelRunTests-20181115' into 'master' · 5f56b8ea

Walter Lampl authored 6 years ago

DataModelRunTests+DataModelTestDataCommon: Updates for testing IOV extension.

See merge request atlas/athena!15945

Former-commit-id: 931ddf79e7c53b1ea031b15f2a9da3abbbd53a53

5f56b8ea

DataModelRunTests+DataModelTestDataCommon: Updates for testing IOV extension. · b98f701e
Scott Snyder authored 6 years ago and Walter Lampl committed 6 years ago
```
Former-commit-id: 73821d38af25d116590100c4fdbe1998bb0fb1b4
```
b98f701e

Merge branch 'cherry-pick- [formerly c303432281]-master' into 'master' · fc043d21

Walter Lampl authored 6 years ago

Sweeping !15929 from 21.1-dev to master.
Add possibility to filter Offline tracks by Roi for the ntple creation

See merge request atlas/athena!16025

Former-commit-id: 95167f763d88a29cbeba862f2e4fb25c1cbb118e

fc043d21

Merge branch 'dataHandle.TrigOnlineMonitor-20181117' into 'master' · 20ae66ad

Walter Lampl authored 6 years ago

TrigOnlineMonitor: Avoid use of non-bound DataHandle.

See merge request atlas/athena!16016

Former-commit-id: 95b1323e7debdbe713ef121dbe823502b8b811e6

20ae66ad

Merge branch 'dataHandle.EventBookkeeperTools-20181117' into 'master' · 8d34e79b

Walter Lampl authored 6 years ago

EventBookkeeperTools: Avoid use of non-bound DataHandle.

See merge request atlas/athena!16015

Former-commit-id: 522a0e55775a2731d78e0559f744e0d9c5a764fe

8d34e79b

Merge branch 'dataHandle.xAODMetaDataCnv-20181117' into 'master' · ebde9f3a

Walter Lampl authored 6 years ago

xAODMetaDataCnv: Avoid use of non-bound DataHandle.

See merge request atlas/athena!16017

Former-commit-id: 6e566dd45aeb322a8293905f6d62880ae15f08e9

ebde9f3a

Merge branch 'TrackParticleCellAssoc_DH' into 'master' · 4e3d033b

Walter Lampl authored 6 years ago

Migrate TrackParticleAssociationAlg to DataHandles

See merge request atlas/athena!16002

Former-commit-id: ab4c82741942587fef9df6da838155b2874a1b0d

4e3d033b

Migrate TrackParticleAssociationAlg to DataHandles · 0703f451
Walter Lampl authored 6 years ago
```
Former-commit-id: 3450e682bfa0f5280f6ca2bf4653e95c1325cc8e
```
0703f451

Merge branch 'dataHandle.OutputStreamAthenaPool-20181117' into 'master' · 14060f8f

Walter Lampl authored 6 years ago

OutputStreamAthenaPool: Avoid use of non-bound DataHandle.

See merge request atlas/athena!16014

Former-commit-id: 2dea594ce5821f3005c3663c6a0dd6a26b5672ce

14060f8f