Merge remote-tracking branch 'upstream/master'

.gitlab-ci.yml

CMakeLists.txt

...oDetDescr/CaloIdDictFiles/data/IdDictCalorimeter_TB00.xml

...ReadoutGeometry/CaloReadoutGeometry/CaloDetectorElement.h

...imeter/CaloDetDescr/EcalGeoModel/src/EcalDetectorTool.cxx

Calorimeter/FaserCaloSimEvent/src/CaloHitIdHelper.cxx

Control/CalypsoConfiguration/python/AllConfigFlags.py

Control/CalypsoConfiguration/python/DetectorConfigFlags.py

Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.h

Control/CalypsoExample/GeoModelTest/CMakeLists.txt

.../CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py

Control/CalypsoExample/GeoModelTest/src/GeoModelTestAlg.cxx

Control/CalypsoExample/RDOReadExample/src/RDOReadAlg.h

Control/CalypsoExample/SimHitExample/CaloREADME.md

Control/CalypsoExample/SimHitExample/src/CaloSimHitAlg.cxx

Control/CalypsoExample/SimHitExample/src/CaloSimHitAlg.h

Control/CalypsoExample/SimHitExample/src/SimHitAlg.h

...ataAccessExample/python/TrackerDataAccessExampleConfig.py

...rol/CalypsoExample/WaveformAnalysisExample/CMakeLists.txt

...psoExample/WaveformAnalysisExample/src/WaveformHitAlg.cxx