X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSv11GeometrySSD.cxx;h=0b221e73f3785c534b06449107e3506a4e819370;hb=44443bbd1b9d6dfbf4ee68f9ca7557eb2a89c7bd;hp=03e07f32a4b7985f1f73d07b40baaf6a8249a6ee;hpb=b7bd9ab6884f3b48c05b18e38e11b0f12dcda559;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITSv11GeometrySSD.cxx b/ITS/AliITSv11GeometrySSD.cxx index 03e07f32a4b..0b221e73f37 100644 --- a/ITS/AliITSv11GeometrySSD.cxx +++ b/ITS/AliITSv11GeometrySSD.cxx @@ -42,8 +42,8 @@ ///////////////////////////////////////////////////////////////////////////////// // Names of the Sensitive Volumes of Layer 5 and Layer 6 ///////////////////////////////////////////////////////////////////////////////// -const char* AliITSv11GeometrySSD::fgSSDsensitiveVolName5 = "ITSssdSensitivL5"; -const char* AliITSv11GeometrySSD::fgSSDsensitiveVolName6 = "ITSssdSensitivL6"; +const char* AliITSv11GeometrySSD::fgkSSDsensitiveVolName5 = "ITSssdSensitivL5"; +const char* AliITSv11GeometrySSD::fgkSSDsensitiveVolName6 = "ITSssdSensitivL6"; ///////////////////////////////////////////////////////////////////////////////// //Parameters for SSD Geometry ///////////////////////////////////////////////////////////////////////////////// @@ -494,7 +494,7 @@ const Double_t AliITSv11GeometrySSD::fgkEndCapSupportMiddleRadius[2] = {377.0*fg const Double_t AliITSv11GeometrySSD::fgkEndCapSupportLowRadius[2] = {375.0*fgkmm,435.0*fgkmm}; const Double_t AliITSv11GeometrySSD::fgkEndCapSupportHighWidth = 20.0*fgkmm; const Double_t AliITSv11GeometrySSD::fgkEndCapSupportLowWidth[2] = {3.0*fgkmm,3.0*fgkmm}; -const Double_t AliITSv11GeometrySSD::fgkEndCapSupportCenterLay5ITSPosition = 625.0*fgkmm; +const Double_t AliITSv11GeometrySSD::fgkEndCapSupportCenterLay5ITSPosition = 624.9*fgkmm; const Double_t AliITSv11GeometrySSD::fgkEndCapSupportCenterLay5Position = 2.5*fgkmm; const Double_t AliITSv11GeometrySSD::fgkEndCapSupportCenterLay6ITSPosition = 635.0*fgkmm; const Double_t AliITSv11GeometrySSD::fgkEndCapSupportCenterLay6Position = 2.5*fgkmm; @@ -613,7 +613,9 @@ AliITSv11GeometrySSD::AliITSv11GeometrySSD(): //////////////////////// // Standard constructor //////////////////////// - + for(Int_t i=0; i~AliITSv11GeometrySSD(); - new(this) AliITSv11GeometrySSD(s); - return *this; -/* - if(&s == this) return *this; - fMotherVol = s.fMotherVol; - return *this; - */ -} + /////////////////////////////////////////////////////////////////////////////// void AliITSv11GeometrySSD::CreateTransformationMatrices(){ /////////////////////////////////////////////////////////////////////// @@ -1226,21 +1147,21 @@ void AliITSv11GeometrySSD::CreateTransformationMatrices(){ TGeoTranslation** localendladdercarbonfiberjunctiontrans[fgkendlabbercarbonfiberjunctionumber]; for(Int_t i=0; iSetAngles(120.*j,0.,0.); for(Int_t i=0; iSetTranslation(fgkCarbonFiberTriangleLength, @@ -1265,7 +1186,7 @@ void AliITSv11GeometrySSD::CreateTransformationMatrices(){ *localendladdercarbonfiberjunctionglobalrot[i]); } for(Int_t i=0; iSetDz(-0.5*fgkCarbonFiberLowerSupportHeight-fgkSSDTolerance); fendladderlowersupptrans[2] = new TGeoTranslation(0.0, fgkCarbonFiberLowerSupportVolumePosition[1] + fgkCarbonFiberLowerSupportVolumePosition[0], @@ -1692,7 +1614,7 @@ void AliITSv11GeometrySSD::CreateTransformationMatrices(){ } delete localladdermotherrot; for(Int_t i=0; iSetLineColor(fColorSilicon); ssdsensorsensitiveLay6->SetLineColor(fColorSilicon); TGeoBBox* ssdsensorinsensitiveshape[2]; @@ -2008,9 +1930,9 @@ TGeoVolume* AliITSv11GeometrySSD::GetCarbonFiberJunction(Double_t width){ fgkCarbonFiberJunctionEdge[0] * TMath::Sin(fgkCarbonFiberJunctionAngle[0] * TMath::DegToRad())); - vertex[4] = new TVector3(fgkCarbonFiberJunctionLength, + vertex[4] = new TVector3(fgkCarbonFiberJunctionLength-fgkSSDTolerance, fgkCarbonFiberJunctionEdge[1]); - vertex[5] = new TVector3(fgkCarbonFiberJunctionLength); + vertex[5] = new TVector3(fgkCarbonFiberJunctionLength-fgkSSDTolerance); vertex[1] = GetReflection(vertex[5],reflectionparam); vertex[2] = GetReflection(vertex[4],reflectionparam); Double_t xvertexpoints[6], yvertexpoints[6]; @@ -2090,7 +2012,7 @@ TList* AliITSv11GeometrySSD::GetCarbonFiberLowerSupportList(){ } /////////////////////////////////////////////////////////////////////////////// TGeoVolume* AliITSv11GeometrySSD::GetSSDSensorSupport(Double_t length, Double_t height, - Double_t width, Double_t* thickness)const{ + Double_t width, const Double_t* thickness)const{ ///////////////////////////////////////////////////////////// // Method generating the Sensor Support ///////////////////////////////////////////////////////////// @@ -2136,9 +2058,9 @@ TGeoVolume* AliITSv11GeometrySSD::GetCoolingTubeSupport(Int_t nedges){ /////////////////////////////////////// TVector3** vertexposition = new TVector3*[kvertexnumber]; - Double_t Router = fgkCoolingTubeSupportRmin/CosD(phi/nedges); // Recalc inner radius so that tube fits inside - vertexposition[0] = new TVector3(Router*CosD(angle), - Router*SinD(angle)); + Double_t router = fgkCoolingTubeSupportRmin/CosD(phi/nedges); // Recalc inner radius so that tube fits inside + vertexposition[0] = new TVector3(router*CosD(angle), + router*SinD(angle)); vertexposition[1] = new TVector3(fgkCoolingTubeSupportRmax*CosD(angle), fgkCoolingTubeSupportRmax*SinD(angle)); vertexposition[2] = new TVector3(vertexposition[1]->X(), @@ -2150,8 +2072,8 @@ TGeoVolume* AliITSv11GeometrySSD::GetCoolingTubeSupport(Int_t nedges){ for(Int_t i=0; iAddNode(j==2 ? fendladdercarbonfiberjunction[i][1] : fendladdercarbonfiberjunction[i][0], @@ -7799,7 +7721,7 @@ void AliITSv11GeometrySSD::SetLadderSupport(Int_t nedges){ Double_t ssdcablepatchpanel3BB26radiusmin[2]; Double_t ssdcablepatchpanel3BB26radiusmax[2]; Double_t ssdcablepatchpanel3RB26zsection[2]; - ssdcablepatchpanel3BB26radiusmin[0] = ssdcableslay5pconrmin[3]-0.5*fgkSSDPatchPanelHeight+2.8; + ssdcablepatchpanel3BB26radiusmin[0] = ssdcableslay5pconrmin[3]-0.5*fgkSSDPatchPanelHeight+2.8+0.003;//Avoid small overlap with SPDshieldring; ssdcablepatchpanel3BB26radiusmax[0] = ssdcablepatchpanel3BB26radiusmin[0] + fgkSSDCablesLay5RightSideHeight + fgkSSDCablesLay6RightSideHeight+0.5*fgkSSDPatchPanelHeight; @@ -8022,7 +7944,7 @@ void AliITSv11GeometrySSD::SetLadderSupport(Int_t nedges){ return ssdcablesmother; } //////////////////////////////////////////////////////////////////////////////// -TGeoArb8* AliITSv11GeometrySSD::GetArbShape(TVector3* vertexpos[], Double_t* width, +TGeoArb8* AliITSv11GeometrySSD::GetArbShape(TVector3 const * const vertexpos[4] , const Double_t* width, Double_t height, const char* shapename, Int_t isign) const{ ///////////////////////////////////////////////////////////// // Method generating an Arb shape @@ -8116,7 +8038,7 @@ TGeoXtru* AliITSv11GeometrySSD::GetArcShape(Double_t phi, Double_t rmin, return arcshape; } //////////////////////////////////////////////////////////////////////////////// -TGeoShape* AliITSv11GeometrySSD::GetScrewShape(Double_t* radius,Int_t* edgesnumber,Double_t* section) const { +TGeoShape* AliITSv11GeometrySSD::GetScrewShape(const Double_t* radius,const Int_t* edgesnumber,const Double_t* section) const { /////////////////////////////////////////////////////////////////////// // Method Generating the Screw Shape // radius[0]: outer radius @@ -8156,7 +8078,7 @@ TGeoShape* AliITSv11GeometrySSD::GetScrewShape(Double_t* radius,Int_t* edgesnumb return screwshape; } //////////////////////////////////////////////////////////////////////////////// -TGeoShape* AliITSv11GeometrySSD::GetHoleShape(Double_t radius, Int_t nedges, Double_t *section) const { +TGeoShape* AliITSv11GeometrySSD::GetHoleShape(Double_t radius, Int_t nedges, const Double_t *section) const { /////////////////////////////////////////////////////////////////////// // Method Generating the Hole Shape // radius of the Hole @@ -8188,7 +8110,7 @@ TGeoShape* AliITSv11GeometrySSD::GetHoleShape(Double_t radius, Int_t nedges, Dou return holeshape; } //////////////////////////////////////////////////////////////////////////////// -TVector3* AliITSv11GeometrySSD::GetReflection(TVector3* vector,Double_t* param) const{ +TVector3* AliITSv11GeometrySSD::GetReflection(const TVector3* vector,const Double_t* param) const{ ///////////////////////////////////////////////////////////// // Given an axis specified by param, it gives the reflection of the point // respect to the axis @@ -8204,7 +8126,7 @@ TVector3* AliITSv11GeometrySSD::GetReflection(TVector3* vector,Double_t* param) return reflectedvector; } //////////////////////////////////////////////////////////////////////////////// -TGeoHMatrix* AliITSv11GeometrySSD::AddTranslationToHMatrix(TGeoHMatrix* ct, +TGeoHMatrix* AliITSv11GeometrySSD::AddTranslationToHMatrix(const TGeoHMatrix* ct, Double_t dx, Double_t dy, Double_t dz) const{ @@ -8304,3 +8226,4 @@ void AliITSv11GeometrySSD::CreateMaterials(){ fCreateMaterials = kTRUE; } ///////////////////////////////////////////////////////////////////// +