From c3664176ac39dd39b4dec81436e267fda0a2bc4e Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Fri, 19 Mar 2021 15:42:09 -0500
Subject: [PATCH] modified: src/cb_EMCAL.cpp
---
src/cb_EMCAL.cpp | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/cb_EMCAL.cpp b/src/cb_EMCAL.cpp
index c54e4b1..d0e0818 100644
--- a/src/cb_EMCAL.cpp
+++ b/src/cb_EMCAL.cpp
@@ -9,19 +9,28 @@ static Ref_t createDetector(Detector& desc, xml_h handle, SensitiveDetector sens
xml::Component dims = detElem.dimensions();
double rInner = dims.inner_radius();
- double rMin = dims.rmin();
+ //double rMin = dims.rmin();
double thickness = dims.thickness();
+ double rOuter = thickness + rInner;
double innerZ = dims.inner_z();
double angle = dims.angle();
Material mat = desc.material(detElem.materialStr());
- Tube outerTubeShape(rMin, rInner + thickness, innerZ + thickness);
- Tube innerTubeShape(0, rInner, innerZ);
- SubtractionSolid unchamferedShape(outerTubeShape, innerTubeShape);
- Cone chamferShape(thickness, 0, rMin, 0, rMin + 2 * tan(angle) * thickness);
- SubtractionSolid detShape(unchamferedShape, chamferShape, Position(0, 0, innerZ + thickness));
- Volume detVol(detName, detShape, mat);
+ std::vector<double> coneROut = {cfg.ROut, cfg.ROut, cfg.ROut, cfg.ROut};
+ std::vector<double> coneRIn = {cfg.ROut - 1. * cm, cfg.RIn, cfg.RIn, cfg.ROut - 1. * cm};
+ std::vector<double> coneZ = {-cfgsolenoid.SizeZ / 2, -cfgsolenoid.SizeZ / 2 + 30 * cm, cfgsolenoid.SizeZ / 2 - 30 * cm, cfgsolenoid.SizeZ / 2};
+
+ Polycone cone_solid("cb_EMCAL_GVol_Solid", 0. * deg, 360. * deg, 4, coneZ, rInner, coneROut);
+ //Logic = new G4LogicalVolume(Solid, worldMaterial, "cb_EMCAL_GVol_Logic");
+ //Phys = new G4PVPlacement(0, G4ThreeVector(), "cb_EMCAL_GVol_Phys", Logic, motherVolume, false, 0);
+ //
+ //Tube outerTubeShape(rMin, rInner + thickness, innerZ + thickness);
+ //Tube innerTubeShape(0, rInner, innerZ);
+ //SubtractionSolid unchamferedShape(outerTubeShape, innerTubeShape);
+ //Cone chamferShape(thickness, 0, rMin, 0, rMin + 2 * tan(angle) * thickness);
+ //SubtractionSolid detShape(unchamferedShape, chamferShape, Position(0, 0, innerZ + thickness));
+ //Volume detVol(detName, detShape, mat);
detVol.setVisAttributes(desc.visAttributes(detElem.visStr()));
--
GitLab