Commits · LCG_dev4 · Kaili Zhang / athena

Sep 10, 2018

Merge branch 'make-l1-jet-roi-FS' into 'master' · a4e33ec6

Fix the Jet RoI descriptor to be realy the FS one

See merge request atlas/athena!14073

Former-commit-id: 7984323a21af45d584f5bf6508db4c63b6428653

a4e33ec6

Merge branch 'bsfiles' into 'master' · 0eb7bbb9

Vakhtang Tsulaia authored 6 years ago

Fix ByteStreamCnvSvc unit tests

See merge request atlas/athena!14060

Former-commit-id: 5c49062e

0eb7bbb9

Merge branch 'master-SCT_Calib' into 'master' · 6579e420

Vakhtang Tsulaia authored 6 years ago

Remove Incident from SCTCalib and SCTCalibWriteSvc (ATLASRECTS-4574)

See merge request atlas/athena!14039

Former-commit-id: 9c9792fe

6579e420

Merge branch 'mmtidyingToMaster' into 'master' · 22bb7b9a

Vakhtang Tsulaia authored 6 years ago

Manually sweep MM digitization tidying up from 21.3 to master

See merge request atlas/athena!14059

Former-commit-id: 21d74806

22bb7b9a

Merge branch 'cherry-pick- [formerly 8b7ecfd83e]-master' into 'master' · b53ec6b8

Vakhtang Tsulaia authored 6 years ago

Sweeping !14043 from 21.1 to master.
Use default input (pp) in ART tests for HI_v4 menu

See merge request atlas/athena!14065

Former-commit-id: fd14b8c6

b53ec6b8

Merge branch 'cherry-pick- [formerly 1c9f4935e4]-master' into 'master' · b8ebbb8f

Vakhtang Tsulaia authored 6 years ago

Sweeping !13994 from 21.1 to master.
TrigP1Test (ATR-16799): fix5

See merge request atlas/athena!14009

Former-commit-id: f33277d9

b8ebbb8f

Merge branch 'test.ControlTest-20180908' into 'master' · f3f82186
Vakhtang Tsulaia authored 6 years ago
```
ControlTest: Migrate ATN tests to ctest.

See merge request atlas/athena!14067

Former-commit-id: dd81d71c
```
f3f82186
Merge branch 'test.AthenaServices-20180908' into 'master' · ff3f78b6
Vakhtang Tsulaia authored 6 years ago
```
AthenaServices: Migrate ATN tests to ctest.

See merge request atlas/athena!14068

Former-commit-id: f2f69a0a
```
ff3f78b6
Merge branch 'test.StoreGateTests-20180908' into 'master' · dabf883f
Vakhtang Tsulaia authored 6 years ago
```
StoreGateTests: Migrate ATN tests to ctest.

See merge request atlas/athena!14069

Former-commit-id: c5142b54
```
dabf883f
Merge branch 'test.CLIDComps-20180908' into 'master' · 3c410eb8
Vakhtang Tsulaia authored 6 years ago
```
CLIDComps: Migrate ATN test to ctest.

See merge request atlas/athena!14070

Former-commit-id: e38b34ef
```
3c410eb8
Merge branch 'warn.ISF_FastCaloSimParametrization-20180908' into 'master' · 5ada4a12
Vakhtang Tsulaia authored 6 years ago
```
ISF_FastCaloSimParametrization: Fix compilation warning.

See merge request atlas/athena!14071

Former-commit-id: ce331a2c
```
5ada4a12

Sep 08, 2018
- Fixed the Jet RoI descriptor to be realy the FS one · 5d6b7bae
  Tomasz Bold authored 6 years ago
  
  Former-commit-id: c90ff06d
  5d6b7bae
- ISF_FastCaloSimParametrization: Fix compilation warning. · d60eb157
  scott snyder authored 6 years ago
  
  Compilation warning: unused variable. Former-commit-id: 317e4da45dfc4837bb346afaf88b419feb232e4f
  d60eb157
- CLIDComps: Migrate ATN test to ctest. · 500139dc
  scott snyder authored 6 years ago
  
  Migrate ATN test to ctest. Former-commit-id: 73ee4df0
  500139dc
