Merge remote-tracking branch 'origin/master' into trackerefficiency

.gitlab-ci.yml

Calorimeter/CaloDigiAlgs/CMakeLists.txt

Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h

...eter/CaloDigiAlgs/src/components/CaloDigiAlgs_entries.cxx

.../FaserCaloSimEventAthenaPool/src/CaloHitCollectionCnv.cxx

...nv/FaserCaloSimEventAthenaPool/src/CaloHitCollectionCnv.h

...imeter/CaloEventCnv/FaserCaloSimEventTPCnv/CMakeLists.txt

...aserCaloSimEventTPCnv/CaloHits/CaloHitCollectionCnv_p1a.h

...v/FaserCaloSimEventTPCnv/CaloHits/CaloHitCollection_p1a.h

...EventTPCnv/FaserCaloSimEventTPCnv/CaloSimEventTPCnvDict.h

...serCaloSimEventTPCnv/FaserCaloSimEventTPCnv/selection.xml

...aloSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1.cxx

...loSimEventTPCnv/src/CaloHits/CaloHitCollectionCnv_p1a.cxx

Calorimeter/CaloG4/EcalG4_SD/python/EcalG4_SDToolConfig.py

Calorimeter/FaserCaloSimEvent/CMakeLists.txt

Calorimeter/FaserCaloSimEvent/FaserCaloSimEvent/CaloHit.h

...ter/FaserCaloSimEvent/FaserCaloSimEvent/CaloHitIdHelper.h

Calorimeter/FaserCaloSimEvent/src/CaloHit.cxx