From 54503d830a01f4c81f28bba5124a4f85a5bcca65 Mon Sep 17 00:00:00 2001 From: masera Date: Mon, 2 Dec 2013 15:06:33 +0000 Subject: [PATCH] added grounding wire in SDD + improvements in SPD (M.Sitta) --- ITS/AliITSv11GeometrySDD.cxx | 10 ++++++++++ ITS/AliITSv11GeometrySDD.h | 2 +- ITS/AliITSv11GeometrySPD.cxx | 10 +++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ITS/AliITSv11GeometrySDD.cxx b/ITS/AliITSv11GeometrySDD.cxx index be835f138e8..31644bbed1e 100755 --- a/ITS/AliITSv11GeometrySDD.cxx +++ b/ITS/AliITSv11GeometrySDD.cxx @@ -826,6 +826,7 @@ void AliITSv11GeometrySDD::CreateBasicObjects() { TGeoMedium *stainless = GetMedium("AISI304L$"); // for screws TGeoMedium *coolerMediumSDD = GetMedium("WATER$"); TGeoMedium *raccordMedium = GetMedium("INOX$"); // same as AISI 316-L + TGeoMedium *copperMedium = GetMedium("COPPER$"); //******************************************************************** // pieces of the carbon fiber structure @@ -976,6 +977,14 @@ void AliITSv11GeometrySDD::CreateBasicObjects() { TGeoCombiTrans *bottomBeamTransf5 = new TGeoCombiTrans (0,-(fgkLadderHeight/2-fgkLadderBeamRadius)-dy,fgkSegmentLength/4, bottomBeamRot5); + // The ground wire running on the top vertex - M.S. 12 nov 2013 + TGeoTube *groundWire = new TGeoTube(0, fgkEndLadderEarthCableR, fgkSegmentLength/2); + TGeoVolume *groundWireVol = new TGeoVolume("ITSsddGroundWire", groundWire, + copperMedium); + groundWireVol->SetLineColor(41); // should be something brown-ish + TGeoTranslation *trGroundWire = new TGeoTranslation(0, + fgkLadderHeight/2-5*fgkEndLadderEarthCableR, 0); + fLaddSegCommonVol[0] = cfLaddTopVol1; fLaddSegCommonTr[0] = trTop1; fLaddSegCommonVol[1] = cfLaddTopVol2; fLaddSegCommonTr[1] = trTop1; fLaddSegCommonVol[2] = cfLaddSideVol1; fLaddSegCommonTr[2] = ctSideR; @@ -995,6 +1004,7 @@ void AliITSv11GeometrySDD::CreateBasicObjects() { fLaddSegCommonVol[16]= bottomBeam2Vol; fLaddSegCommonTr[16]= bottomBeamTransf3; fLaddSegCommonVol[17]= bottomBeam3Vol; fLaddSegCommonTr[17]= bottomBeamTransf4; fLaddSegCommonVol[18]= bottomBeam3Vol; fLaddSegCommonTr[18]= bottomBeamTransf5; + fLaddSegCommonVol[19]= groundWireVol; fLaddSegCommonTr[19]= trGroundWire; //******************************************************************** diff --git a/ITS/AliITSv11GeometrySDD.h b/ITS/AliITSv11GeometrySDD.h index 6d9fe9f4f0c..05ca1449680 100755 --- a/ITS/AliITSv11GeometrySDD.h +++ b/ITS/AliITSv11GeometrySDD.h @@ -142,7 +142,7 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry { TGeoVolume* fCommonVol[2]; //! some common vol. used in several places TGeoMatrix* fCommonTr[2]; //! some common transformations - static const Int_t fgkNladdSegCommonVol = 19; // Number of vol. + static const Int_t fgkNladdSegCommonVol = 20; // Number of vol. TGeoVolume* fLaddSegCommonVol[fgkNladdSegCommonVol];//! volumes in ladder TGeoMatrix* fLaddSegCommonTr[fgkNladdSegCommonVol]; //! their transf. diff --git a/ITS/AliITSv11GeometrySPD.cxx b/ITS/AliITSv11GeometrySPD.cxx index 944b1945920..d7585306769 100644 --- a/ITS/AliITSv11GeometrySPD.cxx +++ b/ITS/AliITSv11GeometrySPD.cxx @@ -1122,14 +1122,14 @@ void AliITSv11GeometrySPD::CarbonFiberSector(TGeoVolume *moth, Int_t sect, sB3->GetDX()*TMath::Cos(t*TMath::DegToRad()); y0 = 0.5*(sB0->GetY(0)+sB0->GetY(sB0->GetNvert()-1))-3.5* sB3->GetDX()*TMath::Sin(t*TMath::DegToRad()); - rotrans = new TGeoCombiTrans("",1.01*x0,y0,z0,rot); + rotrans = new TGeoCombiTrans("",1.02*x0,y0,z0,rot); vM0->AddNode(vB3,3,rotrans); // Put Mounting bracket on sector - h = sM3->GetDz() + sN3->GetZ(1); + h = sM3->GetDz() + sN3->GetZ(1) + 0.03; zt = sB3->GetDZ()-kMountingBlockScrew1ZPos; vM0->AddNode(vN3, 5, new TGeoCombiTrans(x0-h*CosD(180-t), y0+h*SinD(180-t), z0+zt, new TGeoRotation("",90+t,90,90))); - h += ksecCthick2 + 0.02; + h += ksecCthick2 + 0.05; zt = sB3->GetDZ()-kMountingBlockScrew2ZPos; vM0->AddNode(vN3, 6, new TGeoCombiTrans(x0-h*CosD(180-t), y0+h*SinD(180-t), z0+zt, @@ -1148,14 +1148,14 @@ void AliITSv11GeometrySPD::CarbonFiberSector(TGeoVolume *moth, Int_t sect, new TGeoRotation("",90+t,90,90))); rot = new TGeoRotation("",t,180.0,0.0); // z & x axis rotation - rotrans = new TGeoCombiTrans("",1.01*x0,y0,-z0,rot); + rotrans = new TGeoCombiTrans("",1.02*x0,y0,-z0,rot); vM0->AddNode(vB3,4,rotrans); // Put Mounting bracket on sector h = sM3->GetDz() + sD1->GetDz(); zt = sB3->GetDZ()-kMountingBlockScrew1ZPos; vM0->AddNode(vD1, 2, new TGeoCombiTrans(x0-h*CosD(180-t), y0+h*SinD(180-t), -z0-zt, new TGeoRotation("",90+t,90,90))); - h = sM3->GetDz() + sD2->GetDz() + ksecCthick2 + 0.02; + h = sM3->GetDz() + sD2->GetDz() + ksecCthick2 + 0.08; zt = sB3->GetDZ()-kMountingBlockScrew2ZPos; vM0->AddNode(vD2, 4, new TGeoCombiTrans(x0-h*CosD(180-t), y0+h*SinD(180-t), -z0-zt, -- 2.43.0