Skip to content
Snippets Groups Projects

uncomment rich in xml

Merged Chao Peng requested to merge cpeng/topside:rich_geo_conflict into master
Files
3
+ 3
2
@@ -155,11 +155,12 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
@@ -155,11 +155,12 @@ static Ref_t createDetector(Detector& desc, xml::Handle_t handle, SensitiveDetec
if (mRmax > rmax) { rmax = mRmax; }
if (mRmax > rmax) { rmax = mRmax; }
}
}
rmin = std::max(0., rmin - 0.1*cm);
rmin = std::max(0., rmin - 0.1*cm);
 
rmax = 2.*halfLength/mirZ*rmax;
Cone env1(halfLength, rmin, tRmax1 + 0.1*cm , rmin, rmax + 0.1*cm);
Cone env1(halfLength, rmin, tRmax1 + 0.1*cm , rmin, rmax + 0.1*cm);
// disk for detection plane
// disk for detection plane
Tube env2(std::max(0., pRmin - 0.1*cm), pRmax + 0.1*cm, pThick + 0.1*cm, 0., 2.*M_PI);
Tube env2(std::max(0., pRmin - 0.1*cm), pRmax + pTol + pGap + 0.1*cm, pThick + 0.1*cm, 0., 2.*M_PI);
UnionSolid envShape(env1, env2, Position(0., 0., pZ + pThick/2.));
UnionSolid envShape(env1, env2, Position(0., 0., -halfLength + pZ + pThick/2.));
Volume envVol(detName + "_envelope", envShape, desc.material("AirOptical"));
Volume envVol(detName + "_envelope", envShape, desc.material("AirOptical"));
// envVol.setVisAttributes(desc.visAttributes(detElem.visStr()));
// envVol.setVisAttributes(desc.visAttributes(detElem.visStr()));
Loading