Skip to content

Commit 3ddeb15

Browse files
altsybeeIgor Altsybeev
andauthored
[ALICE3] TRK: update of TRK and FT3 services, to better match with Corrado's scheme (#15392)
* update of TRK and FT3 services, to better match with Corrado's scheme * adjust spacing --------- Co-authored-by: Igor Altsybeev <Igor.Altsybeev@cern.ch>
1 parent a204d41 commit 3ddeb15

3 files changed

Lines changed: 102 additions & 58 deletions

File tree

Detectors/Upgrades/ALICE3/FT3/base/include/FT3Base/FT3BaseParam.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct FT3BaseParam : public o2::conf::ConfigurableParamHelper<FT3BaseParam> {
4242

4343
// override values from FT3ModuleConstants, inner and outer
4444
bool cutStavesOnNominalRadius_inner = true;
45-
bool cutStavesOnNominalRadius_outer = false;
45+
bool cutStavesOnNominalRadius_outer = true;
4646

4747
// What to place over x=0 line in case of full outer-outer stave: Gap or Sensor
4848
bool placeSensorInMiddleOfStave = false;

Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
428428
// need to shift outwards always, so + forwards and - backwards
429429
auto* FwdDiskCombiTrans = new TGeoCombiTrans(0, 0, mZ + 0, FwdDiskRotation);
430430

431-
LOG(info) << "Inserting " << layerVol->GetName() << " inside " << motherVolume->GetName();
431+
LOG(info) << "Inserting " << layerVol->GetName() << " (Rmin=" << mInnerRadius << ", Rmax=" << mOuterRadius << ", z=" << mZ << "cm) inside " << motherVolume->GetName();
432432
motherVolume->AddNode(layerVol, 1, FwdDiskCombiTrans);
433433
} else if (ft3Params.layoutFT3 == kSegmentedStave ||
434434
ft3Params.layoutFT3 == kSegmentedStaveOTOnly) {
@@ -459,7 +459,7 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
459459

460460
// shift stave volumes into layer volume, since nominal z_{stave face} = 0
461461
double z_local_offset = z_layer_thickness / 2.0;
462-
TGeoTube* layer = new TGeoTube(mInnerRadius - 12, mOuterRadius + 5, z_layer_thickness / 2);
462+
TGeoTube* layer = new TGeoTube(mInnerRadius - 0.2, mOuterRadius + 0.4, z_layer_thickness / 2); // margins to ensure staves are fully encapsulated in the layer volume
463463
layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
464464

465465
if (ft3Params.drawReferenceCircles) {
@@ -476,7 +476,8 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
476476
double z_offset_directional = mDirection ? z_local_offset : -z_local_offset;
477477
auto* FwdDiskCombiTrans = new TGeoCombiTrans(0, 0, mZ + z_offset_directional, FwdDiskRotation);
478478

479-
LOG(info) << "Inserting " << layerVol->GetName() << " inside " << motherVolume->GetName();
479+
LOG(info) << "Inserting " << layerVol->GetName() << " (Rmin=" << mInnerRadius << ", Rmax=" << mOuterRadius << ", z=" << mZ << "cm, segmented disk with staves) inside " << motherVolume->GetName();
480+
480481
motherVolume->AddNode(layerVol, 1, FwdDiskCombiTrans);
481482
} else {
482483
LOG(fatal) << "Unknown FT3 layout option: " << static_cast<int>(ft3Params.layoutFT3);

0 commit comments

Comments
 (0)