Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ namespace ft3

enum FT3Geometry {
Default = 0,
Telescope = 1
Telescope = 1,
ScopingV3b = 2
};

struct FT3BaseParam : public o2::conf::ConfigurableParamHelper<FT3BaseParam> {
Expand Down
14 changes: 6 additions & 8 deletions Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -353,22 +353,16 @@ void Detector::buildFT3Scoping()

LOG(info) << "Building FT3 Detector: Scoping document version";

mNumberOfLayers = 12;
mNumberOfLayers = 6;
float sensorThickness = 30.e-4;
float layersx2X0 = 1.e-2;
std::vector<std::array<float, 5>> layersConfig{
{26., .5, 2.5, 0.1f * layersx2X0}, // {z_layer, r_in, r_out, Layerx2X0}
{30., .5, 2.5, 0.1f * layersx2X0},
{34., .5, 2.5, 0.1f * layersx2X0},
{77., 5.0, 35., layersx2X0},
{100., 5.0, 35., layersx2X0},
{122., 5.0, 35., layersx2X0},
{150., 5.0, 68.f, layersx2X0},
{180., 5.0, 68.f, layersx2X0},
{220., 5.0, 68.f, layersx2X0},
{260., 5.0, 68.f, layersx2X0},
{300., 5.0, 68.f, layersx2X0},
{350., 5.0, 68.f, layersx2X0}};
{220., 5.0, 68.f, layersx2X0}};

mLayerName.resize(2);
mLayerName[0].resize(mNumberOfLayers);
Expand Down Expand Up @@ -409,13 +403,17 @@ Detector::Detector(bool active)
buildFT3FromFile(ft3BaseParam.configFile);

} else {
LOG(info) << "FT3 Geometry configuration file not provided. Using FT3Base.geoModel " << ft3BaseParam.geoModel << " configuration.";
switch (ft3BaseParam.geoModel) {
case Default:
buildFT3NewVacuumVessel(); // FT3 after Upgrade days March 2024
break;
case Telescope:
buildBasicFT3(ft3BaseParam); // BasicFT3 = Parametrized telescopic detector (equidistant layers)
break;
case ScopingV3b:
buildFT3Scoping(); // FT3 according to scoping document
break;
default:
LOG(fatal) << "Invalid Geometry.\n";
break;
Expand Down