Correct overloading of virtual functions in the derived classes (icc)

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 47145d5514b1048d987b59d8ffecf23a3eb5babc..d1c4b3be726277072cfee017a53d8fd8c30a6e1b 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -210,7 +210,7 @@ Float_t AliZDC::ZMax(void) const
   
 
 //_____________________________________________________________________________
-void AliZDC::MakeBranch(Option_t *opt, const char * /*file*/)
+void AliZDC::MakeBranch(Option_t *opt)
 {
   //
   // Create Tree branches for the ZDC

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 3a33b10627d6b4bfe7a35efb764b4567034e2ce9..6dd75373ef522bbaeba8d43a9272478dffb6a3ea 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -29,7 +29,7 @@ public:
   virtual Float_t ZMin() const;        // Minimum overall dimension of the ZDC
   virtual Float_t ZMax() const;        // Maximum overall dimension of the ZDC
   virtual void  SetTreeAddress();
-  virtual void  MakeBranch(Option_t* opt, const char *file=0);
+  virtual void  MakeBranch(Option_t* opt);
   virtual void  Hits2SDigits();
   virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
   virtual void  Digits2Raw();

diff --git a/ZDC/AliZDCCalibData.cxx b/ZDC/AliZDCCalibData.cxx
index 31424108a7de93c089cf7ab513559af5eb03cead..e1af544d08a0733f94e44971605e2b8c67ff2ddc 100644 (file)
--- a/ZDC/AliZDCCalibData.cxx
+++ b/ZDC/AliZDCCalibData.cxx
@@ -102,7 +102,7 @@ void AliZDCCalibData::PrepHistos()
 }
 
 //________________________________________________________________
-void  AliZDCCalibData::Print() const
+void  AliZDCCalibData::Print(Option_t *) const
 {
    printf("\n  ----    Mean pedestal values    ----\n\n");
    for(int t=0; t<47; t++){

diff --git a/ZDC/AliZDCCalibData.h b/ZDC/AliZDCCalibData.h
index 36edea17ccf5dd20b9afd35ab9dfca029e8ca111..4456207fab3ae2e26255e0ba329854d8f2203ed7 100644 (file)
--- a/ZDC/AliZDCCalibData.h
+++ b/ZDC/AliZDCCalibData.h
@@ -21,7 +21,7 @@ class AliZDCCalibData: public TNamed {
   AliZDCCalibData& operator= (const AliZDCCalibData &calibda);
   virtual ~AliZDCCalibData();
   void Reset();
-  virtual void  Print() const; 
+  virtual void  Print(Option_t *) const; 
   //
   Float_t  GetMeanPed(Int_t channel)           const {return fMeanPedestal[channel];}
   Float_t* GetMeanPed()   const {return (float*)fMeanPedestal;}

diff --git a/ZDC/AliZDCDigit.h b/ZDC/AliZDCDigit.h
index de6ad6d7528efccce3f9db01c4df90be5251ef51..0d80a5508c222bf890d1744b07f3866047c4bc51 100644 (file)
--- a/ZDC/AliZDCDigit.h
+++ b/ZDC/AliZDCDigit.h
@@ -48,7 +48,7 @@ class AliZDCDigit : public TObject {
   Int_t  fADCValue[2];       // ADC channel value (0 = high gain, 1 = low gain)
 
   // Print method
-  virtual void Print(Option_t *) {
+  virtual void Print(Option_t *) const {
      printf(" -> DIGIT: Detector =  %d Quadrant =  %d ADCCh high gain=  %d ADCCh low gain=  %d\n ",
      fSector[0], fSector[1], fADCValue[0], fADCValue[1]);
   }

diff --git a/ZDC/AliZDCHit.h b/ZDC/AliZDCHit.h
index 07b4e39dc9238f58be7ef402a9d2572d879fca28..e28f222191e24d34c37ff5b61e92a7c29109d83b 100644 (file)
--- a/ZDC/AliZDCHit.h
+++ b/ZDC/AliZDCHit.h
@@ -51,7 +51,7 @@ public:
   }
 
   // Print method
-  virtual void Print(Option_t *) {
+  virtual void Print(Option_t *) const {
      printf(" -> HIT: vol[0] =  %d vol[1] =  %d Track: %d \n" 
             "  Primary E = %f, Ximpact = %f, Yimpact = %f, SFlag = %f\n"
            "  PMQLight = %f, PMCLight = %f,  Deposited E = %f\n ", 

diff --git a/ZDC/AliZDCReconstructor.h b/ZDC/AliZDCReconstructor.h
index 77c652ba551c53e578def4c5012ad1f08703d435..771c58e436686b8a401821dcd1634f3f68970d8f 100644 (file)
--- a/ZDC/AliZDCReconstructor.h
+++ b/ZDC/AliZDCReconstructor.h
@@ -25,7 +25,21 @@ public:
   virtual void         Reconstruct(AliRunLoader* runLoader) const;
   virtual void         Reconstruct(AliRunLoader* runLoader, 
                                    AliRawReader* rawReader) const;
+  virtual void         Reconstruct(TTree* digitsTree, TTree* clustersTree) const { AliReconstructor::Reconstruct(digitsTree,clustersTree);}
+  virtual void         Reconstruct(AliRawReader* rawReader, TTree* clustersTree) const {AliReconstructor::Reconstruct(rawReader,clustersTree);}
   virtual void         FillESD(AliRunLoader* runLoader, AliESD* esd) const;
+  virtual void         FillESD(TTree* digitsTree, TTree* clustersTree, 
+                              AliESD* esd) const {
+    AliReconstructor::FillESD(digitsTree,clustersTree,esd);
+  }
+  virtual void         FillESD(AliRawReader* rawReader, TTree* clustersTree, 
+                              AliESD* esd) const {
+    AliReconstructor::FillESD(rawReader,clustersTree,esd);
+  }
+  virtual void         FillESD(AliRunLoader* runLoader, 
+                              AliRawReader* rawReader, AliESD* esd) const {
+    AliReconstructor::FillESD(runLoader,rawReader,esd);
+  }
 
 private:
   AliZDCReconstructor(const AliZDCReconstructor& reconstructor);