Fixed https://savannah.cern.ch/bugs/?88157

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

diff --git a/ITS/AliITSv11GeometrySSD.h b/ITS/AliITSv11GeometrySSD.h
index c80d9908b12aa8810b0875de664d23ff1a2f8a2a..a4e6e755339f209593fa6dcb5aa2734afbaaa241 100644 (file)
--- a/ITS/AliITSv11GeometrySSD.h
+++ b/ITS/AliITSv11GeometrySSD.h
@@ -38,9 +38,9 @@ public:
   // it returns the Sensitive Volume of Layer 5
   const char*   GetSenstiveVolumeName6() const {return fgSSDsensitiveVolName6;};
   // 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
@@ -113,9 +113,11 @@ private:
   static const Double_t fgkSSDCapacitor0603Length; // SSD Stiffener Capacitor 0603 Length
   static const Double_t fgkSSDCapacitor0603Width;  // SSD Stiffener Capacitor 0603 Width
   static const Double_t fgkSSDCapacitor0603Height; // SSD Stiffener Capacitor 0603 Height
+  static const Double_t fgkSSDCapacitor0603CapLength; // SSD Stiffener Capacitor 1812 Cap Length 
   static const Double_t fgkSSDCapacitor1812Length; // SSD Stiffener Capacitor 1812 Length 
   static const Double_t fgkSSDCapacitor1812Width;  // SSD Stiffener Capacitor 1812 Width
   static const Double_t fgkSSDCapacitor1812Height; // SSD Stiffener Capacitor 1812 Height
+  static const Double_t fgkSSDCapacitor1812CapLength; // SSD Stiffener Capacitor 1812 Cap Length 
   static const Double_t fgkSSDWireLength;          // SSD Stiffener Wire Length
   static const Double_t fgkSSDWireRadius;          // SSD Stiffener Wire Radius
   static const Double_t fgkSSDConnectorPosition[2];// SSD Connector Position respect to Stiffener
@@ -125,6 +127,7 @@ private:
   static const Double_t fgkSSDConnectorHeight;     // SSD Stiffener Connector Height
   static const Double_t fgkSSDConnectorAlHeight;     // SSD Stiffener Connector Al Height
   static const Double_t fgkSSDConnectorNiHeight;     // SSD Stiffener Connector Ni Height
+  static const Double_t fgkSSDConnectorSnHeight;     // SSD Stiffener Connector Sn Height
   /////////////////////////////////////////////////////////////////////////
   // Flex
   /////////////////////////////////////////////////////////////////////////
@@ -141,6 +144,7 @@ private:
   // SSD Ladder Cable 
   /////////////////////////////////////////////////////////////////////////////////
   static const Double_t fgkSSDLadderCableWidth;    // SSD Ladder Cable Width
+  static const Double_t fgkSSDLadderCableHeight[2];  // SSD Ladder Cable Height (thickness)
   /////////////////////////////////////////////////////////////////////////
   // SSD Module Components 
   /////////////////////////////////////////////////////////////////////////
@@ -418,7 +422,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 
@@ -454,12 +458,12 @@ 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,
@@ -476,6 +480,7 @@ private:
   TGeoMedium* fSSDStiffenerConnectorMedium;      // SSD Stiffener Connector Medium 
   TGeoMedium* fSSDStiffener0603CapacitorMedium;  // SSD Stiffener Capacitor 0603 Medium 
   TGeoMedium* fSSDStiffener1812CapacitorMedium;  // SSD Stiffener Capacitor 1812 Medium 
+  TGeoMedium* fSSDStiffenerCapacitorCapMedium;  // SSD Stiffener Capacitor Cap Medium 
   TGeoMedium* fSSDStiffenerHybridWireMedium;     // SSD Stiffener Wire Medium  
   TGeoMedium* fSSDKaptonFlexMedium;              // SSD Flex Kapton Layer Medium    
   TGeoMedium* fSSDAlTraceFlexMedium;             // SSD Flex Al Layer Medium 
@@ -495,6 +500,7 @@ private:
   TGeoMedium* fSSDRohaCellCone;                  // Medium for SSD Ring Cone Support
   TGeoMedium* fSSDAir;                                                  // SSD Air
   TGeoMedium* fSSDCopper;                        // Copper for SSD Cables
+  TGeoMedium* fSSDSn;                            // Tin for SSD solderings
   /////////////////////////////////////////////////////////////////////////
   Bool_t fCreateMaterials;               // Bool variable which verifies if materials have been created
   Bool_t fTransformationMatrices; // Bool variable which verifies if matrices have been allocated
@@ -574,8 +580,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
   ///////////////////////////////////
@@ -647,7 +653,7 @@ private:
   /////////////////////////////////////////////////////////////////////////
   // SSD Cone
   /////////////////////////////////////////////////////////////////////////
-  TGeoVolumeAssembly* fSSDCone;  // SSD Cone  
+  TGeoVolumeAssembly*fSSDCone;  // SSD Cone  
   /////////////////////////////////////////////////////////////////////////
   // Color Display 
   /////////////////////////////////////////////////////////////////////////
@@ -656,12 +662,14 @@ private:
   Int_t fColorPhynox;         //  ===
   Int_t fColorSilicon;        //  ===
   Int_t fColorAl;             //  ===
+  Int_t fColorNiSn;           //  ===
   Int_t fColorKapton;         //  ===
   Int_t fColorPolyhamide;     //  ===
   Int_t fColorStiffener;      //  ===
   Int_t fColorEpoxy;          //  ===
   Int_t fColorWater;             //  ===
   Int_t fColorG10;            //  ===
-ClassDef(AliITSv11GeometrySSD, 4)     // ITS v11 SSD geometry
+ClassDef(AliITSv11GeometrySSD, 5)     // ITS v11 SSD geometry
 };
 #endif
+