Merge branch 'tracker_cleanup' into 'master'

Barrel Tracker construction rename

See merge request !4

compact/far_forward_detectors.xml

@@ -15,7 +15,7 @@
   </display>
 
 
-  <include ref="compact/ffi_ZDC.xml" />
+  <include ref="ffi_ZDC.xml" />
   <detectors>
   </detectors>
 

src/SiVertexBarrel_geo.cpp → src/BarrelTrackerWithFrame_geo.cpp

@@ -142,7 +142,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
     Volume module_env = volumes[m_nam];
     DetElement lay_elt(sdet, _toString(x_layer.id(), "layer%d"), lay_id);
     Placements& sensVols = sensitives[m_nam];
-    
+
     // the local coordinate systems of modules in dd4hep and acts differ
     // see http://acts.web.cern.ch/ACTS/latest/doc/group__DD4hepPlugins.html
     Acts::ActsExtension* layerExtension = new Acts::ActsExtension();
@@ -220,4 +220,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 
 //@}
 // clang-format off
+DECLARE_DETELEMENT(BarrelTrackerWithFrame, create_detector)
+DECLARE_DETELEMENT(athena_SiVertexTracker, create_detector)
+DECLARE_DETELEMENT(athena_SiBarrelTracker, create_detector)
 DECLARE_DETELEMENT(refdet_SiVertexBarrel, create_detector)

src/CylinderTrackerBarrel_geo.cpp

@@ -11,6 +11,10 @@ using namespace std;
 using namespace dd4hep;
 using namespace dd4hep::detail;
 
+/** A barrel tracker with a module that is curved (not flat).
+ *
+ *
+ */
 static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector sens)
 {
   typedef vector<PlacedVolume> Placements;