Stupid bug fix in new superlight mode (from Zurich airport)

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

diff --git a/ITS/AliITSv11GeometrySSD.h b/ITS/AliITSv11GeometrySSD.h
index 946a85ee2539bde38aa2868114de556b1b3067ff..e43ba37a6475a8dacd3a7c264a0fef214cd371f9 100644 (file)
--- a/ITS/AliITSv11GeometrySSD.h
+++ b/ITS/AliITSv11GeometrySSD.h
@@ -26,21 +26,19 @@ class TGeoVolumeAssembly;
 class AliITSv11GeometrySSD: public AliITSv11Geometry {
 public:
   AliITSv11GeometrySSD();
-  AliITSv11GeometrySSD(const AliITSv11GeometrySSD &source);
-  AliITSv11GeometrySSD& operator=(const AliITSv11GeometrySSD &source);
   virtual ~AliITSv11GeometrySSD(){};
   /////////////////////////////////////////////////////////////////////////
   // Public methods
   /////////////////////////////////////////////////////////////////////////
   void CreateMaterials();        // Method setting the materials 
   TGeoMedium* GetMedium(const char* mediumName);   // It returns the Medium
-  const char*   GetSenstiveVolumeName5() const {return fgSSDsensitiveVolName5;};
+  const char*   GetSenstiveVolumeName5() const {return fgkSSDsensitiveVolName5;};
   // it returns the Sensitive Volume of Layer 5
-  const char*   GetSenstiveVolumeName6() const {return fgSSDsensitiveVolName6;};
+  const char*   GetSenstiveVolumeName6() const {return fgkSSDsensitiveVolName6;};
   // it returns the Sensitive Volume of Layer 6
-  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* GetLadderSegment(Int_t i) const {return fladdersegment[i];}; // Get Ladder Segment
+  TGeoVolumeAssembly* GetEndLadderSegment(Int_t i) const {return fendladdersegment[i];}; // Get End Ladder Segment 
+  TGeoVolume* GetLadder(Int_t i) const {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
@@ -59,11 +57,14 @@ public:
   void SSDCone(TGeoVolume* moth); // Setting SSD Cone;
   void SSDCables(TGeoVolume* moth); // Setting SSD Cables;
 private:
+  AliITSv11GeometrySSD(const AliITSv11GeometrySSD &source);
+  AliITSv11GeometrySSD& operator=(const AliITSv11GeometrySSD &source);
+
   /////////////////////////////////////////////////////////////////////////////////
   // Names of the Sensitive Volumes of Layer 5 and Layer 6
   /////////////////////////////////////////////////////////////////////////////////
-  static const char* fgSSDsensitiveVolName5;       // sens. vol. name for lay. 5
-  static const char* fgSSDsensitiveVolName6;       // sens. vol. name for lay. 6
+  static const char* fgkSSDsensitiveVolName5;       // sens. vol. name for lay. 5
+  static const char* fgkSSDsensitiveVolName6;       // sens. vol. name for lay. 6
   /////////////////////////////////////////////////////////////////////////////////
   // Variable for Vertical Disalignement of Modules
   /////////////////////////////////////////////////////////////////////////////////
@@ -393,23 +394,6 @@ private:
   static const Double_t fgkSSDCentralAL3SupportLength; // SSD Central Support Length
   static const Double_t fgkSSDCentralAL3SupportWidth; // SSD Central Support Width
   /////////////////////////////////////////////////////////////////////////
-  // SSD Cables e Patch Panel
-  /////////////////////////////////////////////////////////////////////////
-  static const Double_t fgkSSDCablesLay5TubeRadiusMin; // Radius Min Cable Tube Layer 5
-  static const Double_t fgkSSDCablesLay6TubeRadiusMin; // Radius Min Cable Tube Layer 6
-  static const Double_t fgkSSDCablesLay5RightSideHeight;  // Width Lay 5 Cables to be fixed in order to reproduce material budget
-  static const Double_t fgkSSDCablesLay6RightSideHeight;  // // Width Lay 5 Cables to be fixed in order to reproduce material budget
-  static const Double_t fgkSSDCableAngle; // Angle Cable   
-  static const Double_t fgkSSDCablesLay5RightSideWaterHeight;  // Width Lay 5 Water Cables to be fixed in order to reproduce material budget
-  static const Double_t fgkSSDCablesPatchPanel2RB26Angle[2]; // Angle Position Patch Panel RB26
-  static const Double_t fgkSSDCablesPatchPanel2RB24Angle[2]; // Angle Position Patch Panel RB24
-  static const Double_t fgkSSDPatchPanel2RB26ITSDistance;    // Patch Panel RB26 Position
-  static const Double_t fgkSSDPatchPanel2RB24ITSDistance;   // Patch Panel RB24 Position 
-  static const Double_t fgkSSDPatchPanel2RB26Radius; // Patch Panel Radius 
-  static const Double_t fgkSSDPatchPanel2RB24Radius; // Patch Panel Radius
-  static const Double_t fgkSSDPatchPanelHeight; // Patch Panel Height
-  static const Double_t fgkSSDCableMaterialBudgetHeight; // SSD Cable Material Budget
-  /////////////////////////////////////////////////////////////////////////
   // Private methods for private members generation
   /////////////////////////////////////////////////////////////////////////
 
@@ -422,7 +406,7 @@ private:
   TList* GetCarbonFiberLowerSupportList(); 
                                                                            // Method generating CarbonFiberLowerSupport
   TGeoVolume* GetSSDSensorSupport(Double_t length, Double_t height, 
-                                                                 Double_t width, Double_t* thickness) const; //
+                                                                 Double_t width, const Double_t* thickness) const; //
                                                                                // Method generating SSDSensorSupport
   TGeoVolume* GetCoolingTubeSupport(Int_t nedges); // Method generating CoolingTubeSupport 
   TList* GetSSDHybridParts();                  // Method setting Hybrid Components 
@@ -458,15 +442,15 @@ private:
   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, 
+  TGeoArb8* GetArbShape(TVector3 const * const vertexpos[4],const Double_t* width, 
                         Double_t height,const char* shapename,Int_t isign = 1) const;
                                                                           // Method generating an Arb 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; 
+  TGeoShape* GetScrewShape(const Double_t* radius,const Int_t* edgesnumber,const Double_t* section) const;// Method Generating the Screw Shape  
+  TGeoShape* GetHoleShape(Double_t radius, Int_t nedges, const Double_t *section) const;// Method Generating the Hole Shape  
+  TVector3* 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
-  TGeoHMatrix* AddTranslationToHMatrix(TGeoHMatrix* ct,Double_t dx,Double_t dy,
+  TGeoHMatrix* AddTranslationToHMatrix(const TGeoHMatrix* ct,Double_t dx,Double_t dy,
                                                        Double_t dz) const;
                                                                                // add (dx,dy,dz) translation to a initial TGeoCombiTrans
   /////////////////////////////////////////////////////////////////////////
@@ -580,8 +564,8 @@ private:
   ///////////////////////////////////
   static const Int_t fgkendlabbercarbonfiberjunctionumber = 2; // End Ladder Carbon fiber Junction Number
   TGeoVolume** fendladdercarbonfiberjunction[fgkendlabbercarbonfiberjunctionumber]; // End Ladder Carbon fiber Junction Volumes
-  static const Int_t fgkendladdercabonfiberjunctionmatrixnumber = 3; // End Ladder Carbon fiber Junction Matrix Number
-  TGeoHMatrix** fendladdercarbonfiberjunctionmatrix[fgkendlabbercarbonfiberjunctionumber]; // End Ladder Carbon fiber Junction Matrix 
+  static const Int_t fgkendladdercarbonfiberjunctionmatrixnumber = 3; // End Ladder Carbon fiber Junction Matrix Number
+  TGeoHMatrix** fendladdercarbonfiberjunctionmatrix[fgkendladdercarbonfiberjunctionmatrixnumber]; // End Ladder Carbon fiber Junction Matrix 
   ///////////////////////////////////
   // End Ladder Carbon Fiber Support
   ///////////////////////////////////
@@ -672,3 +656,4 @@ private:
 ClassDef(AliITSv11GeometrySSD, 5)     // ITS v11 SSD geometry
 };
 #endif
+