Skip to content

Commit 95d2d94

Browse files
pkurashpkurash
committed
updated radiator sizes
1 parent 3101309 commit 95d2d94

1 file changed

Lines changed: 27 additions & 27 deletions

File tree

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

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -309,24 +309,24 @@ TGeoVolumeAssembly* Detector::buildModuleCherenkov_v1()
309309

310310
const int N = 68;
311311

312-
double x[N] = {7.5, 7.5, 6.4, 3.2, 0, -3.2, -6.4, -7.5, -7.5, -7.5, -6.4, -3.2,
313-
0, 3.2, 6.4, 7.5, 10.7, 10.7, 9.6, 9.6, 6.4, 3.2, 0, -3.2,
314-
-6.4, -9.6, -9.6, -10.7, -10.7, -10.7, -9.6, -9.6, -6.4, -3.2, 0, 3.2,
315-
6.4, 9.6, 9.6, 10.7, 13.9, 13.9, 12.8, 12.8, 9.6, 6.4, 3.2, 0,
316-
-3.2, -6.4, -9.6, -12.8, -12.8, -13.9, -13.9, -13.9, -12.8, -12.8, -9.6, -6.4,
317-
-3.2, 0, 3.2, 6.4, 9.6, 12.8, 12.8, 13.9};
318-
319-
double y[N] = {0, 3.2, 6.4, 7.5, 7.5, 7.5, 6.4, 3.2, 0, -3.2, -6.4, -7.5,
320-
-7.5, -7.5, -6.4, -3.2, 0, 3.2, 6.4, 9.6, 9.6, 10.7, 10.7, 10.7,
321-
9.6, 9.6, 6.4, 3.2, 0, -3.2, -6.4, -9.6, -9.6, -10.7, -10.7, -10.7,
322-
-9.6, -9.6, -6.4, -3.2, 0, 3.2, 6.4, 9.6, 12.8, 12.8, 13.9, 13.9,
323-
13.9, 12.8, 12.8, 9.6, 6.4, 3.2, 0, -3.2, -6.4, -9.6, -12.8, -12.8,
324-
-13.9, -13.9, -13.9, -12.8, -12.8, -9.6, -6.4, -3.2};
312+
float x[N] = {7.5f, 7.5f, 6.4f, 3.2f, 0.f, -3.2f, -6.4f, -7.5f, -7.5f, -7.5f, -6.4f, -3.2f,
313+
0.f, 3.2f, 6.4f, 7.5f, 10.7f, 10.7f, 9.6f, 9.6f, 6.4f, 3.2f, 0.f, -3.2f,
314+
-6.4f, -9.6f, -9.6f, -10.7f, -10.7f, -10.7f, -9.6f, -9.6f, -6.4f, -3.2f, 0.f, 3.2f,
315+
6.4f, 9.6f, 9.6f, 10.7f, 13.9f, 13.9f, 12.8f, 12.8f, 9.6f, 6.4f, 3.2f, 0.f,
316+
-3.2f, -6.4f, -9.6f, -12.8f, -12.8f, -13.9f, -13.9f, -13.9f, -12.8f, -12.8f, -9.6f, -6.4f,
317+
-3.2f, 0.f, 3.2f, 6.4f, 9.6f, 12.8f, 12.8f, 13.9f};
318+
319+
float y[N] = {0.f, 3.2f, 6.4f, 7.5f, 7.5f, 7.5f, 6.4f, 3.2f, 0.f, -3.2f, -6.4f, -7.5f,
320+
-7.5f, -7.5f, -6.4f, -3.2f, 0.f, 3.2f, 6.4f, 9.6f, 9.6f, 10.7f, 10.7f, 10.7f,
321+
9.6f, 9.6f, 6.4f, 3.2f, 0.f, -3.2f, -6.4f, -9.6f, -9.6f, -10.7f, -10.7f, -10.7f,
322+
-9.6f, -9.6f, -6.4f, -3.2f, 0.f, 3.2f, 6.4f, 9.6f, 12.8f, 12.8f, 13.9f, 13.9f,
323+
13.9f, 12.8f, 12.8f, 9.6f, 6.4f, 3.2f, 0.f, -3.2f, -6.4f, -9.6f, -12.8f, -12.8f,
324+
-13.9f, -13.9f, -13.9f, -12.8f, -12.8f, -9.6f, -6.4f, -3.2f};
325325

