Skip to content

Commit c47d446

Browse files
committed
A3: Update FT3, add scoping version
1 parent 9634a2e commit c47d446

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ namespace ft3
2626

2727
enum FT3Geometry {
2828
Default = 0,
29-
Telescope = 1
29+
Telescope = 1,
30+
ScopingV3b = 2
3031
};
3132

3233
struct FT3BaseParam : public o2::conf::ConfigurableParamHelper<FT3BaseParam> {

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -353,22 +353,16 @@ void Detector::buildFT3Scoping()
353353

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

356-
mNumberOfLayers = 12;
356+
mNumberOfLayers = 6;
357357
float sensorThickness = 30.e-4;
358358
float layersx2X0 = 1.e-2;
359359
std::vector<std::array<float, 5>> layersConfig{
360-
{26., .5, 2.5, 0.1f * layersx2X0}, // {z_layer, r_in, r_out, Layerx2X0}
361-
{30., .5, 2.5, 0.1f * layersx2X0},
362-
{34., .5, 2.5, 0.1f * layersx2X0},
363360
{77., 5.0, 35., layersx2X0},
364361
{100., 5.0, 35., layersx2X0},
365362
{122., 5.0, 35., layersx2X0},
366363
{150., 5.0, 68.f, layersx2X0},
367364
{180., 5.0, 68.f, layersx2X0},
368-
{220., 5.0, 68.f, layersx2X0},
369-
{260., 5.0, 68.f, layersx2X0},
370-
{300., 5.0, 68.f, layersx2X0},
371-
{350., 5.0, 68.f, layersx2X0}};
365+
{220., 5.0, 68.f, layersx2X0}};
372366

373367
mLayerName.resize(2);
374368
mLayerName[0].resize(mNumberOfLayers);
@@ -407,15 +401,19 @@ Detector::Detector(bool active)
407401
if (ft3BaseParam.configFile != "") {
408402
LOG(info) << "FT3 Geometry configuration file provided. Overriding FT3Base.geoModel configuration.";
409403
buildFT3FromFile(ft3BaseParam.configFile);
410-
404+
411405
} else {
406+
LOG(info) << "FT3 Geometry configuration file not provided. Using FT3Base.geoModel " << ft3BaseParam.geoModel << " configuration.";
412407
switch (ft3BaseParam.geoModel) {
413408
case Default:
414409
buildFT3NewVacuumVessel(); // FT3 after Upgrade days March 2024
415410
break;
416411
case Telescope:
417412
buildBasicFT3(ft3BaseParam); // BasicFT3 = Parametrized telescopic detector (equidistant layers)
418413
break;
414+
case ScopingV3b:
415+
buildFT3Scoping(); // FT3 according to scoping document
416+
break;
419417
default:
420418
LOG(fatal) << "Invalid Geometry.\n";
421419
break;

0 commit comments

Comments
 (0)