update of the tracker

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

diff --git a/ITS/AliITSv11GeometrySDD.h b/ITS/AliITSv11GeometrySDD.h
index f4f9d2c6778d5130b3a287e3a92743a1ec68dcd7..05ca1449680750ddd929162cefa17f7ca7d1c5c6 100755 (executable)
--- a/ITS/AliITSv11GeometrySDD.h
+++ b/ITS/AliITSv11GeometrySDD.h
@@ -68,8 +68,8 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry {
 
   virtual void  SetParameters();
   TGeoVolume*   GetMotherVolume() const { return fMotherVol;};
-  const char*   GetSenstiveVolumeName3() const {return fgSDDsensitiveVolName3;};
-  const char*   GetSenstiveVolumeName4() const {return fgSDDsensitiveVolName4;};
+  const char*   GetSenstiveVolumeName3() const {return fgkSDDsensitiveVolName3;};
+  const char*   GetSenstiveVolumeName4() const {return fgkSDDsensitiveVolName4;};
   Int_t         GetLay3NLadders() const;
   Int_t         GetLay4NLadders() const;
 
@@ -82,7 +82,7 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry {
   virtual TGeoVolumeAssembly*  CreateEndLadder(Int_t iLay);
   virtual TGeoVolumeAssembly*  CreateEndLadderCards(Int_t iLay);
   virtual TGeoVolume*          CreateEndLadderCardsV(Int_t iLay);
-  virtual TGeoVolumeAssembly*  CreateSupportRing(Int_t iLay);
+  virtual TGeoVolumeAssembly*  CreateSupportRing();
 
   // Create some basic objects : 
   virtual void                 CreateSDDsensor();
@@ -95,11 +95,11 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry {
   virtual TGeoVolumeAssembly*  CreateLadderFoot();
   virtual TGeoVolumeAssembly*  CreateCarlosCard(Int_t iLay);
   virtual Int_t                CreateLVCard();
-  virtual TGeoVolumeAssembly*  CreateHVCard(Int_t iLay);
+  virtual TGeoVolumeAssembly*  CreateHVCard();
 
   void                         CreateBasicObjects();
   Double_t                     GetConeZ(Double_t r, Double_t refR1, Double_t refR2,
-                                       Double_t refZ1, Double_t refZ2);
+                                       Double_t refZ1, Double_t refZ2) const;
   TGeoPcon*                    CreateConeConstSection(Double_t r1max, Double_t z1,
                                                      Double_t r2max, Double_t z2,
                                                      Double_t section, Int_t nDiv=1);
@@ -142,7 +142,7 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry {
   TGeoVolume* fCommonVol[2];      //!  some common vol. used in several places
   TGeoMatrix* fCommonTr[2];       //!  some common transformations
 
-  static const Int_t fgkNladdSegCommonVol = 19;       //  Number of vol.
+  static const Int_t fgkNladdSegCommonVol = 20;       //  Number of vol.
   TGeoVolume* fLaddSegCommonVol[fgkNladdSegCommonVol];//! volumes in ladder
   TGeoMatrix* fLaddSegCommonTr[fgkNladdSegCommonVol]; //! their transf.
 
@@ -175,8 +175,8 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry {
 
   //--------------------------------------  parameters for the SDD geometry
 
-  static const char* fgSDDsensitiveVolName3;      // sens. vol. name for lay. 3
-  static const char* fgSDDsensitiveVolName4;      // sens. vol. name for lay. 4
+  static const char* fgkSDDsensitiveVolName3;      // sens. vol. name for lay. 3
+  static const char* fgkSDDsensitiveVolName4;      // sens. vol. name for lay. 4
 
   static const Int_t    fgkLay3Nladd;             // 14
   static const Int_t    fgkLay3Ndet;              //  6
@@ -209,7 +209,7 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry {
   static const Double_t fgkLadderHeight;          // including bottom beam
   static const Double_t fgkLadderSegBoxDW;        // To include hybrids in box
   static const Double_t fgkLadderSegBoxDH;        // To include hybrids in box
-  static const Double_t fgkLadderSegBoxDHCorr;    // To include hybrids in box
+  //  static const Double_t fgkLadderSegBoxDHCorr;    // To include hybrids in box
 
   static const Double_t fgkLadderBeamRadius;      // carbon fiber beam radius
   static const Double_t fgkLadderLa;              // parameters defining