Merge branch 'master-InDet' into 'master' (78fad04c) · Commits · Peter Sherwood / athena

Commit 78fad04c authored 4 years ago by Frank Winklmeier

Merge branch 'master-InDet' into 'master'

Move or add trhead unsafety reasons to lines of ATLAS_NOT_THREAD_SAFE

See merge request atlas/athena!34354

parents 65322c01 72fe48b4

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h 9 additions, 9 deletions

...tor/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalib.h
InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h 15 additions, 10 deletions

...CalibAlgs/SCT_CalibAlgs/SCT_CalibAlgs/SCTCalibWriteTool.h
InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx 9 additions, 9 deletions

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx 15 additions, 8 deletions

...or/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalibWriteTool.cxx
InnerDetector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx 4 additions, 8 deletions

...etector/InDetCalibTools/TRT_CalibTools/src/Calibrator.cxx
InnerDetector/InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx 2 additions, 5 deletions

.../InDetConditions/InDetBeamSpotService/src/BeamCondSvc.cxx
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx 3 additions, 2 deletions

...eStreamErrorsAthenaPool/src/InDetBSErrContainerCnv_p1.cxx
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx 1 addition, 1 deletion

...teStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p1.cxx
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p2.cxx 1 addition, 1 deletion

...teStreamErrorsAthenaPool/src/TRT_BSErrContainerCnv_p2.cxx
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx 3 additions, 2 deletions

...StreamErrorsAthenaPool/src/TRT_BSIdErrContainerCnv_p1.cxx
InnerDetector/InDetDetDescr/SCT_GeoModel/src/SCT_DetectorTool.cxx 2 additions, 2 deletions

...ector/InDetDetDescr/SCT_GeoModel/src/SCT_DetectorTool.cxx
InnerDetector/InDetDetDescr/TRT_ReadoutGeometry/src/TRT_DetectorManager.cxx 1 addition, 1 deletion

...tDetDescr/TRT_ReadoutGeometry/src/TRT_DetectorManager.cxx
InnerDetector/InDetDigitization/TRT_Digitization/src/TRTDigitizationTool.cxx 1 addition, 1 deletion

...Digitization/TRT_Digitization/src/TRTDigitizationTool.cxx
InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaCandidateCnv_tlp1.cxx 2 additions, 1 deletion

...nv/src/InDetLowBetaInfo/InDetLowBetaCandidateCnv_tlp1.cxx
InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetLowBetaInfo/InDetLowBetaContainerCnv_tlp1.cxx 3 additions, 3 deletions

...nv/src/InDetLowBetaInfo/InDetLowBetaContainerCnv_tlp1.cxx
InnerDetector/InDetEventCnv/InDetEventTPCnv/src/InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx 1 addition, 1 deletion

.../InDetPrepRawData/PixelGangedClusterAmbiguitiesCnv_p1.cxx
InnerDetector/InDetEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.cxx 3 additions, 4 deletions

...tEventCnv/TRT_RawDataByteStreamCnv/src/TRT_RodDecoder.cxx
InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx 3 additions, 6 deletions

...tor/InDetMonitoring/InDetDiMuonMonitoring/src/DiMuMon.cxx
InnerDetector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx 1 addition, 2 deletions

...tector/InDetRawAlgs/InDetOverlay/test/BCMOverlay_test.cxx
InnerDetector/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx 1 addition, 2 deletions

...ctor/InDetRawAlgs/InDetOverlay/test/PixelOverlay_test.cxx

with 80 additions and 78 deletions

Please register or to comment

Admin message

Merge branch 'master-InDet' into 'master'