Skip to content

Please consider the following formatting changes to #13910 #2

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
danielbattistini merged 1 commit into from
Jan 29, 2025
Merged

Please consider the following formatting changes to #13910 #2

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
4 changes: 2 additions & 2 deletions Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/TRKBaseParam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ enum eLayout {
struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {
std::string configFile = "";
float serviceTubeX0 = 0.02f; // X0 Al2O3
eLayout layoutML = kCylinder; // Type of segmentation for the middle layers
eLayout layoutOL = kCylinder; // Type of segmentation for the outer layers
eLayout layoutML = kCylinder; // Type of segmentation for the middle layers
eLayout layoutOL = kCylinder; // Type of segmentation for the outer layers

O2ParamDef(TRKBaseParam, "TRKBase");
};
Expand Down
6 changes: 3 additions & 3 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 @@ -39,9 +39,9 @@ class TRKLayer
auto getNumber() const { return mLayerNumber; }
auto getName() const { return mLayerName; }

TGeoVolume* createSensor(std::string type, double width=-1);
TGeoVolume* createChip(std::string type, double width=-1);
TGeoVolume* createStave(std::string type, double width=-1);
TGeoVolume* createSensor(std::string type, double width = -1);
TGeoVolume* createChip(std::string type, double width = -1);
TGeoVolume* createStave(std::string type, double width = -1);
void createLayer(TGeoVolume* motherVolume);

private:
Expand Down
22 changes: 13 additions & 9 deletions Detectors/Upgrades/ALICE3/TRK/simulation/src/TRKLayer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ TGeoVolume* TRKLayer::createSensor(std::string type, double width)
if (type == "cylinder") {
sensor = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mZ / 2);
} else if (type == "flat") {
if (width < 0) LOGP(fatal, "Attempting to create sensor with invalid width");
if (width < 0)
LOGP(fatal, "Attempting to create sensor with invalid width");
sensor = new TGeoBBox(width / 2, mChipThickness / 2, mZ / 2);
} else {
LOGP(fatal, "Sensor of type '{}' is not implemented", type);
Expand All @@ -75,7 +76,8 @@ TGeoVolume* TRKLayer::createChip(std::string type, double width)
chip = new TGeoTube(mInnerRadius, mInnerRadius + mChipThickness, mZ / 2);
sensVol = createSensor("cylinder");
} else if (type == "flat") {
if (width < 0) LOGP(fatal, "Attempting to create chip with invalid width");
if (width < 0)
LOGP(fatal, "Attempting to create chip with invalid width");
chip = new TGeoBBox(width / 2, mChipThickness / 2, mZ / 2);
sensVol = createSensor("flat", width);
} else {
Expand All @@ -94,7 +96,7 @@ TGeoVolume* TRKLayer::createStave(std::string type, double width)
{
TGeoMedium* medAir = gGeoManager->GetMedium("TRK_AIR$");
std::string staveName = o2::trk::GeometryTGeo::getTRKStavePattern() + std::to_string(mLayerNumber);

TGeoShape* stave;
TGeoVolume* staveVol;
TGeoVolume* chipVol;
Expand All @@ -106,7 +108,8 @@ TGeoVolume* TRKLayer::createStave(std::string type, double width)
LOGP(info, "Inserting {} in {} ", chipVol->GetName(), staveVol->GetName());
staveVol->AddNode(chipVol, 1, nullptr);
} else if (type == "flat") {
if (width < 0) LOGP(fatal, "Attempting to create stave with invalid width");
if (width < 0)
LOGP(fatal, "Attempting to create stave with invalid width");
stave = new TGeoBBox(width / 2, mChipThickness / 2, mZ / 2);
chipVol = createChip("flat", width);
staveVol = new TGeoVolume(staveName.c_str(), stave, medAir);
Expand All @@ -115,17 +118,17 @@ TGeoVolume* TRKLayer::createStave(std::string type, double width)
} else if (type == "staggered") {
double width = mModuleWidth * 2; // Each stave has two modules (based on the LOI design)
stave = new TGeoBBox(width / 2, mChipThickness / 2, mZ / 2);
TGeoVolume *chipVolLeft = createChip("flat", mModuleWidth);
TGeoVolume *chipVolRight = createChip("flat", mModuleWidth);
TGeoVolume* chipVolLeft = createChip("flat", mModuleWidth);
TGeoVolume* chipVolRight = createChip("flat", mModuleWidth);
staveVol = new TGeoVolume(staveName.c_str(), stave, medAir);

TGeoCombiTrans* transLeft = new TGeoCombiTrans();
transLeft->SetTranslation(-mModuleWidth/2 + 0.05, 0, 0); // 1mm overlap between the modules
transLeft->SetTranslation(-mModuleWidth / 2 + 0.05, 0, 0); // 1mm overlap between the modules
LOGP(info, "Inserting {} in {} ", chipVolLeft->GetName(), staveVol->GetName());
staveVol->AddNode(chipVolLeft, 0, transLeft);

TGeoCombiTrans* transRight = new TGeoCombiTrans();
transRight->SetTranslation(mModuleWidth/2 - 0.05, 0.2, 0);
transRight->SetTranslation(mModuleWidth / 2 - 0.05, 0.2, 0);
LOGP(info, "Inserting {} in {} ", chipVolRight->GetName(), staveVol->GetName());
staveVol->AddNode(chipVolRight, 1, transRight);
} else {
Expand Down Expand Up @@ -158,7 +161,8 @@ void TRKLayer::createLayer(TGeoVolume* motherVolume)
} else if (mLayout == eLayout::kTurboStaves) {
// Compute the number of staves
double width = mModuleWidth; // Each stave has two modules (based on the LOI design)
if (mInnerRadius > 25) width *= 2; // Outer layers have two modules per stave
if (mInnerRadius > 25)
width *= 2; // Outer layers have two modules per stave

int nStaves = (int)std::ceil(mInnerRadius * 2 * TMath::Pi() / width);
nStaves += nStaves % 2; // Require an even number of staves
Expand Down