- StoreGateTests: Migrate ATN tests to ctest. · cb8b9f38
  scott snyder authored 6 years ago
  
  Migrate ATN tests to ctest. Former-commit-id: 439af9a3
  cb8b9f38
- AthenaServices: Migrate ATN tests to ctest. · 782b39a0
  scott snyder authored 6 years ago
  
  Migrate ATN tests to ctest. Former-commit-id: e89fd132
  782b39a0
- ControlTest: Migrate ATN tests to ctest. · 084aaea7
  scott snyder authored 6 years ago
  
  Migrate ATN tests to ctest. Former-commit-id: b254d753
  084aaea7
- Merge branch 'ART_HI_v4_change_input' into '21.1' · 28339fd3
  Marija Vranjes Milosavljevic authored 6 years ago and Atlas Nightlybuild committed 6 years ago
  
  Use default input (pp) in ART tests for HI_v4 menu See merge request atlas/athena!14043 (cherry picked from commit 8c0354ad [formerly 8b7ecfd83ed694e89d0bcfa2d65366cfc124fa14]) 408b5ea0 Use default input (pp) in ART tests for HI_v4 menu Former-commit-id: d36d7511
  28339fd3
Sep 07, 2018
- Fix unit test by updating input test file and associated reference · c06bf05f
  cranshaw authored 6 years ago
  
  files. Former-commit-id: 930f684b
  c06bf05f
- Manually sweep MM digitization tidying up from 21.3 to master · a10bb017
  John Derek Chapman authored 6 years ago and Chav Chhiv Chau committed 6 years ago
  
  MM_Digitization divers fixes as discussed in ATLASSIM-3698 See merge request atlas/athena!11741 Former-commit-id: e778bd9a54e8d0a01e1847bf3500336ead746b80
  a10bb017
- Merge branch 'AnalysisTriggerAlgsHandleUpdate-master-20180903' into 'master' · f9809f48
  Adam Edward Barton authored 6 years ago
  
  RoIBResultToxAOD MT Update, master branch (2018.09.02.) See merge request atlas/athena!13929 Former-commit-id: f3bcf05e
  f9809f48
- Merge branch 'master-SCT_ReadCalibChipDataTool' into 'master' · 1b49dc6a
  Adam Edward Barton authored 6 years ago
  
  Code cleanup of SCT_ReadCalibChipDataTool (ATLASRECTS-4555) See merge request atlas/athena!13902 Former-commit-id: e5adf1a82be7eb6ec60b889ef8d214329bcff7f3
  1b49dc6a
- Merge branch 'overlay/indet-updates' into 'master' · c9f59fee
  Adam Edward Barton authored 6 years ago
  
  Split InDetOverlay into separate algorithms (ATLASSIM-3819) See merge request atlas/athena!13939 Former-commit-id: ba072e80
  c9f59fee
- Merge branch 'master-SCT_ReadCalibDataTool' into 'master' · 6f2d23af
  Adam Edward Barton authored 6 years ago
  
  Make methods of SCT_ReadCalibDataTool const (ATLASRECTS-4555) See merge request atlas/athena!13901 Former-commit-id: 23fbfc9a
  6f2d23af
- Merge branch 'master-ATLASRECTS-4564' into 'master' · 73061fcd
  Adam Edward Barton authored 6 years ago
  
  Convert ISCT_FillCabling and ISCT_CablingSvc from Service to Tool (ATLASRECTS-4564) See merge request atlas/athena!13895 Former-commit-id: 63eb87a4
  73061fcd
- Convert ISCT_FillCabling and ISCT_CablingSvc from Service to Tool (ATLASRECTS-4564) · 04452e74
  Susumu Oda authored 6 years ago and Adam Edward Barton committed 6 years ago
  
  Former-commit-id: 8fded5ec
  04452e74
- Merge branch '22.0-testing-TRT_G4Utilities' into 'master' · bfce43a2
  Adam Edward Barton authored 6 years ago
  
  22.0-testing-TRT_G4Utilities See merge request atlas/athena!13886 Former-commit-id: c0c338ac
  bfce43a2
