Commits · ae064298aae02f702d7e535aa081161dbb99f093 · atlas / athena

11 Dec, 2017 1 commit
- Revert "Revert "fix conflicts of KinkTrkSingleJetMetFilterTool"" · ae064298
  Toshiaki Kaji authored Dec 11, 2017
```
This reverts commit cdf718bf [formerly 9d67f5b8].


Former-commit-id: 008b62d0
```
  ae064298
08 Dec, 2017 2 commits
- Revert "fix conflicts of KinkTrkSingleJetMetFilterTool" · cdf718bf
  Toshiaki Kaji authored Dec 08, 2017
```
This reverts commit 9156e32a [formerly f73d17d3], reversing
changes made to 27d106d1 [formerly 8f2f5188].


Former-commit-id: 9d67f5b8
```
  cdf718bf
- fix conflicts of KinkTrkSingleJetMetFilterTool · 9156e32a
  Toshiaki Kaji authored Dec 08, 2017
```
Former-commit-id: f73d17d3
```
  9156e32a
07 Dec, 2017 37 commits

Merge branch 'master-SCT_ModuleVetoSvc' into 'master' · f49b0fe0

Vakhtang Tsulaia authored Dec 07, 2017

Updates of SCT_ModuleVetoSvc and SCT_LinkMaskingSvc to use CondHandles (ATLASRECTS-4046)

See merge request atlas/athena!7074

Former-commit-id: 9f677424

f49b0fe0

Updates of SCT_ModuleVetoSvc and SCT_LinkMaskingSvc to use CondHandles (ATLASRECTS-4046) · 7a358e96
Susumu Oda authored Dec 07, 2017 and Vakhtang Tsulaia committed Dec 07, 2017
```
Former-commit-id: 1fceb58f
```
7a358e96

Merge branch 'FATRAS_package_updates_master' into 'master' · d338a43f

Vakhtang Tsulaia authored Dec 07, 2017

Manual sweep of !6637 from '21.0' into 'master': Synchronise ISF_Fatras in 20.20 and 21.0

See merge request atlas/athena!6800

Former-commit-id: 24dee08a

d338a43f

Merge branch 'cherry-pick- [formerly b0877c6ff8]-master' into 'master' · 26030c53

Vakhtang Tsulaia authored Dec 07, 2017

Sweeping !6354 from 21.2 to master.
Modification in Jet Physics Validation job option to update histogram content

See merge request atlas/athena!6833

Former-commit-id: a6b31838

26030c53

Merge branch 'ATLASRECTS-3796_sweep' into 'master' · 4c19affe
Vakhtang Tsulaia authored Dec 07, 2017
```
Manual sweep of MR !6159 to master

See merge request atlas/athena!6845

Former-commit-id: 1bbc9e65
```
4c19affe

Merge branch 'feature/my-feature' into 'master' · 10bb3203

Vakhtang Tsulaia authored Dec 07, 2017

Add protection to avoid using null pointers (4 files), remove logically dead code (2 files)

See merge request atlas/athena!6981

Former-commit-id: 06f2d74f

10bb3203

Merge branch 'master-egammaAnalysisFrom212_v2' into 'master' · 1b422e60

Vakhtang Tsulaia authored Dec 07, 2017

Try to bring in the Egamma Interfaces as in 21.0 and 21.2 to the master

See merge request atlas/athena!7017

Former-commit-id: a1eb30c5

1b422e60

Merge branch 'cherry-pick- [formerly 94735a2dd0]-master' into 'master' · c0b561b4

Vakhtang Tsulaia authored Dec 07, 2017

Sweeping !6963 from 21.0 to master.
New postInclude job options for use in HECO systematic samples

See merge request atlas/athena!7048

Former-commit-id: d6514d59

c0b561b4

Merge branch '21.0-dqconfig-update' into 'master' · 36cff7eb
Vakhtang Tsulaia authored Dec 07, 2017
```
Resync DQConfig with 21.0 in master

See merge request atlas/athena!7073

Former-commit-id: e5c9368c
```
36cff7eb

Merge branch 'master-egammaV30' into 'master' · 56e385e4

Vakhtang Tsulaia authored Dec 07, 2017

Add some disbles to tool handles when not used; make some bad configs fatal.

See merge request atlas/athena!7131

