-
- TGeoVolume *endcapair1 = new TGeoVolume("SPDendcapair1shield",
- endcapair1shape,medSPDair);
- endcapair1->SetVisibility(kTRUE);
- endcapair1->SetLineColor(5); // Yellow
- endcapair1->SetLineWidth(1);
- endcapair1->SetFillColor(endcapair1->GetLineColor());
- endcapair1->SetFillStyle(4090); // 90% transparent
-
- TGeoVolume *endcapair2 = new TGeoVolume("SPDendcapair2shield",
- endcapair2shape,medSPDair);
- endcapair2->SetVisibility(kTRUE);
- endcapair2->SetLineColor(5); // Yellow
- endcapair2->SetLineWidth(1);
- endcapair2->SetFillColor(endcapair2->GetLineColor());
- endcapair2->SetFillStyle(4090); // 90% transparent
-
- TGeoVolume *endcapair3 = new TGeoVolume("SPDendcapair3shield",
- endcapair3shape,medSPDair);
- endcapair3->SetVisibility(kTRUE);
- endcapair3->SetLineColor(5); // Yellow
- endcapair3->SetLineWidth(1);
- endcapair3->SetFillColor(endcapair3->GetLineColor());
- endcapair3->SetFillStyle(4090); // 90% transparent
-
- TGeoVolume *endcapair4 = new TGeoVolume("SPDendcapair4shield",
- endcapair4shape,medSPDair);
- endcapair4->SetVisibility(kTRUE);
- endcapair4->SetLineColor(5); // Yellow
- endcapair4->SetLineWidth(1);
- endcapair4->SetFillColor(endcapair4->GetLineColor());
- endcapair4->SetFillStyle(4090); // 90% transparent
-
- TGeoVolume *endcapair5 = new TGeoVolume("SPDendcapair5shield",
- endcapair5shape,medSPDair);
- endcapair5->SetVisibility(kTRUE);
- endcapair5->SetLineColor(5); // Yellow
- endcapair5->SetLineWidth(1);
- endcapair5->SetFillColor(endcapair5->GetLineColor());
- endcapair5->SetFillStyle(4090); // 90% transparent
-
- TGeoVolume *endcapair6 = new TGeoVolume("SPDendcapair6shield",
- endcapair6shape,medSPDair);
- endcapair6->SetVisibility(kTRUE);
- endcapair6->SetLineColor(5); // Yellow
- endcapair6->SetLineWidth(1);
- endcapair6->SetFillColor(endcapair6->GetLineColor());
- endcapair6->SetFillStyle(4090); // 90% transparent
-
- endcapshield->AddNode(endcapair1,1,0);
- endcapshield->AddNode(endcapair2,1,0);
- endcapshield->AddNode(endcapair2,2,new TGeoRotation("",90,180,-90));
- endcapshield->AddNode(endcapair3,1,0);
- endcapshield->AddNode(endcapair3,2,new TGeoRotation("",90,180,-90));
- endcapshield->AddNode(endcapair4,1,0);
- endcapshield->AddNode(endcapair4,2,new TGeoRotation("",90,180,-90));
- endcapshield->AddNode(endcapair5,1,0);
- endcapshield->AddNode(endcapair5,2,new TGeoRotation("",90,180,-90));
- endcapshield->AddNode(endcapair6,1,0);
- endcapshield->AddNode(endcapair6,2,new TGeoRotation("",90,180,-90));
+ endcapshield->SetFillColor(endcapshield->GetLineColor());
+ endcapshield->SetFillStyle(4090); // 90% transparent
+
+ TGeoVolume *fillerblock = new TGeoVolume("SPDfillerblock",
+ fillershape,medSPDcf);
+ fillerblock->SetVisibility(kTRUE);
+ fillerblock->SetLineColor(7);
+ fillerblock->SetLineWidth(1);
+ fillerblock->SetFillColor(fillerblock->GetLineColor());
+ fillerblock->SetFillStyle(4090); // 90% transparent
+
+ TGeoVolume *fillerhole = new TGeoVolume("SPDfillerhole",
+ fillerholeshape,medSPDair);
+ fillerhole->SetVisibility(kTRUE);
+ fillerhole->SetLineColor(5); // Yellow
+ fillerhole->SetLineWidth(1);
+ fillerhole->SetFillColor(fillerhole->GetLineColor());
+ fillerhole->SetFillStyle(4090); // 90% transparent
+
+ ypos = (fillershape->GetY(0)+fillershape->GetY(1))/2;
+ fillerblock->AddNode(fillerhole, 1, new TGeoTranslation(0, ypos, 0));
+
+ zpos = omgendcapshape->GetZ(1) - fillershape->GetZ(1) - kFillerBlockZTrans;
+ endcapshield->AddNode(fillerblock, 1, new TGeoTranslation(0, 0, zpos));
+ endcapshield->AddNode(fillerblock, 2, new TGeoCombiTrans(0, 0, zpos,
+ new TGeoRotation("", kThetaDeg,0,0)));
+ endcapshield->AddNode(fillerblock, 3, new TGeoCombiTrans(0, 0, zpos,
+ new TGeoRotation("",-kThetaDeg,0,0)));
+ endcapshield->AddNode(fillerblock, 4, new TGeoCombiTrans(0, 0, zpos,
+ new TGeoRotation("", 2*kThetaDeg,0,0)));
+ endcapshield->AddNode(fillerblock, 5, new TGeoCombiTrans(0, 0, zpos,
+ new TGeoRotation("",-2*kThetaDeg,0,0)));
+
+ TGeoVolume *fillerbar = new TGeoVolume("SPDfillerbar",
+ fillbarshape,medSPDcf);
+ fillerbar->SetVisibility(kTRUE);
+ fillerbar->SetLineColor(7);
+ fillerbar->SetLineWidth(1);
+ fillerbar->SetFillColor(fillerbar->GetLineColor());
+ fillerbar->SetFillStyle(4090); // 90% transparent
+
+ TGeoVolume *fillbarhole = new TGeoVolume("SPDfillerbarhole",
+ fillbarholeshape,medSPDair);
+ fillbarhole->SetVisibility(kTRUE);
+ fillbarhole->SetLineColor(5); // Yellow
+ fillbarhole->SetLineWidth(1);
+ fillbarhole->SetFillColor(fillbarhole->GetLineColor());
+ fillbarhole->SetFillStyle(4090); // 90% transparent
+
+ fillerbar->AddNode(fillbarhole, 1, 0);