Merging changes from v4-04-Release

[u/mrichter/AliRoot.git] / PHOS / AliPHOSJet.cxx

diff --git a/PHOS/AliPHOSJet.cxx b/PHOS/AliPHOSJet.cxx
index 4ee6ca5cc5acacf33092e636033e499ba3a94955..b5880776e8d938781cecbd9dbb8fc73795ea76c9 100644 (file)
--- a/PHOS/AliPHOSJet.cxx
+++ b/PHOS/AliPHOSJet.cxx
@@ -37,7 +37,7 @@ ClassImp(AliPHOSJet)
   
 //____________________________________________________________________________ 
 AliPHOSJet::AliPHOSJet():TObject() {
-  //Inicilize members
+  //Initialize members
   fNpart = 0 ;
   fList = 0 ;
   //  fMode = 0 ;
@@ -66,7 +66,7 @@ AliPHOSJet::~AliPHOSJet(){
   
 }
 //____________________________________________________________________________ 
-void AliPHOSJet::AddParticle(const TParticle * p,const Int_t index){
+void AliPHOSJet::AddParticle(const TParticle * p, Int_t index){
   //adds particle to jet. Calculates change in jet direction, 
   //due to addition of this particle and if it is smaller, than fMaxDev, 
   //add particle, axcept new direction and return true.
@@ -101,7 +101,7 @@ void AliPHOSJet::AddParticle(const TParticle * p,const Int_t index){
   }
 }
 //____________________________________________________________________________ 
-void AliPHOSJet::AddDigit(const Double_t e,const Double_t eta,const Double_t phi, const Int_t index){
+void AliPHOSJet::AddDigit(Double_t e, Double_t eta, Double_t phi, Int_t index){
   //adds particle to jet. Calculates change in jet direction, 
   //due to addition of this particle and if it is smaller, than fMaxDev, 
   //add particle, axcept new direction and return true.
@@ -155,7 +155,7 @@ void AliPHOSJet::AddDigit(const Double_t e,const Double_t eta,const Double_t phi
 //   case 1: 
 //     return AcceptConeDeviation(dEta,dPhi,p->Energy() );
 //   default:
-//     Error("IsInCone","Unknown mode of cone calculation %d \n",mode );
+//     AliError(Form("Unknown mode of cone calculation %d \n",mode ));
 //   }
 //   return kFALSE ;
 //}
@@ -180,7 +180,7 @@ Bool_t AliPHOSJet::AcceptConeDeviation(const TParticle * p)const
     return kFALSE ;
 }
 //____________________________________________________________________________ 
-Bool_t AliPHOSJet::AcceptConeDeviation(const Double_t e,const Double_t eta,const Double_t phi)const
+Bool_t AliPHOSJet::AcceptConeDeviation(Double_t e, Double_t eta, Double_t phi)const
 { //Calculate cone deviation in case of inclusion of the given
   //particle to jet. 
 
@@ -223,7 +223,7 @@ Bool_t AliPHOSJet::IsInCone(const TParticle * p)const
     return kFALSE ;
 }
 //____________________________________________________________________________ 
-Bool_t AliPHOSJet::IsInCone(const Double_t eta,const Double_t phi)const
+Bool_t AliPHOSJet::IsInCone(Double_t eta, Double_t phi)const
 {
   //Says if particle is inside the defined cone
   Double_t dEta ;
@@ -282,7 +282,7 @@ void AliPHOSJet::CalculateAll(void){
   fSumPhi = 0. ;
 }
 //____________________________________________________________________________ 
-void AliPHOSJet::Print(){
+void AliPHOSJet::Print(const Option_t *) const {
   //Print jet parameters
   printf("-------------- AliPHOSJet ------------\n") ;
   printf(" Energy............. %f \n",fEnergy) ;