Trying to get rid of compiler warnings
authorskowron <skowron@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 14 Jun 2005 13:38:14 +0000 (13:38 +0000)
committerskowron <skowron@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 14 Jun 2005 13:38:14 +0000 (13:38 +0000)
HBTAN/AliHBTCorrFitFctn.cxx
HBTAN/AliHBTCorrFitFctn.h
HBTAN/AliHBTCorrectOSLCorrelFctn.cxx
HBTAN/AliHBTCorrectOSLCorrelFctn.h
HBTAN/AliHBTFunction.cxx
HBTAN/AliHBTFunction.h

index 144c7cf7070e52842293bcf56fd166716382e95f..220f33fbbc9ac9f4e1ceded29c1b04d3bf9f4c72 100644 (file)
@@ -106,9 +106,11 @@ TH1* AliHBTCorrFitFctn::GetResult()
 }
 /**************************************************************/
 
-void AliHBTCorrFitFctn::WriteFunction()
+Int_t AliHBTCorrFitFctn::WriteFunction()
 {
   //writes a function 
-  AliHBTFunction::WriteFunction();
-  fNtuple->Write(0,TObject::kOverwrite);
+  Int_t retval;
+  retval += AliHBTFunction::WriteFunction();
+  retval += fNtuple->Write(0,TObject::kOverwrite);
+  return retval;
 }
index f9ec72f5c6d8255884dcf59693b0ba13f9496326..6ab6a7b9390a53a097886b92032ed0c492e02047 100644 (file)
@@ -24,7 +24,7 @@ class AliHBTCorrFitFctn: public AliHBTOnePairFctn1D
    void ProcessDiffEventParticles(AliHBTPair* trackpair);
    
    TH1* GetResult();
-   void WriteFunction();
+   virtual Int_t WriteFunction();
 
    void SetMaxNumberOfPairs(Int_t  fit, Int_t  norm){fNMaxPairsFitArea = fit; fNMaxPairsNormArea = norm;}
    void SetFitRange(Float_t max) {fFitRangeMax = max;}
index b6f8ef0119d4d7bd49709e35d7592379b67416a3..e665fa815a25bb0890fe430c114e55a6efa4bd96 100644 (file)
@@ -224,12 +224,14 @@ void AliHBTCorrectOSLCorrelFctn::ProcessDiffEventParticles(AliHBTPair* pair)
 }
 /******************************************************************/
 
-void AliHBTCorrectOSLCorrelFctn::WriteFunction()
+Int_t AliHBTCorrectOSLCorrelFctn::WriteFunction()
 {
-  AliHBTFunction::WriteFunction();
-  if (fSmearedNumer) fSmearedNumer->Write();
-  if (fSmearedDenom) fSmearedDenom->Write();
-
+  //Writes the function
+  Int_t retval = 0;
+  retval += AliHBTFunction::WriteFunction();
+  if (fSmearedNumer) retval += fSmearedNumer->Write();
+  if (fSmearedDenom) retval += fSmearedDenom->Write();
+  return retval;
 }
 /******************************************************************/
 
index ad3a97e9bb9813b93d64999b789efebd5da49d32..d88af0a23b1a2585a4d301723eea5a441d0d1de5 100644 (file)
@@ -38,7 +38,7 @@ class AliHBTCorrectOSLCorrelFctn: public AliHBTOnePairFctn3D, public AliHBTCorre
 
    void     SetInitialValues(Double_t lambda, Double_t rout, Double_t rside, Double_t rlong);
    void     Init();
-   void     WriteFunction();//overloaded 
+   Int_t    WriteFunction();//overloaded 
 
    TH1*     GetResult();//returns the result histogram
    void     GetValues(AliHBTPair* pair, Double_t& x, Double_t& y, Double_t& z) const ;
index 198041dbf8e0a4ef3323b133f41eb589605dfbae..6a07f04f94cad07f8c08e63bc4a9b1d4c3285fa0 100644 (file)
@@ -102,9 +102,10 @@ AliHBTFunction & AliHBTFunction::operator= (const AliHBTFunction & source)
   return * this;
 }
 
