Merge branch 'atlasrects-4565.v2' into 'master' (a7ec5a15) · Commits · Peter Sherwood / athena

Commit a7ec5a15 authored 5 years ago by Vakhtang Tsulaia

Merge branch 'atlasrects-4565.v2' into 'master'

Conditions migration for pixel charge calibration (ATLASRECTS-4565)

See merge request atlas/athena!21024

parents 65155b98 73f721dc

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt 1 addition, 0 deletions

InnerDetector/InDetCalibAlgs/PixelCalibAlgs/CMakeLists.txt
InnerDetector/InDetCalibAlgs/PixelCalibAlgs/PixelCalibAlgs/PixelChargeToTConversion.h 11 additions, 4 deletions

.../PixelCalibAlgs/PixelCalibAlgs/PixelChargeToTConversion.h
InnerDetector/InDetCalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx 12 additions, 22 deletions

...CalibAlgs/PixelCalibAlgs/src/PixelChargeToTConversion.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt 2 additions, 1 deletion

.../InDetConditions/PixelConditionsAlgorithms/CMakeLists.txt
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.cxx 207 additions, 0 deletions

...PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h 48 additions, 0 deletions

...s/PixelConditionsAlgorithms/src/PixelChargeCalibCondAlg.h
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx 190 additions, 53 deletions

...ions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h 52 additions, 11 deletions

...itions/PixelConditionsAlgorithms/src/PixelConfigCondAlg.h
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelSiliconConditionsTestAlg.cxx 19 additions, 17 deletions

...onditionsAlgorithms/src/PixelSiliconConditionsTestAlg.cxx
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/PixelSiliconConditionsTestAlg.h 16 additions, 7 deletions

...lConditionsAlgorithms/src/PixelSiliconConditionsTestAlg.h
InnerDetector/InDetConditions/PixelConditionsAlgorithms/src/components/PixelConditionsAlgorithms_entries.cxx 2 additions, 0 deletions

...thms/src/components/PixelConditionsAlgorithms_entries.cxx
InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelChargeCalibCondData.h 104 additions, 0 deletions

...itionsData/PixelConditionsData/PixelChargeCalibCondData.h
InnerDetector/InDetConditions/PixelConditionsData/PixelConditionsData/PixelModuleData.h 143 additions, 33 deletions

...PixelConditionsData/PixelConditionsData/PixelModuleData.h
InnerDetector/InDetConditions/PixelConditionsData/src/PixelChargeCalibCondData.cxx 366 additions, 0 deletions

...ions/PixelConditionsData/src/PixelChargeCalibCondData.cxx
InnerDetector/InDetConditions/PixelConditionsData/src/PixelModuleData.cxx 188 additions, 38 deletions

...DetConditions/PixelConditionsData/src/PixelModuleData.cxx
InnerDetector/InDetConditions/PixelConditionsServices/PixelConditionsServices/IPixelCalibSvc.h 0 additions, 47 deletions

...nditionsServices/PixelConditionsServices/IPixelCalibSvc.h
InnerDetector/InDetConditions/PixelConditionsServices/share/PixelCalibSvc_jobOptions.py 0 additions, 39 deletions

...PixelConditionsServices/share/PixelCalibSvc_jobOptions.py
InnerDetector/InDetConditions/PixelConditionsServices/src/PixelCalibSvc.cxx 0 additions, 233 deletions

...tConditions/PixelConditionsServices/src/PixelCalibSvc.cxx
InnerDetector/InDetConditions/PixelConditionsServices/src/PixelCalibSvc.h 0 additions, 69 deletions

...DetConditions/PixelConditionsServices/src/PixelCalibSvc.h
InnerDetector/InDetConditions/PixelConditionsServices/src/components/PixelConditionsServices_entries.cxx 0 additions, 2 deletions

...rvices/src/components/PixelConditionsServices_entries.cxx

with 1361 additions and 576 deletions

Please register or to comment