Merge remote-tracking branch 'origin/master' into drich-two-mirrors

.gitlab-ci.yml

CMakeLists.txt

athena.xml

bin/generate_prim_file

calibrations/emcal_barrel_calibration.json

compact/central_tracker_hybrid_v2.xml

compact/definitions.xml

compact/subsystem_views/calorimeters.xml

compact/subsystem_views/dirc_only.xml

compact/subsystem_views/drich_only.xml

compact/subsystem_views/inner_detector.xml

compact/subsystem_views/ip6.xml

compact/subsystem_views/pfrich_only.xml

compact/subsystem_views/pid_only.xml

compact/subsystem_views/tof_only.xml

compact/subsystem_views/tracking_only.xml

compact/subsystem_views/vertex_only.xml

src/BarrelBarDetectorWithSideFrame_geo.cpp

src/BarrelTrackerWithFrame_geo.cpp

src/CompositeTracker_geo.cpp