Merge branch 'muonCondMigration_csc' into 'master' (54c6ad82) · Commits · Peter Sherwood / athena

Commit 54c6ad82 authored 5 years ago by Vakhtang Tsulaia

Merge branch 'muonCondMigration_csc' into 'master'

Complete MT-safe CSC condition data retrieval

See merge request atlas/athena!26583

parents 4d3d5ecd 5def73b4

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/CMakeLists.txt 2 additions, 1 deletion

...ectrometer/MuonCalib/CscCalib/CscCalibAlgs/CMakeLists.txt
MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcPed.cxx 10 additions, 9 deletions

...ometer/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcPed.cxx
MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcPed.h 5 additions, 4 deletions

...trometer/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcPed.h
MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcSlope.cxx 12 additions, 13 deletions

...eter/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcSlope.cxx
MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcSlope.h 4 additions, 2 deletions

...ometer/MuonCalib/CscCalib/CscCalibAlgs/src/CscCalcSlope.h
MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.cxx 45 additions, 40 deletions

...ter/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.cxx
MuonSpectrometer/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.h 5 additions, 4 deletions

...meter/MuonCalib/CscCalib/CscCalibTools/src/CscCalibTool.h
MuonSpectrometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py 2 additions, 3 deletions

...trometer/MuonCnv/MuonCnvExample/python/MuonCalibConfig.py
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/MuonCondAlg/CscCondDbAlg.h 56 additions, 26 deletions

...ns/MuonCondGeneral/MuonCondAlg/MuonCondAlg/CscCondDbAlg.h
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/python/AllCondDbAlgConfig.py 3 additions, 4 deletions

.../MuonCondGeneral/MuonCondAlg/python/AllCondDbAlgConfig.py
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/python/CscCondDbAlgConfig.py 4 additions, 5 deletions

.../MuonCondGeneral/MuonCondAlg/python/CscCondDbAlgConfig.py
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/python/MuonTopCondAlgConfigRUN2.py 25 additions, 5 deletions

...ondGeneral/MuonCondAlg/python/MuonTopCondAlgConfigRUN2.py
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/CscCondDbAlg.cxx 423 additions, 102 deletions

...nditions/MuonCondGeneral/MuonCondAlg/src/CscCondDbAlg.cxx
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h 84 additions, 8 deletions

...MuonCondGeneral/MuonCondData/MuonCondData/CscCondDbData.h
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondData/src/CscCondDbData.cxx 454 additions, 2 deletions

...itions/MuonCondGeneral/MuonCondData/src/CscCondDbData.cxx
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/MuonCondTest/CSCConditionsTestAlgMT.h 46 additions, 0 deletions

...eneral/MuonCondTest/MuonCondTest/CSCConditionsTestAlgMT.h
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/share/CSCCondSummary_topOptionsMT.py 154 additions, 0 deletions

...General/MuonCondTest/share/CSCCondSummary_topOptionsMT.py
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/CSCConditionsTestAlgMT.cxx 73 additions, 0 deletions

...onCondGeneral/MuonCondTest/src/CSCConditionsTestAlgMT.cxx
MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx 5 additions, 4 deletions

...MuonCondGeneral/MuonCondTest/src/MuonCondTest_entries.cxx
MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py 4 additions, 4 deletions

MuonSpectrometer/MuonConfig/python/CSC_DigitizationConfig.py

with 1416 additions and 236 deletions

Please register or to comment