Merge branch 'master-ATLASRECTS-4579' into 'master' (a305f9fa) · Commits · Peter Sherwood / athena

Commit a305f9fa authored 6 years ago by Adam Edward Barton

Merge branch 'master-ATLASRECTS-4579' into 'master'

Lock mutex only if it is needed (ATLASRECTS-4579)

See merge request atlas/athena!14520

Former-commit-id: 63950698

parents 2ac32856 c90a40f9

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx 4 additions, 4 deletions

InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCTCalib.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx 6 additions, 4 deletions

...SCT_ConditionsAlgorithms/src/SCT_ConfigurationCondAlg.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx 3 additions, 3 deletions

...ionsAlgorithms/src/SCT_ConfigurationConditionsTestAlg.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx 8 additions, 1 deletion

...tions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.h 3 additions, 0 deletions

...ditions/SCT_ConditionsAlgorithms/src/SCT_MonitorCondAlg.h
InnerDetector/InDetConditions/SCT_ConditionsData/SCT_ConditionsData/SCT_ConfigurationCondData.h 13 additions, 7 deletions

...itionsData/SCT_ConditionsData/SCT_ConfigurationCondData.h
InnerDetector/InDetConditions/SCT_ConditionsData/SCT_ConditionsData/SCT_MonitorCondData.h 10 additions, 8 deletions

...T_ConditionsData/SCT_ConditionsData/SCT_MonitorCondData.h
InnerDetector/InDetConditions/SCT_ConditionsData/src/SCT_ConfigurationCondData.cxx 20 additions, 12 deletions

...ions/SCT_ConditionsData/src/SCT_ConfigurationCondData.cxx
InnerDetector/InDetConditions/SCT_ConditionsData/src/SCT_MonitorCondData.cxx 12 additions, 20 deletions

...Conditions/SCT_ConditionsData/src/SCT_MonitorCondData.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ConfigurationConditionsTool.h 4 additions, 3 deletions

...ls/SCT_ConditionsTools/ISCT_ConfigurationConditionsTool.h
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx 4 additions, 3 deletions

...ions/SCT_ConditionsTools/src/SCT_ByteStreamErrorsTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ChargeTrappingTool.cxx 2 additions, 1 deletion

...itions/SCT_ConditionsTools/src/SCT_ChargeTrappingTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx 10 additions, 7 deletions

...T_ConditionsTools/src/SCT_ConfigurationConditionsTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h 2 additions, 2 deletions

...SCT_ConditionsTools/src/SCT_ConfigurationConditionsTool.h
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx 6 additions, 3 deletions

...ditions/SCT_ConditionsTools/src/SCT_DCSConditionsTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx 2 additions, 1 deletion

...onditions/SCT_ConditionsTools/src/SCT_LinkMaskingTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.cxx 2 additions, 1 deletion

...ns/SCT_ConditionsTools/src/SCT_MajorityConditionsTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx 2 additions, 1 deletion

...Conditions/SCT_ConditionsTools/src/SCT_ModuleVetoTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx 6 additions, 6 deletions

...ons/SCT_ConditionsTools/src/SCT_MonitorConditionsTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx 4 additions, 2 deletions

...ons/SCT_ConditionsTools/src/SCT_ReadCalibChipDataTool.cxx

with 123 additions and 89 deletions

Please register or to comment