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

modified: BarrelTrackerWithFrame_geo.cpp

	modified:   TrapEndcapTracker_geo.cpp
parent fa762f36
No related branches found
No related tags found
1 merge request!202Added dd4hep tracking surfaces for TrapEndcapTracker
This commit is part of merge request !202. Comments created here will be created in the context of that merge request.
...@@ -42,16 +42,15 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi ...@@ -42,16 +42,15 @@ static Ref_t create_BarrelTrackerWithFrame(Detector& description, xml_h e, Sensi
int det_id = x_det.id(); int det_id = x_det.id();
string det_name = x_det.nameStr(); string det_name = x_det.nameStr();
DetElement sdet(det_name, det_id); DetElement sdet(det_name, det_id);
//Assembly assembly(det_name);
map<string, Volume> volumes;
map<string, Placements> sensitives;
map<string, std::vector<VolPlane>> volplane_surfaces;
//map<string, xml_h> xmleles;
PlacedVolume pv;
dd4hep::xml::Dimension dimensions(x_det.dimensions());
map<string, Volume> volumes;
map<string, Placements> sensitives;
map<string, std::vector<VolPlane>> volplane_surfaces;
map<string, std::array<double, 2>> module_thicknesses; map<string, std::array<double, 2>> module_thicknesses;
PlacedVolume pv;
dd4hep::xml::Dimension dimensions(x_det.dimensions());
Acts::ActsExtension* detWorldExt = new Acts::ActsExtension(); Acts::ActsExtension* detWorldExt = new Acts::ActsExtension();
detWorldExt->addType("barrel", "detector"); detWorldExt->addType("barrel", "detector");
sdet.addExtension<Acts::ActsExtension>(detWorldExt); sdet.addExtension<Acts::ActsExtension>(detWorldExt);
......
...@@ -38,7 +38,6 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s ...@@ -38,7 +38,6 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
bool reflect = x_det.reflect(false); bool reflect = x_det.reflect(false);
DetElement sdet(det_name, det_id); DetElement sdet(det_name, det_id);
Assembly assembly(det_name); Assembly assembly(det_name);
map<string, std::array<double, 2>> module_thicknesses;
Material air = description.material("Air"); Material air = description.material("Air");
// Volume assembly (det_name,Box(10000,10000,10000),vacuum); // Volume assembly (det_name,Box(10000,10000,10000),vacuum);
...@@ -46,6 +45,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s ...@@ -46,6 +45,8 @@ static Ref_t create_detector(Detector& description, xml_h e, SensitiveDetector s
int m_id = 0, c_id = 0, n_sensor = 0; int m_id = 0, c_id = 0, n_sensor = 0;
map<string, Volume> modules; map<string, Volume> modules;
map<string, Placements> sensitives; map<string, Placements> sensitives;
map<string, std::vector<VolPlane>> volplane_surfaces;
map<string, std::array<double, 2>> module_thicknesses;
PlacedVolume pv; PlacedVolume pv;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment