Merge branch 'master-ATLASRECTS-5624' into 'master' (32d1769f) · Commits · Peter Sherwood / athena

Commit 32d1769f authored 4 years ago by Adam Edward Barton

Merge branch 'master-ATLASRECTS-5624' into 'master'

Use IDCInDetBSErrContainer instead of SCT_FlaggedCondData (ATLASRECTS-5624)

See merge request atlas/athena!35776

parents 0a9688ca bd5866cc

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetConditions/InDetByteStreamErrorsAthenaPool/src/IDCInDetBSErrContainerCnv_p1.cxx 7 additions, 4 deletions

...reamErrorsAthenaPool/src/IDCInDetBSErrContainerCnv_p1.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.cxx 3 additions, 3 deletions

..._ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.h 1 addition, 1 deletion

...CT_ConditionsAlgorithms/src/SCT_FlaggedConditionTestAlg.h
InnerDetector/InDetConditions/SCT_ConditionsData/SCT_ConditionsData/SCT_FlaggedCondEnum.h 36 additions, 0 deletions

...T_ConditionsData/SCT_ConditionsData/SCT_FlaggedCondEnum.h
InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_FlaggedConditionTool.h 6 additions, 5 deletions

...ionsTools/SCT_ConditionsTools/ISCT_FlaggedConditionTool.h
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx 22 additions, 15 deletions

...ions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.cxx
InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h 6 additions, 6 deletions

...itions/SCT_ConditionsTools/src/SCT_FlaggedConditionTool.h
InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx 1 addition, 1 deletion

...nv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx
InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py 2 additions, 2 deletions

...tEventCnv/SCT_RawDataByteStreamCnv/share/testSCTDecode.py
InnerDetector/InDetEventCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx 1 addition, 1 deletion

...ntCnv/SCT_RawDataByteStreamCnv/src/SCTRawDataProvider.cxx
InnerDetector/InDetExample/InDetRecExample/share/WriteInDetESD.py 1 addition, 1 deletion

...ector/InDetExample/InDetRecExample/share/WriteInDetESD.py
InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/SCT_Clusterization.h 3 additions, 2 deletions

...aFormation/InDetPrepRawDataFormation/SCT_Clusterization.h
InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx 4 additions, 1 deletion

...DetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.cxx
InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h 3 additions, 1 deletion

...InDetRecAlgs/InDetPrepRawDataFormation/src/CacheCreator.h
InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/SCT_Clusterization.cxx 34 additions, 6 deletions

...Algs/InDetPrepRawDataFormation/src/SCT_Clusterization.cxx
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h 2 additions, 2 deletions

...Format/InDetTrigPrepRawDataFormat/SCT_TrgClusterization.h
InnerDetector/InDetTrigRecAlgs/InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx 24 additions, 6 deletions

.../InDetTrigPrepRawDataFormat/src/SCT_TrgClusterization.cxx
InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx 2 additions, 2 deletions

...s/InDetTrigRawDataProvider/src/TrigPixRawDataProvider.cxx
InnerDetector/InDetTrigRecAlgs/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx 2 additions, 2 deletions

...s/InDetTrigRawDataProvider/src/TrigSCTRawDataProvider.cxx
Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py 2 additions, 0 deletions

Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py

with 162 additions and 61 deletions

Please register or to comment