Merge branch 'master-SCT-alignment-alg' into 'master' (fbb6f699) · Commits · Peter Sherwood / athena

Commit fbb6f699 authored 6 years ago by Adam Edward Barton

Merge branch 'master-SCT-alignment-alg' into 'master'

Implement condition algs for SCT alignment (ATLASRECTS-4231, ATLASRECTS-4046, ATLASRECTS-4049)

See merge request atlas/athena!12215

Former-commit-id: bae70526

parents d258147c 9bf0b892

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Database/AthenaPOOL/AthenaPoolUtilities/AthenaPoolUtilities/CondAttrListCollection.h 1 addition, 1 deletion

...oolUtilities/AthenaPoolUtilities/CondAttrListCollection.h
DetectorDescription/DetDescrCond/DetDescrConditions/DetDescrConditions/AlignableTransformContainer.h 2 additions, 0 deletions

...nditions/DetDescrConditions/AlignableTransformContainer.h
InnerDetector/InDetConditions/InDetCondFolders/python/InDetAlignFolders.py 21 additions, 4 deletions

...etConditions/InDetCondFolders/python/InDetAlignFolders.py
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt 3 additions, 1 deletion

...r/InDetConditions/SCT_ConditionsAlgorithms/CMakeLists.txt
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx 164 additions, 0 deletions

...ditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.h 44 additions, 0 deletions

...onditions/SCT_ConditionsAlgorithms/src/SCT_AlignCondAlg.h
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx 144 additions, 0 deletions

...T_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.cxx
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.h 41 additions, 0 deletions

...SCT_ConditionsAlgorithms/src/SCT_DetectorElementCondAlg.h
InnerDetector/InDetConditions/SCT_ConditionsAlgorithms/src/components/SCT_ConditionsAlgorithms_entries.cxx 4 additions, 0 deletions

...ithms/src/components/SCT_ConditionsAlgorithms_entries.cxx
InnerDetector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt 3 additions, 2 deletions

...etector/InDetDetDescr/InDetReadoutGeometry/CMakeLists.txt
InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/InDetDetectorManager.h 29 additions, 12 deletions

...adoutGeometry/InDetReadoutGeometry/InDetDetectorManager.h
InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/PixelDetectorManager.h 21 additions, 5 deletions

...adoutGeometry/InDetReadoutGeometry/PixelDetectorManager.h
InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SCT_DetectorManager.h 19 additions, 4 deletions

...eadoutGeometry/InDetReadoutGeometry/SCT_DetectorManager.h
InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiDetectorElement.h 13 additions, 3 deletions

...tReadoutGeometry/InDetReadoutGeometry/SiDetectorElement.h
InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiDetectorElementCollection.h 5 additions, 0 deletions

...ometry/InDetReadoutGeometry/SiDetectorElementCollection.h
InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/SiDetectorManager.h 14 additions, 6 deletions

...tReadoutGeometry/InDetReadoutGeometry/SiDetectorManager.h
InnerDetector/InDetDetDescr/InDetReadoutGeometry/InDetReadoutGeometry/TRT_DetectorManager.h 12 additions, 6 deletions

...eadoutGeometry/InDetReadoutGeometry/TRT_DetectorManager.h
InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx 162 additions, 72 deletions

...etDescr/InDetReadoutGeometry/src/InDetDetectorManager.cxx
InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/PixelDetectorManager.cxx 28 additions, 8 deletions

...etDescr/InDetReadoutGeometry/src/PixelDetectorManager.cxx
InnerDetector/InDetDetDescr/InDetReadoutGeometry/src/SCT_DetectorManager.cxx 123 additions, 101 deletions

...DetDescr/InDetReadoutGeometry/src/SCT_DetectorManager.cxx

with 853 additions and 225 deletions

Please register or to comment