Coverity fixes (Alex)

[u/mrichter/AliRoot.git] / TRD / AliTRDCalibraMode.h

diff --git a/TRD/AliTRDCalibraMode.h b/TRD/AliTRDCalibraMode.h
index d3e9afcb5d4d5b23fa9f3de3cfe6b0a25f669f3c..e47a8029a0fc2db266eb610b03777935c94a837d 100644 (file)
--- a/TRD/AliTRDCalibraMode.h
+++ b/TRD/AliTRDCalibraMode.h
@@ -15,6 +15,8 @@
 #  include <TObject.h>
 #endif
 
+class AliTRDgeometry;
+
 class AliTRDCalibraMode : public TObject {
 
  public: 
@@ -25,8 +27,8 @@ class AliTRDCalibraMode : public TObject {
   AliTRDCalibraMode &operator=(const AliTRDCalibraMode &) { return *this; }
 
    
-  Bool_t   ModePadFragmentation(Int_t iPlane,Int_t iChamb, Int_t iSect, Int_t i);
-  void     ModePadCalibration(Int_t iChamb, Int_t i);
+  Bool_t   ModePadFragmentation(Int_t iLayer,Int_t iStack, Int_t iSector, Int_t i);
+  void     ModePadCalibration(Int_t iStack, Int_t i);
   void     ReconstructionRowPadGroup(Int_t idect, Int_t i);
   void     CalculXBins(Int_t idect, Int_t i);
   void     ResetMinMax(Int_t i);
@@ -45,6 +47,10 @@ class AliTRDCalibraMode : public TObject {
          void     SetColMax(Int_t i, Short_t colmax)                        { fColMax[i] = colmax;            } 
          void     SetDetChamb0(Int_t i);
          void     SetDetChamb2(Int_t i);
+         
+         void     SetPerSuperModule(Int_t i);
+         void     SetAllTogether(Int_t i);
+
 
   //Get
          Short_t  GetNz(Int_t i) const                                      { return fNz[i];                  }
@@ -57,13 +63,16 @@ class AliTRDCalibraMode : public TObject {
          Short_t  GetRowMax(Int_t i) const                                  { return fRowMax[i];              }
          Short_t  GetColMin(Int_t i) const                                  { return fColMin[i];              }
          Short_t  GetColMax(Int_t i) const                                  { return fColMax[i];              }
-         Short_t  GetXbins(Int_t i) const                                   { return fXbins[i];               }
+         Int_t    GetXbins(Int_t i) const                                   { return fXbins[i];               }
           Short_t  GetDetChamb0(Int_t i) const                               { return fDetChamb0[i];           }
           Short_t  GetDetChamb2(Int_t i) const                               { return fDetChamb2[i];           }
     
      
  protected:
 
+  // Geometry
+  AliTRDgeometry  *fGeo;                    //! The TRD geometry
+
           Short_t  fNz[3];                  // Mode of calibration 
           Short_t  fNrphi[3];               // Mode of calibration 
          Short_t  fNnZ[3];                 // Number of pad rows in a group
@@ -79,11 +88,11 @@ class AliTRDCalibraMode : public TObject {
           Short_t  fDetChamb2[3];           // Number of Xbins for chamber 2
 
   // Some basic geometry function
-  virtual Int_t    GetPlane(Int_t d) const;
-  virtual Int_t    GetChamber(Int_t d) const;
+  virtual Int_t    GetLayer(Int_t d) const;
+  virtual Int_t    GetStack(Int_t d) const;
   virtual Int_t    GetSector(Int_t d) const;
  
-  ClassDef(AliTRDCalibraMode,1)             // TRD Calibration class
+  ClassDef(AliTRDCalibraMode,2)             // TRD Calibration class
 
 };
 #endif