Skip to content

Commit 5dd4aec

Browse files
mconcassawenzel
mconcas
authored and
sawenzel
committed
Uniform colors with LoI sketches
1 parent d2ec829 commit 5dd4aec

File tree

5 files changed

+25
-15
lines changed

5 files changed

+25
-15
lines changed

‎Detectors/Upgrades/ALICE3/FCT/simulation/src/FCTLayer.cxx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,14 @@ void FCTLayer::createDiskLayer(TGeoVolume* motherVolume)
9999
TGeoMedium* medAir = gGeoManager->GetMedium("FCT_AIR$");
100100

101101
TGeoVolume* sensVol = new TGeoVolume(sensName.c_str(), sensor, medSi);
102+
sensVol->SetLineColor(kGreen + 3);
102103
TGeoVolume* chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
104+
chipVol->SetLineColor(kGreen + 3);
103105
TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
106+
layerVol->SetLineColor(kGreen + 3);
104107

105-
LOG(info) << "Inserting " << sensVol->GetName() << " inside " << chipVol->GetName();
108+
LOG(info)
109+
<< "Inserting " << sensVol->GetName() << " inside " << chipVol->GetName();
106110
chipVol->AddNode(sensVol, 1, nullptr);
107111

108112
LOG(info) << "Inserting " << chipVol->GetName() << " inside " << layerVol->GetName();

‎Detectors/Upgrades/ALICE3/FT3/simulation/src/FT3Layer.cxx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,11 @@ void FT3Layer::createLayer(TGeoVolume* motherVolume)
7474
TGeoMedium* medAir = gGeoManager->GetMedium("FT3_AIR$");
7575

7676
TGeoVolume* sensVol = new TGeoVolume(sensName.c_str(), sensor, medSi);
77+
sensVol->SetLineColor(kBlue - 4);
7778
TGeoVolume* chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
79+
chipVol->SetLineColor(kBlue - 4);
7880
TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
81+
layerVol->SetLineColor(kBlue - 4);
7982

8083
LOG(info) << "Inserting " << sensVol->GetName() << " inside " << chipVol->GetName();
8184
chipVol->AddNode(sensVol, 1, nullptr);

‎Detectors/Upgrades/ALICE3/IOTOF/simulation/src/Layer.cxx‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ void ITOFLayer::createLayer(TGeoVolume* motherVolume)
5151
TGeoVolume* sensVol = new TGeoVolume(sensName.c_str(), sensor, medSi);
5252
TGeoVolume* chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
5353
TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
54-
sensVol->SetLineColor(kAzure + 4);
55-
chipVol->SetLineColor(kAzure + 4);
56-
layerVol->SetLineColor(kAzure + 4);
54+
sensVol->SetLineColor(kMagenta - 7);
55+
chipVol->SetLineColor(kMagenta - 7);
56+
layerVol->SetLineColor(kMagenta - 7);
5757

5858
LOGP(info, "Inserting {} in {} ", sensVol->GetName(), chipVol->GetName());
5959
chipVol->AddNode(sensVol, 1, nullptr);
@@ -80,9 +80,9 @@ void OTOFLayer::createLayer(TGeoVolume* motherVolume)
8080
TGeoVolume* sensVol = new TGeoVolume(sensName.c_str(), sensor, medSi);
8181
TGeoVolume* chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
8282
TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
83-
sensVol->SetLineColor(kRed + 1);
84-
chipVol->SetLineColor(kRed + 1);
85-
layerVol->SetLineColor(kRed + 1);
83+
sensVol->SetLineColor(kMagenta - 7);
84+
chipVol->SetLineColor(kMagenta - 7);
85+
layerVol->SetLineColor(kMagenta - 7);
8686

8787
LOGP(info, "Inserting {} in {} ", sensVol->GetName(), chipVol->GetName());
8888
chipVol->AddNode(sensVol, 1, nullptr);
@@ -109,9 +109,9 @@ void FTOFLayer::createLayer(TGeoVolume* motherVolume)
109109
TGeoVolume* sensVol = new TGeoVolume(sensName.c_str(), sensor, medSi);
110110
TGeoVolume* chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
111111
TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
112-
sensVol->SetLineColor(kGreen + 2);
113-
chipVol->SetLineColor(kGreen + 2);
114-
layerVol->SetLineColor(kGreen + 2);
112+
sensVol->SetLineColor(kMagenta - 7);
113+
chipVol->SetLineColor(kMagenta - 7);
114+
layerVol->SetLineColor(kMagenta - 7);
115115

