Skip to content

Commit 5e08419

Browse files
plarionoplariono
committed
Changes towards the coreect version
1 parent 839dfe2 commit 5e08419

10 files changed

Lines changed: 2084 additions & 7 deletions

File tree

‎Detectors/Upgrades/ALICE3/TRK/base/include/TRKBase/TRKBaseParam.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ enum eLayout {
2929
struct TRKBaseParam : public o2::conf::ConfigurableParamHelper<TRKBaseParam> {
3030
std::string configFile = "";
3131
float serviceTubeX0 = 0.02f; // X0 Al2O3
32+
float gapPetals = 0.04; // gap between IRIS petals in cm
3233
Bool_t irisOpen = false;
3334

3435
eLayout layoutML = kCylinder; // Type of segmentation for the middle layers

‎Detectors/Upgrades/ALICE3/TRK/simulation/include/TRKSimulation/TRKPetalCase.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TRKPetalCase
2626
{
2727
public:
2828
TRKPetalCase() = default;
29-
TRKPetalCase(Int_t number, TGeoVolume* motherVolume, Bool_t irisOpen);
29+
TRKPetalCase(Int_t number, TGeoVolume* motherVolume, Bool_t irisOpen, Float_t petalGapPhi);
3030
~TRKPetalCase() = default;
3131

3232
// Sensitive volume list
@@ -58,6 +58,7 @@ class TRKPetalCase
5858
Double_t mROut; // cm
5959
Double_t mRInOpenState; // cm
6060
Double_t mPetalCaseLength; // cm
61+
Double_t mPetalGapPhi; // cm, gap between IRIS petals in cm at the radius of 12.247 mm
6162

6263
Double_t mAngularCoverageAzimuthalWall; // Rad // Angular coverage of azimuthal part of wall (equivalent to that of the sensitive volumes)
6364
Double_t mAngularCoverageRadialWall; // Rad // Angular coverage of radial part of wall

‎Detectors/Upgrades/ALICE3/TRK/simulation/src/Detector.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void Detector::createGeometry()
242242
// Add petal cases (the sensitive layers inside the petal cases get constructed here too)
243243
auto& trkPars = TRKBaseParam::Instance();
244244
for (Int_t petalCaseNumber = 0; petalCaseNumber < 4; ++petalCaseNumber) {
245-
mPetalCases.emplace_back(petalCaseNumber, vTRK, trkPars.irisOpen);
245+
mPetalCases.emplace_back(petalCaseNumber, vTRK, trkPars.irisOpen, trkPars.gapPetals);
246246
mServices.excavateFromVacuum(mPetalCases[petalCaseNumber].getFullName());
247247
}
248248
mServices.registerVacuum(vTRK);

‎Detectors/Upgrades/ALICE3/TRK/simulation/src/TRKPetalCase.cxx‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace o2
2626
{
2727
namespace trk
2828
{
29-
TRKPetalCase::TRKPetalCase(Int_t number, TGeoVolume* motherVolume, Bool_t irisOpen) : mPetalCaseNumber(number), mOpenState(irisOpen)
29+
TRKPetalCase::TRKPetalCase(Int_t number, TGeoVolume* motherVolume, Bool_t irisOpen, Float_t petalGapPhi) : mPetalCaseNumber(number), mOpenState(irisOpen), mPetalGapPhi(petalGapPhi)
3030
{
3131

3232
mWallThickness = .15e-1; // cm // Assume all the walls have the same thickness for now.
@@ -36,7 +36,7 @@ TRKPetalCase::TRKPetalCase(Int_t number, TGeoVolume* motherVolume, Bool_t irisOp
3636
mPetalCaseLength = 70.; // cm
3737

3838
// Calculate angular coverages of azimuthal part of wall (equivalent to that of the sensitive volumes)
39-
mAngularCoverageAzimuthalWall = (0.25 * (2 * mRIn * TMath::Pi()) - 2 * mWallThickness) / mRIn;
39+
mAngularCoverageAzimuthalWall = 360.0 - (mPetalGapPhi / 0.12247) * TMath::RadToDeg();
4040
mAngularCoverageRadialWall = mWallThickness / mRIn;
4141
mToDeg = 180 / TMath::Pi();
4242

@@ -141,9 +141,10 @@ void TRKPetalCase::constructDetectionPetals(TGeoVolume* motherVolume)
141141
{
142142
// Add petal layers
143143
// layerNumber, layerName, rIn, angularCoverage, zLength, layerx2X0
144-
mPetalLayers.emplace_back(0, Form("%s_LAYER%d", mPetalCaseName.Data(), 0), 0.5f, mAngularCoverageAzimuthalWall, 50.f, 1.e-3);
145-
mPetalLayers.emplace_back(1, Form("%s_LAYER%d", mPetalCaseName.Data(), 1), 1.2f, mAngularCoverageAzimuthalWall, 50.f, 1.e-3);
146-
mPetalLayers.emplace_back(2, Form("%s_LAYER%d", mPetalCaseName.Data(), 2), 2.5f, mAngularCoverageAzimuthalWall, 50.f, 1.e-3);
144+
const Float_t arc1 = 0.6247; // in cm
145+
mPetalLayers.emplace_back(0, Form("%s_LAYER%d", mPetalCaseName.Data(), 0), 0.5f, (arc1 / 0.5f) * TMath::RadToDeg(), 50.f, 1.e-3);
146+
mPetalLayers.emplace_back(1, Form("%s_LAYER%d", mPetalCaseName.Data(), 1), 1.2f, (360.0f) - (0.12f / 1.2f) * TMath::RadToDeg(), 50.f, 1.e-3);
147+
mPetalLayers.emplace_back(2, Form("%s_LAYER%d", mPetalCaseName.Data(), 2), 2.5f, (360.0f) - (0.12f / 2.5f) * TMath::RadToDeg(), 50.f, 1.e-3);
147148
for (Int_t i = 0; i < mPetalLayers.size(); ++i) {
148149
mPetalLayers[i].createLayer(motherVolume, mAzimuthalWallCombiTrans);
149150
}

‎tests/FT3_layout.cfg‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# z_layer r_in r_out Layerx2X0
2+
-26 0.5 2.5 0.001
3+
-30 0.5 2.5 0.001
4+
-34 0.5 2.5 0.001
5+
-77 7 35 0.01
6+
-100 7 35 0.01
7+
-122 7 35 0.01
8+
-150 7 68 0.01
9+
-180 7 68 0.01
10+
-220 7 68 0.01
11+
-260 7 68 0.01
12+
-300 7 68 0.01
13+
-350 7 68 0.01
14+
26 0.5 2.5 0.001
15+
30 0.5 2.5 0.001
16+
34 0.5 2.5 0.001
17+
77 5 35 0.01
18+
100 5 35 0.01
19+
122 5 35 0.01
20+
150 5 68 0.01
21+
180 5 68 0.01
22+
220 5 68 0.01
23+
260 5 68 0.01
24+
300 5 68 0.01
25+
350 5 68 0.01

‎tests/MCStepLoggerSenVol.dat‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
9:TRKSensor0
2+
13:TRKSensor1
3+
17:TRKSensor2
4+
21:TRKSensor3
5+
25:TRKSensor4
6+
29:TRKSensor5
7+
33:TRKSensor6
8+
37:TRKSensor7
9+
41:TRKSensor8
10+
45:TRKSensor9
11+
49:TRKSensor10
12+
103:FT3Sensor_0_0
13+
106:FT3Sensor_0_1
14+
109:FT3Sensor_0_2
15+
112:FT3Sensor_0_3
16+
115:FT3Sensor_0_4
17+
118:FT3Sensor_0_5
18+
121:FT3Sensor_0_6
19+
124:FT3Sensor_0_7
20+
127:FT3Sensor_0_8
21+
130:FT3Sensor_0_9
22+
133:FT3Sensor_0_10
23+
136:FT3Sensor_0_11
24+
138:FT3Sensor_1_0
25+
140:FT3Sensor_1_1
26+
142:FT3Sensor_1_2
27+
144:FT3Sensor_1_3
28+
146:FT3Sensor_1_4
29+
148:FT3Sensor_1_5
30+
150:FT3Sensor_1_6
31+
152:FT3Sensor_1_7
32+
154:FT3Sensor_1_8
33+
156:FT3Sensor_1_9
34+
158:FT3Sensor_1_10
35+
160:FT3Sensor_1_11
36+
164:ITOFSensor
37+
167:OTOFSensor
38+
170:FTOFSensor
39+
173:BTOFSensor

‎tests/MCStepLoggerVolMap.dat‎

Lines changed: 206 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,206 @@
1+
cave:CAVE
2+
barrel:CAVE
3+
VACUUM_BASE:A3IP
4+
A3IP:A3IP
5+
TRKV:TRK
6+
TRKLayer0:TRK
7+
TRKSensor0:TRK
8+
TRKChip0:TRK
9+
TRKStave0:TRK
10+
TRKLayer1:TRK
11+
TRKSensor1:TRK
12+
TRKChip1:TRK
13+
TRKStave1:TRK
14+
TRKLayer2:TRK
15+
TRKSensor2:TRK
16+
TRKChip2:TRK
17+
TRKStave2:TRK
18+
TRKLayer3:TRK
19+
TRKSensor3:TRK
20+
TRKChip3:TRK
21+
TRKStave3:TRK
22+
TRKLayer4:TRK
23+
TRKSensor4:TRK
24+
TRKChip4:TRK
25+
TRKStave4:TRK
26+
TRKLayer5:TRK
27+
TRKSensor5:TRK
28+
TRKChip5:TRK
29+
TRKStave5:TRK
30+
TRKLayer6:TRK
31+
TRKSensor6:TRK
32+
TRKChip6:TRK
33+
TRKStave6:TRK
34+
TRKLayer7:TRK
35+
TRKSensor7:TRK
36+
TRKChip7:TRK
37+
TRKStave7:TRK
38+
TRKLayer8:TRK
39+
TRKSensor8:TRK
40+
TRKChip8:TRK
41+
TRKStave8:TRK
42+
TRKLayer9:TRK
43+
TRKSensor9:TRK
44+
TRKChip9:TRK
45+
TRKStave9:TRK
46+
TRKLayer10:TRK
47+
TRKSensor10:TRK
48+
TRKChip10:TRK
49+
TRKStave10:TRK
50+
TRK_COLDPLATE:TRK
51+
TRK_IRISVACUUMVESSEL:TRK
52+
TRK_addServicesEta34:TRK
53+
TRK_MID_CARBONSUPPORT:TRK
54+
TRK_MID_FIBER_SIO2_bwd:TRK
55+
TRK_MID_FIBER_PE_bwd:TRK
56+
TRK_MID_POWER_CU_bwd:TRK
57+
TRK_MID_POWER_PE_bwd:TRK
58+
TRK_MID_COOLING_PU_bwd:TRK
59+
TRK_MID_COOLING_H2O_bwd:TRK
60+
TRK_MID_FIBER_SIO2_fwd:TRK
61+
TRK_MID_FIBER_PE_fwd:TRK
62+
TRK_MID_POWER_CU_fwd:TRK
63+
TRK_MID_POWER_PE_fwd:TRK
64+
TRK_MID_COOLING_PU_fwd:TRK
65+
TRK_MID_COOLING_H2O_fwd:TRK
66+
TRK_MIDBARCONN_DISK_SIO2_bwd:TRK
67+
TRK_MIDBARCONN_DISK_PE_bwd:TRK
68+
TRK_MIDBARCONN_DISK_CU_bwd:TRK
69+
TRK_MIDBARCONN_DISK_PE_bwd:TRK
70+
TRK_MIDBARCONN_DISK_PU_bwd:TRK
71+
TRK_MIDBARCONN_DISK_H2O_bwd:TRK
72+
TRK_MIDBARCONN_DISK_SIO2_fwd:TRK
73+
TRK_MIDBARCONN_DISK_PE_fwd:TRK
74+
TRK_MIDBARCONN_DISK_CU_fwd:TRK
75+
TRK_MIDBARCONN_DISK_PE_fwd:TRK
76+
TRK_MIDBARCONN_DISK_PU_fwd:TRK
77+
TRK_MIDBARCONN_DISK_H2O_fwd:TRK
78+
TRK_MIDBARFWD_FIBER_SIO2:TRK
79+
TRK_MIDBARFWD_FIBER_PE:TRK
80+
TRK_MIDBARFWD_POWER_CU:TRK
81+
TRK_MIDBARFWD_POWER_PE:TRK
82+
TRK_MIDBARFWD_COOLING_PU:TRK
83+
TRK_MIDBARFWD_COOLING_H2O:TRK
84+
TRK_MIDBARFWD_FIBER_SIO2:TRK
85+
TRK_MIDBARFWD_FIBER_PE:TRK
86+
TRK_MIDBARFWD_POWER_CU:TRK
87+
TRK_MIDBARFWD_POWER_PE:TRK
88+
TRK_MIDBARFWD_COOLING_PU:TRK
89+
TRK_MIDBARFWD_COOLING_H2O:TRK
90+
TRK_MIDFWD_FIBER_SIO2:TRK
91+
TRK_MIDFWD_FIBER_PE:TRK
92+
TRK_MIDFWD_POWER_CU:TRK
93+
TRK_MIDFWD_POWER_PE:TRK
94+
TRK_MIDFWD_COOLING_PU:TRK
95+
TRK_MIDFWD_COOLING_H2O:TRK
96+
TRK_MIDFWD_FIBER_SIO2:TRK
97+
TRK_MIDFWD_FIBER_PE:TRK
98+
TRK_MIDFWD_POWER_CU:TRK
99+
TRK_MIDFWD_POWER_PE:TRK
100+
TRK_MIDFWD_COOLING_PU:TRK
101+
TRK_MIDFWD_COOLING_H2O:TRK
102+
TRK_OUTERDISKS_FIBER_SIO2:TRK
103+
TRK_OUTERDISKS_FIBER_PE:TRK
104+
TRK_OUTERDISKS_POWER_CU:TRK
105+
TRK_OUTERDISKS_POWER_PE:TRK
106+
TRK_OUTERDISKS_COOLING_PU:TRK
107+
TRK_OUTERDISKS_COOLING_H2O:TRK
108+
TRK_OUTERDISKS_FIBER_SIO2:TRK
109+
TRK_OUTERDISKS_FIBER_PE:TRK
110+
TRK_OUTERDISKS_POWER_CU:TRK
111+
TRK_OUTERDISKS_POWER_PE:TRK
112+
TRK_OUTERDISKS_COOLING_PU:TRK
113+
TRK_OUTERDISKS_COOLING_H2O:TRK
114+
TRK_OUTERBARREL_FIBER_SIO2:TRK
115+
TRK_OUTERBARREL_FIBER_PE:TRK
116+
TRK_OUTERBARREL_POWER_CU:TRK
117+
TRK_OUTERBARREL_POWER_PE:TRK
118+
TRK_OUTERBARREL_COOLING_PU:TRK
119+
TRK_OUTERBARREL_COOLING_H2O:TRK
120+
FT3V:FT3
121+
FT3Inner:FT3
122+
FT3Sensor_0_0:FT3
123+
FT3Chip0:FT3
124+
FT3Layer0_0:FT3
125+
FT3Sensor_0_1:FT3
126+
FT3Chip1:FT3
127+
FT3Layer0_1:FT3
128+
FT3Sensor_0_2:FT3
129+
FT3Chip2:FT3
130+
FT3Layer0_2:FT3
131+
FT3Sensor_0_3:FT3
132+
FT3Chip3:FT3
133+
FT3Layer0_3:FT3
134+
FT3Sensor_0_4:FT3
135+
FT3Chip4:FT3
136+
FT3Layer0_4:FT3
137+
FT3Sensor_0_5:FT3
138+
FT3Chip5:FT3
139+
FT3Layer0_5:FT3
140+
FT3Sensor_0_6:FT3
141+
FT3Chip6:FT3
142+
FT3Layer0_6:FT3
143+
FT3Sensor_0_7:FT3
144+
FT3Chip7:FT3
145+
FT3Layer0_7:FT3
146+
FT3Sensor_0_8:FT3
147+
FT3Chip8:FT3
148+
FT3Layer0_8:FT3
149+
FT3Sensor_0_9:FT3
150+
FT3Chip9:FT3
151+
FT3Layer0_9:FT3
152+
FT3Sensor_0_10:FT3
153+
FT3Chip10:FT3
154+
FT3Layer0_10:FT3
155+
FT3Sensor_0_11:FT3
156+
FT3Chip11:FT3
157+
FT3Layer0_11:FT3
158+
FT3Sensor_1_0:FT3
159+
FT3Chip0:FT3
160+
FT3Layer1_0:FT3
161+
FT3Sensor_1_1:FT3
162+
FT3Chip1:FT3
163+
FT3Layer1_1:FT3
164+
FT3Sensor_1_2:FT3
165+
FT3Chip2:FT3
166+
FT3Layer1_2:FT3
167+
FT3Sensor_1_3:FT3
168+
FT3Chip3:FT3
169+
FT3Layer1_3:FT3
170+
FT3Sensor_1_4:FT3
171+
FT3Chip4:FT3
172+
FT3Layer1_4:FT3
173+
FT3Sensor_1_5:FT3
174+
FT3Chip5:FT3
175+
FT3Layer1_5:FT3
176+
FT3Sensor_1_6:FT3
177+
FT3Chip6:FT3
178+
FT3Layer1_6:FT3
179+
FT3Sensor_1_7:FT3
180+
FT3Chip7:FT3
181+
FT3Layer1_7:FT3
182+
FT3Sensor_1_8:FT3
183+
FT3Chip8:FT3
184+
FT3Layer1_8:FT3
185+
FT3Sensor_1_9:FT3
186+
FT3Chip9:FT3
187+
FT3Layer1_9:FT3
188+
FT3Sensor_1_10:FT3
189+
FT3Chip10:FT3
190+
FT3Layer1_10:FT3
191+
FT3Sensor_1_11:FT3
192+
FT3Chip11:FT3
193+
FT3Layer1_11:FT3
194+
IOTOFV:TF3
195+
ITOFSensor:TF3
196+
ITOFChip:TF3
197+
ITOFLayer:TF3
198+
OTOFSensor:TF3
199+
OTOFChip:TF3
200+
OTOFLayer:TF3
201+
FTOFSensor:TF3
202+
FTOFChip:TF3
203+
FTOFLayer:TF3
204+
BTOFSensor:TF3
205+
BTOFChip:TF3
206+
BTOFLayer:TF3

‎tests/alice3_TRK_layout.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/// TRK configuration file: inn_radius z_length lay_thickness
2+
0.5 50 0.01
3+
1.2 50 0.01
4+
2.5 50 0.01
5+
7 124 0.1
6+
9 124 0.1
7+
12 124 0.1
8+
20 124 0.1
9+
30 124 0.1
10+
45 258 0.1
11+
60 258 0.1
12+
80 258 0.1

0 commit comments

Comments
 (0)