Skip to content

Commit c70b15b

Browse files
f3schf3sch
committed
ITS3: renamed SuperAlpide to Mosaix
This is essentially a rebase on the changes by @ChunzhengLab. Signed-off-by: Felix Schlepper <[email protected]>
1 parent acd47bc commit c70b15b

File tree

20 files changed

+115
-133
lines changed

20 files changed

+115
-133
lines changed

‎Detectors/Upgrades/ITS3/alignment/src/MisalignmentHits.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
// or submit itself to any jurisdiction.
1111

1212
#include "ITS3Align/MisalignmentHits.h"
13-
#include "ITS3Base/SegmentationSuperAlpide.h"
1413
#include "ITS3Base/ITS3Params.h"
1514
#include "SimConfig/DigiParams.h"
1615
#include "DetectorsBase/Propagator.h"

Detectors/Upgrades/ITS3/base/include/ITS3Base/SegmentationSuperAlpide.h renamed to Detectors/Upgrades/ITS3/base/include/ITS3Base/SegmentationMosaix.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file SegmentationSuperAlpide.h
13-
/// \brief Definition of the SegmentationSuperAlpide class
12+
/// \file SegmentationMosaix.h
13+
/// \brief Definition of the SegmentationMosaix class
1414
/// \author [email protected]
1515

16-
#ifndef ALICEO2_ITS3_SEGMENTATIONSUPERALPIDE_H_
17-
#define ALICEO2_ITS3_SEGMENTATIONSUPERALPIDE_H_
16+
#ifndef ALICEO2_ITS3_SEGMENTATIONMOSAIX_H_
17+
#define ALICEO2_ITS3_SEGMENTATIONMOSAIX_H_
1818

1919
#include "MathUtils/Cartesian.h"
2020
#include "ITS3Base/SpecsV2.h"
@@ -26,7 +26,7 @@ namespace o2::its3
2626
{
2727

2828
/// Segmentation and response for pixels in ITS3 upgrade
29-
class SegmentationSuperAlpide
29+
class SegmentationMosaix
3030
{
3131
// This class defines the segmenation of the pixelArray in the tile. We define
3232
// two coordinate systems, one width x,z detector local coordianates (cm) and
@@ -53,12 +53,12 @@ class SegmentationSuperAlpide
5353
// | | |
5454
// x----------------------x
5555
public:
56-
~SegmentationSuperAlpide() = default;
57-
SegmentationSuperAlpide(const SegmentationSuperAlpide&) = default;
58-
SegmentationSuperAlpide(SegmentationSuperAlpide&&) = delete;
59-
SegmentationSuperAlpide& operator=(const SegmentationSuperAlpide&) = default;
60-
SegmentationSuperAlpide& operator=(SegmentationSuperAlpide&&) = delete;
61-
constexpr SegmentationSuperAlpide(int layer) : mLayer{layer} {}
56+
~SegmentationMosaix() = default;
57+
SegmentationMosaix(const SegmentationMosaix&) = default;
58+
SegmentationMosaix(SegmentationMosaix&&) = delete;
59+
SegmentationMosaix& operator=(const SegmentationMosaix&) = default;
60+
SegmentationMosaix& operator=(SegmentationMosaix&&) = delete;
61+
constexpr SegmentationMosaix(int layer) : mLayer{layer} {}
6262

6363
static constexpr int mNCols{constants::pixelarray::nCols};
6464
static constexpr int mNRows{constants::pixelarray::nRows};

‎Detectors/Upgrades/ITS3/macros/test/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ its3_add_macro(CheckHits.C)
1919
its3_add_macro(CheckDigitsDensity.C)
2020
its3_add_macro(CheckClusterSize.C)
2121
its3_add_macro(CompareClusterSize.C)
22-
its3_add_macro(CheckSuperAlpideSegment.C)
23-
its3_add_macro(CheckSuperAlpideSegmentTrans.C)
22+
its3_add_macro(CheckMosaixSegment.C)
23+
its3_add_macro(CheckMosaixSegmentTrans.C)
2424
its3_add_macro(CompareClustersAndDigits.C)
2525
its3_add_macro(CheckROFs.C)
2626
its3_add_macro(CheckTileNumbering.C)

‎Detectors/Upgrades/ITS3/macros/test/CheckClustersITS3.C‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define ENABLE_UPGRADES
2626
#include "DetectorsCommonDataFormats/DetID.h"
2727
#include "ITSMFTBase/SegmentationAlpide.h"
28-
#include "ITS3Base/SegmentationSuperAlpide.h"
28+
#include "ITS3Base/SegmentationMosaix.h"
2929
#include "ITS3Base/SpecsV2.h"
3030
#include "ITSBase/GeometryTGeo.h"
3131
#include "DataFormatsITSMFT/CompCluster.h"
@@ -50,15 +50,15 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
5050
using namespace o2::base;
5151
using namespace o2::its;
5252

53-
using SuperSegmentation = o2::its3::SegmentationSuperAlpide;
53+
using MosaixSegmentation = o2::its3::SegmentationMosaix;
5454
using Segmentation = o2::itsmft::SegmentationAlpide;
5555
using o2::itsmft::CompClusterExt;
5656
using o2::itsmft::Hit;
5757
using ROFRec = o2::itsmft::ROFRecord;
5858
using MC2ROF = o2::itsmft::MC2ROFRecord;
5959
using HitVec = std::vector<Hit>;
6060
using MC2HITS_map = std::unordered_map<uint64_t, int>; // maps (track_ID<<32 + chip_ID) to entry in the hit vector
61-
std::array<SuperSegmentation, 3> mSuperSegmentations{0, 1, 2};
61+
std::array<MosaixSegmentation, 3> mMosaixSegmentations{0, 1, 2};
6262

6363
std::vector<HitVec*> hitVecPool;
6464
std::vector<MC2HITS_map> mc2hitVec;
@@ -185,8 +185,8 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
185185
locC = dict.getClusterCoordinates(cluster);
186186
errX = dict.getErrX(pattID);
187187
errZ = dict.getErrZ(pattID);
188-
errX *= (isIB) ? SuperSegmentation::mPitchRow : Segmentation::PitchRow;
189-
errZ *= (isIB) ? SuperSegmentation::mPitchCol : Segmentation::PitchCol;
188+
errX *= (isIB) ? MosaixSegmentation::mPitchRow : Segmentation::PitchRow;
189+
errZ *= (isIB) ? MosaixSegmentation::mPitchCol : Segmentation::PitchCol;
190190
npix = dict.getNpixels(pattID);
191191
++cPattValid;
192192
}
@@ -235,21 +235,16 @@ void CheckClustersITS3(const std::string& clusfile = "o2clus_its.root",
235235
} else {
236236
// compare in local flat coordinates
237237
float xFlatEnd{0.}, yFlatEnd{0.};
238-
mSuperSegmentations[layer].curvedToFlat(locH.X(), locH.Y(), xFlatEnd, yFlatEnd);
238+
mMosaixSegmentations[layer].curvedToFlat(locH.X(), locH.Y(), xFlatEnd, yFlatEnd);
239239
locH.SetXYZ(xFlatEnd, yFlatEnd, locH.Z());
240240
float xFlatSta{0.}, yFlatSta{0.};
241-
mSuperSegmentations[layer].curvedToFlat(locHsta.X(), locHsta.Y(), xFlatSta, yFlatSta);
241+
mMosaixSegmentations[layer].curvedToFlat(locHsta.X(), locHsta.Y(), xFlatSta, yFlatSta);
242242
locHsta.SetXYZ(xFlatSta, yFlatSta, locHsta.Z());
243-
// recalculate x/y in flat
244-
// x0 = xFlatSta, dltx = xFlatEnd - x0;
245-
// y0 = yFlatSta, dlty = yFlatEnd - y0;
246-
// r = (0.5 * (SuperSegmentation::mSensorLayerThickness - SuperSegmentation::mSensorLayerThicknessEff) - y0) / dlty;
247-
// locH.SetXYZ(x0 + r * dltx, y0 + r * dlty, z0 + r * dltz);
248243

249244
// not really precise, but okish
250245
locH.SetXYZ(0.5f * (locH.X() + locHsta.X()), 0.5f * (locH.Y() + locHsta.Y()), 0.5f * (locH.Z() + locHsta.Z()));
251246

252-
mSuperSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlatSta, yFlatSta);
247+
mMosaixSegmentations[layer].curvedToFlat(locC.X(), locC.Y(), xFlatSta, yFlatSta);
253248
locC.SetXYZ(xFlatSta, yFlatSta, locC.Z());
254249
}
255250
float theta = std::acos(gloC.Z() / gloC.Rho());

‎Detectors/Upgrades/ITS3/macros/test/CheckDigitsDensity.C‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "ITS3Base/SpecsV2.h"
3838
#include "CommonConstants/MathConstants.h"
3939
#include "DataFormatsITSMFT/Digit.h"
40-
#include "ITS3Base/SegmentationSuperAlpide.h"
40+
#include "ITS3Base/SegmentationMosaix.h"
4141
#include "DetectorsBase/GeometryManager.h"
4242
#include "ITSBase/GeometryTGeo.h"
4343
#include "fairlogger/Logger.h"
@@ -56,15 +56,15 @@ constexpr double qedRate = qedXSection / hadXSection * interaction_rate; // Hz
5656
constexpr double qedFactor = qedRate * integration_time; // a.u.
5757
using o2::itsmft::Digit;
5858
namespace its3 = o2::its3;
59-
using SSAlpide = its3::SegmentationSuperAlpide;
59+
using Mosaix = its3::SegmentationMosaix;
6060

6161
void checkFile(const std::unique_ptr<TFile>& file);
6262

6363
void CheckDigitsDensity(int nEvents = 10000, std::string digitFileName = "it3digits.root", std::string geomFileName = "o2sim_geometry.root", bool qed = false, bool batch = true)
6464
{
6565
gROOT->SetBatch(batch);
6666
LOGP(debug, "Checking Digit ITS3 Density");
67-
std::array<SSAlpide, 3> mSuperSegmentations{0, 1, 2};
67+
std::array<Mosaix, 3> mMosaixSegmentations{0, 1, 2};
6868

6969
// Geometry
7070
o2::base::GeometryManager::loadGeometry(geomFileName);
@@ -103,8 +103,8 @@ void CheckDigitsDensity(int nEvents = 10000, std::string digitFileName = "it3dig
103103
// goto curved coordinates
104104
float x{0.f}, y{0.f}, z{0.f};
105105
float xFlat{0.f}, yFlat{0.f};
106-
mSuperSegmentations[layer].detectorToLocal(row, col, xFlat, z);
107-
mSuperSegmentations[layer].flatToCurved(xFlat, 0., x, y);
106+
mMosaixSegmentations[layer].detectorToLocal(row, col, xFlat, z);
107+
mMosaixSegmentations[layer].flatToCurved(xFlat, 0., x, y);
108108
const o2::math_utils::Point3D<double> locD(x, y, z);
109109
const auto gloD = gman->getMatrixL2G(id)(locD); // convert to global
110110
const auto R = std::hypot(gloD.X(), gloD.Y());
@@ -115,7 +115,7 @@ void CheckDigitsDensity(int nEvents = 10000, std::string digitFileName = "it3dig
115115
std::unique_ptr<TFile> oFile(TFile::Open("checkDigitsDensity.root", "RECREATE"));
116116
checkFile(oFile);
117117
for (const auto& h : hists) {
118-
h->Scale(1. / (SSAlpide::mPitchCol * SSAlpide::mPitchRow * nEvents));
118+
h->Scale(1. / (Mosaix::mPitchCol * Mosaix::mPitchRow * nEvents));
119119
h->ProjectionX()->Write();
120120
h->Write();
121121
}

‎Detectors/Upgrades/ITS3/macros/test/CheckDigitsITS3.C‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define ENABLE_UPGRADES
2828
#include "ITSBase/GeometryTGeo.h"
2929
#include "DataFormatsITSMFT/Digit.h"
30-
#include "ITS3Base/SegmentationSuperAlpide.h"
30+
#include "ITS3Base/SegmentationMosaix.h"
3131
#include "ITSMFTBase/SegmentationAlpide.h"
3232
#include "ITSMFTSimulation/Hit.h"
3333
#include "MathUtils/Utils.h"
@@ -51,7 +51,7 @@ void CheckDigitsITS3(std::string digifile = "it3digits.root", std::string hitfil
5151
using o2::itsmft::Hit;
5252

5353
using o2::itsmft::SegmentationAlpide;
54-
std::array<its3::SegmentationSuperAlpide, 3> mSuperSegmentations{0, 1, 2};
54+
std::array<its3::SegmentationMosaix, 3> mMosaixSegmentations{0, 1, 2};
5555

5656
TFile* f = TFile::Open("CheckDigits.root", "recreate");
5757
TNtuple* nt = new TNtuple("ntd", "digit ntuple", "id:x:y:z:rowD:colD:rowH:colH:xlH:zlH:xlcH:zlcH:dx:dz");
@@ -166,8 +166,8 @@ void CheckDigitsITS3(std::string digifile = "it3digits.root", std::string hitfil
166166
if (isIB) {
167167
// ITS3 IB
168168
float xFlat{0.f}, yFlat{0.f};
169-
mSuperSegmentations[layer].detectorToLocal(ix, iz, xFlat, z);
170-
mSuperSegmentations[layer].flatToCurved(xFlat, 0., x, y);
169+
mMosaixSegmentations[layer].detectorToLocal(ix, iz, xFlat, z);
170+
mMosaixSegmentations[layer].flatToCurved(xFlat, 0., x, y);
171171
} else {
172172
// ITS2 OB
173173
SegmentationAlpide::detectorToLocal(ix, iz, x, z);
@@ -203,12 +203,12 @@ void CheckDigitsITS3(std::string digifile = "it3digits.root", std::string hitfil
203203

204204
if (isIB) {
205205
float xFlat{0.}, yFlat{0.};
206-
mSuperSegmentations[layer].curvedToFlat(xyzLocM.X(), xyzLocM.Y(), xFlat, yFlat);
206+
mMosaixSegmentations[layer].curvedToFlat(xyzLocM.X(), xyzLocM.Y(), xFlat, yFlat);
207207
xyzLocM.SetCoordinates(xFlat, yFlat, xyzLocM.Z());
208-
mSuperSegmentations[layer].curvedToFlat(locD.X(), locD.Y(), xFlat, yFlat);
208+
mMosaixSegmentations[layer].curvedToFlat(locD.X(), locD.Y(), xFlat, yFlat);
209209
locD.SetCoordinates(xFlat, yFlat, locD.Z());
210-
if (auto v1 = !mSuperSegmentations[layer].localToDetector(xyzLocM.X(), xyzLocM.Z(), row, col),
211-
v2 = !mSuperSegmentations[layer].detectorToLocal(row, col, xlc, zlc);
210+
if (auto v1 = !mMosaixSegmentations[layer].localToDetector(xyzLocM.X(), xyzLocM.Z(), row, col),
211+
v2 = !mMosaixSegmentations[layer].detectorToLocal(row, col, xlc, zlc);
212212
v1 || v2) {
213213
continue;
214214
}

‎Detectors/Upgrades/ITS3/macros/test/CheckHits.C‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,13 @@
3131

3232
#define ENABLE_UPGRADES
3333
#include "CommonConstants/MathConstants.h"
34-
#include "ITS3Base/SegmentationSuperAlpide.h"
3534
#include "ITS3Base/SpecsV2.h"
3635
#include "ITSMFTSimulation/Hit.h"
3736
#include "SimulationDataFormat/MCTrack.h"
3837
#endif
3938

4039
namespace it3c = o2::its3::constants;
4140
namespace it3d = it3c::detID;
42-
using SSAlpide = o2::its3::SegmentationSuperAlpide;
4341
using o2::itsmft::Hit;
4442

4543
constexpr double interaction_rate = 50e3; // Hz

Detectors/Upgrades/ITS3/macros/test/CheckSuperAlpideSegment.C renamed to Detectors/Upgrades/ITS3/macros/test/CheckMosaixSegment.C

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file CheckTracksITS3.C
13-
/// \brief Simple macro to check ITS3 tracks
14-
1512
#if !defined(__CLING__) || defined(__ROOTCLING__)
1613

1714
#include "Rtypes.h"
@@ -41,22 +38,22 @@
4138
#include "MathUtils/Cartesian.h"
4239

4340
#include "ITS3Base/SpecsV2.h"
44-
#include "ITS3Base/SegmentationSuperAlpide.h"
41+
#include "ITS3Base/SegmentationMosaix.h"
4542
#include "ITSBase/GeometryTGeo.h"
4643

4744
#endif
4845

4946
using gITS = o2::its::GeometryTGeo;
5047

51-
void CheckSuperAlpideSegment(bool isTestDetectorToLocal = false,
52-
bool isTestFlatToCurved = false,
53-
bool isTestLocalToGlobal = false)
48+
void CheckMosaixSegment(bool isTestDetectorToLocal = false,
49+
bool isTestFlatToCurved = false,
50+
bool isTestLocalToGlobal = false)
5451
{
5552
using namespace o2::its3;
56-
static constexpr unsigned int mNCols{SegmentationSuperAlpide::mNCols};
57-
static constexpr unsigned int mNRows{SegmentationSuperAlpide::mNRows};
53+
static constexpr unsigned int mNCols{SegmentationMosaix::mNCols};
54+
static constexpr unsigned int mNRows{SegmentationMosaix::mNRows};
5855
static constexpr unsigned int nPixels{mNCols * mNRows};
59-
std::array<SegmentationSuperAlpide, 3> mSuperSegmentations{0, 1, 2};
56+
std::array<SegmentationMosaix, 3> mMosaixSegmentations{0, 1, 2};
6057

6158
if (isTestDetectorToLocal || isTestFlatToCurved) {
6259
namespace cp = constants::pixelarray;
@@ -75,7 +72,7 @@ void CheckSuperAlpideSegment(bool isTestDetectorToLocal = false,
7572
TGraph* g_col_zLocal_translate = new TGraph();
7673
g_col_zLocal_translate->SetMarkerStyle(20);
7774

78-
SegmentationSuperAlpide seg(0);
75+
SegmentationMosaix seg(0);
7976
int nPoint = 0;
8077
for (UInt_t i = 0; i < mNRows; ++i) {
8178
for (UInt_t j = 0; j < mNCols; ++j) {
@@ -164,11 +161,11 @@ void CheckSuperAlpideSegment(bool isTestDetectorToLocal = false,
164161
float xLocal_translate = 0;
165162
float yLocal_translate = 0;
166163

167-
mSuperSegmentations[iLayer].detectorToLocal(row, col, xLocal, zLocal);
168-
mSuperSegmentations[iLayer].flatToCurved(xLocal, 0., xCurved, yCurved);
164+
mMosaixSegmentations[iLayer].detectorToLocal(row, col, xLocal, zLocal);
165+
mMosaixSegmentations[iLayer].flatToCurved(xLocal, 0., xCurved, yCurved);
169166
double posLocal[3] = {xCurved, yCurved, zLocal};
170167
double posGlobal[3] = {0, 0, 0};
171-
mSuperSegmentations[iLayer].curvedToFlat(xCurved, yCurved, xLocal_translate, yLocal_translate);
168+
mMosaixSegmentations[iLayer].curvedToFlat(xCurved, yCurved, xLocal_translate, yLocal_translate);
172169
matrix->LocalToMaster(posLocal, posGlobal);
173170

174171
h_xCurved_yCurved->Fill(xLocal, 0);

Detectors/Upgrades/ITS3/macros/test/CheckSuperAlpideSegmentTrans.C renamed to Detectors/Upgrades/ITS3/macros/test/CheckMosaixSegmentTrans.C

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// granted to it by virtue of its status as an Intergovernmental Organization
1010
// or submit itself to any jurisdiction.
1111

12-
/// \file CheckSuperAlpideSegmentTrans.C
12+
/// \file CheckMosaixSegmentTrans.C
1313
/// \brief Simple macro to check ITS3 Alpide Trans
1414

1515
#if !defined(__CLING__) || defined(__ROOTCLING__)
@@ -26,7 +26,7 @@
2626
#include "TStyle.h"
2727
#include "TTree.h"
2828

29-
#include "ITS3Base/SegmentationSuperAlpide.h"
29+
#include "ITS3Base/SegmentationMosaix.h"
3030
#include "ITS3Base/SpecsV2.h"
3131

3232
#endif
@@ -37,11 +37,11 @@ constexpr float PI = 3.14159274101257324e+00f;
3737
constexpr float Rad2Deg = 180.f / PI;
3838
constexpr float Deg2Rad = 1. / Rad2Deg;
3939

40-
constexpr auto nRows{SegmentationSuperAlpide::mNRows};
41-
constexpr auto nCols{SegmentationSuperAlpide::mNCols};
42-
constexpr auto fLength{SegmentationSuperAlpide::mLength};
43-
constexpr auto fWidth{SegmentationSuperAlpide::mWidth};
44-
std::array<SegmentationSuperAlpide, 3> mSuperSegmentations{0, 1, 2};
40+
constexpr auto nRows{SegmentationMosaix::mNRows};
41+
constexpr auto nCols{SegmentationMosaix::mNCols};
42+
constexpr auto fLength{SegmentationMosaix::mLength};
43+
constexpr auto fWidth{SegmentationMosaix::mWidth};
44+
const std::array<SegmentationMosaix, 3> mMosaixSegmentations{0, 1, 2};
4545

4646
TH2* DrawReverseBins(TH2* h)
4747
{
@@ -84,7 +84,7 @@ void DrawXAxisCol(TH1* h)
8484
newaxis->Draw();
8585
}
8686

87-
void CheckSuperAlpideSegmentTrans()
87+
void CheckMosaixSegmentTrans()
8888
{
8989
gStyle->SetOptStat(1111111);
9090

@@ -141,10 +141,10 @@ void CheckSuperAlpideSegmentTrans()
141141
g_arc_inner->AddPoint(x_inner, y_inner);
142142
g_arc_outer->AddPoint(x_outer, y_outer);
143143
// Test Segmentation
144-
mSuperSegmentations[iLayer].curvedToFlat(x_inner, y_inner, x_inner_flat, y_inner_flat);
145-
mSuperSegmentations[iLayer].flatToCurved(x_inner_flat, y_inner_flat, x_inner_curved, y_inner_curved);
146-
mSuperSegmentations[iLayer].curvedToFlat(x_outer, y_outer, x_outer_flat, y_outer_flat);
147-
mSuperSegmentations[iLayer].flatToCurved(x_outer_flat, y_outer_flat, x_outer_curved, y_outer_curved);
144+
mMosaixSegmentations[iLayer].curvedToFlat(x_inner, y_inner, x_inner_flat, y_inner_flat);
145+
mMosaixSegmentations[iLayer].flatToCurved(x_inner_flat, y_inner_flat, x_inner_curved, y_inner_curved);
146+
mMosaixSegmentations[iLayer].curvedToFlat(x_outer, y_outer, x_outer_flat, y_outer_flat);
147+
mMosaixSegmentations[iLayer].flatToCurved(x_outer_flat, y_outer_flat, x_outer_curved, y_outer_curved);
148148
g_arc_inner_flat->AddPoint(x_inner_flat, y_inner_flat);
149149
g_arc_outer_flat->AddPoint(x_outer_flat, y_outer_flat);
150150
h_f2c_res->Fill(x_inner - x_inner_curved, y_inner - y_inner_curved);
@@ -202,9 +202,9 @@ void CheckSuperAlpideSegmentTrans()
202202
for (int iCol{0}; iCol < nCols; ++iCol) {
203203
float xRow{0}, zCol{0};
204204
int iiRow{0}, iiCol{0};
205-
auto v1 = mSuperSegmentations[iLayer].detectorToLocal(iRow, iCol, xRow, zCol);
206-
auto v2 = mSuperSegmentations[iLayer].localToDetector(xRow, zCol, iiRow,
207-
iiCol);
205+
auto v1 = mMosaixSegmentations[iLayer].detectorToLocal(iRow, iCol, xRow, zCol);
206+
auto v2 = mMosaixSegmentations[iLayer].localToDetector(xRow, zCol, iiRow,
207+
iiCol);
208208
// Info("L2D",
209209
// "iRow=%d, iCol=%d --d2l(%s)--> xRow=%f, zCol=%f --l2d(%s)--> "
210210
// "iiRow=%d, iiCol=%d",

‎Detectors/Upgrades/ITS3/macros/test/CheckTileNumbering.C‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include "ITSBase/GeometryTGeo.h"
2727
#include "ITS3Base/SpecsV2.h"
28-
#include "ITS3Base/SegmentationSuperAlpide.h"
28+
#include "ITS3Base/SegmentationMosaix.h"
2929
#include "MathUtils/Cartesian.h"
3030
#include "MathUtils/Utils.h"
3131
#include "DataFormatsITSMFT/NoiseMap.h"
@@ -102,7 +102,7 @@ void CheckTileNumbering(const std::string& inputGeom = "", const std::string& de
102102
Int_t colors[NRGBs] = {kWhite, kRed, kGray};
103103
TColor::SetPalette(NRGBs, colors, 1.0);
104104

105-
std::array<o2::its3::SegmentationSuperAlpide, 3> mSuperSegmentations{0, 1, 2};
105+
std::array<o2::its3::SegmentationMosaix, 3> mMosaixSegmentations{0, 1, 2};
106106

107107
const float phiOffsetL0 = std::asin(o2::its3::constants::equatorialGap / 2.f / o2::its3::constants::radii[0]);
108108
const float phiOffsetL1 = std::asin(o2::its3::constants::equatorialGap / 2.f / o2::its3::constants::radii[1]);
@@ -144,7 +144,7 @@ void CheckTileNumbering(const std::string& inputGeom = "", const std::string& de
144144
for (unsigned int iDet{0}; iDet <= o2::its3::constants::detID::l2IDEnd; ++iDet) {
145145
int sensorID = o2::its3::constants::detID::getSensorID(iDet);
146146
int layerID = o2::its3::constants::detID::getDetID2Layer(iDet);
147-
mSuperSegmentations[layerID].flatToCurved(xFlat, 0., x, y);
147+
mMosaixSegmentations[layerID].flatToCurved(xFlat, 0., x, y);
148148
o2::math_utils::Point3D<float> locC{x, y, z};
149149
auto gloC = gman->getMatrixL2G(iDet)(locC);
150150
float phi = o2::math_utils::to02Pi(std::atan2(gloC.Y(), gloC.X()));

0 commit comments

Comments
 (0)