Correcting some trivial warnings on Alpha

diff --git a/EMCAL/AliEMCALJetFinder.cxx b/EMCAL/AliEMCALJetFinder.cxx
index b9c04fd5d4e80f8e86e0ca4b760e10eb0c6a3a49..c391d8f13d506d63ff14297b9a21bb82a7b94fff 100644 (file)
--- a/EMCAL/AliEMCALJetFinder.cxx
+++ b/EMCAL/AliEMCALJetFinder.cxx
@@ -1037,7 +1037,7 @@ void AliEMCALJetFinder::FillFromDigits(Int_t flag)
     
     if (!fLego) BookLego();
     if (flag == 0) fLego->Reset();
-    Int_t nbytes;
+    Int_t nbytes=0;
     
 
 //

diff --git a/EMCAL/AliEMCALRecParticle.cxx b/EMCAL/AliEMCALRecParticle.cxx
index bb7aa8f7316b3b7ec31fb55621ce03713a7b4117..c101bad46b9c47def2a5a5db9b1965e84272d1d2 100644 (file)
--- a/EMCAL/AliEMCALRecParticle.cxx
+++ b/EMCAL/AliEMCALRecParticle.cxx
@@ -93,14 +93,11 @@ const TParticle * AliEMCALRecParticle::GetPrimary(Int_t index) const
              index, GetNPrimaries()) ;
     return 0 ; 
   } 
-  else { 
-    Int_t dummy ; 
-    AliEMCALGetter * gime = AliEMCALGetter::Instance() ; 
+  Int_t dummy ; 
+  AliEMCALGetter * gime = AliEMCALGetter::Instance() ; 
 
-    Int_t ecaRPindex = dynamic_cast<AliEMCALTrackSegment*>(gime->TrackSegments()->At(GetEMCALTSIndex()))->GetECAIndex();
-    Int_t primaryindex = dynamic_cast<AliEMCALTowerRecPoint*>(gime->ECARecPoints()->At(ecaRPindex))->GetPrimaries(dummy)[index] ; 
-    return gime->Primary(primaryindex) ;
-   } 
-  return 0 ; 
+  Int_t ecaRPindex = dynamic_cast<AliEMCALTrackSegment*>(gime->TrackSegments()->At(GetEMCALTSIndex()))->GetECAIndex();
+  Int_t primaryindex = dynamic_cast<AliEMCALTowerRecPoint*>(gime->ECARecPoints()->At(ecaRPindex))->GetPrimaries(dummy)[index] ; 
+  return gime->Primary(primaryindex) ;
 }
 

diff --git a/HBTAN/AliHBTFunction.cxx b/HBTAN/AliHBTFunction.cxx
index 110a1737cbc4ead77c90f092916d471c466c0ecb..b93d5142bc0351586b52c3319e74b128724cb7df 100644 (file)
--- a/HBTAN/AliHBTFunction.cxx
+++ b/HBTAN/AliHBTFunction.cxx
@@ -293,8 +293,8 @@ Double_t AliHBTFunction1D::Scale(TH1D* num,TH1D* den)
   
   if(fNBinsToScale < 1) 
    {
-    return 0.0;
     Error("Scale","Number of bins for scaling is smaller thnan 1");
+    return 0.0;
    }
   UInt_t nbins = num->GetNbinsX();
   if (fNBinsToScale > nbins) 
@@ -463,8 +463,8 @@ Double_t AliHBTFunction2D::Scale()
   
   if( (fNBinsToScaleX < 1) || (fNBinsToScaleY < 1) ) 
    {
-    return 0.0;
     Error("Scale","Number of bins for scaling is smaller thnan 1");
+    return 0.0;
    }
   UInt_t nbinsX = fNumerator->GetNbinsX();
   if (fNBinsToScaleX > nbinsX) 
@@ -654,8 +654,8 @@ Double_t AliHBTFunction3D::Scale()
   
   if( (fNBinsToScaleX < 1) || (fNBinsToScaleY < 1) || (fNBinsToScaleZ < 1)) 
    {
-    return 0.0;
     Error("Scale","Number of bins for scaling is smaller thnan 1");
+    return 0.0;
    }
   UInt_t nbinsX = fNumerator->GetNbinsX();
   if (fNBinsToScaleX > nbinsX) 

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index ca775fc2f3bd6078a8b643a274efdb5571cb95e0..2c554e3fcfbd38dbda783d7595dc51e009edd2e9 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -408,7 +408,7 @@ const Float_t  AliPHOSPIDv1::GetDistance(AliPHOSEmcRecPoint * emc,AliPHOSRecPoin
   return 100000000 ;
 }
 //____________________________________________________________________________
-const Int_t  AliPHOSPIDv1::GetCPVBit(AliPHOSEmcRecPoint * emc,AliPHOSRecPoint * cpv,const Int_t effPur, const Float_t e) const
+const Int_t  AliPHOSPIDv1::GetCPVBit(AliPHOSEmcRecPoint * emc,AliPHOSRecPoint * cpv,const Int_t effPur, Float_t e) const
 {
   if(effPur>2 || effPur<0)
     Error("GetCPVBit","Invalid Efficiency-Purity choice %d",effPur);
@@ -426,7 +426,7 @@ const Int_t  AliPHOSPIDv1::GetCPVBit(AliPHOSEmcRecPoint * emc,AliPHOSRecPoint *
 }
 
 //____________________________________________________________________________
-const Int_t  AliPHOSPIDv1::GetPrincipalBit(TString particle, const Double_t* p,const Int_t effPur, const Float_t e)const
+const Int_t  AliPHOSPIDv1::GetPrincipalBit(TString particle, const Double_t* p,const Int_t effPur, Float_t e)const
 {
   //Is the particle inside de PCA ellipse?
   

diff --git a/STEER/AliConfig.cxx b/STEER/AliConfig.cxx
index 63331ca6a0fa5e765f34b78c51277cb50e6f3a3e..3f2c2ffcf830d47960feed24f66ee9dc92b73a19 100644 (file)
--- a/STEER/AliConfig.cxx
+++ b/STEER/AliConfig.cxx
@@ -738,21 +738,15 @@ Int_t AliConfig::AddSubFolder(TFolder* topfolder, const char* infoler,
     }
    else return 0;//success
   }
- else
-  {//such an object already exists
-    TFolder* fol = dynamic_cast<TFolder*>(obj);
-    if (fol == 0x0)
-     {
-      Error("AddSubFodler(TFolder*, ....",
-             "Object named %s already exists in folder %s AND IT IS NOT A FOLDER",newfoldname,infoler);
-      return 3;
-     }
-    else
-     {
-      Warning("AddSubFodler(TFolder*, ....",
-             "Folder named %s already exists in folder %s",newfoldname,infoler);
-      return 0;
-     }
-  }
- return 0; //never reached
+ //such an object already exists
+ TFolder* fol = dynamic_cast<TFolder*>(obj);
+ if (fol == 0x0)
+   {
+     Error("AddSubFodler(TFolder*, ....",
+          "Object named %s already exists in folder %s AND IT IS NOT A FOLDER",newfoldname,infoler);
+     return 3;
+   }
+ Warning("AddSubFodler(TFolder*, ....",
+        "Folder named %s already exists in folder %s",newfoldname,infoler);
+ return 0;
 }

diff --git a/STEER/AliLoader.h b/STEER/AliLoader.h
index 29a6dc5b0548b4886e53e9969575488059ea1fcb..43c927f6eaa7f3a4f10d26428f2db46a4f3a8dc6 100644 (file)
--- a/STEER/AliLoader.h
+++ b/STEER/AliLoader.h
@@ -114,9 +114,9 @@ class AliLoader: public TNamed
     TTree*         TreeT(){return GetTracksDataLoader()->Tree();}    //returns the tree from folder; shortcut method
     TTree*         TreeP(){return GetRecParticlesDataLoader()->Tree();} //returns the tree from folder; shortcut method
 