Former-commit-id: 2659e6c8

56e385e4

Merge branch 'feature/my-feature-calib' into 'master' · 759e5e44

Vakhtang Tsulaia authored Dec 07, 2017

Disable copy constructor and assignment operator for PixelChargeInterpolationHistograms.h

See merge request atlas/athena!7139

Former-commit-id: 6e50bd55

759e5e44

Merge branch 'cherry-pick- [formerly 0998be9179]-master' into 'master' · b8800f92

Vakhtang Tsulaia authored Dec 07, 2017

Sweeping !6924 from 21.0-TrigMC to master.
Sweeping !6844 from 21.1-dev to 21.1.Clean up the beamspot test from unused runMergedChain settings

See merge request atlas/athena!6984

Former-commit-id: 980fe741

b8800f92

Merge branch 'cherry-pick- [formerly 4b59bd0dba]-master' into 'master' · f4d43dcd

Vakhtang Tsulaia authored Dec 07, 2017

Sweeping !6840 from 21.0 to master.
OverlayMonitoringRTT: fix test name

See merge request atlas/athena!7047

Former-commit-id: aa7e6bb1

f4d43dcd

Merge branch 'cherry-pick- [formerly 0457b73df7]-master' into 'master' · bb390ccb

Vakhtang Tsulaia authored Dec 07, 2017

Sweeping !6885 from 21.0 to master.
checkCorrelInHIST DQ script update

See merge request atlas/athena!7050

Former-commit-id: 96affbe2

bb390ccb

Merge branch 'master-doxygenfixes' into 'master' · 991da298
Vakhtang Tsulaia authored Dec 07, 2017
```
Resolve Doxygen Warnings

See merge request atlas/athena!7135

Former-commit-id: ac36f3fa
```
991da298
Resolve Doxygen Warnings · d32d7a6b
Adam Edward Barton authored Dec 07, 2017 and Vakhtang Tsulaia committed Dec 07, 2017
```
Former-commit-id: 75b7c4ca
```
d32d7a6b

Merge branch 'master-deleteConverter' into 'master' · d30c6dd0

Vakhtang Tsulaia authored Dec 07, 2017

Remove unused file

See merge request atlas/athena!7133

Former-commit-id: 84677b4e44f583334ef280746612f6d70f363674

d30c6dd0

Merge branch 'cherry-pick- [formerly adb04ef0e2]-master' into 'master' · d64818e8

Vakhtang Tsulaia authored Dec 07, 2017

Sweeping !7007 from 21.0-TrigMC to master.
L1Topo: Update OutputWidthSelect* parameters

See merge request atlas/athena!7144

Former-commit-id: 1472c29a

d64818e8

Merge branch 'noUserData.HSG2DPDUtils-20171125' into 'master' · 466c1a64
Vakhtang Tsulaia authored Dec 07, 2017
```
HSG2DPDUtils: Remove references to UserDataSvc.

See merge request atlas/athena!6828

Former-commit-id: 7481df10
```
466c1a64
Merge branch 'noUserData.HSG5DPDUtils-20171125' into 'master' · 86bc4149
Vakhtang Tsulaia authored Dec 07, 2017
```
HSG5DPDUtils: Remove reference to UserDataSvc.

See merge request atlas/athena!6829

Former-commit-id: b76d204c
```
86bc4149
Merge branch 'templatedConverter.ByteStreamEventAthenaPool-20171201' into 'master' · 52993184
Vakhtang Tsulaia authored Dec 07, 2017
```
ByteStreamEventAthenaPool: Use templated pool converters.

See merge request atlas/athena!7001

Former-commit-id: a41db835
```
52993184
Merge branch 'datamodel.TrackD3PDMaker-20171204' into 'master' · d2a385ed
Vakhtang Tsulaia authored Dec 07, 2017
```
TrackD3PDMaker: DataModel->AthContainer, etc.

See merge request atlas/athena!7045

Former-commit-id: e42ed620
```
d2a385ed

Merge branch 'namespace.TRT_RawDataByteStreamCnv-20171204' into 'master' · 5006950a

Vakhtang Tsulaia authored Dec 07, 2017

TRT_RawDataByteStreamCnv: Fix placement of using declarations.

See merge request atlas/athena!7071

Former-commit-id: f134a842

5006950a

