//
Float_t alhc = 0.794;
- TGeoRotation* rotxz = new TGeoRotation("rotxz", 90., 0., 90., 90., 180., 0.);
+ TGeoRotation* rotxz = new TGeoRotation("rotxz", 270., 0., 90., 90., 180., 0.);
+ TGeoRotation* rotiz = new TGeoRotation("rotiz", 90., 0., 90., 90., 180., 0.);
TGeoRotation* rotxzlhc = new TGeoRotation("rotxzlhc", 180., 180. + alhc, 0.);
- TGeoRotation* rotlhc = new TGeoRotation("rotlhc", 0., alhc, 0.);
TGeoRotation* rotxz108 = new TGeoRotation("rotxz108", 90., 108., 90., 198., 180., 0.);
TGeoRotation* rotxz180 = new TGeoRotation("rotxz180", 90., 180., 90., 270., 180., 0.);
//
- // Mother volume
+ // Mother volume for muon spectrometer tracking station 3
+
+ Float_t z30 = 825.;
+ Float_t zst = 1052.;
+
+ Float_t rcD0 = (kZDipoleF - 5.) * TMath::Tan(9. * kDegrad);
Float_t rcD1 = kZDipole * TMath::Tan(9. * kDegrad);
- TGeoPcon* shDDIP1 = new TGeoPcon("shDDIP1", 0., 360., 4);
- shDDIP1->DefineSection(0, -dipoleL/2. - 5., 0., (kZDipoleF -5.) * TMath::Tan(9. * kDegrad));
- shDDIP1->DefineSection(1, 0., 0., rcD1);
Float_t rcD2 = rcD1 + dipoleL/2. * TMath::Tan(10.1 * kDegrad);
- shDDIP1->DefineSection(2, +dipoleL/2., 0., rcD2);
- shDDIP1->DefineSection(3, +dipoleL/2. + 5., 0., rcD2);
-
- TGeoCombiTrans* trDDIP = new TGeoCombiTrans("trDDIP", 0., dipoleL/2. * TMath::Tan(alhc * kDegrad), 0., rotlhc);
- trDDIP->RegisterYourself();
+ Float_t rc30 = z30 * TMath::Tan(9. * kDegrad);
+ Float_t rcst = rcD1 + (zst - kZDipole) * TMath::Tan(10.1 * kDegrad);
+
+
+ Float_t riD0 = (kZDipoleF - 5.) * TMath::Tan(2. * kDegrad) + 0.2;
+ Float_t riD1 = 30.;
+ Float_t riD2 = 35.8;
+ Float_t riD3 = riD2 + (kZDipoleR - zst) * TMath::Tan(2. * kDegrad);
+ Float_t riD4 = riD2 + (kZDipoleR - zst + 5.) * TMath::Tan(2. * kDegrad);
+
+
+ TGeoPcon* shDDIP1 = new TGeoPcon("shDDIP1", 0., 360., 7);
+
+ shDDIP1->DefineSection(0, (kZDipoleF - 5.), riD0, rcD0);
+ shDDIP1->DefineSection(1, z30 , riD1, rc30);
+ shDDIP1->DefineSection(2, kZDipole , riD1, rcD1);
+ shDDIP1->DefineSection(3, zst , riD1, rcst);
+ shDDIP1->DefineSection(4, zst , riD2, rcst);
+ shDDIP1->DefineSection(5, kZDipoleR , riD3, rcD2);
+ shDDIP1->DefineSection(6, (kZDipoleR + 5.), riD4, rcD2);
- TGeoBBox* shDDIP2 = new TGeoBBox("shDDIP2", 164, 182., 25.);
+ TGeoBBox* shDDIP2 = new TGeoBBox(164., 182., 36.);
+ shDDIP2->SetName("shDDIP2");
+ TGeoTranslation* trDDIP2 = new TGeoTranslation("trDDIP2", 0., 0., kZDipole - 12.);
+ trDDIP2->RegisterYourself();
- TGeoPcon* shDDIP3 = new TGeoPcon("shDDIP3", 0., 360., 5);
- Float_t z30 = 825. - kZDipole;
- Float_t zst = 1052. - kZDipole;
-
-
- shDDIP3->DefineSection(0, -dipoleL/2. - 10., 0., (kZDipoleF - 10.) * TMath::Tan(2. * kDegrad) + 0.2);
- shDDIP3->DefineSection(1, z30, 0., 28.8 + 0.2);
- shDDIP3->DefineSection(2, zst, 0., 28.8 + 0.2);
- shDDIP3->DefineSection(3, zst, 0., 35.8);
- shDDIP3->DefineSection(4, +dipoleL/2. + 10., 0., 35.8 + (dipoleL/2. + 10. - zst) * TMath::Tan(2. * kDegrad));
-
- TGeoCompositeShape* shDDIP = new TGeoCompositeShape("shDDIP", "(shDDIP2 + shDDIP1:trDDIP) - shDDIP3:trDDIP");
+ TGeoTube* shDDIP3 = new TGeoTube(0., 30., 40.);
+ shDDIP3->SetName("shDDIP3");
+
+ TGeoCompositeShape* shDDIP = new TGeoCompositeShape("shDDIP", "shDDIP1+(shDDIP2:trDDIP2-shDDIP3:trDDIP2)");
TGeoVolume* voDDIP = new TGeoVolume("DDIP", shDDIP, kMedAir);
//
// Yoke
asYoke->AddNode(asYokeSide, 1, new TGeoTranslation(+lx0/2. + 3. * dGap - blockHeight/2., 0., 0.));
- asYoke->AddNode(asYokeSide, 2, new TGeoCombiTrans( -lx0/2. - 3. * dGap + blockHeight/2., 0., 0., rotxz));
+ asYoke->AddNode(asYokeSide, 2, new TGeoCombiTrans( -lx0/2. - 3. * dGap + blockHeight/2., 0., 0., rotiz));
//
// Coils
asDCoilSupport->AddNode(voDCS04, 1, gGeoIdentity);
for (Int_t i = 0; i < 9; i++)
{
- char name[16];
- sprintf(name, "rotdcs%1d", i);
+ char nameR[16];
+ sprintf(nameR, "rotdcs%1d", i);
Float_t phi = Float_t(i) * 3.75;
- TGeoRotation* rot = new TGeoRotation(name, 90., phi, 90., 90. + phi, 0., 0.);
+ TGeoRotation* rot = new TGeoRotation(nameR, 90., phi, 90., 90. + phi, 0., 0.);
asDCoilSupport->AddNode(voDCS021, i, new TGeoCombiTrans(0., 0., -(sW - coilH)/2., rot));
}
Float_t rmin1, rmin2, rmax1, rmax2;
Float_t zHanger1 = 811.9;
- TGeoBBox* shHanger11 = new TGeoBBox("shHanger11", 2.5/2., 250., 25./2.);
-
+ TGeoBBox* shHanger11 = new TGeoBBox(2.5/2., 250., 25./2.);
+ shHanger11->SetName("shHanger11");
+
rmin1 = (zHanger1 - 13.) * TMath::Tan(2. * kDegrad);
rmin2 = rmin1 + 26. * TMath::Tan( 2.0 * kDegrad);
+
rmax1 = (zHanger1 - 13.) * TMath::Tan(9. * kDegrad);
rmax2 = rmax1 + 26. * TMath::Tan(9. * kDegrad);
- TGeoCone* shHanger12 = new TGeoCone("shHanger12", 13., rmin1, rmax1, rmin2, rmax2);
+ TGeoCone* shHanger12 = new TGeoCone(13., rmin1, rmax1, rmin2, rmax2);
+ shHanger12->SetName("shHanger12");
TGeoCompositeShape* shHanger1 = new TGeoCompositeShape("shHanger1", "shHanger12*shHanger11:trHanger");
TGeoVolume* voHanger1 = new TGeoVolume("DHanger1", shHanger1, kMedSteel);
//
// SAA1 Support: Hanger 2
//
Float_t zHanger2 = 1171.9;
- TGeoBBox* shHanger21 = new TGeoBBox("shHanger21", 3.5/2., 250., 25./2.);
+ TGeoBBox* shHanger21 = new TGeoBBox(3.5/2., 250., 25./2.);
+ shHanger21->SetName("shHanger21");
-
- rmin1 = 35.8 + (zHanger2 - 13. - zst - kZDipole) * TMath::Tan(2. * kDegrad);
+ rmin1 = 35.8 + (zHanger2 - 13. - zst) * TMath::Tan(2. * kDegrad);
rmin2 = rmin1 + 26. * TMath::Tan( 2.0 * kDegrad);
+
rmax1 = rcD1 + (zHanger2 - 13. - kZDipole) * TMath::Tan(10.1 * kDegrad);
rmax2 = rmax1 + 26. * TMath::Tan(10.1 * kDegrad);
- TGeoCone* shHanger22 = new TGeoCone("shHanger22", 13., rmin1, rmax1, rmin2, rmax2);
+ TGeoCone* shHanger22 = new TGeoCone(13., rmin1, rmax1, rmin2, rmax2);
+ shHanger22->SetName("shHanger22");
+
TGeoCompositeShape* shHanger2 = new TGeoCompositeShape("shHanger2", "shHanger22*shHanger21:trHanger");
TGeoVolume* voHanger2 = new TGeoVolume("DHanger2", shHanger2, kMedSteel);
TGeoVolume* voHS1 = new TGeoVolume("DHS1", new TGeoBBox( 1.5, 12.5, hsLength/2.), kMedSteel);
TGeoVolume* voHS2 = new TGeoVolume("DHS2", new TGeoBBox(12.5, 1.5, hsLength/2.), kMedSteel);
- Float_t hsH = gapHeight/2. + blockHeight - (rmax1+rmax2)/2.;
+ Float_t hsH = gapHeight/2. + blockHeight - (rmax1+rmax2)/2. - 2.;
TGeoVolume* voHS3 = new TGeoVolume("DHS3", new TGeoBBox(3.5/2., hsH/2., 25./2.), kMedSteel);
asHS->AddNode(voHS1, 1, gGeoIdentity);
asHS->AddNode(voHS2, 1, new TGeoTranslation(0., +14., 0.));
asHS->AddNode(voHS2, 2, new TGeoTranslation(0., -14., 0.));
- asHS->AddNode(voHS3, 1, new TGeoTranslation(0., -hsH/2. - 14., hsLength/2. - 25./2.));
+ asHS->AddNode(voHS3, 1, new TGeoTranslation(0., -hsH/2. - 14. -1.5, hsLength/2. - 25./2.));
- dz = zHanger1 - kZDipole;
- dy = -(kZDipoleR - zHanger1) * TMath::Tan(alhc * kDegrad);
- voDDIP->AddNode(voHanger1, 1, new TGeoCombiTrans(0., dy, dz, rotlhc));
+ dz = zHanger1;
+ voDDIP->AddNode(voHanger1, 1, new TGeoTranslation(0., 0., dz));
- dz = zHanger2 - kZDipole;
- dy = -(kZDipoleR - zHanger2) * TMath::Tan(alhc * kDegrad);
- voDDIP->AddNode(voHanger2, 1, new TGeoCombiTrans(0., dy, dz, rotlhc));
+ dz = zHanger2;
+ voDDIP->AddNode(voHanger2, 1, new TGeoTranslation(0., 0., dz));
asDipole->AddNode(asDCoilSupport, 3, new TGeoCombiTrans( 0., 0., dz, rotxy108));
asDipole->AddNode(asDCoilSupport, 4, new TGeoCombiTrans( 0., 0., dz, rotxy288));
- asDipole->AddNode(asDCoilSupport, 5, new TGeoCombiTrans( 0., 0., -dz, rotxz));
+ asDipole->AddNode(asDCoilSupport, 5, new TGeoCombiTrans( 0., 0., -dz, rotiz));
asDipole->AddNode(asDCoilSupport, 6, new TGeoCombiTrans( 0., 0., -dz, rotxz108));
asDipole->AddNode(asDCoilSupport, 7, new TGeoCombiTrans( 0., 0., -dz, rotxz180));
asDipole->AddNode(asDCoilSupport, 8, new TGeoCombiTrans( 0., 0., -dz, rotxz288));
// Hanger (Support)
dy = gapHeight/2. + blockHeight + 14.;
- asDipole->AddNode(asHS, 1, new TGeoTranslation(0., dy, ((zHanger2 - kZDipole - yokeLength/2.) + 25./2.)/2.));
+ asDipole->AddNode(asHS, 1, new TGeoTranslation(0., dy + 1.5, ((zHanger2 - kZDipole - yokeLength/2.) + 25./2.)/2.));
asDipole->SetVisContainers(1);
voDDIP->SetVisibility(0);
- asDipole->AddNode(voDDIP, 1, gGeoIdentity);
- top->AddNode(asDipole, 1, new TGeoCombiTrans(0., dipoleL / 2. * TMath::Tan(alhc * kDegrad), -kZDipole, rotxzlhc));
+ top->AddNode(asDipole, 1, new TGeoCombiTrans(0., dipoleL / 2. * TMath::Tan(alhc * kDegrad), -kZDipole, rotxzlhc));
+ top->AddNode(voDDIP, 1, new TGeoCombiTrans(0., 0., 0., rotxz));
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff