X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSv11GeometrySSD.h;h=2bafb12c9c19dc5edac6446a2a7e348e280a1d97;hb=15d5fd02232860362cc216af7a7d60bcdb2a5dc0;hp=a25c8d64d4939c369633f9836b5bb4f0ab214fd9;hpb=ca86fdb4728c96a7fa4901b6d98aca1ee07fba28;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSv11GeometrySSD.h b/ITS/AliITSv11GeometrySSD.h
index a25c8d64d49..2bafb12c9c1 100644
--- a/ITS/AliITSv11GeometrySSD.h
+++ b/ITS/AliITSv11GeometrySSD.h
@@ -8,6 +8,7 @@
  * See cxx source for full Copyright notice                               */
 /* $Id$ */
 class TGeoVolume;
+class TGeoShape;
 class TGeoCombiTrans;
 class TGeoMedium;
 class TGeoCompositeShape;
@@ -66,7 +67,7 @@ private:
   // Variable for Vertical Disalignement of Modules
   /////////////////////////////////////////////////////////////////////////////////
   static const Double_t fgkSSDModuleVerticalDisalignment;  // Vertical Disalignement of Volume
-  static const Double_t fgkSSDModuleVerticalDisalignment2;  // Vertical Disalignement of Volume
+  static const Double_t fgkSSDModuleSideDisalignment;  // Vertical Disalignement of Volume
   static const Double_t fgkSSDTolerance;  // SSD Tolerance
   /////////////////////////////////////////////////////////////////////////
   // Layer5 (lengths are in mm and angles in degrees)
@@ -211,6 +212,7 @@ private:
   /////////////////////////////////////////////////////////////////////////
   //Parameters for Carbon Fiber Lower Support (lengths are in mm)
   /////////////////////////////////////////////////////////////////////////
+  static const Double_t fgkLowerSupportToSensorZ;                   // Distance from lower support to sensor center
   static const Double_t fgkCarbonFiberLowerSupportWidth;            // Lower Support of Carbon Fiber Width
   static const Double_t fgkCarbonFiberLowerSupportLowerLenght;      // Lower Support of Carbon Fiber Length
   static const Double_t fgkCarbonFiberLowerSupportHeight;           // Lower Support of Carbon Fiber Height
@@ -447,15 +449,15 @@ private:
   TGeoVolume** EndCapSupport();        // End Cap Support Layer 5 and Layer 6
   void SetEndCapSupportAssembly();     // EndCap Support + End Cap Layer 5 and 6
   TGeoVolume* GetEndCapEffectiveCables(Double_t radiusmin, Double_t radiusmax, 
-									   Double_t width,Int_t ncables,char* volname); // End Cap Effective HV Cables
+									   Double_t width,Int_t ncables,const char* volname); // End Cap Effective HV Cables
   TGeoXtru* GetArcShape(Double_t phi, Double_t rmin, 
 					    Double_t rmax, Int_t nedges, Double_t height); 
 										//Auxiliary Method for Arc Shape
   TGeoArb8* GetArbShape(TVector3* vertexpos[],Double_t* width, 
-                        Double_t height,char* shapename,Int_t isign = 1) const;
+                        Double_t height,const char* shapename,Int_t isign = 1) const;
 									   // Method generating an Arb shape 
-  TGeoXtru* GetScrewShape(Double_t* radius,Int_t* edgesnumber,Double_t* section) const;// Method Generating the Screw Shape  
-  TGeoXtru* GetHoleShape(Double_t radius, Int_t nedges, Double_t *section) const;// Method Generating the Hole Shape  
+  TGeoShape* GetScrewShape(Double_t* radius,Int_t* edgesnumber,Double_t* section) const;// Method Generating the Screw Shape  
+  TGeoShape* GetHoleShape(Double_t radius, Int_t nedges, Double_t *section) const;// Method Generating the Hole Shape  
   TVector3* GetReflection(TVector3* vector,Double_t* param) const; 
 										// Given an axis specified by param,
 										// it gives the reflection of the point respect to the axis