Skip to content
Snippets Groups Projects
Commit 817e2d40 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Modified dd4hep surface definitions.

parent 52241d83
No related branches found
No related tags found
1 merge request!224Modified dd4hep surface definitions.
...@@ -195,9 +195,9 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi ...@@ -195,9 +195,9 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi
module_thicknesses[m_nam] = {thickness_so_far + x_comp.thickness()/2.0, total_thickness-thickness_so_far - x_comp.thickness()/2.0}; module_thicknesses[m_nam] = {thickness_so_far + x_comp.thickness()/2.0, total_thickness-thickness_so_far - x_comp.thickness()/2.0};
// -------- create a measurement plane for the tracking surface attched to the sensitive volume ----- // -------- create a measurement plane for the tracking surface attched to the sensitive volume -----
Vector3D u(0., 1., 0.); Vector3D u(-1., 0., 0.);
Vector3D v(0., 0., 1.); Vector3D v(0., -1., 0.);
Vector3D n(1., 0., 0.); Vector3D n(0., 0., 1.);
// Vector3D o( 0. , 0. , 0. ) ; // Vector3D o( 0. , 0. , 0. ) ;
// compute the inner and outer thicknesses that need to be assigned to the tracking surface // compute the inner and outer thicknesses that need to be assigned to the tracking surface
......
...@@ -182,9 +182,9 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s ...@@ -182,9 +182,9 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
sensitives[m_nam].push_back(pv); sensitives[m_nam].push_back(pv);
++n_sensor; ++n_sensor;
// -------- create a measurement plane for the tracking surface attched to the sensitive volume ----- // -------- create a measurement plane for the tracking surface attched to the sensitive volume -----
Vector3D u(1., 0., 0.); Vector3D u(0., 0., -1.);
Vector3D v(0., 1., 0.); Vector3D v(-1., 0., 0.);
Vector3D n(0., 0., 1.); Vector3D n(0., 1., 0.);
// Vector3D o( 0. , 0. , 0. ) ; // Vector3D o( 0. , 0. , 0. ) ;
// compute the inner and outer thicknesses that need to be assigned to the tracking surface // compute the inner and outer thicknesses that need to be assigned to the tracking surface
...@@ -245,18 +245,17 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s ...@@ -245,18 +245,17 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
} }
DetElement layer_element(sdet, layer_name, l_id); DetElement layer_element(sdet, layer_name, l_id);
layer_element.setPlacement(layer_pv); layer_element.setPlacement(layer_pv);
// ACTS extension
{ Acts::ActsExtension* layerExtension = new Acts::ActsExtension();
Acts::ActsExtension* layerExtension = new Acts::ActsExtension(); layerExtension->addType("sensitive disk", "layer");
// layer is simple tube so no need to set envelope //layerExtension->addType("axes", "definitions", "XZY");
layerExtension->addType("layer", "layer"); //layerExtension->addType("sensitive disk", "layer");
// Add the proto layer material //layerExtension->addType("axes", "definitions", "XZY");
for (xml_coll_t lmat(x_layer, _Unicode(layer_material)); lmat; ++lmat) { for (xml_coll_t lmat(x_layer, _Unicode(layer_material)); lmat; ++lmat) {
xml_comp_t x_layer_material = lmat; xml_comp_t x_layer_material = lmat;
xmlToProtoSurfaceMaterial(x_layer_material, *layerExtension, "layer_material"); xmlToProtoSurfaceMaterial(x_layer_material, *layerExtension, "layer_material");
}
layer_element.addExtension<Acts::ActsExtension>(layerExtension);
} }
layer_element.addExtension<Acts::ActsExtension>(layerExtension);
for (xml_coll_t ri(x_layer, _U(ring)); ri; ++ri) { for (xml_coll_t ri(x_layer, _U(ring)); ri; ++ri) {
xml_comp_t x_ring = ri; xml_comp_t x_ring = ri;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment