Merge branch 'atlasrects-4720' into 'master' (0c762e30) · Commits · Peter Sherwood / athena

Commit 0c762e30 authored 5 years ago by Adam Edward Barton

Merge branch 'atlasrects-4720' into 'master'

Conditions migration: PixelCabling, ReadoutSpeed, HitDiscCnfg (ATLASRECTS-4720)

See merge request atlas/athena!24436

parents 78fd22e3 5f12c4ce

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/NoiseMapBuilder.h 0 additions, 2 deletions

...CalibAlgs/PixelCalibAlgs/PixelCalibAlgs/NoiseMapBuilder.h
InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.cxx 1 addition, 11 deletions

...tor/InDetCalibAlgs/PixelCalibAlgs/src/NoiseMapBuilder.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx 314 additions, 0 deletions

...ons/PixelConditionsAlgorithms/src/PixelCablingCondAlg.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h 55 additions, 0 deletions

...tions/PixelConditionsAlgorithms/src/PixelCablingCondAlg.h
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.cxx 135 additions, 0 deletions

...ons/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h 40 additions, 0 deletions

...tions/PixelConditionsAlgorithms/src/PixelHitDiscCnfgAlg.h
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.cxx 98 additions, 0 deletions

...ns/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h 39 additions, 0 deletions

...ions/PixelConditionsAlgorithms/src/PixelReadoutSpeedAlg.h
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx 0 additions, 653 deletions

.../PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h 0 additions, 81 deletions

...ns/PixelConditionsAlgorithms/src/SpecialPixelMapCondAlg.h
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/components/PixelConditionsAlgorithms_entries.cxx 6 additions, 2 deletions

...thms/src/components/PixelConditionsAlgorithms_entries.cxx
InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelCablingCondData.h 87 additions, 0 deletions

...ConditionsData/PixelConditionsData/PixelCablingCondData.h
InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelHitDiscCnfgData.h 33 additions, 0 deletions

...ConditionsData/PixelConditionsData/PixelHitDiscCnfgData.h
InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelReadoutSpeedData.h 37 additions, 0 deletions

...onditionsData/PixelConditionsData/PixelReadoutSpeedData.h
InnerDetector/InDetConditions/PixelConditionsData/src/PixelCablingCondData.cxx 242 additions, 0 deletions

...nditions/PixelConditionsData/src/PixelCablingCondData.cxx
InnerDetector/InDetConditions/PixelConditionsData/src/PixelHitDiscCnfgData.cxx 17 additions, 0 deletions

...nditions/PixelConditionsData/src/PixelHitDiscCnfgData.cxx
InnerDetector/InDetConditions/PixelConditionsData/src/PixelReadoutSpeedData.cxx 17 additions, 0 deletions

...ditions/PixelConditionsData/src/PixelReadoutSpeedData.cxx
InnerDetector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt 2 additions, 2 deletions

...Detector/InDetDetDescr/InDetRegionSelector/CMakeLists.txt
InnerDetector/InDetDetDescr/InDetRegionSelector/InDetRegionSelector/SiRegionSelectorTable.h 6 additions, 3 deletions

...egionSelector/InDetRegionSelector/SiRegionSelectorTable.h
InnerDetector/InDetDetDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx 9 additions, 11 deletions

...etDescr/InDetRegionSelector/src/SiRegionSelectorTable.cxx

with 1138 additions and 765 deletions

Please register or to comment