Skip to content

[ALICE3] update TOF geometry #15096

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 1 commit into from
Feb 24, 2026
+257 −101
Merged

[ALICE3] update TOF geometry #15096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Detectors/Upgrades/ALICE3/IOTOF/base/include/IOTOFBase/GeometryTGeo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,15 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache

// Inner TOF
static const char* getITOFLayerPattern() { return sITOFLayerName.c_str(); }
static const char* getITOFStavePattern() { return sITOFStaveName.c_str(); }
static const char* getITOFModulePattern() { return sITOFModuleName.c_str(); }
static const char* getITOFChipPattern() { return sITOFChipName.c_str(); }
static const char* getITOFSensorPattern() { return sITOFSensorName.c_str(); }

// Outer TOF
static const char* getOTOFLayerPattern() { return sOTOFLayerName.c_str(); }
static const char* getOTOFStavePattern() { return sOTOFStaveName.c_str(); }
static const char* getOTOFModulePattern() { return sOTOFModuleName.c_str(); }
static const char* getOTOFChipPattern() { return sOTOFChipName.c_str(); }
static const char* getOTOFSensorPattern() { return sOTOFSensorName.c_str(); }

Expand Down Expand Up @@ -81,11 +85,15 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache

// Inner TOF
static std::string sITOFLayerName;
static std::string sITOFStaveName;
static std::string sITOFModuleName;
static std::string sITOFChipName;
static std::string sITOFSensorName;

// Outer TOF
static std::string sOTOFLayerName;
static std::string sOTOFStaveName;
static std::string sOTOFModuleName;
static std::string sOTOFChipName;
static std::string sOTOFSensorName;

Expand Down
4 changes: 4 additions & 0 deletions Detectors/Upgrades/ALICE3/IOTOF/base/src/GeometryTGeo.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ std::string GeometryTGeo::sIOTOFVolumeName = "IOTOFV";

// Inner TOF
std::string GeometryTGeo::sITOFLayerName = "ITOFLayer";
std::string GeometryTGeo::sITOFStaveName = "ITOFStave";
std::string GeometryTGeo::sITOFModuleName = "ITOFModule";
std::string GeometryTGeo::sITOFChipName = "ITOFChip";
std::string GeometryTGeo::sITOFSensorName = "ITOFSensor";

// Outer TOF
std::string GeometryTGeo::sOTOFLayerName = "OTOFLayer";
std::string GeometryTGeo::sOTOFStaveName = "OTOFStave";
std::string GeometryTGeo::sOTOFModuleName = "OTOFModule";
std::string GeometryTGeo::sOTOFChipName = "OTOFChip";
std::string GeometryTGeo::sOTOFSensorName = "OTOFSensor";

Expand Down
12 changes: 6 additions & 6 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/include/IOTOFSimulation/Layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Layer
public:
Layer() = default;
Layer(std::string layerName, float rInn, float rOut, float zLength, float zOffset, float layerX2X0,
int layout = kBarrel, int nSegments = 0, float segmentSize = 0.0, int nSensorsPerSegment = 0, double tiltAngle = 0.0);
int layout = kBarrel, int nStaves = 0, float staveSize = 0.0, double staveTiltAngle = 0.0, int modulesPerStave = 0);
~Layer() = default;

auto getInnerRadius() const { return mInnerRadius; }
Expand All @@ -37,7 +37,7 @@ class Layer
auto getChipThickness() const { return mChipThickness; }
auto getName() const { return mLayerName; }
auto getLayout() const { return mLayout; }
auto getSegments() const { return mSegments; }
auto getSegments() const { return mStaves; }
static constexpr int kBarrel = 0;
static constexpr int kDisk = 1;
static constexpr int kBarrelSegmented = 2;
Expand All @@ -54,10 +54,10 @@ class Layer
float mX2X0;
float mChipThickness;
int mLayout{kBarrel}; // Identifier of the type of layer layout (barrel, disk, barrel segmented, disk segmented)
// To be used only in case of the segmented layout, to define the number of segments in phi (for barrel) or in r (for disk)
std::pair<int, float> mSegments{0, 0.0f}; // Number and size of segments in phi (for barrel) or in r (for disk) in case of segmented layout
int mSensorsPerSegment{0}; // Number of sensors along a segment
double mTiltAngle{0.0}; // Tilt angle in degrees to be applied as a rotation around the local center of the segment
// To be used only in case of the segmented layout, to define the number of staves in phi (for barrel) or in r (for disk)
std::pair<int, float> mStaves{0, 0.0f}; // Number and size of staves in phi (for barrel) or in r (for disk) in case of segmented layout
int mModulesPerStave{0}; // Number of modules along a stave
double mTiltAngle{0.0}; // Tilt angle in degrees to be applied as a rotation around the local center of the stave
};

class ITOFLayer : public Layer
Expand Down
4 changes: 2 additions & 2 deletions Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ void Detector::configLayers(bool itof, bool otof, bool ftof, bool btof, std::str
if (itof) { // iTOF
mITOFLayer = itofSegmented ? ITOFLayer(std::string{GeometryTGeo::getITOFLayerPattern()},
radiusInnerTof, 0.f, lengthInnerTof, 0.f, 0.02f, ITOFLayer::kBarrelSegmented,
24, 5.42, 80, 10)
24, 5.42, 10.0, 10)
: ITOFLayer(std::string{GeometryTGeo::getITOFLayerPattern()},
radiusInnerTof, 0.f, lengthInnerTof, 0.f, 0.02f, ITOFLayer::kBarrel);
}
if (otof) { // oTOF
mOTOFLayer = otofSegmented ? OTOFLayer(std::string{GeometryTGeo::getOTOFLayerPattern()},
radiusOuterTof, 0.f, lengthOuterTof, 0.f, 0.02f, OTOFLayer::kBarrelSegmented,
62, 9.74, 432, 5)
62, 9.74, 5.0, 54)
: OTOFLayer(std::string{GeometryTGeo::getOTOFLayerPattern()},
radiusOuterTof, 0.f, lengthOuterTof, 0.f, 0.02f, OTOFLayer::kBarrel);
}
Expand Down
Loading