Commits · efd1cb54faf10d4889dcf88e55baf4bbcc6a63e8 · Peter Sherwood / athena

Jan 09, 2018
- Merge in changes in master from over the holidays. · efd1cb54
  cranshaw authored 7 years ago
  
  Former-commit-id: 9b39c6d9
  efd1cb54
Dec 20, 2017
- Move some INFO statements to DEBUG in the MetaDataSvc and fix some ref · b2bbc1e9
  cranshaw authored 7 years ago
  
  files for AthenaPoolExampleAlgorithms Former-commit-id: f2d03af1
  b2bbc1e9
Dec 19, 2017
- Migrate ReadMeta to new IMetaDataTool interface · c5114cc2
  cranshaw authored 7 years ago
  
  Former-commit-id: 78f4a8b6
  c5114cc2
Dec 18, 2017
- Merge remote-tracking branch 'upstream/master' into metadatasvc_tools2 · 39356b1b
  cranshaw authored 7 years ago
  
  Former-commit-id: a3527896
  39356b1b
Dec 17, 2017
- Merge branch 'datamodel.TrackParticleTPCnv-20171214' into 'master' · 1d33a48b
  Vakhtang Tsulaia authored 7 years ago
  
  TrackParticleTPCnv: DataModel -> AthLinks. See merge request atlas/athena!7433 Former-commit-id: d87a2f22
  1d33a48b
- Merge branch 'datamodel.TBEvent-20171214' into 'master' · 71d6ca6f
  Vakhtang Tsulaia authored 7 years ago
  
  TBEvent: DataModel -> AthLinks, AthContainers. See merge request atlas/athena!7435 Former-commit-id: b05d8f22
  71d6ca6f
- Merge branch 'gcc8.CLIDComps-20171217' into 'master' · bc1d2f67
  Vakhtang Tsulaia authored 7 years ago
  
  CLIDComps: Fix gcc8 warning. See merge request atlas/athena!7473 Former-commit-id: cd40a651
  bc1d2f67
- Merge branch 'AmdcDataRemoval_v01' into 'master' · 95ebeee3
  Vakhtang Tsulaia authored 7 years ago
  
  removal of AmdcData package See merge request atlas/athena!7420 Former-commit-id: d46fe7e7
  95ebeee3
- Merge branch 'muonTrkHandleInit' into 'master' · 06e30f4b
  Vakhtang Tsulaia authored 7 years ago
  
  Fixes for some unretrieved ToolHandles used by muons from outside the muon domain See merge request atlas/athena!7371 Former-commit-id: d8319dd6
  06e30f4b
- Merge branch 'feature/my-feature-calib1' into 'master' · 259ebb7f
  Vakhtang Tsulaia authored 7 years ago
  
  Tainted string, resource leak, wrong identifier key See merge request atlas/athena!7391 Former-commit-id: f33e194d
  259ebb7f
- Merge branch 'feature/my-feature-calib2' into 'master' · 1a05d7c2
  Vakhtang Tsulaia authored 7 years ago
  
  change 'writeCdo' to smart pointer to avoid resource leak See merge request atlas/athena!7393 Former-commit-id: 9a751c77
  1a05d7c2
- Merge branch 'feature/my-feature-calib4' into 'master' · 2e2b5efb
  Vakhtang Tsulaia authored 7 years ago
  
  use smart pointer to resolve memory leak See merge request atlas/athena!7398 Former-commit-id: 97953c48
  2e2b5efb
- Merge branch 'master-ATLASSIM-4046' into 'master' · b22d0c72
  Vakhtang Tsulaia authored 7 years ago
  
  Code cleanups of SCT_ByteStreamErrorSvc.cxx (preparation for ATLASRECTS-3178) See merge request atlas/athena!7401 Former-commit-id: 879653a6
  b22d0c72
- Code cleanups of SCT_ByteStreamErrorSvc.cxx (preparation for ATLASRECTS-3178) · fd22d6c9
  Susumu Oda authored 7 years ago and Vakhtang Tsulaia committed 7 years ago
  
  Former-commit-id: 28398507
  fd22d6c9
