Fix from comparison (Constantin Loizides, Tim Schuster)

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALPIDUtils.cxx

diff --git a/EMCAL/AliEMCALPIDUtils.cxx b/EMCAL/AliEMCALPIDUtils.cxx
index 3fff29c413a557f097bf3979a8eb71b097f66c76..6c1c28e2e35298f742714bf082c1f46a969721fe 100644 (file)
--- a/EMCAL/AliEMCALPIDUtils.cxx
+++ b/EMCAL/AliEMCALPIDUtils.cxx
@@ -31,15 +31,15 @@
 //
 //   pid->GetPIDFinal(idx) gives the probabilities
 //
-//   Double_t PIDFinal[AliPID::kSPECIESN]  is the standard PID for :
+//   Double_t PIDFinal[AliPID::kSPECIESCN]  is the standard PID for :
 //
 //     kElectron :  fPIDFinal[0]
 //     kMuon     :  fPIDFinal[1]
-//     kPion     :  fPIDFinal[2]
-//     kKaon     :  fPIDFinal[3]
+//     kPion       :  fPIDFinal[2]
+//     kKaon       :  fPIDFinal[3]
 //     kProton   :  fPIDFinal[4]
 //     kPhoton   :  fPIDFinal[5]
-//     kPi0      :  fPIDFinal[6]
+//     kPi0        :  fPIDFinal[6]
 //     kNeutron  :  fPIDFinal[7]
 //     kKaon0    :  fPIDFinal[8]
 //     kEleCon   :  fPIDFinal[9]
@@ -164,19 +164,27 @@ void AliEMCALPIDUtils::ComputePID(Double_t energy, Double_t lambda0)
     AliInfo(Form( "PIDWeight in loop = %f ||| %f ||| %f",  fPIDWeight[0] , fPIDWeight[1], fPIDWeight[2]) );
     AliInfo("********************************************************" );
   }
-  
-  fPIDFinal[0]  = fPIDWeight[0]/2; // photon
-  fPIDFinal[1]  = fPIDWeight[2]/8;
-  fPIDFinal[2]  = fPIDWeight[2]/8;
-  fPIDFinal[3]  = fPIDWeight[2]/8;
-  fPIDFinal[4]  = fPIDWeight[2]/8;
-  fPIDFinal[5]  = fPIDWeight[0]/2; // electron
-  fPIDFinal[6]  = fPIDWeight[1]  ; // Pi0
-  fPIDFinal[7]  = fPIDWeight[2]/8;
-  fPIDFinal[8]  = fPIDWeight[2]/8;
-  fPIDFinal[9]  = fPIDWeight[2]/8;
-  fPIDFinal[10] = fPIDWeight[2]/8;
 
+  //default particles
+  fPIDFinal[AliPID::kElectron]  = fPIDWeight[0]/2; // photon
+  fPIDFinal[AliPID::kMuon]      = fPIDWeight[2]/8;
+  fPIDFinal[AliPID::kPion]      = fPIDWeight[2]/8;
+  fPIDFinal[AliPID::kKaon]      = fPIDWeight[2]/8;
+  fPIDFinal[AliPID::kProton]    = fPIDWeight[2]/8;
+  //light nuclei
+  fPIDFinal[AliPID::kDeuteron]  = 0;
+  fPIDFinal[AliPID::kTriton]    = 0;
+  fPIDFinal[AliPID::kHe3]       = 0;
+  fPIDFinal[AliPID::kAlpha]     = 0;
+  //neutral particles
+  fPIDFinal[AliPID::kPhoton]    = fPIDWeight[0]/2; // electron
+  fPIDFinal[AliPID::kPi0]       = fPIDWeight[1]  ; // Pi0
+  fPIDFinal[AliPID::kNeutron]   = fPIDWeight[2]/8;
+  fPIDFinal[AliPID::kKaon0]     = fPIDWeight[2]/8;
+  fPIDFinal[AliPID::kEleCon]    = fPIDWeight[2]/8;
+  //
+  fPIDFinal[AliPID::kUnknown]   = fPIDWeight[2]/8;
+  
 }
 
 
@@ -243,7 +251,6 @@ Double_t AliEMCALPIDUtils::DistEnergy(const Double_t energy, const Int_t type)
   // Compute the values of the weigh for a given energy the parametrised distribution using the data initialised before.
   //
   Double_t constante = 0.;
-  Double_t  energyParam;
   
   switch (type) {
     
@@ -251,18 +258,16 @@ Double_t AliEMCALPIDUtils::DistEnergy(const Double_t energy, const Int_t type)
     constante  = 1.;    
     break;
   case 2:
-      constante  = 1.;
+    constante  = 1.;
     break;
   case 3:
     constante  = PowerExp(energy, fHadronEnergyProb);
     break;
   }
   
-  energyParam = constante;
+  //   cout << "Weight   " << constante << " for energy  "<< energy<< " GeV "<<  endl;
   
-  // //   cout << "Weight   " << constante << " for energy  "<< energy<< " GeV "<<  endl;
-  
-  return energyParam;
+  return constante;
 }
 
 
@@ -274,8 +279,7 @@ Double_t AliEMCALPIDUtils::Polynomial(const Double_t x, const Double_t *params)
   // with the array of parameters passed as the second arg
   //
   