- 22.0-testing-TRT_G4Utilities · c84d1cd6
  Shaun Roe authored 6 years ago and Adam Edward Barton committed 6 years ago
  
  Former-commit-id: debb8b5c
  c84d1cd6
- Merge branch 'master-SCT_PrepDataToxAOD' into 'master' · e9d3ff39
  Adam Edward Barton authored 6 years ago
  
  Remove incident from SCT_PrepDataToxAOD (ATLASRECTS-4574) See merge request atlas/athena!14038 Former-commit-id: 9c3bb9e5
  e9d3ff39
- Merge branch 'test.AthenaPoolExampleAlgorithms-20180906' into 'master' · 9cba46f6
  Adam Edward Barton authored 6 years ago
  
  AthenaPoolExampleAlgorithms: Update reference files. See merge request atlas/athena!14015 Former-commit-id: 20c7d8ba
  9cba46f6
- Merge branch 'testDeadOTXCorr.LArCellRec-20180906' into 'master' · 53c1ba63
  Adam Edward Barton authored 6 years ago
  
  LArCellRec: Add test for LArCellDeadOTXCorr. See merge request atlas/athena!14031 Former-commit-id: ee0d5b9c
  53c1ba63
- Merge branch 'fpe.TrigInDetEventTPCnv-20180906' into 'master' · 10768788
  Adam Edward Barton authored 6 years ago
  
  TrigInDetEventTPCnv: Suppress FPEs in TrigVertexCnv_p2. See merge request atlas/athena!14032 Former-commit-id: 7577d526
  10768788
- Merge branch 'test.AthenaROOTAccess-20180906' into 'master' · dfa76f85
  Adam Edward Barton authored 6 years ago
  
  AthenaROOTAccess: Mark some differences to ignore. See merge request atlas/athena!14010 Former-commit-id: 028ad4dd
  dfa76f85
- Merge branch 'conv.xAODEgammaAthenaPool-20180906' into 'master' · 99dfdaf8
  Adam Edward Barton authored 6 years ago
  
  xAODEgammaAthenaPool: Protect converter against missing clusters. See merge request atlas/athena!14011 Former-commit-id: 4e00203c
  99dfdaf8
- Merge branch 'pushBack.egammaEvent-20180906' into 'master' · 7c996508
  Adam Edward Barton authored 6 years ago
  
  egammaEvent: Remove const-violating push_back implementations. See merge request atlas/athena!14037 Former-commit-id: 67af25a5
  7c996508
- Merge branch 'tpcnv.TrkTruthTPCnv-20180906' into 'master' · b9221104
  Adam Edward Barton authored 6 years ago
  
  TrkTruthTPCnv: Add missing tpcnv entry for DetailedTrackTruthCollectionCnv_p2. See merge request atlas/athena!14034 Former-commit-id: c14e5e0654bbeebcb6d1cdf6e6ec753a4975a973
  b9221104
- Merge branch 'cling.TrkTruthData-20180906' into 'master' · 5a5f8271
  Adam Edward Barton authored 6 years ago
  
  TrkTruthData: Avoid cling error. See merge request atlas/athena!14033 Former-commit-id: 60c4b860
  5a5f8271
- Merge branch 'conv.xAODTrigMuon-20180906' into 'master' · 040a18cd
  Adam Edward Barton authored 6 years ago
  
  xAODTrigMuon: Fix conversion rule for L2CombinedMuonAuxContainer. See merge request atlas/athena!14013 Former-commit-id: 79c52e56
  040a18cd
- Merge branch 'dvproxy.xAODHIEvent-20180906' into 'master' · 18fbb8c2
  Adam Edward Barton authored 6 years ago
  
  xAODHIEvent: Add missing DV proxy declaration for HIEventShapeContainer_v1. See merge request atlas/athena!14012 Former-commit-id: 3b2ed1a1
  18fbb8c2
- Remove Incident from SCTCalib and SCTCalibWriteSvc · 2fbed4dd
  Susumu Oda authored 6 years ago
  
  Former-commit-id: f1b737cd
  2fbed4dd