Fixing warnings

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

diff --git a/TRD/AliTRDfeeParam.h b/TRD/AliTRDfeeParam.h
index 7cd5616a5819962447ece8039523ec66270cd66a..efeec152da966cad8a9663c53ea428d27470c525 100644 (file)
--- a/TRD/AliTRDfeeParam.h
+++ b/TRD/AliTRDfeeParam.h
@@ -42,8 +42,11 @@ class AliTRDfeeParam : public TObject
   // Translation from MCM to Pad and vice versa
   virtual Int_t    GetPadRowFromMCM(Int_t irob, Int_t imcm) const;
   virtual Int_t    GetPadColFromADC(Int_t irob, Int_t imcm, Int_t iadc) const;
+  virtual Int_t    GetExtendedPadColFromADC(Int_t irob, Int_t imcm, Int_t iadc) const;
   virtual Int_t    GetMCMfromPad(Int_t irow, Int_t icol) const;
+  virtual Int_t    GetMCMfromSharedPad(Int_t irow, Int_t icol) const;
   virtual Int_t    GetROBfromPad(Int_t irow, Int_t icol) const;
+  virtual Int_t    GetROBfromSharedPad(Int_t irow, Int_t icol) const;
   virtual Int_t    GetRobSide(Int_t irob) const;
   virtual Int_t    GetColSide(Int_t icol) const;
 
@@ -89,7 +92,7 @@ class AliTRDfeeParam : public TObject
 
   static  Int_t    GetTFtype()            { return fgkTFtype;       }
   //static  Int_t    GetTFnExp()            { return fgkTFnExp;       }
-          Int_t    GetTFnExp()            { return fTFnExp;         }
+          Int_t    GetTFnExp()      const { return fTFnExp;         }
           Float_t  GetTFr1()        const { return fTFr1;           }
           Float_t  GetTFr2()        const { return fTFr2;           }
           Float_t  GetTFc1()        const { return fTFc1;           }
@@ -99,7 +102,7 @@ class AliTRDfeeParam : public TObject
          Bool_t   GetTracklet()         const { return fgTracklet; } 
   static  void     SetTracklet(Bool_t trackletSim = kTRUE) { fgTracklet = trackletSim; }
           Int_t    GetMaxNrOfTracklets() const { return fgkMaxNrOfTracklets; } 
-         Bool_t    GetMCTrackletOutput() const { return fgkMCTrackletOutput; }
+         Bool_t   GetMCTrackletOutput() const { return fgkMCTrackletOutput; }
 
   static  Float_t  GetTFattPar()          { return ((Float_t) fgkTFattPar1) / ((Float_t) fgkTFattPar2); }
           Float_t  GetTFf0()        const { return 1.0 + fgkTFon*(-1.0+GetTFattPar()); }   // 1 if TC off
@@ -173,11 +176,11 @@ class AliTRDfeeParam : public TObject
  // Tracklet  processing on/off 
   static       Bool_t   fgTracklet; // tracklet processing
 
-  // max. nr of tracklet words for one mcm
-  static const Int_t    fgkMaxNrOfTracklets = 4; 
+  static const Int_t    fgkMaxNrOfTracklets = 4;          // Max. nr of tracklet words for one mcm
 
-  // additional tracklet folder structure output, containing all necessary Monte Carlo information; maybe this should go somewhere else;
-  static const Bool_t   fgkMCTrackletOutput = kTRUE; // default should be kTRUE
+  // additional tracklet folder structure output, 
+  // containing all necessary Monte Carlo information; maybe this should go somewhere else;
+  static const Bool_t   fgkMCTrackletOutput = kTRUE;      // Default should be kTRUE
 
   // following need Instance because initialized in constructor
                Float_t  fTFr1;                            // Time constant [us] long (old name fR1)
@@ -206,11 +209,8 @@ class AliTRDfeeParam : public TObject
   static const Int_t    fgkMinClusterCharge   = 20;       // Hit detection [in ADC units]
 
   //new
-  //time constants for linear fit
-  static const Int_t    fgkPREPLinearFitStart = 5;
-  static const Int_t    fgkPREPLinearFitEnd   = 20;
-
-
+  static const Int_t    fgkPREPLinearFitStart = 5;        // Time constants for linear fit
+  static const Int_t    fgkPREPLinearFitEnd   = 20;       // Time constants for linear fit
 
   // OLD TRAP processing parameters calculated from above
   //static const Float_t  fClusThr;                       // Cluster threshold
@@ -229,3 +229,4 @@ class AliTRDfeeParam : public TObject
 
 };
 #endif
+