FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[ITS, ITS3] Add first version of ITS3 descriptor in ITS geometry (#10… · AliceO2Group/AliceO2@f3d21ea · GitHub

/ AliceO2 Public

Commit f3d21ea

Browse files
fgrosa
authored
[ITS, ITS3] Add first version of ITS3 descriptor in ITS geometry (#10289)
* Apply naming conventions * Add first version of DTS3 descriptr in ITS geometry * Remove leftover comment * Fix format * Fix whitespace * Attempt to fix circular dependencies * Fix whitespaces * Fix CI * Fix format * Fix CI * Implement Matteo's comment
1 parent 3dd3d86 commit f3d21ea

38 files changed

Lines changed: 637 additions & 10573 deletions

‎Detectors/ITSMFT/ITS/base/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ o2_add_library(ITSBase
1313
SOURCES src/GeometryTGeo.cxx src/ContainerFactory.cxx
1414
src/MisalignmentParameter.cxx
1515
src/DescriptorInnerBarrel.cxx
16-
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2::ITSMFTBase)
17-
16+
PUBLIC_LINK_LIBRARIES O2::DetectorsBase O2::ITSMFTBase $<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3Base>)
1817
o2_target_root_dictionary(ITSBase
1918
HEADERS include/ITSBase/GeometryTGeo.h
2019
include/ITSBase/ContainerFactory.h

‎Detectors/ITSMFT/ITS/base/include/ITSBase/DescriptorInnerBarrel.h‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <vector>
2020
#include <TObject.h>
2121
#include <TGeoTube.h>
22+
#include <TMath.h>
2223

2324
namespace o2
2425
{
@@ -41,28 +42,24 @@ class DescriptorInnerBarrel : public TObject
4142
return TMath::ASin((rMax * rMax - rMin * rMin) / (2 * rMid * sensW)) * TMath::RadToDeg();
4243
}
4344

44-
int GetNumberOfLayers() const { return fNumLayers; }
45-
double GetSensorThickness() const { return fSensorLayerThickness; }
46-
void GetConfigurationWrapperVolume(double& minradius, double& maxradius, double& zspan);
47-
TGeoTube* DefineWrapperVolume();
45+
int getNumberOfLayers() const { return mNumLayers; }
46+
double getSensorThickness() const { return mSensorLayerThickness; }
47+
void getConfigurationWrapperVolume(double& minradius, double& maxradius, double& zspan);
48+
TGeoTube* defineWrapperVolume();
4849

4950
protected:
50-
int fNumLayers{3};
51+
int mNumLayers{3};
5152

5253
// wrapper volume properties
53-
double fWrapperMinRadius{2.1};
54-
double fWrapperMaxRadius{16.4};
55-
double fWrapperZSpan{70.};
56-
57-
// sensor properties
58-
double fSensorLayerThickness{};
54+
double mWrapperMinRadius{2.1};
55+
double mWrapperMaxRadius{16.4};
56+
double mWrapperZSpan{70.};
5957

6058
// layer properties
61-
std::vector<double> fLayerRadii{};
62-
std::vector<double> fLayerZLen{};
63-
std::vector<double> fDetectorThickness{};
64-
std::vector<int> fChipTypeID{};
65-
std::vector<int> fBuildLevel{};
59+
double mSensorLayerThickness{}; // sensor thickness
60+
std::vector<double> mLayerRadii{}; // Vector of layer radius
61+
std::vector<double> mDetectorThickness{}; // Vector of detector thickness
62+
std::vector<int> mChipTypeID{}; //! Vector of unique chip ID
6663

6764
/// \cond CLASSIMP
6865
ClassDef(DescriptorInnerBarrel, 1); /// ITS inner barrel geometry descriptor

‎Detectors/ITSMFT/ITS/base/include/ITSBase/GeometryTGeo.h‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,25 +272,33 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
272272
static void setITSModulePattern(const char* nm) { sModuleName = nm; }
273273
static void setITSChipPattern(const char* nm) { sChipName = nm; }
274274
static void setITSSensorPattern(const char* nm) { sSensorName = nm; }
275+
276+
static const char* getITS3LayerPattern() { return sLayerNameITS3.c_str(); }
277+
static const char* getITS3HalfBarrelPattern() { return sHalfBarrelNameITS3.c_str(); }
278+
static const char* getITS3StavePattern() { return sStaveNameITS3.c_str(); }
279+
static const char* getITS3HalfStavePattern() { return sHalfStaveNameITS3.c_str(); }
280+
static const char* getITS3ModulePattern() { return sModuleNameITS3.c_str(); }
281+
static const char* getITS3ChipPattern() { return sChipNameITS3.c_str(); }
282+
static const char* getITS3SensorPattern() { return sSensorNameITS3.c_str(); }
275283
/// sym name of the layer
276-
static const char* composeSymNameITS() { return o2::detectors::DetID(o2::detectors::DetID::ITS).getName(); }
284+
static const char* composeSymNameITS(bool isITS3 = false);
277285
/// sym name of the layer
278-
static const char* composeSymNameLayer(int lr);
286+
static const char* composeSymNameLayer(int lr, bool isITS3 = false);
279287

280288
/// Sym name of the half barrel at given layer
281-
static const char* composeSymNameHalfBarrel(int lr, int hba);
289+
static const char* composeSymNameHalfBarrel(int lr, int hba, bool isITS3 = false);
282290

283291
/// Sym name of the stave at given layer
284-
static const char* composeSymNameStave(int lr, int hba, int sta);
292+
static const char* composeSymNameStave(int lr, int hba, int sta, bool isITS3 = false);
285293

286294
/// Sym name of the stave at given layer/halfbarrel
287-
static const char* composeSymNameHalfStave(int lr, int hba, int sta, int ssta);
295+
static const char* composeSymNameHalfStave(int lr, int hba, int sta, int ssta, bool isITS3 = false);
288296

289297
/// Sym name of the substave at given layer/halfbarrel/stave
290-
static const char* composeSymNameModule(int lr, int hba, int sta, int ssta, int mod);
298+
static const char* composeSymNameModule(int lr, int hba, int sta, int ssta, int mod, bool isITS3 = false);
291299

292300
/// Sym name of the chip in the given layer/halfbarrel/stave/substave/module
293-
static const char* composeSymNameChip(int lr, int hba, int sta, int ssta, int mod, int chip);
301+
static const char* composeSymNameChip(int lr, int hba, int sta, int ssta, int mod, int chip, bool isITS3 = false);
294302

295303
protected:
296304
/// Get the transformation matrix of the SENSOR (not necessary the same as the chip)
@@ -365,6 +373,7 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
365373
std::vector<int> mNumberOfChipsPerHalfBarrel; ///< number of chips per halfbarrel
366374
std::vector<int> mNumberOfChipsPerLayer; ///< number of chips per stave
367375
std::vector<int> mLastChipIndex; ///< max ID of the detctor in the layer
376+
std::array<bool, MAXLAYERS> mIsLayerITS3; ///< flag with the information of the ITS version (ITS2 or ITS3)
368377
std::array<char, MAXLAYERS> mLayerToWrapper; ///< Layer to wrapper correspondence
369378

370379
std::vector<float> mCacheRefX; ///< sensors tracking plane reference X
@@ -380,6 +389,14 @@ class GeometryTGeo : public o2::itsmft::GeometryTGeo
380389
static std::string sSensorName; ///< Sensor name
381390
static std::string sWrapperVolumeName; ///< Wrapper volume name
382391

392+
static std::string sLayerNameITS3; ///< Layer name for ITS3
393+
static std::string sHalfBarrelNameITS3; ///< HalfBarrel name for ITS3
394+
static std::string sStaveNameITS3; ///< Stave name for ITS3
395+
static std::string sHalfStaveNameITS3; ///< HalfStave name for ITS3
396+
static std::string sModuleNameITS3; ///< Module name for ITS3
397+
static std::string sChipNameITS3; ///< Chip name for ITS3
398+
static std::string sSensorNameITS3; ///< Sensor name for ITS3
399+
383400
private:
384401
#ifndef GPUCA_STANDALONE
385402
static std::unique_ptr<o2::its::GeometryTGeo> sInstance; ///< singletone instance

‎Detectors/ITSMFT/ITS/base/src/DescriptorInnerBarrel.cxx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@ DescriptorInnerBarrel::DescriptorInnerBarrel() : TObject()
4444
}
4545

4646
//________________________________________________________________
47-
DescriptorInnerBarrel::DescriptorInnerBarrel(int nlayers) : TObject(), fNumLayers(nlayers)
47+
DescriptorInnerBarrel::DescriptorInnerBarrel(int nlayers) : TObject(), mNumLayers(nlayers)
4848
{
4949
//
5050
// Standard constructor
5151
//
5252
}
5353

5454
//________________________________________________________________
55-
void DescriptorInnerBarrel::GetConfigurationWrapperVolume(double& minradius, double& maxradius, double& zspan)
55+
void DescriptorInnerBarrel::getConfigurationWrapperVolume(double& minradius, double& maxradius, double& zspan)
5656
{
57-
minradius = fWrapperMinRadius;
58-
maxradius = fWrapperMaxRadius;
59-
zspan = fWrapperZSpan;
57+
minradius = mWrapperMinRadius;
58+
maxradius = mWrapperMaxRadius;
59+
zspan = mWrapperZSpan;
6060
}
6161

6262
//________________________________________________________________
63-
TGeoTube* DescriptorInnerBarrel::DefineWrapperVolume()
63+
TGeoTube* DescriptorInnerBarrel::defineWrapperVolume()
6464
{
65-
TGeoTube* wrap = new TGeoTube(fWrapperMinRadius, fWrapperMaxRadius, fWrapperZSpan / 2.);
65+
TGeoTube* wrap = new TGeoTube(mWrapperMinRadius, mWrapperMaxRadius, mWrapperZSpan / 2.);
6666
return wrap;
6767
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL