Fix compiler warnings (Theodor)

diff --git a/TRD/AliTRDclusterizer.cxx b/TRD/AliTRDclusterizer.cxx
index a113535d9ee580d1c99e77f69138632d80e9df3a..6d8486ed47c8c962381287e2c830a1933048cf1d 100644 (file)
--- a/TRD/AliTRDclusterizer.cxx
+++ b/TRD/AliTRDclusterizer.cxx
@@ -855,7 +855,7 @@ Bool_t AliTRDclusterizer::MakeClusters(Int_t det)
   }
 
   if (TestBit(kAddLabels)) {
-    AddLabels(fDet,firstClusterROC,fClusterROC);
+    AddLabels();
   }
 
   return kTRUE;
@@ -909,7 +909,7 @@ Bool_t AliTRDclusterizer::IsMaximum(const MaxStruct &Max, UChar_t &padStatus, Sh
       return kTRUE;
     }
     else if (status[1] && (!(status[0] || status[2])) && ((Signals[2] >= fSigThresh) || (Signals[0] >= fSigThresh))) {
-      Signals[1]=fMaxThresh;
+      Signals[1]=TMath::Nint(fMaxThresh);
       SetPadStatus(status[1], padStatus);
       return kTRUE;
     }
@@ -1110,7 +1110,7 @@ void AliTRDclusterizer::AddClusterToArray(AliTRDcluster *cluster)
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterROC, const Int_t nClusterROC)
+Bool_t AliTRDclusterizer::AddLabels()
 {
   //
   // Add the track indices to the found clusters
@@ -1128,7 +1128,7 @@ Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterRO
   Int_t iPad = 0;
 
   // Temporary array to collect the track indices
-  Int_t *idxTracks = new Int_t[kNtrack*nClusterROC];
+  Int_t *idxTracks = new Int_t[kNtrack*fClusterROC];
 
   // Loop through the dictionary arrays one-by-one
   // to keep memory consumption low
@@ -1136,10 +1136,10 @@ Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterRO
   for (Int_t iDict = 0; iDict < kNdict; iDict++) {
 
     // tracksIn should be expanded beforehand!
-    tracksIn = (AliTRDarrayDictionary *) fDigitsManager->GetDictionary(idet,iDict);
+    tracksIn = (AliTRDarrayDictionary *) fDigitsManager->GetDictionary(fDet,iDict);
 
     // Loop though the clusters found in this ROC
-    for (iClusterROC = 0; iClusterROC < nClusterROC; iClusterROC++) {
+    for (iClusterROC = 0; iClusterROC < fClusterROC; iClusterROC++) {
 
       AliTRDcluster *cluster = (AliTRDcluster *)
                                RecPoints()->UncheckedAt(firstClusterROC+iClusterROC);
@@ -1159,7 +1159,7 @@ Bool_t AliTRDclusterizer::AddLabels(const Int_t idet, const Int_t firstClusterRO
 
   // Copy the track indices into the cluster
   // Loop though the clusters found in this ROC
-  for (iClusterROC = 0; iClusterROC < nClusterROC; iClusterROC++) {
+  for (iClusterROC = 0; iClusterROC < fClusterROC; iClusterROC++) {
 
     AliTRDcluster *cluster = (AliTRDcluster *)
       RecPoints()->UncheckedAt(firstClusterROC+iClusterROC);

diff --git a/TRD/AliTRDclusterizer.h b/TRD/AliTRDclusterizer.h
index cf3ebade35f251ffca8bf4fb430abce17b69512d..ee10beaf3fe43fdc5f5bdd1d474c9bcd807af9d4 100644 (file)
--- a/TRD/AliTRDclusterizer.h
+++ b/TRD/AliTRDclusterizer.h
@@ -66,37 +66,37 @@ class AliTRDclusterizer : public TNamed
   virtual         ~AliTRDclusterizer();
   AliTRDclusterizer &operator=(const AliTRDclusterizer &c);
 
-  virtual void     Copy(TObject &c) const;
+  void     Copy(TObject &c) const;
 
-  virtual Bool_t   Open(const Char_t *name, Int_t nEvent = 0);
-  virtual Bool_t   OpenInput(Int_t nEvent = 0);
-  virtual Bool_t   OpenOutput();
-  virtual Bool_t   OpenOutput(TTree *clusterTree);
+  Bool_t   Open(const Char_t *name, Int_t nEvent = 0);
+  Bool_t   OpenInput(Int_t nEvent = 0);
+  Bool_t   OpenOutput();
+  Bool_t   OpenOutput(TTree *clusterTree);
 
-  virtual Bool_t   ReadDigits();
-  virtual Bool_t   ReadDigits(AliRawReader *rawReader);
-  virtual Bool_t   ReadDigits(TTree *digitsTree);
+  Bool_t   ReadDigits();
+  Bool_t   ReadDigits(AliRawReader *rawReader);
+  Bool_t   ReadDigits(TTree *digitsTree);
 
-  virtual Bool_t   WriteClusters(Int_t det);
+  Bool_t   WriteClusters(Int_t det);
   void     ResetRecPoints();
   virtual TClonesArray    *RecPoints();
-          Bool_t   WriteTracklets(Int_t det);
+  Bool_t   WriteTracklets(Int_t det);
 
-  virtual Bool_t   Raw2Clusters(AliRawReader *rawReader);
-  virtual Bool_t   Raw2ClustersChamber(AliRawReader *rawReader);
+  Bool_t   Raw2Clusters(AliRawReader *rawReader);
+  Bool_t   Raw2ClustersChamber(AliRawReader *rawReader);
 
-  virtual Bool_t   MakeClusters();
-  virtual Bool_t   MakeClusters(Int_t det);
+  Bool_t   MakeClusters();
+  Bool_t   MakeClusters(Int_t det);
 
-  virtual Bool_t   AddLabels(const Int_t idet, const Int_t firstClusterROC, const Int_t nClusterROC);
-  virtual Bool_t   SetAddLabels(const Bool_t kset) { SetBit(kAddLabels, kset); return TestBit(kAddLabels);  } // should we assign labels to clusters
-  virtual void     SetRawVersion(const Int_t iver) { fRawVersion = iver; } // set the expected raw data version
+  Bool_t   AddLabels();
+  Bool_t   SetAddLabels(const Bool_t kset) { SetBit(kAddLabels, kset); return TestBit(kAddLabels);  } // should we assign labels to clusters
+  void     SetRawVersion(const Int_t iver) { fRawVersion = iver; } // set the expected raw data version
   void             SetReconstructor(const AliTRDReconstructor *rec) {fReconstructor = rec;}
   static UChar_t   GetStatus(Short_t &signal);
   Int_t            GetAddedClusters() {return fNoOfClusters;}
 
-  virtual Bool_t   IsClustersOwner() const {return TestBit(kOwner);}
-  void             SetClustersOwner(Bool_t own=kTRUE) {SetBit(kOwner, own); if(!own) {fRecPoints = 0x0; fNoOfClusters=0;} }
+  Bool_t   IsClustersOwner() const {return TestBit(kOwner);}
+  virtual void     SetClustersOwner(Bool_t own=kTRUE) {SetBit(kOwner, own); if(!own) {fRecPoints = 0x0; fNoOfClusters=0;} }
 
  protected:
 
@@ -104,10 +104,10 @@ class AliTRDclusterizer : public TNamed
                             ,const Int_t nTimeTotal, const Int_t nexp);
   void             TailCancelation();
 
-  virtual Float_t  Unfold(Double_t eps, Int_t layer, Double_t *padSignal) const;
-          Double_t GetCOG(Double_t signal[5]) const; 
+  Float_t  Unfold(Double_t eps, Int_t layer, Double_t *padSignal) const;
+  Double_t GetCOG(Double_t signal[5]) const; 
   void             FillLUT();
-          Double_t LUTposition(Int_t ilayer, Double_t ampL, Double_t ampC, Double_t ampR) const;
+  Double_t LUTposition(Int_t ilayer, Double_t ampL, Double_t ampC, Double_t ampR) const;
   
   void             SetPadStatus(const UChar_t status, UChar_t &encoding);
   UChar_t          GetPadStatus(UChar_t encoding) const;