Fix from for producing a dataset via the alien plugin. Redirecting the alien 'find...

[u/mrichter/AliRoot.git] / ITS / AliITSv11GeometrySSD.h

diff --git a/ITS/AliITSv11GeometrySSD.h b/ITS/AliITSv11GeometrySSD.h
index 18e37fa5828f80f7e468397f64ffb3db32be0f0c..d023d44e99feadc0cc7a61f6cb51a494e6fd58f6 100644 (file)
--- 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;
@@ -39,6 +40,7 @@ public:
   TGeoVolumeAssembly* GetLadderSegment(Int_t i){return fladdersegment[i];}; // Get Ladder Segment
   TGeoVolumeAssembly* GetEndLadderSegment(Int_t i){return fendladdersegment[i];}; // Get End Ladder Segment 
   TGeoVolume* GetLadder(Int_t i) {return fladder[i];}; // Get Ladder
+//  TGeoVolumeAssembly* GetLadder(Int_t i) {return fladder[i];}; // Get Ladder
   TGeoVolumeAssembly* GetLayer(Int_t i)const {return i==5? fSSDLayer5 : fSSDLayer6;}; // Get Layer
   TGeoVolume** GetEndCapAssembly();     // End Cap Assembly
   void SetLadderSegment();                             // Set Ladder Elementary Segment 
@@ -65,6 +67,8 @@ private:
   // Variable for Vertical Disalignement of Modules
   /////////////////////////////////////////////////////////////////////////////////
   static const Double_t fgkSSDModuleVerticalDisalignment;  // 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)
   /////////////////////////////////////////////////////////////////////////
@@ -208,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
@@ -451,8 +456,8 @@ private:
   TGeoArb8* GetArbShape(TVector3* vertexpos[],Double_t* width, 
                         Double_t height,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
@@ -608,6 +613,7 @@ private:
   static const Int_t fgkladdernumber = 2;                    // Ladder Number 
   TGeoVolume* fladder[fgkladdernumber];                              //fladder[0]: ladder of Layer 5
                                                                                                      //fladder[1]: ladder of Layer 6
+//  TGeoVolumeAssembly* fladder[fgkladdernumber];
   TGeoHMatrix** fladdermatrix[fgkladdernumber];       // Ladder Matrix
   ///////////////////////////////////
   // SSD Sensor