@@ -320,8 +320,8 @@ void TRKServices::createMiddleServices(TGeoVolume* motherVolume)
320320 const float rMaxMiddleBarrelDisk = 35 .f ;
321321 const float zLengthMiddleBarrel = 64 .2f ;
322322 for (auto & orientation : {Orientation::kASide , Orientation::kCSide }) {
323- TGeoTube* middleBarrelConnDiskSIO2 = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_SIO2sh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, siO2FiberThick/ 2 .);
324- TGeoTube* middleBarrelConnDiskPE = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_PEsh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, peFiberThick/ 2 .);
323+ TGeoTube* middleBarrelConnDiskSIO2 = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_SIO2sh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, siO2FiberThick / 2 .);
324+ TGeoTube* middleBarrelConnDiskPE = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_PEsh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, peFiberThick / 2 .);
325325 TGeoVolume* middleBarrelConnDiskSIO2Volume = new TGeoVolume (Form (" TRK_MIDBARCONN_DISK_SIO2_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), middleBarrelConnDiskSIO2, medSiO2);
326326 TGeoVolume* middleBarrelConnDiskPEVolume = new TGeoVolume (Form (" TRK_MIDBARCONN_DISK_PE_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), middleBarrelConnDiskPE, medPE);
327327 middleBarrelConnDiskSIO2Volume->SetLineColor (kGray );
@@ -332,8 +332,8 @@ void TRKServices::createMiddleServices(TGeoVolume* motherVolume)
332332 motherVolume->AddNode (middleBarrelConnDiskSIO2Volume, 1 , combiTransSIO2);
333333 motherVolume->AddNode (middleBarrelConnDiskPEVolume, 1 , combiTransPE);
334334
335- TGeoTube* middleBarrelConnDiskCu = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_CUsh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, cuPowerThick/ 2 .);
336- TGeoTube* middleBarrelConnDiskPEPower = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_PEsh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, pePowerThick/ 2 .);
335+ TGeoTube* middleBarrelConnDiskCu = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_CUsh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, cuPowerThick / 2 .);
336+ TGeoTube* middleBarrelConnDiskPEPower = new TGeoTube (Form (" TRK_MIDBARCONN_DISK_PEsh_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), rMinMiddleBarrelDisk, rMaxMiddleBarrelDisk, pePowerThick / 2 .);
337337 TGeoVolume* middleBarrelConnDiskCuVolume = new TGeoVolume (Form (" TRK_MIDBARCONN_DISK_CU_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), middleBarrelConnDiskCu, medCu);
338338 TGeoVolume* middleBarrelConnDiskPEPowerVolume = new TGeoVolume (Form (" TRK_MIDBARCONN_DISK_PE_%s" , orientation == Orientation::kASide ? " bwd" : " fwd" ), middleBarrelConnDiskPEPower, medPE);
339339 middleBarrelConnDiskCuVolume->SetLineColor (kGray );
@@ -357,8 +357,8 @@ void TRKServices::createMiddleServices(TGeoVolume* motherVolume)
357357 float rMaxMiddleServicesBarFwd = 74 .5f + siO2FiberThick + peFiberThick + cuPowerThick + pePowerThick + puCoolingThick + h2oCoolingThick;
358358 for (auto & orientation : {Orientation::kASide , Orientation::kCSide }) {
359359 // Create fibers: 3.07mm, 50% SiO2, 50% PE
360- TGeoTube* middleBarFwdFiberSIO2 = new TGeoTube (" TRK_MIDBARFWD_FIBER_SIO2sh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, siO2FiberThick/ 2 .);
361- TGeoTube* middleBarFwdFiberPE = new TGeoTube (" TRK_MIDBARFWD_FIBER_PEsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, peFiberThick/ 2 .);
360+ TGeoTube* middleBarFwdFiberSIO2 = new TGeoTube (" TRK_MIDBARFWD_FIBER_SIO2sh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, siO2FiberThick / 2 .);
361+ TGeoTube* middleBarFwdFiberPE = new TGeoTube (" TRK_MIDBARFWD_FIBER_PEsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, peFiberThick / 2 .);
362362 TGeoVolume* middleBarFwdFiberSIO2Volume = new TGeoVolume (" TRK_MIDBARFWD_FIBER_SIO2" , middleBarFwdFiberSIO2, medSiO2);
363363 TGeoVolume* middleBarFwdFiberPEVolume = new TGeoVolume (" TRK_MIDBARFWD_FIBER_PE" , middleBarFwdFiberPE, medPE);
364364 middleBarFwdFiberSIO2Volume->SetLineColor (kGray );
@@ -370,8 +370,8 @@ void TRKServices::createMiddleServices(TGeoVolume* motherVolume)
370370 motherVolume->AddNode (middleBarFwdFiberPEVolume, 1 , combiTransPE);
371371
372372 // Create powerlines: 10.9mm, 9% Cu, 91% PE
373- TGeoTube* middleBarFwdPowerCu = new TGeoTube (" TRK_MIDBARFWD_POWER_CUsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, cuPowerThick/ 2 .);
374- TGeoTube* middleBarFwdPowerPE = new TGeoTube (" TRK_MIDBARFWD_POWER_PEsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, pePowerThick/ 2 .);
373+ TGeoTube* middleBarFwdPowerCu = new TGeoTube (" TRK_MIDBARFWD_POWER_CUsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, cuPowerThick / 2 .);
374+ TGeoTube* middleBarFwdPowerPE = new TGeoTube (" TRK_MIDBARFWD_POWER_PEsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, pePowerThick / 2 .);
375375 TGeoVolume* middleBarFwdPowerCuVolume = new TGeoVolume (" TRK_MIDBARFWD_POWER_CU" , middleBarFwdPowerCu, medCu);
376376 TGeoVolume* middleBarFwdPowerPEVolume = new TGeoVolume (" TRK_MIDBARFWD_POWER_PE" , middleBarFwdPowerPE, medPE);
377377 middleBarFwdPowerCuVolume->SetLineColor (kGray );
@@ -382,8 +382,8 @@ void TRKServices::createMiddleServices(TGeoVolume* motherVolume)
382382 motherVolume->AddNode (middleBarFwdPowerPEVolume, 1 , combiTransPEPower);
383383
384384 // Create cooling pipes: 4.74mm, 56% PU, 44% H2O
385- TGeoTube* middleBarFwdCoolingPU = new TGeoTube (" TRK_MIDBARFWD_COOLING_PUsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, puCoolingThick/ 2 .);
386- TGeoTube* middleBarFwdCoolingH2O = new TGeoTube (" TRK_MIDBARFWD_COOLING_H2Osh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, h2oCoolingThick/ 2 .);
385+ TGeoTube* middleBarFwdCoolingPU = new TGeoTube (" TRK_MIDBARFWD_COOLING_PUsh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, puCoolingThick / 2 .);
386+ TGeoTube* middleBarFwdCoolingH2O = new TGeoTube (" TRK_MIDBARFWD_COOLING_H2Osh" , rMinMiddleBarrel, rMaxMiddleServicesBarFwd, h2oCoolingThick / 2 .);
387387 TGeoVolume* middleBarFwdCoolingPUVolume = new TGeoVolume (" TRK_MIDBARFWD_COOLING_PU" , middleBarFwdCoolingPU, medPU);
388388 TGeoVolume* middleBarFwdCoolingH2OVolume = new TGeoVolume (" TRK_MIDBARFWD_COOLING_H2O" , middleBarFwdCoolingH2O, medH2O);
389389 middleBarFwdCoolingPUVolume->SetLineColor (kGray );
0 commit comments