Commits · ffc0ff6ed63d099cba4aa69dee5cb097fde5d3d4 · Peter Sherwood / athena

Mar 27, 2018

Merge branch 'SimulationEnergiesThreadSafetyPt1_master' into 'master' · ffc0ff6e

Sweep !9651 from '21.0' to 'master': Replace static bool variables with std::call_once (ATLASSIM-3568)

See merge request atlas/athena!10016

Former-commit-id: c8bdb6d8

ffc0ff6e

Merge branch 'IMagFieldSvcDropQueryInterface_master' into 'master' · 00dc9377

Vakhtang Tsulaia authored 6 years ago

Sweep of !9646 from '21.0' into 'master': Update interface declaration syntax in IMagFieldSvc implementations

See merge request atlas/athena!10017

Former-commit-id: e9836f9a

00dc9377

Merge branch 'naming.FTKStandaloneMonitoring-20180326' into 'master' · 2db55034

Vakhtang Tsulaia authored 6 years ago

FTKStandaloneMonitoring: Comply with ATLAS naming conventions.

See merge request atlas/athena!10001

Former-commit-id: 29a22d58

2db55034

Merge branch 'master.InDetTrackSystematicsTools-20180326' into 'master' · b79d9fcb
Vakhtang Tsulaia authored 6 years ago
```
InDetTrackSystematicsTools: Fix StatusCode return value.

See merge request atlas/athena!10024

Former-commit-id: 1c9167f5
```
b79d9fcb
Merge branch 'depr.ZMassConstraint-20180326' into 'master' · f8bc1be9
Vakhtang Tsulaia authored 6 years ago
```
ZMassConstraint: Fix deprecation warning.

See merge request atlas/athena!10025

Former-commit-id: 648d6adc
```
f8bc1be9

Merge branch 'naming.SemileptonicCorr-20180326' into 'master' · d4a41115

Vakhtang Tsulaia authored 6 years ago

SemileptonicCorr: Comply with ATLAS naming conventions.

See merge request atlas/athena!10026

Former-commit-id: 7784fb48

d4a41115

Merge branch 'dvconst.TrigTauMatching-20180326' into 'master' · 89b99335
Vakhtang Tsulaia authored 6 years ago
```
TrigTauMatching: const fix

See merge request atlas/athena!10027

Former-commit-id: 8711bf61
```
89b99335
Merge branch 'cmake.PhotonEfficiencyCorrection-20180326' into 'master' · dde02f81
Vakhtang Tsulaia authored 6 years ago
```
PhotonEfficiencyCorrection: cmake fix

See merge request atlas/athena!10028

Former-commit-id: 55378a6a
```
dde02f81

Merge branch 'config.RpcRawDataMonitoring-20180326' into 'master' · f09be932

Vakhtang Tsulaia authored 6 years ago

RpcRawDataMonitoring:  Allow MuCTPI_RDO to be missing in RCPStandaloneTracksMon.

See merge request atlas/athena!10030

Former-commit-id: b1026c04

f09be932

Merge branch 'larcond.LArConditionsCommon-20180323' into 'master' · 0f2287dc
Vakhtang Tsulaia authored 6 years ago
```
Fixes for LAr conditions setup.

See merge request atlas/athena!9950

Former-commit-id: cbb0572a
```
0f2287dc

Merge branch 'test.RecExOnline-20180322' into 'master' · 946cfc81

Vakhtang Tsulaia authored 6 years ago

RecExOnline: Fix configuration of test job.

See merge request atlas/athena!9915

Former-commit-id: 250fc617

946cfc81

Merge branch 'namespace.FileStager-20180322' into 'master' · 33f04c34

Frank Winklmeier authored 6 years ago

FileStager: Fix placement of using directives.

See merge request atlas/athena!9908

Former-commit-id: 605a5234

33f04c34

