@@ -50,7 +50,7 @@ TGeoVolume* TRKLayer::createSensor(std::string type)
5050 TGeoShape* sensor;
5151
5252 if (type == " cylinder" ) {
53- sensor = new TGeoTube (mInnerRadius , mInnerRadius + mSensorThickness , mChipLength / 2 ); // TO BE CHECKED !!!
53+ sensor = new TGeoTube (mInnerRadius , mInnerRadius + mSensorThickness , (constants::moduleMLOT::length * mNumberOfModules ) / 2 ); // TO BE CHECKED !!!
5454 } else if (type == " flat" ) {
5555 sensor = new TGeoBBox ((mChipWidth - mDeadzoneWidth ) / 2 , mSensorThickness / 2 , mChipLength / 2 ); // TO BE CHECKED !!!
5656 } else {
@@ -71,7 +71,7 @@ TGeoVolume* TRKLayer::createDeadzone(std::string type)
7171 TGeoShape* deadzone;
7272
7373 if (type == " cylinder" ) {
74- deadzone = new TGeoTube (mInnerRadius , mInnerRadius + mSensorThickness , mChipLength / 2 ); // TO BE CHECKED !!!
74+ deadzone = new TGeoTube (mInnerRadius , mInnerRadius + mSensorThickness , 0 ); // TO BE CHECKED !!!
7575 } else if (type == " flat" ) {
7676 deadzone = new TGeoBBox (mDeadzoneWidth / 2 , mSensorThickness / 2 , mChipLength / 2 ); // TO BE CHECKED !!!
7777 } else {
@@ -92,7 +92,7 @@ TGeoVolume* TRKLayer::createMetalStack(std::string type)
9292 TGeoShape* metalStack;
9393
9494 if (type == " cylinder" ) {
95- metalStack = new TGeoTube (mInnerRadius + mSensorThickness , mInnerRadius + mChipThickness , mChipLength / 2 ); // TO BE CHECKED !!!
95+ metalStack = new TGeoTube (mInnerRadius + mSensorThickness , mInnerRadius + mChipThickness , (constants::moduleMLOT::length * mNumberOfModules ) / 2 ); // TO BE CHECKED !!!
9696 } else if (type == " flat" ) {
9797 metalStack = new TGeoBBox (mChipWidth / 2 , (mChipThickness - mSensorThickness ) / 2 , mChipLength / 2 ); // TO BE CHECKED !!!
9898 } else {
@@ -118,7 +118,7 @@ TGeoVolume* TRKLayer::createChip(std::string type)
118118 TGeoVolume* metalVol;
119119
120120 if (type == " cylinder" ) {
121- chip = new TGeoTube (mInnerRadius , mInnerRadius + mChipThickness , mChipLength / 2 );
121+ chip = new TGeoTube (mInnerRadius , mInnerRadius + mChipThickness , (constants::moduleMLOT::length * mNumberOfModules ) / 2 );
122122 chipVol = new TGeoVolume (chipName.c_str (), chip, medSi);
123123
124124 sensVol = createSensor (" cylinder" );
@@ -175,7 +175,7 @@ TGeoVolume* TRKLayer::createModule(std::string type)
175175 TGeoVolume* moduleVol;
176176
177177 if (type == " cylinder" ) {
178- module = new TGeoTube (mInnerRadius , mInnerRadius + mChipThickness , mChipLength / 2 );
178+ module = new TGeoTube (mInnerRadius , mInnerRadius + mChipThickness , (constants::moduleMLOT::length * mNumberOfModules ) / 2 );
179179 moduleVol = new TGeoVolume (moduleName.c_str (), module , medAir);
180180
181181 TGeoVolume* chipVol = createChip (" cylinder" );
@@ -269,7 +269,7 @@ TGeoVolume* TRKLayer::createStave(std::string type)
269269 TGeoVolume* staveVol;
270270
271271 if (type == " cylinder" ) {
272- stave = new TGeoTube (mInnerRadius , mInnerRadius + mChipThickness , mChipLength / 2 );
272+ stave = new TGeoTube (mInnerRadius , mInnerRadius + mChipThickness , (constants::moduleMLOT::length * mNumberOfModules ) / 2 );
273273 staveVol = new TGeoVolume (staveName.c_str (), stave, medAir);
274274
275275 TGeoVolume* moduleVol = createModule (" cylinder" );
@@ -341,7 +341,7 @@ void TRKLayer::createLayer(TGeoVolume* motherVolume)
341341 TGeoVolume* layerVol;
342342
343343 if (mLayout == eLayout::kCylinder ) {
344- layer = new TGeoTube (mInnerRadius - 0.333 * layerThickness, mInnerRadius + 0.667 * layerThickness, mChipLength / 2 );
344+ layer = new TGeoTube (mInnerRadius - 0.333 * layerThickness, mInnerRadius + 0.667 * layerThickness, (constants::moduleMLOT::length * mNumberOfModules ) / 2 );
345345 layerVol = new TGeoVolume (mLayerName .c_str (), layer, medAir);
346346
347347 TGeoVolume* staveVol = createStave (" cylinder" );
0 commit comments