-  Double_t y;
-  y  = params[0];
+  Double_t y  = params[0];
   y += params[1] * x;
   y += params[2] * x * x;
   y += params[3] * x * x * x;
@@ -292,8 +296,7 @@ Double_t AliEMCALPIDUtils::Polynomial0(const Double_t *params) const
   // with the array of parameters passed as the second arg
   //
   
-  Double_t y;
-  y  = params[0];
+  Double_t y  = params[0];
   return y;
 }
 
@@ -305,17 +308,17 @@ Double_t AliEMCALPIDUtils::Polynomialinv(const Double_t x, const Double_t *param
   // with the array of parameters passed as the second arg
   //
   
-  Double_t y;
+  Double_t y=0.;
+  
   if(x>0){
-  y  = params[0];
-  y += params[1] / x;
-  y += params[2] / (x * x);
-  y += params[3] / (x * x * x);
-  y += params[4] / (x * x * x * x);
-  y += params[5] / (x * x * x * x * x);
+    y  = params[0];
+    y += params[1] / x;
+    y += params[2] / (x * x);
+    y += params[3] / (x * x * x);
+    y += params[4] / (x * x * x * x);
+    y += params[5] / (x * x * x * x * x);
   }  
-  else
-    y=0.;
+  
   return y;
   
 }
@@ -327,7 +330,7 @@ Double_t AliEMCALPIDUtils::PolynomialMixed1(const Double_t x, const Double_t *pa
   // with the array of parameters passed as the second arg
   //
   
-  Double_t y;
+  Double_t y=0.;
   if(x>0){
     y  = params[0] / x;
     y += params[1] ;
@@ -336,8 +339,7 @@ Double_t AliEMCALPIDUtils::PolynomialMixed1(const Double_t x, const Double_t *pa
     //   y += params[4] * 0.;
     //   y += params[5] * 0.;
   }  
-  else
-    y=0.;
+
   
   return y;
   
@@ -351,7 +353,7 @@ Double_t AliEMCALPIDUtils::PolynomialMixed2(const Double_t x, const Double_t *pa
   // with the array of parameters passed as the second arg
   //
   
-  Double_t y;
+  Double_t y=0.;
   if(x>0){
     y  = params[0] / ( x * x);
     y += params[1] / x;
@@ -360,8 +362,6 @@ Double_t AliEMCALPIDUtils::PolynomialMixed2(const Double_t x, const Double_t *pa
     y += params[4] * x * x ;
     //   y += params[5] * 0.;
   }  
-  else
-    y=0.;
 
   return y;
   
@@ -376,10 +376,8 @@ Double_t AliEMCALPIDUtils::PowerExp(const Double_t x, const Double_t *params) co
   // par[0]*TMath::Power(x[0],par[1])
   // par[0]*TMath::Exp((x[0]-par[1])*par[2]);
   
-  Double_t y;
-  
-  y  = params[0] *TMath::Power( x,params[1]);
-  y += params[2] *TMath::Exp((x-params[3])*params[4]);
+  Double_t y = params[0] *TMath::Power( x,params[1]);
+  y         += params[2] *TMath::Exp((x-params[3])*params[4]);
   
   return y;
   
@@ -399,7 +397,7 @@ void AliEMCALPIDUtils::InitParameters()
   fPIDWeight[1] = -1;
   fPIDWeight[2] = -1;
   
-  for(Int_t i=0; i<AliPID::kSPECIESN+1; i++)
+  for(Int_t i=0; i<AliPID::kSPECIESCN+1; i++)
     fPIDFinal[i]= 0;
   
   //   init the parameters here instead of from loading from recparam
@@ -414,16 +412,17 @@ void AliEMCALPIDUtils::SetLowFluxParam()
 {
   
   // as a first step, all array elements are initialized to 0.0
-  Int_t i, j;
+  Int_t i=0, j=0;
   
   for (i = 0; i < 6; i++) {
     for (j = 0; j < 6; j++) {
       fGamma[i][j]      = fHadron[i][j] =  fPiZero[i][j] = 0.;
       fGamma1to10[i][j] = fHadron1to10[i][j] = 0.;
     }
-       fGammaEnergyProb[i]  =  fGammaEnergyProb[i];
-       fPiZeroEnergyProb[i] = fPiZeroEnergyProb[i];
-       fHadronEnergyProb[i] = fHadronEnergyProb[i];
+       //Why we had the next 3 lines?
+       //fGammaEnergyProb[i]  =  fGammaEnergyProb[i];
+       //fPiZeroEnergyProb[i] = fPiZeroEnergyProb[i];
+       //fHadronEnergyProb[i] = fHadronEnergyProb[i];
   }
   
   // New parameterization for lambda0^2 (=x): f(x) = normLandau*TMath::Landau(x,mpvLandau,widthLandau)+normgaus*TMath::Gaus(x,meangaus,sigmagaus)
@@ -565,7 +564,7 @@ void AliEMCALPIDUtils::SetHighFluxParam()
 {
   
   // as a first step, all array elements are initialized to 0.0
-  Int_t i, j;
+  Int_t i=0, j=0;
   for (i = 0; i < 6; i++) {
     for (j = 0; j < 6; j++) {
       fGamma[i][j]      = fHadron[i][j] = fPiZero[i][j] = 0.;