116116
LOGP(info, "Inserting {} in {} ", sensVol->GetName(), chipVol->GetName());
117117
chipVol->AddNode(sensVol, 1, nullptr);
@@ -141,9 +141,9 @@ void BTOFLayer::createLayer(TGeoVolume* motherVolume)
141141
TGeoVolume* sensVol = new TGeoVolume(sensName.c_str(), sensor, medSi);
142142
TGeoVolume* chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
143143
TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
144-
sensVol->SetLineColor(kGreen + 2);
145-
chipVol->SetLineColor(kGreen + 2);
146-
layerVol->SetLineColor(kGreen + 2);
144+
sensVol->SetLineColor(kMagenta - 7);
145+
chipVol->SetLineColor(kMagenta - 7);
146+
layerVol->SetLineColor(kMagenta - 7);
147147

148148
LOGP(info, "Inserting {} in {} ", sensVol->GetName(), chipVol->GetName());
149149
chipVol->AddNode(sensVol, 1, nullptr);

‎Detectors/Upgrades/ALICE3/Passive/src/Pipe.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void Alice3Pipe::ConstructGeometry()
103103
// Strategy used here is to use a composite shape where shapes of TRK layers are subtracted to the vacuum volume
104104
TGeoTube* outerBeTube = new TGeoTube("OUT_PIPEsh", mBeOuterPipeRmin, mBeOuterPipeRmin + mBeOuterPipeThick, mOuterIpHLength);
105105
TGeoVolume* outerBeTubeVolume = new TGeoVolume("OUT_PIPE", outerBeTube, kMedBe);
106-
outerBeTubeVolume->SetLineColor(kBlue);
106+
outerBeTubeVolume->SetLineColor(kGreen - 9);
107107

108108
TGeoTube* outerBerylliumTubeVacuumBase = new TGeoTube("OUT_PIPEVACUUM_BASEsh", mBeInnerPipeRmin + mBeInnerPipeThick, mBeOuterPipeRmin, mOuterIpHLength); // Vacuum filling for outer pipe
109109
TGeoCompositeShape* outerBerylliumTubeVacuumComposite; // Composite volume to subctract to vacuum
@@ -155,7 +155,7 @@ void Alice3Pipe::ConstructGeometry()
155155
TGeoTube* innerBeTube =
156156
new TGeoTube("INN_PIPEsh", mBeInnerPipeRmin, mBeInnerPipeRmin + mBeInnerPipeThick, mInnerIpHLength);
157157
TGeoVolume* innerBeTubeVolume = new TGeoVolume("INN_PIPE", innerBeTube, kMedBe);
158-
innerBeTubeVolume->SetLineColor(kRed);
158+
innerBeTubeVolume->SetLineColor(kGreen - 9);
159159

160160
TGeoTube* berylliumTubeVacuum =
161161
new TGeoTube("INN_PIPEVACUUMsh", 0., mBeInnerPipeRmin, mInnerIpHLength);

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@ void TRKLayer::createLayer(TGeoVolume* motherVolume)
5151
TGeoMedium* medAir = gGeoManager->GetMedium("TRK_AIR$");
5252

5353
TGeoVolume* sensVol = new TGeoVolume(sensName.c_str(), sensor, medSi);
54+
sensVol->SetLineColor(kBlue - 4);
5455
TGeoVolume* chipVol = new TGeoVolume(chipName.c_str(), chip, medSi);
56+
chipVol->SetLineColor(kBlue - 4);
5557
TGeoVolume* layerVol = new TGeoVolume(mLayerName.c_str(), layer, medAir);
58+
layerVol->SetLineColor(kBlue - 4);
5659

5760
LOGP(info, "Inserting {} in {} ", sensVol->GetName(), chipVol->GetName());
5861
chipVol->AddNode(sensVol, 1, nullptr);

0 commit comments

Comments
 (0)