Merge branch 'namespace.Tauola_i-20171206' into 'master' · b3b25de9
Vakhtang Tsulaia authored Dec 07, 2017
```
Tauola_i: Fix placement of using directive.

See merge request atlas/athena!7114

Former-commit-id: 0db1341f
```
b3b25de9
Merge branch 'datamodel.AnalysisJiveXML-20171206' into 'master' · 4d63a65f
Vakhtang Tsulaia authored Dec 07, 2017
```
AnalysisJiveXML: DataModel->AthContainers, AthLinks

See merge request atlas/athena!7116

Former-commit-id: d25b83aa
```
4d63a65f
Merge branch 'test.ByteStreamTest-20171206' into 'master' · 48d997c2
Vakhtang Tsulaia authored Dec 07, 2017
```
ByteStreamTest: Update reference files.

See merge request atlas/athena!7118

Former-commit-id: 063b6bb0
```
48d997c2

Merge branch 'condDataBucket-20171206' into 'master' · 7763f9de

Vakhtang Tsulaia authored Dec 07, 2017

AthenaKernel+IOVSvc: CondContFactory should return a DataBucket.

See merge request atlas/athena!7132

Former-commit-id: 8f8ad2a1

7763f9de

Merge branch 'moveCxxUtils.AthLinks-20171206' into 'master' · 732a5abe

Vakhtang Tsulaia authored Dec 07, 2017

AthLinks: Move CachedValue and CachedPointer to CxxUtils.

See merge request atlas/athena!7138

Former-commit-id: e3db2ca8

732a5abe

Merge branch 'spelling.CxxUtils-20171207' into 'master' · 67c5ea2f
Vakhtang Tsulaia authored Dec 07, 2017
```
CxxUtils: Fix some typos in comments.

See merge request atlas/athena!7146

Former-commit-id: a60c1955
```
67c5ea2f

Merge branch 'initloop.SGComps-20171207' into 'master' · 2ee7ec5a

Vakhtang Tsulaia authored Dec 07, 2017

SGComps: Improve handling of ProxyProviderSvc initialization loops.

See merge request atlas/athena!7147

Former-commit-id: c4e6f5c7

2ee7ec5a

Merge branch 'warn.AthenaMonitoring-20171207' into 'master' · 0031eae0
Vakhtang Tsulaia authored Dec 07, 2017
```
AthenaMonitoring: Fix compilation warning.

See merge request atlas/athena!7148

Former-commit-id: 91f3a31b
```
0031eae0
Merge branch 'cpp11.StorageSvc-20171207' into 'master' · 03aed594
Vakhtang Tsulaia authored Dec 07, 2017
```
StorageSvc: Update for c++11.

See merge request atlas/athena!7149

Former-commit-id: 4c315522
```
03aed594

Merge branch 'clidsvc.TBRec-20171207' into 'master' · 2cf2ec6e

Vakhtang Tsulaia authored Dec 07, 2017

TBRec: CLASS_DEF.h moved from CLIDSvc to AthenaKernel.

See merge request atlas/athena!7150

Former-commit-id: 241acf02

2cf2ec6e

Merge branch 'datamodel.InDetAlignmentMonitoring-20171207' into 'master' · 101754de
Vakhtang Tsulaia authored Dec 07, 2017
```
InDetAlignmentMonitoring: DataModel->AthContainers.

See merge request atlas/athena!7151

Former-commit-id: 98d8fd67
```
101754de

Merge branch 'naming.TrkVertexFitterValidationTools-20171207' into 'master' · 908a732d

Vakhtang Tsulaia authored Dec 07, 2017

TrkVertexFitterValidationTools: Comply with ATLAS naming conventions.

See merge request atlas/athena!7152

Former-commit-id: 0005f340

908a732d

Merge branch 'dev/master/clidsvc_fixmsg' into 'master' · 6b3b35eb
Vakhtang Tsulaia authored Dec 07, 2017
```
ClassIDSvc: fix messaging

See merge request atlas/athena!7154

Former-commit-id: 32b1b40c
```
6b3b35eb

Merge branch 'explicit_StatusCode' into 'master' · def7c9fc

Vakhtang Tsulaia authored Dec 07, 2017

Remove implicit StatusCode bool/long conversions

See merge request atlas/athena!7057

Former-commit-id: 70efef97

def7c9fc