Skip to content

FT3: build v3b version of the geometry by default #11590

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
mconcas merged 4 commits into from
Jul 10, 2023
Merged

FT3: build v3b version of the geometry by default #11590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01e8d79
Modifications of beampipe
Mar 17, 2023
acd5f6a
Changes outer radius, correct version
plariono Jun 30, 2023
6ed6abf
Please consider the following formatting changes
alibuild Jun 30, 2023
afcb677
Merge pull request #1 from alibuild/alibot-cleanup-11590
plariono Jul 4, 2023
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
1 change: 1 addition & 0 deletions Detectors/Upgrades/ALICE3/FT3/simulation/include/FT3Simulation/Detector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ class Detector : public o2::base::DetImpl<Detector>

void buildBasicFT3(const FT3BaseParam& param);
void buildFT3V1();
void buildFT3V3b();
void buildFT3FromFile(std::string);

GeometryTGeo* mGeometryTGeo; //! access to geometry details
Expand Down
51 changes: 50 additions & 1 deletion Detectors/Upgrades/ALICE3/FT3/simulation/src/Detector.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,55 @@ void Detector::buildFT3V1()
}
}

//_________________________________________________________________________________________________
void Detector::buildFT3V3b()
{
// Build FT3 detector according to
// https://www.overleaf.com/project/6051acc870e39aaeb4653621

LOG(info) << "Building FT3 Detector: V3b";

mNumberOfLayers = 12;
Float_t sensorThickness = 30.e-4;
Float_t layersx2X0 = 1.e-2;
std::vector<std::array<Float_t, 5>> layersConfig{
{26., .5, 3., 0.1f * layersx2X0}, // {z_layer, r_in, r_out, Layerx2X0}
{30., .5, 3., 0.1f * layersx2X0},
{34., .5, 3., 0.1f * layersx2X0},
{77., 5.0, 35., layersx2X0},
{100., 5.0, 35., layersx2X0},
{122., 5.0, 35., layersx2X0},
{150., 5.5, 80.f, layersx2X0},
{180., 6.6, 80.f, layersx2X0},
{220., 8.1, 80.f, layersx2X0},
{279., 10.2, 80.f, layersx2X0},
{340., 12.5, 80.f, layersx2X0},
{400., 14.7, 80.f, layersx2X0}};

mLayerName.resize(2);
mLayerName[0].resize(mNumberOfLayers);
mLayerName[1].resize(mNumberOfLayers);
mLayerID.clear();
mLayers.resize(2);

for (auto direction : {0, 1}) {
for (int layerNumber = 0; layerNumber < mNumberOfLayers; layerNumber++) {
std::string directionName = std::to_string(direction);
std::string layerName = GeometryTGeo::getFT3LayerPattern() + directionName + std::string("_") + std::to_string(layerNumber);
mLayerName[direction][layerNumber] = layerName;
auto& z = layersConfig[layerNumber][0];

auto& rIn = layersConfig[layerNumber][1];
auto& rOut = layersConfig[layerNumber][2];
auto& x0 = layersConfig[layerNumber][3];

LOG(info) << "Adding Layer " << layerName << " at z = " << z;
// Add layers
auto& thisLayer = mLayers[direction].emplace_back(direction, layerNumber, layerName, z, rIn, rOut, x0);
}
}
}

//_________________________________________________________________________________________________
Detector::Detector(Bool_t active)
: o2::base::DetImpl<Detector>("FT3", active),
Expand All @@ -238,7 +287,7 @@ Detector::Detector(Bool_t active)
} else {
switch (ft3BaseParam.geoModel) {
case Default:
buildFT3V1(); // FT3V1
buildFT3V3b(); // FT3V3b
break;
case Telescope:
buildBasicFT3(ft3BaseParam); // BasicFT3 = Parametrized telescopic detector (equidistant layers)
Expand Down