-void AliHBTFunction::WriteFunction()
+Int_t AliHBTFunction::WriteFunction()
 {
 //writes result of the function to file
+  Int_t retval =0;
    AliDebug(1,"Entering");
    if (fWriteNumAndDen)
     { 
@@ -120,9 +121,10 @@ void AliHBTFunction::WriteFunction()
    if (res) 
     { 
       AliDebug(1,"Writing Result");
-      res->Write();
+      retval = res->Write();
       AliDebug(1,"Writing Result Done");
     }
+   return retval;
 }
 /******************************************************************/
 
index 253f69703b193a89bf2e549f6c2810d757421d80..5431c6923f3a47e13d3c3f5d5a6dee322c2df44c 100644 (file)
@@ -1,6 +1,6 @@
 #ifndef ALIHBTFUNCTION_H
 #define ALIHBTFUNCTION_H
-
 /* Id: $ */
 
 ///////////////////////////////////////////////////////
@@ -40,7 +40,7 @@ class AliHBTFunction: public TNamed
     virtual TH1* GetDenominator() const = 0;
     virtual TH1* GetResult() = 0;
 
-    virtual void WriteFunction();
+    virtual Int_t WriteFunction();
     virtual void InitFunction();
     
     TH1* GetRatio(Double_t normfactor = 1.0);
@@ -125,7 +125,7 @@ class AliHBTOnePairFctn
     virtual void ProcessDiffEventParticles(AliHBTPair* pair) = 0;
 
     virtual void Init() = 0;
-    virtual void Write() = 0;
+    virtual Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0) = 0;
     virtual const char* Name() = 0;
     
    ClassDef(AliHBTOnePairFctn,2)
@@ -163,7 +163,7 @@ class AliHBTTwoPairFctn
     ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair) = 0;
     
     virtual void Init() = 0;
-    virtual void Write(const char* /*x1*/ = 0 , int/*x2*/ = 0, int /*x3*/ = 0) = 0;
+    virtual Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0) = 0;
     virtual const char* Name() = 0;
             
    ClassDef(AliHBTTwoPairFctn,2)
@@ -406,7 +406,7 @@ class AliHBTOnePairFctn1D: public AliHBTOnePairFctn, public AliHBTFunction1D
 
   void ProcessSameEventParticles(AliHBTPair* pair);
   void ProcessDiffEventParticles(AliHBTPair* pair);
-  void Write(){WriteFunction();}
+  Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0){return WriteFunction();}
   void Init(){InitFunction();}
   const char* Name(){return GetName();}
   
@@ -450,7 +450,7 @@ class AliHBTOnePairFctn2D: public AliHBTOnePairFctn, public AliHBTFunction2D
   
   void ProcessSameEventParticles(AliHBTPair* pair);
   void ProcessDiffEventParticles(AliHBTPair* pair);
-  void Write(){WriteFunction();}
+  Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0){return WriteFunction();}
   void Init(){InitFunction();}
   const char* Name(){return GetName();}
  protected:
@@ -494,7 +494,7 @@ class AliHBTOnePairFctn3D: public AliHBTOnePairFctn, public AliHBTFunction3D
 
   void ProcessSameEventParticles(AliHBTPair* pair);
   void ProcessDiffEventParticles(AliHBTPair* pair);
-  void Write(){WriteFunction();}
+  Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0){return WriteFunction();}
   void Init(){InitFunction();}
   const char* Name(){return GetName();}
  protected:
@@ -531,7 +531,7 @@ class AliHBTTwoPairFctn1D: public AliHBTTwoPairFctn, public AliHBTFunction1D
 
   void ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
   void ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-  void Write(){WriteFunction();}
+  Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0){return WriteFunction();}
   void Init(){InitFunction();}
   const char* Name(){return GetName();}
   
@@ -576,7 +576,7 @@ class AliHBTTwoPairFctn2D: public AliHBTTwoPairFctn, public AliHBTFunction2D
   
   void ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
   void ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-  void Write(){WriteFunction();}
+  Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0){return WriteFunction();}
   void Init(){InitFunction();}
   const char* Name(){return GetName();}
 
@@ -623,7 +623,7 @@ class AliHBTTwoPairFctn3D: public AliHBTTwoPairFctn, public AliHBTFunction3D
 
   void ProcessSameEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
   void ProcessDiffEventParticles(AliHBTPair* trackpair, AliHBTPair* partpair);
-  void Write(){WriteFunction();}
+  Int_t Write(const char* /*x1*/ = 0,Int_t /*x2*/ = 0, Int_t /*x3*/ = 0){return WriteFunction();}
   void Init(){InitFunction();}
   const char* Name(){return GetName();}