Merge branch 'master' into drich-optics

.gitlab-ci.yml

CMakeLists.txt

compact/central_tracker.xml

compact/display.xml

compact/fake_dirc.xml

compact/gem_tracker_endcap.xml

compact/mrich.xml

compact/tof_barrel.xml

compact/tof_endcap.xml

compact/vertex_tracker.xml

src/BarrelBarDetectorWithSideFrame_geo.cpp

src/BarrelTrackerWithFrame_geo.cpp

src/MRich_geo.cpp

src/SimpleDiskDetector_geo.cpp

src/SimpleRectangularTracker_geo.cpp

src/TrapEndcapTracker_geo.cpp