Mar 26, 2018
- Merge branch 'master-Coverity' into 'master' · 7d57d18f
  Vakhtang Tsulaia authored 6 years ago
  
  Fix SCT related Coverity defects See merge request atlas/athena!9938 Former-commit-id: f394c4d0
  7d57d18f
- Fix SCT related Coverity defects · 94615eb8
  Susumu Oda authored 6 years ago and Vakhtang Tsulaia committed 6 years ago
  
  Former-commit-id: 6147bb44
  94615eb8
- Merge branch 'ATR-17470_sweep' into 'master' · 19dcae3a
  Vakhtang Tsulaia authored 6 years ago
  
  Merge branch 'ATR-17470_list2vector-21.0' into master See merge request atlas/athena!9465 Former-commit-id: eced6273
  19dcae3a
- Merge branch 'cutflowsvc_bug' into 'master' · 18635bfc
  Vakhtang Tsulaia authored 6 years ago
  
  Cutflowsvc bug See merge request atlas/athena!9830 Former-commit-id: fe7a9018
  18635bfc
- Merge branch 'master-MuonCalibrationMemLeak' into 'master' · 0f651045
  Vakhtang Tsulaia authored 6 years ago
  
  Master - Fix leaking histogram in MuonCalibrationAndSmearingTool See merge request atlas/athena!9866 Former-commit-id: bdcdcb47
  0f651045
- Merge branch 'eflowRec_ATLJETMET_897' into 'master' · 57c987b1
  Vakhtang Tsulaia authored 6 years ago
  
  Adjust topocluster links on xAOD::PFO See merge request atlas/athena!9881 Former-commit-id: 41fdbe03
  57c987b1
- Merge branch 'master-digitizationtests-ant' into 'master' · 290e505c
  Vakhtang Tsulaia authored 6 years ago
  
  Added inlude flags to art tests so they only run in certain branches (ATLASSIM-3607) See merge request atlas/athena!9927 Former-commit-id: 92c108cb
  290e505c
- Merge branch 'CID118544_118543_uninitialized_scalar' into 'master' · 2b8ac384
  Vakhtang Tsulaia authored 6 years ago
  
  Fix uninitialized member. See merge request atlas/athena!9952 Former-commit-id: e22eb704
  2b8ac384
- RpcRawDataMonitoring: Allow MuCTPI_RDO to be missing in RCPStandaloneTracksMon. · d887d09c
  scott snyder authored 6 years ago
  
  Works around existing misconfigurations. Fixes crash with q222. Former-commit-id: 74c56cdc
  d887d09c
- PhotonEfficiencyCorrection: cmake fix · 3fae1340
  Scott Snyder authored 6 years ago
  
  Fix spelling of boost cmake variables. Former-commit-id: 1a3335cf
  3fae1340
- TrigTauMatching: const fix · 5292766d
  scott snyder authored 6 years ago
  
  Fix const problem in DataVector iteration. Former-commit-id: f6f23608
  5292766d
- Merge branch 'ART-scandir' into 'master' · 4355f936
  Vakhtang Tsulaia authored 6 years ago
  
  Add scandir to master See merge request atlas/athena!9746 Former-commit-id: 514e4e67
  4355f936
- Merge branch 'depr.egammaValidation-20180326' into 'master' · b96b5812
  Vakhtang Tsulaia authored 6 years ago
  
  egammaValidation: Fix deprecation warning. See merge request atlas/athena!9996 Former-commit-id: 01aff859
  b96b5812
- Merge branch 'datamodel.EventBookkeeperMetaData-20180322' into 'master' · 0ce3d937
  Vakhtang Tsulaia authored 6 years ago
  
  EventBookkeeperMetaData: DataModel -> AthContainers. See merge request atlas/athena!9944 Former-commit-id: 49026687
  0ce3d937
- Merge branch 'datamodel.ByteStreamData-20180322' into 'master' · 5591ccf8
  Vakhtang Tsulaia authored 6 years ago
  
  ByteStreamData: DataModel -> AthContainers. See merge request atlas/athena!9943 Former-commit-id: cc04b18d
  5591ccf8
