Switching to the TDR naming schema (I cross my fingers)

[u/mrichter/AliRoot.git] / ITS / UPGRADE / AliITSUv1Layer.h

diff --git a/ITS/UPGRADE/AliITSUv1Layer.h b/ITS/UPGRADE/AliITSUv1Layer.h
index 520cbd00b71aab26bf295bffa7f2fc7375ad41ff..a363b5e57dae137b414c306d7fb20c497264da1b 100644 (file)
--- a/ITS/UPGRADE/AliITSUv1Layer.h
+++ b/ITS/UPGRADE/AliITSUv1Layer.h
@@ -37,28 +37,28 @@ class AliITSUv1Layer : public AliITSv11Geometry {
     //
     Bool_t    IsTurbo() const {return fIsTurbo;};
 
-    Double_t  GetLadderThick() const {return fLadderThick;};
-    Double_t  GetLadderTilt()  const {return fLadderTilt;};
-    Double_t  GetLadderWidth() const {return fLadderWidth;};
+    Double_t  GetStaveThick() const {return fStaveThick;};
+    Double_t  GetStaveTilt()  const {return fStaveTilt;};
+    Double_t  GetStaveWidth() const {return fStaveWidth;};
     Double_t  GetSensorThick() const {return fSensorThick;};
-    Double_t  GetNLadders()    const {return fNLadders;};
-    Double_t  GetNModules()    const {return fNModules;};
+    Double_t  GetNStaves()    const {return fNStaves;};
+    Double_t  GetNChips()    const {return fNChips;};
     Double_t  GetRadius()      const {return fLayRadius;};
     Double_t  GetPhi0()        const {return fPhi0;};
     Double_t  GetZLength()     const {return fZLength;};
-    Int_t     GetDetType()     const {return fDetTypeID;}
+    Int_t     GetChipType()     const {return fChipTypeID;}
     AliITSUv1::AliITSUModel_t GetStaveModel() const {return fStaveModel;}
     //
-    void      SetLadderThick(Double_t t)    {fLadderThick = t;};
-    void      SetLadderTilt(Double_t t);
-    void      SetLadderWidth(Double_t w);
+    void      SetStaveThick(Double_t t)    {fStaveThick = t;};
+    void      SetStaveTilt(Double_t t);
+    void      SetStaveWidth(Double_t w);
     void      SetSensorThick(Double_t t)    {fSensorThick = t;};
-    void      SetNLadders(Int_t n)          {fNLadders = n;};
-    void      SetNModules(Int_t m)          {fNModules = m;};
+    void      SetNStaves(Int_t n)          {fNStaves = n;};
+    void      SetNChips(Int_t m)          {fNChips = m;};
     void      SetRadius(Double_t r)         {fLayRadius = r;};
     void      SetPhi0(Double_t phi)         {fPhi0 = phi;}
     void      SetZLength(Double_t z)        {fZLength   = z;};
-    void      SetDetType(Int_t tp)          {fDetTypeID = tp;}
+    void      SetChipType(Int_t tp)          {fChipTypeID = tp;}
     void      SetBuildLevel(Int_t buildLevel){fBuildLevel=buildLevel;}
     void      SetStaveModel(AliITSUv1::AliITSUModel_t model) {fStaveModel=model;}
     virtual void CreateLayer(TGeoVolume *moth);
@@ -68,10 +68,10 @@ class AliITSUv1Layer : public AliITSv11Geometry {
 
     Double_t RadiusOfTurboContainer();
 
-    TGeoVolume* CreateLadder(const TGeoManager *mgr=gGeoManager);
-    //TGeoVolume* CreateModule(Double_t x, Double_t z, const TGeoManager *mgr=gGeoManager);
-    TGeoVolume* CreateModuleInnerB(Double_t x,Double_t y, Double_t z, const TGeoManager *mgr=gGeoManager);
-    TGeoVolume* CreateModuleOuterB(Double_t x,Double_t y, Double_t z, const TGeoManager *mgr=gGeoManager);
+    TGeoVolume* CreateStave(const TGeoManager *mgr=gGeoManager);
+    //TGeoVolume* CreateChip(Double_t x, Double_t z, const TGeoManager *mgr=gGeoManager);
+    TGeoVolume* CreateChipInnerB(Double_t x,Double_t y, Double_t z, const TGeoManager *mgr=gGeoManager);
+    TGeoVolume* CreateChipOuterB(Double_t x,Double_t y, Double_t z, const TGeoManager *mgr=gGeoManager);
 
 
     TGeoVolume* CreateStaveStructInnerB(Double_t x,Double_t z, const TGeoManager *mgr=gGeoManager);
@@ -90,7 +90,7 @@ class AliITSUv1Layer : public AliITSv11Geometry {
     TGeoVolume* CreateSpaceFrameOuterBDummy(Double_t x, const TGeoManager *mgr=gGeoManager) const;
     TGeoVolume* CreateSpaceFrameOuterB0(Double_t x, const TGeoManager *mgr=gGeoManager);
 
-    TGeoArb8* CreateLadderSide(const char *name,
+    TGeoArb8* CreateStaveSide(const char *name,
                               Double_t dz, Double_t angle, Double_t xSign,
                               Double_t L, Double_t H, Double_t l);
     TGeoCombiTrans* CreateCombiTrans( const char *name,
@@ -102,16 +102,16 @@ class AliITSUv1Layer : public AliITSv11Geometry {
 
 
     Int_t     fLayerNumber; // Current layer number
-    Double_t  fPhi0;        // lab phi of 1st ladder, in degrees!!!
+    Double_t  fPhi0;        // lab phi of 1st stave, in degrees!!!
     Double_t  fLayRadius;   // Inner radius of this layer
     Double_t  fZLength;     // Z length of this layer
     Double_t  fSensorThick; // Sensor thickness
-    Double_t  fLadderThick; // Ladder thickness
-    Double_t  fLadderWidth; // Ladder width (for turbo layers only)
-    Double_t  fLadderTilt;  // Ladder tilt angle (for turbo layers only) in degrees
-    Int_t     fNLadders;    // Number of ladders in this layer
-    Int_t     fNModules;    // Number of modules per ladder in this layer
-    UInt_t    fDetTypeID;   // detector type id
+    Double_t  fStaveThick; // Stave thickness
+    Double_t  fStaveWidth; // Stave width (for turbo layers only)
+    Double_t  fStaveTilt;  // Stave tilt angle (for turbo layers only) in degrees
+    Int_t     fNStaves;    // Number of staves in this layer
+    Int_t     fNChips;    // Number of chips per stave in this layer
+    UInt_t    fChipTypeID;   // detector type id
     Bool_t    fIsTurbo;     // True if this layer is a "turbo" layer
     Int_t     fBuildLevel;  // Used for material studies
 
@@ -120,10 +120,10 @@ class AliITSUv1Layer : public AliITSv11Geometry {
     // Parameters for the Upgrade geometry
 
     static const Double_t fgkDefaultSensorThick; // Default sensor thickness
-    static const Double_t fgkDefaultLadderThick; // Default ladder thickness
+    static const Double_t fgkDefaultStaveThick; // Default stave thickness
 
     static const Double_t fgkOBHalfStaveWidth;   // OB Half Stave Width
-    static const Double_t fgkOBModuleGap;        // Gap between OB modules
+    static const Double_t fgkOBChipGap;        // Gap between OB chips
     static const Double_t fgkOBFlexCable1Thick;  // Thickness of
     static const Double_t fgkOBFlexCable2Thick;  // OB flex cables
     static const Double_t fgkOBBusCable1Thick;   // Thickness of
@@ -131,7 +131,7 @@ class AliITSUv1Layer : public AliITSv11Geometry {
     static const Double_t fgkOBCarbonPlateThick; // OB Carbon Plate Thickness
     static const Double_t fgkOBColdPlateThick;   // OB Cold Plate Thickness
     static const Double_t fgkOBGlueThick;        // OB Glue total Thickness
-    static const Double_t fgkOBModuleZLength;    // OB Module Length along Z
+    static const Double_t fgkOBChipZLength;    // OB Chip Length along Z
 
   ClassDef(AliITSUv1Layer,0) // ITS Upgrade v1 geometry
 };