Overlaps

• cleaned up the SI tracker
• renamed some detector constructors to avoid confusion
• removed solid in subdetector assembly to avoid overlaps

src/SiTrackerBarrel2_geo.cpp

@@ -130,7 +130,7 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
     xml_comp_t z_layout = x_layer.child(_U(z_layout));  // Get the <z_layout> element.
     int lay_id = x_layer.id();
     string m_nam = x_layer.moduleStr();
-    string lay_nam = _toString(x_layer.id(), "layer%d");
+    string lay_nam = _toString(x_layer.id(), "barrel_layer%d");
     Tube lay_tub(x_barrel.inner_r(), x_barrel.outer_r(), x_barrel.z_length() / 2);
     Volume lay_vol(lay_nam, lay_tub, air);  // Create the layer envelope volume.
     lay_vol.setVisAttributes(description.visAttributes(x_layer.visStr()));
@@ -147,7 +147,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();
@@ -226,4 +226,4 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
 }
 
 // clang-format off
-DECLARE_DETELEMENT(topside_SiliconTrackerBarrel, create_detector)
+DECLARE_DETELEMENT(topside_SiTrackerBarrel2, create_detector)