- Merge branch 'feature/my-feature-calib5' into 'master' · a91d1eb4
  Vakhtang Tsulaia authored 7 years ago
  
  initialize pointers, and comment off unused variables See merge request atlas/athena!7413 Former-commit-id: f6cb6c02
  a91d1eb4
- Merge branch 'G4Atlas-UserActionsV3-master' into 'master' · fe843220
  Vakhtang Tsulaia authored 7 years ago
  
  Migrate G4Atlas user actions to new UserActionToolBase See merge request atlas/athena!7414 Former-commit-id: 65ce49e0
  fe843220
- Merge branch 'FCS_combineCaloHitAnaISFHitAnalysis_ATLASSIM-3526_master' into 'master' · 70ae84a8
  Vakhtang Tsulaia authored 7 years ago
  
  Manual sweep of !7367 from '21.0' into 'master: Combining CaloHitAna and ISF_HitAnalysis (ATLASSIM-3526) See merge request atlas/athena!7422 Former-commit-id: 25abf72e
  70ae84a8
- Merge branch 'add-mssing-conditions-dependencies-for-sct' into 'master' · f56d2834
  Vakhtang Tsulaia authored 7 years ago
  
  Additional dependencies to force conditions loading in InDet_CacheCreator See merge request atlas/athena!7429 Former-commit-id: f02ddde0
  f56d2834
- Merge branch 'cherry-pick-2d5cf8e0 [formerly 0000215177]-master' into 'master' · 416f59dd
  Vakhtang Tsulaia authored 7 years ago
  
  Sweeping !7423 from 21.0 to master. Revert "Merge branch 'CleanInDetTrackValid_21.0' into '21.0'" See merge request atlas/athena!7441 Former-commit-id: 4f8ec9d2
  416f59dd
- Merge branch 'feature/my-feature-condition2' into 'master' · 93378b48
  Vakhtang Tsulaia authored 7 years ago
  
  free pointer 'f', protect string copy See merge request atlas/athena!7442 Former-commit-id: a5488ee9
  93378b48
- Merge branch 'master-ATLASRECTS-4022-TRT_TrackHoleSearch' into 'master' · 795e0a86
  Vakhtang Tsulaia authored 7 years ago
  
  Update TRT_TrackHoleSearch to VarHandles See merge request atlas/athena!7443 Former-commit-id: 5c45c018
  795e0a86
- Merge branch 'removeContainerCheckMSFA' into 'master' · 7e5b12c1
  Vakhtang Tsulaia authored 7 years ago
  
  Remove SG container check from the MuonSegmentFinderAlg See merge request atlas/athena!7450 Former-commit-id: 33854741
  7e5b12c1
- Merge branch 'cherry-pick-2b5c69d3 [formerly 5356823528]-master' into 'master' · 6c811ae6
  Vakhtang Tsulaia authored 7 years ago
  
  Sweeping !7388 from 21.0 to master. Simplify merging scheme for LArFCS_StepInfoSD See merge request atlas/athena!7469 Former-commit-id: e111a315
  6c811ae6
- Merge branch 'test.AthenaPoolUtilities-20171213' into 'master' · 72733cdf
  Vakhtang Tsulaia authored 7 years ago
  
  AthenaPoolUtilities: A couple fixes for *AthenaPool test jobs. See merge request atlas/athena!7404 Former-commit-id: 1d9fce2f
  72733cdf
- Merge branch 'condHandleNoBase.StoreGate-20171213' into 'master' · deb517bc
  Vakhtang Tsulaia authored 7 years ago
  
  StoreGate: Remove VarHandleBase base from Read/WriteCondHandle. See merge request atlas/athena!7387 Former-commit-id: a338639f
  deb517bc
- Merge branch 'thread4.AthContainers-20171213' into 'master' · f5b43301
  Vakhtang Tsulaia authored 7 years ago
  
  AthContainers: Thread-safety fixes. See merge request atlas/athena!7385 Former-commit-id: 55a80e15
  f5b43301
- Merge branch 'concurrentBitset.CxxUtils-20171212' into 'master' · dcbb9e5d
  Vakhtang Tsulaia authored 7 years ago
  
  CxxUtils: Concurrent bitset. See merge request atlas/athena!7368 Former-commit-id: 6d7d7eeb
  dcbb9e5d
