#include <Riostream.h>
-#include <TSystem.h>
-#include <TVirtualMC.h>
+#include <TGeoBBox.h>
+#include <TGeoCompositeShape.h>
+#include <TGeoCone.h>
+#include <TGeoGlobalMagField.h>
#include <TGeoManager.h>
-#include <TGeoVolume.h>
+#include <TGeoMatrix.h>
+#include <TGeoPcon.h>
#include <TGeoTorus.h>
#include <TGeoTube.h>
-#include <TGeoCone.h>
-#include <TGeoPcon.h>
-#include <TGeoBBox.h>
+#include <TGeoVolume.h>
#include <TGeoXtru.h>
-#include <TGeoCompositeShape.h>
+#include <TSystem.h>
+#include <TVirtualMC.h>
#include "AliConst.h"
#include "AliMagF.h"
const TGeoMedium* kMedCu = gGeoManager->GetMedium("PIPE_CU");
const TGeoMedium* kMedKapton = gGeoManager->GetMedium("PIPE_KAPTON");
const TGeoMedium* kMedAco = gGeoManager->GetMedium("PIPE_ANTICORODAL");
+ const TGeoMedium* kMedNEG = gGeoManager->GetMedium("PIPE_NEG COATING");
+
// Top volume
TGeoVolume* top = gGeoManager->GetVolume("ALIC");
//
// CP/1 //
///////////////////
// Inner and outer radii of the Be-section [Pos 1]
+ const Float_t kCP1NegRo = 2.90 + 0.0002;
const Float_t kCP1BeRi = 2.90;
const Float_t kCP1BeRo = 2.98;
const Float_t kCP1KaRo = 2.99;
// CP/1 Be-Section //
/////////////////////////////////////////////
TGeoVolume* voCp1Vac = new TGeoVolume("CP1VAC",
- new TGeoTube(0., kCP1BeRi, kCP1Length / 2.),
+ new TGeoTube(0., kCP1BeRi, kCP1BeLength / 2.),
kMedVac);
TGeoVolume* voCp1Be = new TGeoVolume("CP1BE",
new TGeoTube(0., kCP1BeRo, kCP1BeLength / 2.),
TGeoVolume* voCp1Ka = new TGeoVolume("CP1KA",
new TGeoTube(0., kCP1KaRo, kCP1BeLength / 2.),
kMedKapton);
+ // Inner NEG coating
+ TGeoVolume* voCp1NEG = new TGeoVolume("CP1NEG",
+ new TGeoTube(kCP1BeRi, kCP1NegRo, kCP1BeLength / 2.),
+ kMedNEG);
voCp1Ka->AddNode(voCp1Be, 1, gGeoIdentity);
voCp1Be->AddNode(voCp1Vac, 1, gGeoIdentity);
+ voCp1Be->AddNode(voCp1NEG, 1, gGeoIdentity);
voCp1Mo->AddNode(voCp1Ka, 1, gGeoIdentity);
/////////////////////////////////////////////
TGeoPcon* shCp1At = new TGeoPcon(0., 360., 8);
// First Bulge
z = - kCP1BeStAdaptorLength / 2.;
- shCp1At->DefineSection(0, z, kCP1BeRi, kCP1BeStRo);
+ shCp1At->DefineSection(0, z, 0., kCP1BeStRo);
z += kCP1BulgeLength;
- shCp1At->DefineSection(1, z, kCP1BeRi, kCP1BeStRo);
- shCp1At->DefineSection(2, z, kCP1BeRi, kCP1BeRo);
+ shCp1At->DefineSection(1, z, 0., kCP1BeStRo);
+ shCp1At->DefineSection(2, z, 0., kCP1BeRo);
// Between the bulges
z += kCP1BulgeBulgeDistance;
- shCp1At->DefineSection(3, z, kCP1BeRi, kCP1BeRo);
- shCp1At->DefineSection(4, z, kCP1BeRi, kCP1BeStRo);
+ shCp1At->DefineSection(3, z, 0., kCP1BeRo);
+ shCp1At->DefineSection(4, z, 0., kCP1BeStRo);
// Second bulge
z += kCP1BulgeLength;
- shCp1At->DefineSection(5, z, kCP1BeRi, kCP1BeStRo);
- shCp1At->DefineSection(6, z, kCP1BeRi, kCP1BeRo);
+ shCp1At->DefineSection(5, z, 0., kCP1BeStRo);
+ shCp1At->DefineSection(6, z, 0., kCP1BeRo);
// Straight piece
z = kCP1BeStAdaptorLength / 2.;
- shCp1At->DefineSection(7, z, kCP1BeRi, kCP1BeRo);
+ shCp1At->DefineSection(7, z, 0., kCP1BeRo);
//
- TGeoVolume* voCp1At = new TGeoVolume("CP1AT", shCp1At, kMedSteel);
-
+ TGeoVolume* voCp1At = new TGeoVolume("CP1AT", shCp1At, kMedSteel);
+ TGeoVolume* voCp1AtV = new TGeoVolume("CP1ATV", new TGeoTube(0., kCP1BeRi, kCP1BeStAdaptorLength / 2.), kMedVac);
+ voCp1At->AddNode(voCp1AtV, 1, gGeoIdentity);
+
// Position adaptor tube at both ends
dz = kCP1Length / 2. - kCP1BeStAdaptorLength / 2.;
voCp1Mo->AddNode(voCp1At, 1, new TGeoTranslation(0., 0., -dz));
//
// Central beam pipe support collars
// LHCVC2C_0019
+// cp1l = 405.
// Position at z = -46., 40., 150.
- TGeoVolume* voCpSupC = new TGeoVolume("CpSupC", new TGeoTube(3.0, 4.0, 0.35), kMedAco);
- voCp1->AddNode(voCpSupC, 1, new TGeoTranslation(0., 0., kCP1Length / 2. - 81.5));
- voCp1->AddNode(voCpSupC, 2, new TGeoTranslation(0., 0., kCP1Length / 2.- 191.5));
+ TGeoVolume* voCpSupC = new TGeoVolume("CpSupC", new TGeoTube(3.051, 4.00, 0.35), kMedAco);
+ voCp1->AddNode(voCpSupC, 1, new TGeoTranslation(0., 0., kCP1Length / 2. - 98.2 - 34.77 + 0.49));
+// voCp1->AddNode(voCpSupC, 2, new TGeoTranslation(0., 0., kCP1Length / 2.- 191.5));
// Beam Pipe Protection Tube
//
// ALIFWDA_0025
voCp3Mo->SetVisibility(0);
TGeoVolumeAssembly* voCp3 = new TGeoVolumeAssembly("Cp3");
voCp3->AddNode(voCp3Mo, 1, gGeoIdentity);
- voCp3->AddNode(voCpSupC, 3, new TGeoTranslation(0., 0., - kCP3Length / 2. + 4.5));
+ voCp3->AddNode(voCpSupC, 3, new TGeoTranslation(0., 0., - kCP3Length / 2. + 4.6 - 0.49));
dz = kCP3pos;
//////////////////////////////////////////////
// Pos 2.1 RF Contact Flange LHCVSR__0003
//
TGeoPcon* shRB24B1RCTFlange = new TGeoPcon(0., 360., 6);
- const Float_t kRB24B1RCTFlangeRin = 8.06/2.; // Inner radius
- const Float_t kRB24B1RCTFlangeL = 1.45; // Length
+ const Float_t kRB24B1RCTFlangeRin = 8.06/2. + 0.05; // Inner radius
+ const Float_t kRB24B1RCTFlangeL = 1.45; // Length
z = 0.;
shRB24B1RCTFlange->DefineSection(0, z, kRB24B1RCTFlangeRin, 8.20/2.);
z = kRB24B1RCTL - kRB24B1RCTSL;
// In the (VSR0004) this section is straight in (LHCVC2U_0001) it is conical ????
shRB24B1RCT->DefineSection(1, z, kRB24B1RCTRin + 0.35, kRB24B1RCTRin + 0.35 + kRB24B1RCTd);
- z = kRB24B1RCTL;
+ z = kRB24B1RCTL - 0.03;
shRB24B1RCT->DefineSection(2, z, kRB24B1RCTRin, kRB24B1RCTRin + kRB24B1RCTd);
TGeoVolume* voRB24B1RCT = new TGeoVolume("RB24B1RCT", shRB24B1RCT, kMedCu);
shRB24B1TTF->DefineSection(5, z, 6.30/2., 6.7/2.);
// Transition Tube
z += 3.75;
- shRB24B1TTF->DefineSection(6, z, 8.2/2., 8.6/2.);
+ shRB24B1TTF->DefineSection(6, z, 8.05/2., 8.45/2.);
TGeoVolume* voRB24B1TTF = new TGeoVolume("RB24B1TTF", shRB24B1TTF, kMedSteel);
z = 0.;
voRB24B1BellowM->AddNode(voRB24B1TTF, 1, new TGeoTranslation(0., 0., z));
z += (20.35 - 0.63);
shRB24VMABCTT->DefineSection(5, z, 6.3/2., 6.7/2.);
z += 0.63;
- shRB24VMABCTT->DefineSection(6, z, 6.5/2., 6.9/2.);
+ shRB24VMABCTT->DefineSection(6, z, 6.3/2., 6.7/2.);
TGeoVolume* voRB24VMABCTT = new TGeoVolume("RB24VMABCTT", shRB24VMABCTT, kMedSteel);
voRB24VMABCRB->AddNode(voRB24VMABCTT, 1, new TGeoTranslation(0., 0., - kRB24VMABCRBT1L/2.-1.));
voRB24->AddNode(voRB24ValveMo, 1, new TGeoTranslation(0., 0., z));
z += (kRB24ValveWz/2.+ kRB24VMABCRBT1L/2. + 1.);
// VMABC close to forward detectors
- voRB24->AddNode(voRB24VMABCRB, 2, new TGeoTranslation(0., 0., z));
+ voRB24->AddNode(voRB24VMABCRB, 3, new TGeoTranslation(0., 0., z));
//
// RB24/2
//
shRB26s3SFlange->DefineSection(5, z0, kRB26s3SFlangeRi3, kRB26s3SFlangeRo);
TGeoVolume* voRB26s3SFlange = new TGeoVolume("RB26s3SFlange", shRB26s3SFlange, kMedSteel);
- TGeoVolume* voRB26s3SFlangeM = new TGeoVolume("RB26s3SFlange", MakeMotherFromTemplate(shRB26s3SFlange, 0, 3), kMedVac);
+ TGeoVolume* voRB26s3SFlangeM = new TGeoVolume("RB26s3SFlangeM", MakeMotherFromTemplate(shRB26s3SFlange, 0, 3), kMedVac);
voRB26s3SFlangeM->AddNode(voRB26s3SFlange, 1, gGeoIdentity);
///////////////////////////////////
shRB26s3FFlange->DefineSection(5, z0, kRB26s3FFlangeRi3, kRB26s3FFlangeRo);
TGeoVolume* voRB26s3FFlange = new TGeoVolume("RB26s3FFlange", shRB26s3FFlange, kMedSteel);
- TGeoVolume* voRB26s3FFlangeM = new TGeoVolume("RB26s3FFlange", MakeMotherFromTemplate(shRB26s3FFlange, 2, 5), kMedVac);
+ TGeoVolume* voRB26s3FFlangeM = new TGeoVolume("RB26s3FFlangeM", MakeMotherFromTemplate(shRB26s3FFlange, 2, 5), kMedVac);
voRB26s3FFlangeM->AddNode(voRB26s3FFlange, 1, gGeoIdentity);
const Float_t kRB26s5CompTubeInnerR = 10.00/2.; // Connection tubes inner radius [Pos 2 + 3]
const Float_t kRB26s5CompTubeOuterR = 10.30/2.; // Connection tubes outer radius [Pos 2 + 3]
const Float_t kRB26s5WeldingTubeLeftL = 3.70/2.; // Left connection tube half length [Pos 2]
- const Float_t kRB26s5WeldingTubeRightL = 13.42/2.; // Right connection tube half length [Pos 3] (0.3 cm added for welding)
+ const Float_t kRB26s5WeldingTubeRightL = 13.40/2.; // Right connection tube half length [Pos 3] (0.3 cm added for welding)
const Float_t kRB26s5RingInnerR = 11.2/2.; // Ring inner radius [Pos 4]
const Float_t kRB26s5RingOuterR = 16.0/2.; // Ring inner radius [Pos 4]
const Float_t kRB26s5RingL = 0.4/2.; // Ring half length [Pos 4]
//
AliDebugClass(1,"Create PIPEv3 materials");
- Int_t isxfld = gAlice->Field()->Integ();
- Float_t sxmgmx = gAlice->Field()->Max();
+ Int_t isxfld = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+ Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
// Steel (Inox)
Float_t asteel[4] = { 55.847,51.9961,58.6934,28.0855 };
Float_t zsteel[4] = { 26.,24.,28.,14. };
Float_t zAir[4]={6.,7.,8.,18.};
Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
Float_t dAir = 1.20479E-3;
- Float_t dAir1 = 1.20479E-10;
+ Float_t dAir1 = 1.20479E-11;
//
// Insulation powder
// Si O Ti Al
Float_t zKapton[4]={1.,6.,7.,8.};
Float_t wKapton[4]={0.026362,0.69113,0.07327,0.209235};
Float_t dKapton = 1.42;
+ // NEG coating
+ // Ti V Zr
+ Float_t aNEG[4] = {47.87, 50.94, 91.24};
+ Float_t zNEG[4] = {22.00, 23.00, 40.00};
+ Float_t wNEG[4] = {1./3., 1./3., 1./3.};
+ Float_t dNEG = 5.6; // ?
+ //
//
// Berillium
AliMaterial(5, "BERILLIUM$", 9.01, 4., 1.848, 35.3, 36.7);
AliMixture(23, "KAPTON", aKapton, zKapton, dKapton, 4, wKapton);
// Anticorodal
AliMixture(24, "ANTICORODAL", aaco, zaco, 2.66, 3, waco);
-
+
//
// Insulation powder
AliMixture(14, "INSULATION0$", ains, zins, 0.41, 4, wins);
AliMixture(34, "INSULATION1$", ains, zins, 0.41, 4, wins);
AliMixture(54, "INSULATION2$", ains, zins, 0.41, 4, wins);
+
+ // NEG
+ AliMixture(25, "NEG COATING", aNEG, zNEG, dNEG, -3, wNEG);
+
+
// ****************
// Defines tracking media parameters.
//
//
// KAPTON
AliMedium(23, "KAPTON", 23, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
+
+ //
+ // NEG
+ AliMedium(25, "NEG COATING", 25, 0, isxfld, sxmgmx, tmaxfd, stemax, deemax, epsil, stmin);
}
}
-TGeoVolume* AliPIPEv3::MakeBellow(char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t dU, Float_t rPlie, Float_t dPlie)
+TGeoVolume* AliPIPEv3::MakeBellow(const char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t dU, Float_t rPlie, Float_t dPlie)
{
// nc Number of convolution
// rMin Inner radius of the bellow
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff