Skip to content

[ALICE3] Further developments for TRK #15262

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

Draft
scannito wants to merge 3 commits into
base: dev
Choose a base branch
from
+252 −59
Draft

[ALICE3] Further developments for TRK #15262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8bd6abe
Update TRK
scannito Apr 2, 2026
53f41d4
For L6 the nominal radius corresponds to the outer one
scannito Apr 10, 2026
e8d17ce
Removed unused variable
scannito Apr 10, 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
30 changes: 24 additions & 6 deletions Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/TRKLayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@
#ifndef ALICEO2_TRK_LAYER_H
#define ALICEO2_TRK_LAYER_H

#include "TRKBase/Specs.h"
#include "TRKBase/TRKBaseParam.h"
#include <TGeoManager.h>

#include <Rtypes.h>

#include "TRKBase/TRKBaseParam.h"
#include "TRKBase/Specs.h"
#include <string>
#include <utility>

namespace o2
{
Expand Down Expand Up @@ -68,7 +71,7 @@ class TRKSegmentedLayer : public TRKCylindricalLayer
{
public:
TRKSegmentedLayer() = default;
TRKSegmentedLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
TRKSegmentedLayer(int layerNumber, std::string layerName, float rInn, float tiltAngle, int numberOfStaves, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
~TRKSegmentedLayer() override = default;

TGeoVolume* createSensor() override;
Expand All @@ -80,7 +83,10 @@ class TRKSegmentedLayer : public TRKCylindricalLayer
void createLayer(TGeoVolume* motherVolume) override = 0;

protected:
float mTiltAngle;
int mNumberOfModules;
int mNumberOfStaves;
bool mIsFlipped = false;

// Fixed parameters for the layer, to be set based on the specifications of the chip and module
static constexpr double sChipWidth = constants::moduleMLOT::chip::width;
Expand All @@ -93,21 +99,33 @@ class TRKSegmentedLayer : public TRKCylindricalLayer
// TGeo objects outside logical volumes can cause errors
static constexpr float sLogicalVolumeThickness = 1.3;

// For the segmented layers, because of tilting and staggering the bounding radii can be different
// from the inner radius and inner radius + thickness.
// This function calculates the bounding radii based on the geometry of the stave and the tilt angle,
// to ensure that the layer volume is large enough to contain all the staves without overlaps.
virtual std::pair<float, float> getBoundingRadii(double staveWidth) const;

ClassDefOverride(TRKSegmentedLayer, 0);
};

class TRKMLLayer : public TRKSegmentedLayer
{
public:
TRKMLLayer() = default;
TRKMLLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
TRKMLLayer(int layerNumber, std::string layerName, float rInn, float staggerOffset, float tiltAngle, int numberOfStaves, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
~TRKMLLayer() override = default;

TGeoVolume* createStave() override;
void createLayer(TGeoVolume* motherVolume) override;

private:
float mStaggerOffset;

static constexpr double sStaveWidth = constants::ML::width;
static constexpr int sFlippedLayerNumber = 3;

// Override to account for the staggering offset present in specific ML layers
std::pair<float, float> getBoundingRadii(double staveWidth) const override;

ClassDefOverride(TRKMLLayer, 0);
};
Expand All @@ -116,7 +134,7 @@ class TRKOTLayer : public TRKSegmentedLayer
{
public:
TRKOTLayer() = default;
TRKOTLayer(int layerNumber, std::string layerName, float rInn, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
TRKOTLayer(int layerNumber, std::string layerName, float rInn, float tiltAngle, int numberOfStaves, int numberOfModules, float thickOrX2X0, MatBudgetParamMode mode);
~TRKOTLayer() override = default;

TGeoVolume* createStave() override;
Expand All @@ -133,4 +151,4 @@ class TRKOTLayer : public TRKSegmentedLayer

} // namespace trk
} // namespace o2
#endif // ALICEO2_TRK_LAYER_H
#endif // ALICEO2_TRK_LAYER_H
90 changes: 74 additions & 16 deletions Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#include <FairVolume.h>

#include <TVirtualMC.h>
#include <TVirtualMCStack.h>
#include <TGeoVolume.h>
#include "TRKSimulation/Detector.h"

#include "DetectorsBase/Stack.h"
#include "TRKSimulation/Hit.h"
#include "TRKSimulation/Detector.h"

#include "TRKBase/TRKBaseParam.h"
#include "TRKSimulation/Hit.h"
#include "TRKSimulation/VDGeometryBuilder.h"
#include "TRKSimulation/VDSensorRegistry.h"
#include <TGeoVolume.h>
#include <TVirtualMC.h>
#include <TVirtualMCStack.h>

#include <FairVolume.h>

#include <string>
#include <type_traits>
Expand Down Expand Up @@ -105,14 +106,21 @@ void Detector::configMLOT()
break;
}
case kSegmented: {
const std::vector<float> tiltAngles{11.2f, 11.9f, 11.4f, 0.f, 0.f, 0.f, 0.f, 0.f};
// const std::vector<float> tiltAngles{10.f, 16.1f, 19.2f, 0.f, 0.f, 0.f, 0.f, 0.f};
const std::vector<int> nStaves{10, 14, 18, 26, 38, 32, 42, 56};
// const std::vector<int> nStaves{10, 16, 22, 26, 38, 32, 42, 56};
const std::vector<int> nMods{10, 10, 10, 10, 10, 20, 20, 20};

const std::vector<float> stagOffsets{0.f, 0.f, 0.f, 1.17f, 0.89f};

LOGP(warning, "Loading segmented configuration for ALICE3 TRK");
for (int i{0}; i < 8; ++i) {
std::string name = GeometryTGeo::getTRKLayerPattern() + std::to_string(i);
if (i < 4) {
mLayers.push_back(std::make_unique<TRKMLLayer>(i, name, rInn[i], nMods[i], thick, MatBudgetParamMode::Thickness));
if (i < 5) {
mLayers.push_back(std::make_unique<TRKMLLayer>(i, name, rInn[i], stagOffsets[i], tiltAngles[i], nStaves[i], nMods[i], thick, MatBudgetParamMode::Thickness));
} else {
mLayers.push_back(std::make_unique<TRKOTLayer>(i, name, rInn[i], nMods[i], thick, MatBudgetParamMode::Thickness));
mLayers.push_back(std::make_unique<TRKOTLayer>(i, name, rInn[i], tiltAngles[i], nStaves[i], nMods[i], thick, MatBudgetParamMode::Thickness));
}
}
break;
Expand Down Expand Up @@ -153,16 +161,66 @@ void Detector::configFromFile(std::string fileName)
}

std::string name = GeometryTGeo::getTRKLayerPattern() + std::to_string(layerCount);

switch (trkPars.layoutMLOT) {
case kCylindrical:
mLayers.push_back(std::make_unique<TRKCylindricalLayer>(layerCount, name, tmpBuff[0], tmpBuff[1], tmpBuff[2], MatBudgetParamMode::Thickness));
case kCylindrical: {
// Cylindrical requires at least 3 parameters
if (tmpBuff.size() < 3) {
LOGP(fatal, "Invalid configuration for cylindrical layer {}: insufficient parameters.", layerCount);
}

// Default mode is Thickness
MatBudgetParamMode mode = MatBudgetParamMode::Thickness;
if (tmpBuff.size() >= 4) {
mode = static_cast<MatBudgetParamMode>(static_cast<int>(tmpBuff[3]));
}

mLayers.push_back(std::make_unique<TRKCylindricalLayer>(layerCount, name, tmpBuff[0], tmpBuff[1], tmpBuff[2], mode));
break;
}
case kSegmented: {
int nMods = static_cast<int>(tmpBuff[1]);
if (layerCount < 4) {
mLayers.push_back(std::make_unique<TRKMLLayer>(layerCount, name, tmpBuff[0], nMods, tmpBuff[2], MatBudgetParamMode::Thickness));
// Expected column mapping in the text file (separated by \t):
// tmpBuff[0] = rInn
// tmpBuff[1] = thick
// tmpBuff[2] = tiltAngle
// tmpBuff[3] = nStaves
// tmpBuff[4] = nMods
// tmpBuff[5] = stagOffset (required ONLY for ML)
// tmpBuff[6] = matBudgetMode (optional, default = Thickness)

// Base parameters for all segmented layers (at least 5 needed)
if (tmpBuff.size() < 5) {
LOGP(fatal, "Invalid configuration for segmented layer {}: missing base parameters.", layerCount);
}

float rInn = tmpBuff[0];
float thick = tmpBuff[1];
float tiltAngle = tmpBuff[2];
int nStaves = static_cast<int>(tmpBuff[3]);
int nMods = static_cast<int>(tmpBuff[4]);

// Default mode is Thickness
MatBudgetParamMode mode = MatBudgetParamMode::Thickness;

if (layerCount < 5) {
// ML layers (0 to 4) require stagOffset (index 5)
if (tmpBuff.size() < 6) {
LOGP(fatal, "Invalid configuration for ML layer {}: stagOffset is missing.", layerCount);
}
float stagOffset = tmpBuff[5];

if (tmpBuff.size() >= 7) {
mode = static_cast<MatBudgetParamMode>(static_cast<int>(tmpBuff[6]));
}

mLayers.push_back(std::make_unique<TRKMLLayer>(layerCount, name, rInn, stagOffset, tiltAngle, nStaves, nMods, thick, mode));
} else {
mLayers.push_back(std::make_unique<TRKOTLayer>(layerCount, name, tmpBuff[0], nMods, tmpBuff[2], MatBudgetParamMode::Thickness));
// OT layers (5+) do NOT have stagOffset. The optional mode is at index 5.
if (tmpBuff.size() >= 6) {
mode = static_cast<MatBudgetParamMode>(static_cast<int>(tmpBuff[5]));
}

mLayers.push_back(std::make_unique<TRKOTLayer>(layerCount, name, rInn, tiltAngle, nStaves, nMods, thick, mode));
}
break;
}
Expand Down
Loading