-    Int_t          LoadHits(Option_t* opt=""){return GetHitsDataLoader()->Load(opt);SetTAddrInDet();}
-    Int_t          LoadSDigits(Option_t* opt=""){return GetSDigitsDataLoader()->Load(opt);SetTAddrInDet();}
-    Int_t          LoadDigits(Option_t* opt=""){return GetDigitsDataLoader()->Load(opt);SetTAddrInDet();}
+    Int_t          LoadHits(Option_t* opt=""){Int_t status = GetHitsDataLoader()->Load(opt);SetTAddrInDet();return status;}
+    Int_t          LoadSDigits(Option_t* opt=""){Int_t status = GetSDigitsDataLoader()->Load(opt);SetTAddrInDet(); return status;}
+    Int_t          LoadDigits(Option_t* opt=""){Int_t status = GetDigitsDataLoader()->Load(opt);SetTAddrInDet();return status;}
     Int_t          LoadRecPoints(Option_t* opt=""){return GetRecPointsDataLoader()->Load(opt);}
     Int_t          LoadTracks(Option_t* opt=""){return GetTracksDataLoader()->Load(opt);}
     Int_t          LoadRecParticles(Option_t* opt=""){return GetRecParticlesDataLoader()->Load(opt);}

diff --git a/THbtp/AliGenHBTprocessor.cxx b/THbtp/AliGenHBTprocessor.cxx
index 2ee260d39663cd6de4ade29da1ec70e4effb72b2..fe8257a32896b32e74b962179fa3164c81182cd3 100644 (file)
--- a/THbtp/AliGenHBTprocessor.cxx
+++ b/THbtp/AliGenHBTprocessor.cxx
@@ -352,9 +352,8 @@ Int_t AliGenHBTprocessor::GetHbtPStatusCode(Int_t part) const
     Error("GetHbtPStatusCode","GetTrackEventIndex returned error");
     return 0;
   }
- else return fHbtPStatCodes[ev][idx];
+ return fHbtPStatCodes[ev][idx];
   
- return 0;
 }
 
 /*******************************************************************/
@@ -923,12 +922,8 @@ TParticle* AliGenHBTprocessor::GetTrack(Int_t n)
     Error("GetTrack","GetTrackEventIndex returned error");
     return 0x0;
   }
- else
-  {
-    if (fgDebug > 5) Info("GetTrack","Number of Tracks in Event(%d) = %d",ev,cab->GetStack(ev)->GetNprimary());
-    return cab->GetStack(ev)->Particle(idx); //safe - in case stack does not exist 
-  }                                               //GetTrackEventIndex would have returned error
- return 0x0;  
+ if (fgDebug > 5) Info("GetTrack","Number of Tracks in Event(%d) = %d",ev,cab->GetStack(ev)->GetNprimary());
+ return cab->GetStack(ev)->Particle(idx);//safe - in case stack does not exist 
 }
 /*******************************************************************/
 

diff --git a/TOF/AliTOFReconstructionerV2.cxx b/TOF/AliTOFReconstructionerV2.cxx
index 33e6093949f2ffc24062434de33ed8ff89d06ef6..8bfaca3a17ff69e4d821ba5a1ceed5ddde6da332 100644 (file)
--- a/TOF/AliTOFReconstructionerV2.cxx
+++ b/TOF/AliTOFReconstructionerV2.cxx
@@ -924,9 +924,9 @@ Int_t AliTOFReconstructionerV2::SaveTracks(const Char_t *outname, const Int_t sp
   T.Write();
   savedir->cd();
   out->Close();
-  return 0;
   gBenchmark->Stop(name);
   gBenchmark->Show(name);
+  return 0;
 }
 
 //__________________________________________________________________

diff --git a/TPC/AliTPCPRF2D.cxx b/TPC/AliTPCPRF2D.cxx
index 7ec8a358f5cf5c76ea580f94bdfe7d8881e797e5..0331fbba7dd45b20dbdf864a6e29889b00d41ace 100644 (file)
--- a/TPC/AliTPCPRF2D.cxx
+++ b/TPC/AliTPCPRF2D.cxx
@@ -177,42 +177,39 @@ Float_t AliTPCPRF2D::GetPRF(Float_t xin, Float_t yin)
     fcharge   = &(fChargeArray[i*fNPRF]);
     return GetPRFActiv(xin);
   }
