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 @@ -43,6 +43,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
return sInstance.get();
};
static const char* getTRKVolPattern() { return sVolumeName.c_str(); }
static const char* getTRKServiceVolPattern() { return sServiceVolName.c_str(); }
static const char* getTRKLayerPattern() { return sLayerName.c_str(); }
static const char* getTRKPetalAssemblyPattern() { return sPetalAssemblyName.c_str(); }
static const char* getTRKPetalPattern() { return sPetalName.c_str(); }
Expand Down Expand Up @@ -198,6 +199,7 @@ class GeometryTGeo : public o2::detectors::DetMatrixCache
static constexpr int MAXLAYERS = 20; ///< max number of active layers

static std::string sVolumeName;
static std::string sServiceVolName;
static std::string sLayerName;
static std::string sPetalAssemblyName;
static std::string sPetalName;
Expand Down
1 change: 1 addition & 0 deletions Detectors/Upgrades/ALICE3/TRK/base/src/GeometryTGeo.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ std::unique_ptr<o2::trk::GeometryTGeo> GeometryTGeo::sInstance;

// Names
std::string GeometryTGeo::sVolumeName = "TRKV";
std::string GeometryTGeo::sServiceVolName = "TRKService";
std::string GeometryTGeo::sLayerName = "TRKLayer";
std::string GeometryTGeo::sPetalAssemblyName = "PETAL";
std::string GeometryTGeo::sPetalName = "PETALCASE";
Expand Down
13 changes: 8 additions & 5 deletions Detectors/Upgrades/ALICE3/TRK/simulation/src/TRKServices.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -127,18 +127,21 @@ void TRKServices::createMaterials()

void TRKServices::createServices(TGeoVolume* motherVolume)
{

TGeoVolumeAssembly* vol = new TGeoVolumeAssembly(GeometryTGeo::getTRKServiceVolPattern());
motherVolume->AddNode(vol, 2, new TGeoTranslation(0, 0., 0));
createMaterials();
createVacuumCompositeShape();
auto& trkPars = TRKBaseParam::Instance();
if (trkPars.getLayoutSRV() == kLOISymm) {
LOGP(info, "TRK services: LoI version");
createMiddleServices(motherVolume);
createOuterDisksServices(motherVolume);
createOuterBarrelServices(motherVolume);
createMiddleServices(vol);
createOuterDisksServices(vol);
createOuterBarrelServices(vol);
} else {
LOGP(info, "TRK services: Peacock layout");
createMLServicesPeacock(motherVolume);
createOTServicesPeacock(motherVolume);
createMLServicesPeacock(vol);
createOTServicesPeacock(vol);
}
}

Expand Down
Loading