- Merge branch 'noUserData.AthenaServices-20171213' into 'master' · fda39397
  Vakhtang Tsulaia authored 7 years ago
  
  AthenaServices: Remove UserDataSvc. See merge request atlas/athena!7403 Former-commit-id: 11be1a60
  fda39397
- Merge branch 'datamodel.Navigation-20171214' into 'master' · 871dd39d
  Vakhtang Tsulaia authored 7 years ago
  
  Navigation: DataModel -> AthContainers. See merge request atlas/athena!7430 Former-commit-id: d9e2bcaf
  871dd39d
- Merge branch 'datamodel.Particle-20171214' into 'master' · 2fece1ed
  Vakhtang Tsulaia authored 7 years ago
  
  Particle: DataModel -> AthLinks, AthContainers. See merge request atlas/athena!7432 Former-commit-id: a4d69228
  2fece1ed
- Merge branch 'datamodel.PrimaryDPDMaker-20171214' into 'master' · 9e036ded
  Vakhtang Tsulaia authored 7 years ago
  
  PrimaryDPDMaker: DataModel -> AthLinks, AthContainers. See merge request atlas/athena!7434 Former-commit-id: b8682d87
  9e036ded
- Merge branch 'datamodel.TrigMuonEventTPCnv-20171216' into 'master' · dc386b5f
  Vakhtang Tsulaia authored 7 years ago
  
  TrigMuonEventTPCnv: DataModel -> AthLinks. See merge request atlas/athena!7467 Former-commit-id: 5b19b7b1
  dc386b5f
- Merge branch 'datamodel.TrigMuonEvent-20171216' into 'master' · e0f2d5ca
  Vakhtang Tsulaia authored 7 years ago
  
  TrigMuonEvent: DataModel -> AthLinks, AthContainers. See merge request atlas/athena!7466 Former-commit-id: 196cac6f
  e0f2d5ca
- Merge branch 'datamodel.TrigCaloEventTPCnv-20171216' into 'master' · 4614d1ed
  Vakhtang Tsulaia authored 7 years ago
  
  TrigCaloEventTPCnv: DataModel -> AthLinks See merge request atlas/athena!7465 Former-commit-id: 80fdfdd1
  4614d1ed
- Merge branch 'datamodel.TrigCaloEvent-20171216' into 'master' · eda06253
  Vakhtang Tsulaia authored 7 years ago
  
  TrigCaloEvent: DataModel -> AthLinks, AthContainers. See merge request atlas/athena!7464 Former-commit-id: ded47b39
  eda06253
- Merge branch 'datamodel.TrigBphysHypo-20171216' into 'master' · 881322af
  Vakhtang Tsulaia authored 7 years ago
  
  TrigBphysHypo: DataModel -> AthLinks. See merge request atlas/athena!7463 Former-commit-id: 91e25258
  881322af
- Merge branch 'namespace.MuonAGDDDescription-20171216' into 'master' · f334af13
  Vakhtang Tsulaia authored 7 years ago
  
  MuonAGDDDescription: Fix placement of using directives. See merge request atlas/athena!7462 Former-commit-id: bbd0a25e
  f334af13
- CLIDComps: Fix gcc8 warning. · 3a78d06b
  Scott Snyder authored 7 years ago
  
  gcc8 warning: catching polymorphic exception type by value. Former-commit-id: 5b10a45c
  3a78d06b
Dec 16, 2017

Merge branch 'FCS_SD_MergingUpdate_21.0' into '21.0' · dd9bc955

Tamara Vazquez Schroeder authored 7 years ago and

Atlas Nightlybuild committed 7 years ago

Simplify merging scheme for LArFCS_StepInfoSD

See merge request atlas/athena!7388

(cherry picked from commit 2b5c69d3 [formerly 5356823528bdbed092d62bf37c99ae7d24b1bc89])

62b06329 Add new max radius cut specifically for layer EMB1 and EME1
4194af94 Simplify merging scheme for LArFCS_StepInfoSD

Former-commit-id: 39e17f9c

dd9bc955

TrigMuonEventTPCnv: DataModel -> AthLinks. · d54f0344
scott snyder authored 7 years ago
```
Remove references to obsolete package DataModel.



Former-commit-id: be5ba414
```
d54f0344