Merge branch 'master-ATLASRECTS-4072-v2' into 'master' (d140c014) · Commits · atlas / athena

Commit d140c014 authored 6 years ago by Vakhtang Tsulaia

Merge branch 'master-ATLASRECTS-4072-v2' into 'master'

Use InDetBSErrContainer to define temporarily masked chips (ATLASRECTS-4072, ATLASRECTS-3178)

See merge request atlas/athena!9693

parents eb03595b 0d9ac2b1

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetConditions/InDetByteStreamErrors/CMakeLists.txt 10 additions, 0 deletions

...ctor/InDetConditions/InDetByteStreamErrors/CMakeLists.txt
InnerDetector/InDetConditions/InDetByteStreamErrors/InDetByteStreamErrors/InDetByteStreamErrorsDict.h 1 addition, 0 deletions

...mErrors/InDetByteStreamErrors/InDetByteStreamErrorsDict.h
InnerDetector/InDetConditions/InDetByteStreamErrors/InDetByteStreamErrors/SCT_ByteStreamFraction.h 17 additions, 2 deletions

...reamErrors/InDetByteStreamErrors/SCT_ByteStreamFraction.h
InnerDetector/InDetConditions/InDetByteStreamErrors/InDetByteStreamErrors/SCT_ByteStreamFractionContainer.h 10 additions, 1 deletion

...s/InDetByteStreamErrors/SCT_ByteStreamFractionContainer.h
InnerDetector/InDetConditions/InDetByteStreamErrors/src/SCT_ByteStreamFraction.cxx 74 additions, 0 deletions

...ions/InDetByteStreamErrors/src/SCT_ByteStreamFraction.cxx
InnerDetector/InDetConditions/InDetByteStreamErrors/src/SCT_ByteStreamFractionContainer.cxx 71 additions, 0 deletions

...tByteStreamErrors/src/SCT_ByteStreamFractionContainer.cxx
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt 2 additions, 1 deletion

...Conditions/InDetByteStreamErrorsAthenaPool/CMakeLists.txt
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPoolCnvDict.h 1 addition, 0 deletions

...ErrorsAthenaPool/InDetByteStreamErrorsAthenaPoolCnvDict.h
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/SCT_ByteStreamFractionContainer_p1.h 26 additions, 0 deletions

...reamErrorsAthenaPool/SCT_ByteStreamFractionContainer_p1.h
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/InDetByteStreamErrorsAthenaPool/selection.xml 1 addition, 0 deletions

...sAthenaPool/InDetByteStreamErrorsAthenaPool/selection.xml
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.cxx 30 additions, 0 deletions

...rorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.cxx
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.h 35 additions, 0 deletions

...ErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv.h
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv_p1.cxx 46 additions, 0 deletions

...sAthenaPool/src/SCT_ByteStreamFractionContainerCnv_p1.cxx
InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/SCT_ByteStreamFractionContainerCnv_p1.h 28 additions, 0 deletions

...orsAthenaPool/src/SCT_ByteStreamFractionContainerCnv_p1.h
InnerDetector/InDetConditions/SCT_ConditionsServices/CMakeLists.txt 2 additions, 2 deletions

...tor/InDetConditions/SCT_ConditionsServices/CMakeLists.txt
InnerDetector/InDetConditions/SCT_ConditionsServices/SCT_ConditionsServices/ISCT_ByteStreamErrorsSvc.h 5 additions, 25 deletions

...ervices/SCT_ConditionsServices/ISCT_ByteStreamErrorsSvc.h
InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx 151 additions, 469 deletions

...ns/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.cxx
InnerDetector/InDetConditions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.h 30 additions, 48 deletions

...ions/SCT_ConditionsServices/src/SCT_ByteStreamErrorsSvc.h
InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt 1 addition, 2 deletions

...tor/InDetEventCnv/SCT_RawDataByteStreamCnv/CMakeLists.txt
InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h 1 addition, 1 deletion

...eamCnv/SCT_RawDataByteStreamCnv/ISCTRawDataProviderTool.h

with 542 additions and 551 deletions

Please register or to comment

Admin message

Merge branch 'master-ATLASRECTS-4072-v2' into 'master'