- Merge branch 'const.SCT_ConditionsTools-20180322' into 'master' · c8e60f8e
  Vakhtang Tsulaia authored 6 years ago
  
  SCT_ConditionsTools: Declare tool methods const. See merge request atlas/athena!9941 Former-commit-id: b143a0d9
  c8e60f8e
- Merge branch 'cmake.AthContainersInterfaces-20180322' into 'master' · d9aeca11
  Vakhtang Tsulaia authored 6 years ago
  
  AthContainersInterfaces: cmake fix See merge request atlas/athena!9940 Former-commit-id: 2ab2a1b5
  d9aeca11
- Merge branch 'coverity.AthenaKernel-20180314' into 'master' · 7e5b8536
  Vakhtang Tsulaia authored 6 years ago
  
  AthenaKernel: Coverity 118547. See merge request atlas/athena!9670 Former-commit-id: 4680b03b
  7e5b8536
- SemileptonicCorr: Comply with ATLAS naming conventions. · d380c350
  scott snyder authored 6 years ago
  
  Private data members should start with m_. Former-commit-id: f5f6b9ac3899d91df05d92cac2cb69d6f3b067e4
  d380c350
- ZMassConstraint: Fix deprecation warning. · b825d1a3
  scott snyder authored 6 years ago
  
  IEgammaCalibrationAndSmearingTool.h moved from ElectronPhotonFourMomentumCorrection to EgammaAnalysisInterfaces. Former-commit-id: 6312fa8a
  b825d1a3
- InDetTrackSystematicsTools: Fix StatusCode return value. · e5e7414f
  scott snyder authored 6 years ago
  
  Fix StatusCode return value. Former-commit-id: 70282260
  e5e7414f
- Merge branch 'IMagFieldSvcDropQueryInterface_21.0' into '21.0' · 2ea3c492
  Tamara Vazquez Schroeder authored 7 years ago
  
  Update interface declaration syntax in IMagFieldSvc implementations See merge request atlas/athena!9646 Former-commit-id: fe7a7e05
  2ea3c492
- Merge branch 'SimulationEnergiesThreadSafetyPt1_21.0' into '21.0' · f8f973fc
  James Beacham authored 7 years ago
  
  Replace static bool variables with std::call_once (ATLASSIM-3568) See merge request atlas/athena!9651 Former-commit-id: 19990582
  f8f973fc
- Merge branch 'gaudi_declare_component_trigger' into 'master' · f0d5efd0
  Frank Winklmeier authored 6 years ago
  
  Migrate remaining Trigger packages to DECLARE_COMPONENT macros See merge request atlas/athena!9926 Former-commit-id: bb9de4e9
  f0d5efd0
- FTKStandaloneMonitoring: Comply with ATLAS naming conventions. · ff8b7ce8
  scott snyder authored 6 years ago
  
  Private data members should start with m_. (Constants can be all caps.) Former-commit-id: fc487da6
  ff8b7ce8
- egammaValidation: Fix deprecation warning. · 0b89e730
  scott snyder authored 6 years ago
  
  IAsgElectronLikelihoodTool.h moved from ElectronPhotonSelectorTools to EgammaAnalysisInterfaces. Former-commit-id: 27199d98c487b6545f3f43b1c87e22155a3d2ee4
  0b89e730
Mar 24, 2018
- Merge branch 'master-trig-decisionhandling-base-classes' into 'master' · 212c548a
  Stewart Martin-Haugh authored 7 years ago
  
  Master trig decisionhandling base classes See merge request atlas/athena!9963 Former-commit-id: 4b1b8b0b
  212c548a
- Master trig decisionhandling base classes · 265e3028
  Simon George authored 7 years ago and Stewart Martin-Haugh committed 7 years ago
  
  Former-commit-id: 95a08b1c
  265e3028