Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Detectors/Upgrades/ALICE3/TRK/simulation/src/TRKLayer.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ TGeoVolume* TRKLayer::createSensor(std::string type)
TGeoShape* sensor;

if (type == "cylinder") {
sensor = new TGeoTube(mInnerRadius, mInnerRadius + mSensorThickness, mChipLength / 2); // TO BE CHECKED !!!
sensor = new TGeoTube(mInnerRadius, mInnerRadius + mSensorThickness, (constants::moduleMLOT::length * mNumberOfModules) / 2); // TO BE CHECKED !!!
} else if (type == "flat") {
sensor = new TGeoBBox((mChipWidth - mDeadzoneWidth) / 2, mSensorThickness / 2, mChipLength / 2); // TO BE CHECKED !!!
} else {
Expand All @@ -71,7 +71,7 @@ TGeoVolume* TRKLayer::createDeadzone(std::string type)
TGeoShape* deadzone;

if (type == "cylinder") {
deadzone = new TGeoTube(mInnerRadius, mInnerRadius + mSensorThickness, mChipLength / 2); // TO BE CHECKED !!!
deadzone = new TGeoTube(mInnerRadius, mInnerRadius + mSensorThickness, 0); // TO BE CHECKED !!!
} else if (type == "flat") {
deadzone = new TGeoBBox(mDeadzoneWidth / 2, mSensorThickness / 2, mChipLength / 2); // TO BE CHECKED !!!
} else {
Expand All @@ -92,7 +92,7 @@ TGeoVolume* TRKLayer::createMetalStack(std::string type)
TGeoShape* metalStack;

if (type == "cylinder") {
metalStack = new TGeoTube(mInnerRadius + mSensorThickness, mInnerRadius + mChipThickness, mChipLength / 2); // TO BE CHECKED !!!
metalStack = new TGeoTube(mInnerRadius + mSensorThickness, mInnerRadius + mChipThickness, (constants::moduleMLOT::length * mNumberOfModules) / 2); // TO BE CHECKED !!!
} else if (type == "flat") {
metalStack = new TGeoBBox(mChipWidth / 2, (mChipThickness - mSensorThickness) / 2, mChipLength / 2); // TO BE CHECKED !!!
} else {
Expand All @@ -118,7 +118,7 @@ TGeoVolume* TRKLayer::createChip(std::string type)
TGeoVolume* metalVol;

if (type == "cylinder") {
chip = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mChipLength / 2);
chip = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, (constants::moduleMLOT::length * mNumberOfModules) / 2);
chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);

sensVol = createSensor("cylinder");
Expand Down Expand Up @@ -175,7 +175,7 @@ TGeoVolume* TRKLayer::createModule(std::string type)
TGeoVolume* moduleVol;

if (type == "cylinder") {
module = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mChipLength / 2);
module = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, (constants::moduleMLOT::length * mNumberOfModules) / 2);
moduleVol = new TGeoVolume(moduleName.c_str(), module, medAir);

TGeoVolume* chipVol = createChip("cylinder");
Expand Down Expand Up @@ -269,7 +269,7 @@ TGeoVolume* TRKLayer::createStave(std::string type)
TGeoVolume* staveVol;

if (type == "cylinder") {
stave = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mChipLength / 2);
stave = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, (constants::moduleMLOT::length * mNumberOfModules) / 2);
staveVol = new TGeoVolume(staveName.c_str(), stave, medAir);

TGeoVolume* moduleVol = createModule("cylinder");
Expand Down Expand Up @@ -341,7 +341,7 @@ void TRKLayer::createLayer(TGeoVolume* motherVolume)
TGeoVolume* layerVol;

if (mLayout == eLayout::kCylinder) {
layer = new TGeoTube(mInnerRadius - 0.333 * layerThickness, mInnerRadius + 0.667 * layerThickness, mChipLength / 2);
layer = new TGeoTube(mInnerRadius - 0.333 * layerThickness, mInnerRadius + 0.667 * layerThickness, (constants::moduleMLOT::length * mNumberOfModules) / 2);
layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);

TGeoVolume* staveVol = createStave("cylinder");
Expand Down