Skip to content

Commit 544c8ef

Browse files
marcovanleeuwenmarcovanleeuwen
committed
[ALICE 3] Fix one more overlap in the tracker services in the LoI geometry; plus cosmetics
1 parent 871f3e3 commit 544c8ef

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

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

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,10 @@ void TRKServices::createMiddleServices(TGeoVolume* motherVolume)
331331
const float rMaxMiddleBarrelDisk = 35.f;
332332
const float zLengthMiddleBarrel = 64.5f;
333333
for (auto& orientation : {Orientation::kASide, Orientation::kCSide}) {
334-
TGeoTube* middleBarrelConnDiskSIO2 = new TGeoTube(Form("TRK_MIDBARCONN_DISK_SIO2sh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, siO2FiberThick / 2.);
335-
TGeoTube* middleBarrelConnDiskPE = new TGeoTube(Form("TRK_MIDBARCONN_DISK_PEsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, peFiberThick / 2.);
336-
TGeoVolume* middleBarrelConnDiskSIO2Volume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_SIO2_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskSIO2, medSiO2);
337-
TGeoVolume* middleBarrelConnDiskPEVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_PE_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskPE, medPE);
334+
TGeoTube* middleBarrelConnDiskSIO2 = new TGeoTube(Form("TRK_MIDBARCONN_DISK_FIBER_SIO2sh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, siO2FiberThick / 2.);
335+
TGeoTube* middleBarrelConnDiskPE = new TGeoTube(Form("TRK_MIDBARCONN_DISK_FIBER_PEsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, peFiberThick / 2.);
336+
TGeoVolume* middleBarrelConnDiskSIO2Volume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_FIBER_SIO2_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskSIO2, medSiO2);
337+
TGeoVolume* middleBarrelConnDiskPEVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_FIBER_PE_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskPE, medPE);
338338
middleBarrelConnDiskSIO2Volume->SetLineColor(kGray);
339339
middleBarrelConnDiskPEVolume->SetLineColor(kGray);
340340
auto* rot = new TGeoRotation("", 0, 0, 180);
@@ -343,25 +343,27 @@ void TRKServices::createMiddleServices(TGeoVolume* motherVolume)
343343
motherVolume->AddNode(middleBarrelConnDiskSIO2Volume, 1, combiTransSIO2);
344344
motherVolume->AddNode(middleBarrelConnDiskPEVolume, 1, combiTransPE);
345345

346-
TGeoTube* middleBarrelConnDiskCu = new TGeoTube(Form("TRK_MIDBARCONN_DISK_CUsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, cuPowerThick / 2.);
347-
TGeoTube* middleBarrelConnDiskPEPower = new TGeoTube(Form("TRK_MIDBARCONN_DISK_PEsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, pePowerThick / 2.);
348-
TGeoVolume* middleBarrelConnDiskCuVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_CU_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskCu, medCu);
349-
TGeoVolume* middleBarrelConnDiskPEPowerVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_PE_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskPEPower, medPE);
346+
TGeoTube* middleBarrelConnDiskCu = new TGeoTube(Form("TRK_MIDBARCONN_DISK_POWER_CUsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, cuPowerThick / 2.);
347+
TGeoTube* middleBarrelConnDiskPEPower = new TGeoTube(Form("TRK_MIDBARCONN_DISK_POWER_PEsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, pePowerThick / 2.);
348+
TGeoVolume* middleBarrelConnDiskCuVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_POWER_CU_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskCu, medCu);
349+
TGeoVolume* middleBarrelConnDiskPEPowerVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_POWER_PE_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskPEPower, medPE);
350350
middleBarrelConnDiskCuVolume->SetLineColor(kGray);
351351
middleBarrelConnDiskPEPowerVolume->SetLineColor(kGray);
352352
auto* combiTransCu = new TGeoCombiTrans(0, 0, (int)orientation * (siO2FiberThick + peFiberThick + cuPowerThick / 2. + zLengthMiddleBarrel), rot);
353353
auto* combiTransPEPower = new TGeoCombiTrans(0, 0, (int)orientation * (siO2FiberThick + peFiberThick + cuPowerThick + pePowerThick / 2. + zLengthMiddleBarrel), rot);
354354
motherVolume->AddNode(middleBarrelConnDiskCuVolume, 1, combiTransCu);
355355
motherVolume->AddNode(middleBarrelConnDiskPEPowerVolume, 1, combiTransPEPower);
356356

357-
TGeoTube* middleBarrelConnDiskPU = new TGeoTube(Form("TRK_MIDBARCONN_DISK_PUsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, puCoolingThick);
358-
TGeoTube* middleBarrelConnDiskH2O = new TGeoTube(Form("TRK_MIDBARCONN_DISK_H2Osh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, h2oCoolingThick);
357+
TGeoTube* middleBarrelConnDiskPU = new TGeoTube(Form("TRK_MIDBARCONN_DISK_PUsh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, puCoolingThick / 2.);
358+
TGeoTube* middleBarrelConnDiskH2O = new TGeoTube(Form("TRK_MIDBARCONN_DISK_H2Osh_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, h2oCoolingThick / 2.);
359359
TGeoVolume* middleBarrelConnDiskPUVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_PU_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskPU, medPU);
360360
TGeoVolume* middleBarrelConnDiskH2OVolume = new TGeoVolume(Form("TRK_MIDBARCONN_DISK_H2O_%s", orientation == Orientation::kASide ? "bwd" : "fwd"), middleBarrelConnDiskH2O, medH2O);
361361
middleBarrelConnDiskPUVolume->SetLineColor(kGray);
362362
middleBarrelConnDiskH2OVolume->SetLineColor(kGray);
363-
motherVolume->AddNode(middleBarrelConnDiskPUVolume, 1, combiTransCu);
364-
motherVolume->AddNode(middleBarrelConnDiskH2OVolume, 1, combiTransPEPower);
363+
auto* combiTransPU = new TGeoCombiTrans(0, 0, (int)orientation * (siO2FiberThick + peFiberThick + cuPowerThick + pePowerThick + puCoolingThick / 2. + zLengthMiddleBarrel), rot);
364+
auto* combiTransH2O = new TGeoCombiTrans(0, 0, (int)orientation * (siO2FiberThick + peFiberThick + cuPowerThick + pePowerThick + puCoolingThick + h2oCoolingThick / 2. + zLengthMiddleBarrel), rot);
365+
motherVolume->AddNode(middleBarrelConnDiskPUVolume, 1, combiTransPU);
366+
motherVolume->AddNode(middleBarrelConnDiskH2OVolume, 1, combiTransH2O);
365367
}
366368

367369
// Barrel to forward connection disks
@@ -533,7 +535,7 @@ void TRKServices::createMLServicesPeacock(TGeoVolume* motherVolume)
533535
const int ITBarrelnPower = 70;
534536
float siO2FiberAreaB = ITBarrelnFiber * mFiberArea * mFiberComposition[0];
535537
float peFiberAreaB = ITBarrelnFiber * mFiberArea * mFiberComposition[1];
536-
;
538+
537539
float puCoolingAreaB = 0;
538540
float h2oCoolingAreaB = 0;
539541
float cuPowerAreaB = ITBarrelnPower * mPowerBundleArea * mPowerBundleComposition[0];
@@ -544,7 +546,7 @@ void TRKServices::createMLServicesPeacock(TGeoVolume* motherVolume)
544546
const int ITDisknPower = 3 * 16;
545547
float siO2FiberAreaD = ITDisknFiber * mFiberArea * mFiberComposition[0];
546548
float peFiberAreaD = ITDisknFiber * mFiberArea * mFiberComposition[1];
547-
;
549+
548550
float puCoolingAreaD = 0;
549551
float h2oCoolingAreaD = 0;
550552
float cuPowerAreaD = ITDisknPower * mPowerBundleArea * mPowerBundleComposition[0];
@@ -579,16 +581,16 @@ void TRKServices::createMLServicesPeacock(TGeoVolume* motherVolume)
579581

580582
double zCur = zLengthMiddleBarrel;
581583
double dZ = siO2FiberAreaB / diskCircumference / 2.;
582-
TGeoTube* middleBarrelConnDiskSIO2 = new TGeoTube("TRK_MIDBARCONN_DISK_SIO2sh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
583-
TGeoVolume* middleBarrelConnDiskSIO2Volume = new TGeoVolume("TRK_MIDBARCONN_DISK_SIO2", middleBarrelConnDiskSIO2, medSiO2);
584+
TGeoTube* middleBarrelConnDiskSIO2 = new TGeoTube("TRK_MIDBARCONN_DISK_FIBER_SIO2sh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
585+
TGeoVolume* middleBarrelConnDiskSIO2Volume = new TGeoVolume("TRK_MIDBARCONN_DISK_FIBER_SIO2", middleBarrelConnDiskSIO2, medSiO2);
584586
middleBarrelConnDiskSIO2Volume->SetLineColor(kGray);
585587
auto* rot = new TGeoRotation("", 0, 0, 180); // Why this?
586588
auto* combiTransSIO2 = new TGeoCombiTrans(0, 0, (int)orientation * (zCur + dZ), rot);
587589

588590
zCur += 2. * dZ;
589591
dZ = peFiberAreaB / diskCircumference / 2.;
590-
TGeoTube* middleBarrelConnDiskPE = new TGeoTube("TRK_MIDBARCONN_DISK_PEsh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
591-
TGeoVolume* middleBarrelConnDiskPEVolume = new TGeoVolume("TRK_MIDBARCONN_DISK_PE", middleBarrelConnDiskPE, medPE);
592+
TGeoTube* middleBarrelConnDiskPE = new TGeoTube("TRK_MIDBARCONN_DISK_FIBER_PEsh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
593+
TGeoVolume* middleBarrelConnDiskPEVolume = new TGeoVolume("TRK_MIDBARCONN_DISK_FIBER_PE", middleBarrelConnDiskPE, medPE);
592594
middleBarrelConnDiskPEVolume->SetLineColor(kGray);
593595
auto* combiTransPE = new TGeoCombiTrans(0, 0, (int)orientation * (zCur + dZ), rot);
594596

@@ -597,15 +599,15 @@ void TRKServices::createMLServicesPeacock(TGeoVolume* motherVolume)
597599

598600
zCur += 2. * dZ;
599601
dZ = cuPowerAreaB / diskCircumference / 2.;
600-
TGeoTube* middleBarrelConnDiskCu = new TGeoTube("TRK_MIDBARCONN_DISK_CUsh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
601-
TGeoVolume* middleBarrelConnDiskCuVolume = new TGeoVolume("TRK_MIDBARCONN_DISK_CU", middleBarrelConnDiskCu, medCu);
602+
TGeoTube* middleBarrelConnDiskCu = new TGeoTube("TRK_MIDBARCONN_DISK_POWER_CUsh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
603+
TGeoVolume* middleBarrelConnDiskCuVolume = new TGeoVolume("TRK_MIDBARCONN_DISK_POWER_CU", middleBarrelConnDiskCu, medCu);
602604
middleBarrelConnDiskCuVolume->SetLineColor(kGray);
603605
auto* combiTransCu = new TGeoCombiTrans(0, 0, (int)orientation * (zCur + dZ), rot);
604606

605607
zCur += 2. * dZ;
606608
dZ = pePowerAreaB / diskCircumference / 2.;
607-
TGeoTube* middleBarrelConnDiskPEPower = new TGeoTube("TRK_MIDBARCONN_DISK_PEsh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
608-
TGeoVolume* middleBarrelConnDiskPEPowerVolume = new TGeoVolume("TRK_MIDBARCONN_DISK_PE", middleBarrelConnDiskPEPower, medPE);
609+
TGeoTube* middleBarrelConnDiskPEPower = new TGeoTube("TRK_MIDBARCONN_DISK_POWER_PEsh", rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, dZ);
610+
TGeoVolume* middleBarrelConnDiskPEPowerVolume = new TGeoVolume("TRK_MIDBARCONN_DISK_POWER_PE", middleBarrelConnDiskPEPower, medPE);
609611
middleBarrelConnDiskPEPowerVolume->SetLineColor(kGray);
610612
auto* combiTransPEPower = new TGeoCombiTrans(0, 0, (int)orientation * (zCur + dZ), rot);
611613
motherVolume->AddNode(middleBarrelConnDiskCuVolume, 1, combiTransCu);

0 commit comments

Comments
 (0)