Skip to content

[ALICE 3] Fix VD full cyl building for ACTS #15116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
njacazio merged 3 commits into from
Mar 4, 2026
+63 −16
Merged

[ALICE 3] Fix VD full cyl building for ACTS #15116

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b074426
Fix full cyl building for ACTS
plariono Mar 3, 2026
2bb7bc9
Please consider the following formatting changes
alibuild Mar 3, 2026
866d002
Merge pull request #4 from alibuild/alibot-cleanup-15116
plariono Mar 3, 2026
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
79 changes: 63 additions & 16 deletions Detectors/Upgrades/ALICE3/TRK/simulation/src/VDLayer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ namespace o2
{
namespace trk
{

// Helper function for floating point comparison
inline bool isFullCircle(double phiSpanDeg, double epsilon = 0.005)
{
return (std::fabs(phiSpanDeg - 360.0) < epsilon);
}

// Base layer constructor
VDLayer::VDLayer(int layerNumber, const std::string& layerName, double layerX2X0)
: mLayerNumber(layerNumber), mLayerName(layerName), mX2X0(layerX2X0), mModuleWidth(4.54)
Expand Down Expand Up @@ -88,8 +95,13 @@ TGeoVolume* VDCylindricalLayer::createSensor() const
const double rIn = mRadius;
const double rOut = mRadius + mSensorThickness;
const double halfZ = 0.5 * mLengthSensZ;
const double halfPhi = 0.5 * mPhiSpanDeg; // degrees
auto* shape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
TGeoShape* shape;
if (isFullCircle(mPhiSpanDeg)) {
shape = new TGeoTube(rIn, rOut, halfZ);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg; // degrees
shape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
}
auto* vol = new TGeoVolume(sensName.c_str(), shape, medSi);
vol->SetLineColor(kYellow);
vol->SetTransparency(30);
Expand Down Expand Up @@ -138,10 +150,15 @@ TGeoVolume* VDDiskLayer::createSensor() const
}
std::string sensName = Form("%s_%s%d", this->mLayerName.c_str(), GeometryTGeo::getTRKSensorPattern(), this->mLayerNumber);
const double halfThickness = 0.5 * mSensorThickness; // active sensor thickness along Z
const double halfPhi = 0.5 * mPhiSpanDeg; // degrees

// Same geometry as the layer (identical radii + phi span + thickness)
auto* shape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
TGeoShape* shape;
if (isFullCircle(mPhiSpanDeg)) {
shape = new TGeoTube(mRMin, mRMax, halfThickness);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg; // degrees
shape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
}

auto* sensVol = new TGeoVolume(sensName.c_str(), shape, medSi);
sensVol->SetLineColor(kYellow);
Expand Down Expand Up @@ -177,9 +194,14 @@ TGeoVolume* VDCylindricalLayer::createMetalStack() const
const double rIn = mRadius + mSensorThickness;
const double rOut = mRadius + mChipThickness;
const double halfZ = 0.5 * mLengthSensZ;
const double halfPhi = 0.5 * mPhiSpanDeg;

auto* shape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
TGeoShape* shape;
if (isFullCircle(mPhiSpanDeg)) {
shape = new TGeoTube(rIn, rOut, halfZ);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg;
shape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
}
auto* vol = new TGeoVolume(name.c_str(), shape, medSi);
vol->SetLineColor(kGray);
vol->SetTransparency(30);
Expand Down Expand Up @@ -244,9 +266,14 @@ TGeoVolume* VDDiskLayer::createMetalStack() const
GeometryTGeo::getTRKMetalStackPattern(), mLayerNumber);

const double halfThickness = 0.5 * metalT;
const double halfPhi = 0.5 * mPhiSpanDeg;

auto* shape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
TGeoShape* shape;
if (isFullCircle(mPhiSpanDeg)) {
shape = new TGeoTube(mRMin, mRMax, halfThickness);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg;
shape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
}
auto* vol = new TGeoVolume(name.c_str(), shape, medSi);
vol->SetLineColor(kGray);
vol->SetTransparency(30);
Expand Down Expand Up @@ -275,9 +302,14 @@ TGeoVolume* VDCylindricalLayer::createChip() const
const double rIn = mRadius;
const double rOut = mRadius + mChipThickness;
const double halfZ = 0.5 * mLengthSensZ;
const double halfPhi = 0.5 * mPhiSpanDeg;

auto* chipShape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
TGeoShape* chipShape;
if (isFullCircle(mPhiSpanDeg)) {
chipShape = new TGeoTube(rIn, rOut, halfZ);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg;
chipShape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
}
auto* chipVol = new TGeoVolume(chipName.c_str(), chipShape, medSi);

// sensor
Expand Down Expand Up @@ -361,9 +393,14 @@ TGeoVolume* VDDiskLayer::createChip() const
GeometryTGeo::getTRKChipPattern(), mLayerNumber);

const double halfThickness = 0.5 * mChipThickness;
const double halfPhi = 0.5 * mPhiSpanDeg;

auto* chipShape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
TGeoShape* chipShape;
if (isFullCircle(mPhiSpanDeg)) {
chipShape = new TGeoTube(mRMin, mRMax, halfThickness);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg;
chipShape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
}
auto* chipVol = new TGeoVolume(chipName.c_str(), chipShape, medSi);
chipVol->SetLineColor(kYellow);
chipVol->SetTransparency(30);
Expand Down Expand Up @@ -417,9 +454,14 @@ void VDCylindricalLayer::createLayer(TGeoVolume* motherVolume, TGeoMatrix* combi
const double rIn = mRadius;
const double rOut = mRadius + mChipThickness;
const double halfZ = 0.5 * mLengthZ;
const double halfPhi = 0.5 * mPhiSpanDeg; // degrees

auto* layerShape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
TGeoShape* layerShape;
if (isFullCircle(mPhiSpanDeg)) {
layerShape = new TGeoTube(rIn, rOut, halfZ);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg; // degrees
layerShape = new TGeoTubeSeg(rIn, rOut, halfZ, -halfPhi, +halfPhi);
}
auto* layerVol = new TGeoVolume(mLayerName.c_str(), layerShape, medAir);
layerVol->SetLineColor(kYellow);
layerVol->SetTransparency(30);
Expand Down Expand Up @@ -523,10 +565,15 @@ void VDDiskLayer::createLayer(TGeoVolume* motherVolume, TGeoMatrix* combiTrans)

// For disks the thickness is along Z and equals mChipThickness
const double halfThickness = 0.5 * mChipThickness;
const double halfPhi = 0.5 * mPhiSpanDeg;

// AIR container (layer)
auto* layerShape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
TGeoShape* layerShape;
if (isFullCircle(mPhiSpanDeg)) {
layerShape = new TGeoTube(mRMin, mRMax, halfThickness);
} else {
const double halfPhi = 0.5 * mPhiSpanDeg;
layerShape = new TGeoTubeSeg(mRMin, mRMax, halfThickness, -halfPhi, +halfPhi);
}
auto* layerVol = new TGeoVolume(mLayerName.c_str(), layerShape, medAir);
layerVol->SetLineColor(kYellow);
layerVol->SetTransparency(30);
Expand Down