326326
for (int i = 0; i < N; i++) {
327327
int cellId = mChannelCounter++;
328328
std::string nodeName = "fd3_node" + std::to_string(cellId);
329-
auto box = new TGeoBBox(rsizeq - 0.05, rsizeq - 0.05, dz / 2);
329+
auto box = new TGeoBBox(rsizeq, rsizeq, dz / 2);
330330
auto node = new TGeoVolume(nodeName.c_str(), box, medium);
331331
node->SetLineColor(kOrange + 7);
332332
mod->AddNode(node, 1, new TGeoTranslation(x[i], y[i], 0));
@@ -345,24 +345,24 @@ TGeoVolumeAssembly* Detector::buildModuleCherenkov_v2()
345345

346346
const int N = 68;
347347

348-
double x[N] = {4.6, 3.2, 0, -3.2, -4.6, -3.2, 0, 3.2, 7.8, 6.4, 6.4, 3.2,
349-
0, -3.2, -6.4, -6.4, -7.8, -6.4, -6.4, -3.2, 0, 3.2, 6.4, 6.4,
350-
11, 9.6, 9.6, 9.6, 6.4, 3.2, 0, -3.2, -6.4, -9.6, -9.6, -9.6,
351-
-11, -9.6, -9.6, -9.6, -6.4, -3.2, 0, 3.2, 6.4, 9.6, 9.6, 9.6,
352-
14.2, 12.8, 12.8, 6.4, 3.2, 0, -3.2, -6.4, -12.8, -12.8, -14.2, -12.8,
353-
-12.8, -6.4, -3.2, 0, 3.2, 6.4, 12.8, 12.8};
348+
float x[N] = {4.6f, 3.2f, 0.f, -3.2f, -4.6f, -3.2f, 0.f, 3.2f, 7.8f, 6.4f, 6.4f, 3.2f,
349+
0.f, -3.2f, -6.4f, -6.4f, -7.8f, -6.4f, -6.4f, -3.2f, 0.f, 3.2f, 6.4f, 6.4f,
350+
11.f, 9.6f, 9.6f, 9.6f, 6.4f, 3.2f, 0.f, -3.2f, -6.4f, -9.6f, -9.6f, -9.6f,
351+
-11.f, -9.6f, -9.6f, -9.6f, -6.4f, -3.2f, 0.f, 3.2f, 6.4f, 9.6f, 9.6f, 9.6f,
352+
14.2f, 12.8f, 12.8f, 6.4f, 3.2f, 0.f, -3.2f, -6.4f, -12.8f, -12.8f, -14.2f, -12.8f,
353+
-12.8f, -6.4f, -3.2f, 0.f, 3.2f, 6.4f, 12.8f, 12.8f};
354354

355-
double y[N] = {0, 3.2, 4.6, 3.2, 0, -3.2, -4.6, -3.2, 0, 3.2, 6.4, 6.4,
356-
7.8, 6.4, 6.4, 3.2, 0, -3.2, -6.4, -6.4, -7.8, -6.4, -6.4, -3.2,
357-
0, 3.2, 6.4, 9.6, 9.6, 9.6, 11, 9.6, 9.6, 9.6, 6.4, 3.2,
358-
0, -3.2, -6.4, -9.6, -9.6, -9.6, -11, -9.6, -9.6, -9.6, -6.4, -3.2,
359-
0, 3.2, 6.4, 12.8, 12.8, 14.2, 12.8, 12.8, 6.4, 3.2, 0, -3.2,
360-
-6.4, -12.8, -12.8, -14.2, -12.8, -12.8, -6.4, -3.2};
355+
float y[N] = {0.f, 3.2f, 4.6f, 3.2f, 0.f, -3.2f, -4.6f, -3.2f, 0.f, 3.2f, 6.4f, 6.4f,
356+
7.8f, 6.4f, 6.4f, 3.2f, 0.f, -3.2f, -6.4f, -6.4f, -7.8f, -6.4f, -6.4f, -3.2f,
357+
0.f, 3.2f, 6.4f, 9.6f, 9.6f, 9.6f, 11.f, 9.6f, 9.6f, 9.6f, 6.4f, 3.2f,
358+
0.f, -3.2f, -6.4f, -9.6f, -9.6f, -9.6f, -11.f, -9.6f, -9.6f, -9.6f, -6.4f, -3.2f,
359+
0.f, 3.2f, 6.4f, 12.8f, 12.8f, 14.2f, 12.8f, 12.8f, 6.4f, 3.2f, 0.f, -3.2f,
360+
-6.4f, -12.8f, -12.8f, -14.2f, -12.8f, -12.8f, -6.4f, -3.2f};
361361

362362
for (int i = 0; i < N; i++) {
363363
int cellId = mChannelCounter++;
364364
std::string nodeName = "fd3_node" + std::to_string(cellId);
365-
auto box = new TGeoBBox(rsizeq - 0.05, rsizeq - 0.05, dz / 2);
365+
auto box = new TGeoBBox(rsizeq, rsizeq, dz / 2);
366366
auto node = new TGeoVolume(nodeName.c_str(), box, medium);
367367
node->SetLineColor(kOrange + 7);
368368
mod->AddNode(node, 1, new TGeoTranslation(x[i], y[i], 0));

0 commit comments

Comments
 (0)