modifications to satisfy the coding conventions

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

diff --git a/ITS/AliITSv11GeometrySSD.h b/ITS/AliITSv11GeometrySSD.h
index bbeaaf68bcbd117ee6382e57641f337a6c8b883d..2bafb12c9c19dc5edac6446a2a7e348e280a1d97 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 
@@ -46,6 +48,7 @@ public:
   void SetLadder();                                            // Set Ladder
   void SetLayer();                                             // Set Layer
   void SetSSDCone();                    // Set SSD Cone
+  TGeoVolume* SetSSDCables();           // Set SSD Cables
   void Layer5(TGeoVolume* moth);        // Setting Layer 5 into mother volume
   void Layer6(TGeoVolume* moth);        // Setting Layer 6 into mother volume
   void LadderSupportLayer5(TGeoVolume* moth); // Setting Ladder Support of Layer 5
@@ -53,7 +56,7 @@ public:
   void EndCapSupportSystemLayer5(TGeoVolume* moth); // Setting End Cap Support + End Cap Assembly Layer 5
   void EndCapSupportSystemLayer6(TGeoVolume* moth); // Setting End Cap Support + End Cap Assembly Layer 6
   void SSDCone(TGeoVolume* moth); // Setting SSD Cone;
-  TGeoVolume* SetSSDCables();
+  void SSDCables(TGeoVolume* moth); // Setting SSD Cables;
 private:
   /////////////////////////////////////////////////////////////////////////////////
   // Names of the Sensitive Volumes of Layer 5 and Layer 6
@@ -64,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)
   /////////////////////////////////////////////////////////////////////////
@@ -207,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
@@ -443,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
@@ -607,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