-  else{
-    //make interpolation from more fore lines
-    Int_t i= Int_t(y);
-    Float_t res;
-    if ((i<0) || (i>=fNYdiv) ) return 0;
-    Float_t z0=0;
-    Float_t z1=0;
-    Float_t z2=0;
-    Float_t z3=0;
-    if (i>0) {
-      fcharge =&(fChargeArray[(i-1)*fNPRF]);
-      z0 = GetPRFActiv(xin);
-    }
-    fcharge =&(fChargeArray[i*fNPRF]);
-    z1=GetPRFActiv(xin);
-    if ((i+1)<fNYdiv){
-      fcharge =&(fChargeArray[(i+1)*fNPRF]);
-      z2 = GetPRFActiv(xin);
-    }
-    if ((i+2)<fNYdiv){
-      fcharge =&(fChargeArray[(i+2)*fNPRF]);
-      z3 = GetPRFActiv(xin);
-    }
-    Float_t a,b,c,d,k,l;
-    a=z1;
-    b=(z2-z0)/2.;
-    k=z2-a-b;
-    l=(z3-z1)/2.-b;
-    d=l-2*k;
-    c=k-d;
-    Float_t dy=y-Float_t(i);
-
-    res = a+b*dy+c*dy*dy+d*dy*dy*dy;  
-    return res;            
-  }        
-  return 0.;
+  //make interpolation from more fore lines
+  Int_t i= Int_t(y);
+  Float_t res;
+  if ((i<0) || (i>=fNYdiv) ) return 0;
+  Float_t z0=0;
+  Float_t z1=0;
+  Float_t z2=0;
+  Float_t z3=0;
+  if (i>0) {
+    fcharge =&(fChargeArray[(i-1)*fNPRF]);
+    z0 = GetPRFActiv(xin);
+  }
+  fcharge =&(fChargeArray[i*fNPRF]);
+  z1=GetPRFActiv(xin);
+  if ((i+1)<fNYdiv){
+    fcharge =&(fChargeArray[(i+1)*fNPRF]);
+    z2 = GetPRFActiv(xin);
+  }
+  if ((i+2)<fNYdiv){
+    fcharge =&(fChargeArray[(i+2)*fNPRF]);
+    z3 = GetPRFActiv(xin);
+  }
+  Float_t a,b,c,d,k,l;
+  a=z1;
+  b=(z2-z0)/2.;
+  k=z2-a-b;
+  l=(z3-z1)/2.-b;
+  d=l-2*k;
+  c=k-d;
+  Float_t dy=y-Float_t(i);
+  
+  res = a+b*dy+c*dy*dy+d*dy*dy*dy;  
+  return res;            
 } 
 
 

diff --git a/TPC/AliTPCtrack.cxx b/TPC/AliTPCtrack.cxx
index 1361aaaabd3b16a957c113785fb88fcf70dd60af..94f170f5431a8060976e264345a79d34cbdaf9b9 100644 (file)
--- a/TPC/AliTPCtrack.cxx
+++ b/TPC/AliTPCtrack.cxx
@@ -139,7 +139,7 @@ AliTPCtrack::AliTPCtrack(const AliESDtrack& t) : AliKalmanTrack() {
   fC30=c[6 ];   fC31=c[7 ];   fC32=c32;   fC33=c[9 ];
   fC40=c[10];   fC41=c[11];   fC42=c42;   fC43=c[13]; fC44=c[14];
 
-  if (t.GetStatus()&AliESDtrack::kTIME == 0) return;
+  if ((t.GetStatus()&AliESDtrack::kTIME) == 0) return;
   StartTimeIntegral();
   Double_t times[10]; t.GetIntegratedTimes(times); SetIntegratedTimes(times);
   SetIntegratedLength(t.GetIntegratedLength());