Skip to content
Snippets Groups Projects
Commit 68706def authored by Marshall Scott's avatar Marshall Scott
Browse files

SiDISCS changed overlap error

parent 5d6fee2a
No related branches found
No related tags found
1 merge request!39Draft: Resolve "Implement cb_SiDISCS"
...@@ -16,6 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens ...@@ -16,6 +16,7 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
double ROut = dims.rmax(); double ROut = dims.rmax();
double SizeZ = dims.z_length(); double SizeZ = dims.z_length();
double PosZ = dims.z(); double PosZ = dims.z();
double lay_thickness = dims.dz();
double lay_RIn = dims.rmin1(); double lay_RIn = dims.rmin1();
double lay_ROut = dims.rmax1(); double lay_ROut = dims.rmax1();
double lay_phi0 = dims.phi0(); double lay_phi0 = dims.phi0();
...@@ -24,18 +25,18 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens ...@@ -24,18 +25,18 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
Material Vacuum = desc.material("Vacuum"); Material Vacuum = desc.material("Vacuum");
//Outer volume //Outer volume
Tube ci_SiDISCS_Solid(RIn, ROut, SizeZ / 2., 0., 360 * dd4hep::deg); Tube cb_SiDISCS_Solid(RIn, ROut, SizeZ / 2., 0., 360 * dd4hep::deg);
Volume envelopeVol("cb_SiDISCS_Logic", ci_SiDISCS_Solid, Vacuum); Volume envelopeVol("cb_SiDISCS_Logic", cb_SiDISCS_Solid, Vacuum);
envelopeVol.setVisAttributes(detElem.visStr()); envelopeVol.setVisAttributes(detElem.visStr());
//Ar10CO2 tube for the layers //Ar10CO2 tube for the layers
Tube ci_SiDISCS_detSolid(lay_RIn, lay_ROut, PosZ / 2., lay_phi0 * dd4hep::deg, lay_phi1 * dd4hep::deg); Tube cb_SiDISCS_detSolid(lay_RIn, lay_ROut, lay_thickness / 2., lay_phi0 * dd4hep::deg, lay_phi1 * dd4hep::deg);
//Adding layers to placed detector volume //Adding layers to placed detector volume
for (xml_coll_t li(detElem,_U(layer)); li; ++li){ for (xml_coll_t li(detElem,_U(layer)); li; ++li){
xml_comp_t x_layer = li; xml_comp_t x_layer = li;
std::string layer_name = detName + _toString(x_layer.id(), "_layer%d"); std::string layer_name = detName + _toString(x_layer.id(), "_layer%d");
Volume layer_vol(layer_name, ci_SiDISCS_detSolid, mat); Volume layer_vol(layer_name, cb_SiDISCS_detSolid, mat);
layer_vol.setVisAttributes(x_layer.visStr()); layer_vol.setVisAttributes(x_layer.visStr());
sens.setType("tracker"); sens.setType("tracker");
layer_vol.setSensitiveDetector(sens); layer_vol.setSensitiveDetector(sens);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment