Skip to content

Commit 5dbcf2f

Browse files
AllaMaevskayasawenzel
AllaMaevskaya
authored and
sawenzel
committed
FT0 module's positions according drawings
1 parent 2360d52 commit 5dbcf2f

File tree

4 files changed

+27
-28
lines changed

4 files changed

+27
-28
lines changed

‎Detectors/FIT/FT0/base/include/FT0Base/Geometry.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class Geometry
4949
static constexpr int Nsensors = 208; // number of channels
5050
static constexpr int NCellsA = 24; // number of radiatiors on A side
5151
static constexpr int NCellsC = 28; // number of radiatiors on C side
52-
static constexpr float ZdetA = 335.5; // number of radiatiors on A side
53-
static constexpr float ZdetC = 82; // number of radiatiors on C side
52+
static constexpr float ZdetA = 335.5; // Z position of center volume on A side
53+
static constexpr float ZdetC = 82; // Z position of center volume on C side
5454
static constexpr float ChannelWidth = 13.02; // channel width in ps
5555
static constexpr float ChannelWidthInverse = 0.076804916; // channel width in ps inverse
5656
static constexpr o2::detectors::DetID::ID getDetID() { return o2::detectors::DetID::FT0; }

‎Detectors/FIT/FT0/base/src/Geometry.cxx‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,27 @@ void Geometry::setCsideModules()
6565
for (Int_t i = 0; i < 6; i++) {
6666
gridpoints[i] = crad * TMath::Sin((1 - 1 / (2 * TMath::Abs(grdin[i]))) * grdin[i] * btta);
6767
}
68+
Double_t xi[NCellsC] = {-15.038271418735729, 15.038271418735729,
69+
-15.003757581112167, 15.003757581112167, -9.02690018974363,
70+
9.02690018974363, -9.026897413747076, 9.026897413747076,
71+
-9.026896531935773, 9.026896531935773, -3.0004568618531313,
72+
3.0004568618531313, -3.0270795197907225, 3.0270795197907225,
73+
3.0003978432927543, -3.0003978432927543, 3.0270569670429572,
74+
-3.0270569670429572, 9.026750365564254, -9.026750365564254,
75+
9.026837450695885, -9.026837450695885, 9.026849243816981,
76+
-9.026849243816981, 15.038129472387304, -15.038129472387304,
77+
15.003621961057961, -15.003621961057961};
78+
Double_t yi[NCellsC] = {3.1599494336464455, -3.1599494336464455,
79+
9.165191680982874, -9.165191680982874, 3.1383331772537426,
80+
-3.1383331772537426, 9.165226363918643, -9.165226363918643,
81+
15.141616002932361, -15.141616002932361, 9.16517861649866,
82+
-9.16517861649866, 15.188854859073416, -15.188854859073416,
83+
9.165053319552113, -9.165053319552113, 15.188703787345304,
84+
-15.188703787345304, 3.138263189805292, -3.138263189805292,
85+
9.165104089644917, -9.165104089644917, 15.141494417823818,
86+
-15.141494417823818, 3.1599158563428644, -3.1599158563428644,
87+
9.165116302773846, -9.165116302773846};
6888

69-
Double_t xi[NCellsC] = {gridpoints[1], gridpoints[2], gridpoints[3], gridpoints[4], gridpoints[0],
70-
gridpoints[1], gridpoints[2], gridpoints[3], gridpoints[4], gridpoints[5],
71-
gridpoints[0], gridpoints[1], gridpoints[4], gridpoints[5], gridpoints[0],
72-
gridpoints[1], gridpoints[4], gridpoints[5], gridpoints[0], gridpoints[1],
73-
gridpoints[2], gridpoints[3], gridpoints[4], gridpoints[5], gridpoints[1],
74-
gridpoints[2], gridpoints[3], gridpoints[4]};
75-
Double_t yi[NCellsC] = {gridpoints[5], gridpoints[5], gridpoints[5], gridpoints[5], gridpoints[4],
76-
gridpoints[4], gridpoints[4], gridpoints[4], gridpoints[4], gridpoints[4],
77-
gridpoints[3], gridpoints[3], gridpoints[3], gridpoints[3], gridpoints[2],
78-
gridpoints[2], gridpoints[2], gridpoints[2], gridpoints[1], gridpoints[1],
79-
gridpoints[1], gridpoints[1], gridpoints[1], gridpoints[1], gridpoints[0],
80-
gridpoints[0], gridpoints[0], gridpoints[0]};
8189
Double_t zi[NCellsC];
8290
for (Int_t i = 0; i < NCellsC; i++) {
8391
zi[i] = TMath::Sqrt(TMath::Power(crad, 2) - TMath::Power(xi[i], 2) - TMath::Power(yi[i], 2));

‎Detectors/FIT/FT0/simulation/include/FT0Simulation/Detector.h‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -263,19 +263,11 @@ class Detector : public o2::base::DetImpl<Detector>
263263

264264
int mSim2LUT[Geometry::Nchannels];
265265

266-
Float_t mPosModuleAx[Geometry::NCellsA] = {-12.2, -6.1, 0, 6.1, 12.2, -12.2, -6.1, 0,
267-
6.1, 12.2, -13.3743, -7.274299999999999,
268-
7.274299999999999, 13.3743, -12.2, -6.1, 0,
269-
6.1, 12.2, -12.2, -6.1, 0, 6.1, 12.2};
270-
271-
Float_t mPosModuleAy[Geometry::NCellsA] = {12.2, 12.2, 13.53, 12.2, 12.2, 6.1, 6.1,
272-
7.43, 6.1, 6.1, 0, 0, 0, 0, -6.1, -6.1,
273-
-7.43, -6.1, -6.1, -12.2, -12.2, -13.53,
274-
-12.2, -12.2};
275-
276-
float mPosModuleCx[Geometry::NCellsC];
277-
float mPosModuleCy[Geometry::NCellsC];
278-
float mPosModuleCz[Geometry::NCellsC];
266+
Double_t mPosModuleAx[Geometry::NCellsA];
267+
Double_t mPosModuleAy[Geometry::NCellsA];
268+
Double_t mPosModuleCx[Geometry::NCellsC];
269+
Double_t mPosModuleCy[Geometry::NCellsC];
270+
Double_t mPosModuleCz[Geometry::NCellsC];
279271
Float_t mStartC[3] = {20., 20, 5.5};
280272
Float_t mStartA[3] = {20., 20., 5};
281273
Float_t mInStart[3] = {2.9491, 2.9491, 2.5};

‎Detectors/FIT/FT0/simulation/src/Detector.cxx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Detector::Detector(Bool_t Active)
4747

4848
{
4949
// Gegeo = GetGeometry() ;
50-
5150
// TString gn(geo->GetName());
5251
}
5352

0 commit comments

Comments
 (0)