Correct version of PID

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 04725ac0b26175b1958c8071697b207b7d8312cd..c5f0f084e6a2cabb26a001ba69229c5e69de44ef 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -585,61 +585,61 @@ const Double_t  AliPHOSPIDv1::GetCalibrationParameter(const Int_t i) const
   return param;
 }
 //____________________________________________________________________________
-// const Double_t  AliPHOSPIDv1::GetEllipseParameter(const TString Param,Float_t E) const 
-// {
-//   // Calculates the parameter Param of the ellipse
+const Double_t  AliPHOSPIDv1::GetEllipseParameter(const TString Param,Float_t E) const 
+{
+  // Calculates the parameter Param of the ellipse
   
-//   Double_t p[4]={0.,0.,0.,0.};
-//   Double_t value = 0.0;
-//   Int_t i;
+  Double_t p[4]={0.,0.,0.,0.};
+  Double_t value = 0.0;
+  Int_t i;
 
-//   if(Param.Contains("a")){
-//     for(i=0;i<4;i++)p[i]=(*fParameters)(4,i);
-//     if(E>70.)E=70.;
-//   }
+  if(Param.Contains("a")){
+    for(i=0;i<4;i++)p[i]=(*fParameters)(4,i);
+    if(E>70.)E=70.;
+  }
   
-//   else if(Param.Contains("b")){
-//     for(i=0;i<4;i++)p[i]=(*fParameters)(5,i);
-//     if(E>70.)E=70.;
-//   }
+  else if(Param.Contains("b")){
+    for(i=0;i<4;i++)p[i]=(*fParameters)(5,i);
+    if(E>70.)E=70.;
+  }
   
-//   else if(Param.Contains("c"))
-//     for(i=0;i<4;i++)p[i]=(*fParameters)(6,i);
+  else if(Param.Contains("c"))
+    for(i=0;i<4;i++)p[i]=(*fParameters)(6,i);
   
-//   else if(Param.Contains("x0")){
-//     for(i=0;i<4;i++)p[i]=(*fParameters)(7,i);
-//     if(E<1.)E=1.1;
-//   }
-//   else if(Param.Contains("y0"))
-//     for(i=0;i<4;i++)p[i]=(*fParameters)(8,i);
+  else if(Param.Contains("x0")){
+    for(i=0;i<4;i++)p[i]=(*fParameters)(7,i);
+    if(E<1.)E=1.1;
+  }
+  else if(Param.Contains("y0"))
+    for(i=0;i<4;i++)p[i]=(*fParameters)(8,i);
   
-//   value = p[0]/TMath::Sqrt(E)+p[1]*E+p[2]*E*E+p[3];
-//   return value;
-// }
+  value = p[0]/TMath::Sqrt(E)+p[1]*E+p[2]*E*E+p[3];
+  return value;
+}
 
 //____________________________________________________________________________
-const Double_t  AliPHOSPIDv1::GetEllipseParameter(const TString Param,Float_t E) const 
-{
-  // Calculates the parameter Param of the pi0 ellipse
+// const Double_t  AliPHOSPIDv1::GetEllipseParameter(const TString Param,Float_t E) const 
+// {
+//   // Calculates the parameter Param of the pi0 ellipse
   
-  Double_t p[3]  = {0.,0.,0.};
-  Double_t value = 0.0;
-  Int_t    i;
+//   Double_t p[3]  = {0.,0.,0.};
+//   Double_t value = 0.0;
+//   Int_t    i;
 
-  if(Param.Contains("a"))
-    for(i=0;i<3;i++)p[i]=(*fParameters)(4,i);
-  else if(Param.Contains("b"))
-    for(i=0;i<3;i++)p[i]=(*fParameters)(5,i);
-  else if(Param.Contains("c"))
-    for(i=0;i<3;i++)p[i]=(*fParameters)(6,i);
-  else if(Param.Contains("x0"))
-    for(i=0;i<3;i++)p[i]=(*fParameters)(7,i);
-  else if(Param.Contains("y0"))
-    for(i=0;i<3;i++)p[i]=(*fParameters)(8,i);
+//   if(Param.Contains("a"))
+//     for(i=0;i<3;i++)p[i]=(*fParameters)(4,i);
+//   else if(Param.Contains("b"))
+//     for(i=0;i<3;i++)p[i]=(*fParameters)(5,i);
+//   else if(Param.Contains("c"))
+//     for(i=0;i<3;i++)p[i]=(*fParameters)(6,i);
+//   else if(Param.Contains("x0"))
+//     for(i=0;i<3;i++)p[i]=(*fParameters)(7,i);
+//   else if(Param.Contains("y0"))
+//     for(i=0;i<3;i++)p[i]=(*fParameters)(8,i);
   
-  value = p[0] + p[1]*E + p[2]*E*E;
-  return value;
-}
+//   value = p[0] + p[1]*E + p[2]*E*E;
+//   return value;
+// }
 //____________________________________________________________________________
 const Double_t  AliPHOSPIDv1::GetEllipseParameterPi0(const TString Param,Float_t E) const 
 {

diff --git a/PHOS/Parameters.dat b/PHOS/Parameters.dat
index e51640c49a976e22af148e0754c22bfe6679c7ae..2ac9aa0b483e3dc7822a820070d52203288c4416 100644 (file)
--- a/PHOS/Parameters.dat
+++ b/PHOS/Parameters.dat
@@ -2,11 +2,11 @@
 0.64     0.44      0.30        0.0
 0.54      0.14      0.42        0.0
 1.7e-8    1.7e-8    1.65e-8     0.0    
-0.5916    0.1123    -8.612e-4   0.0
-0.5524    0.09824   -5.116e-4   0.0
--1.356    0.04663   -2.889e-4   0.0
--7.23     0.1194    -1.397e-5   0.0
-21.45     -0.3339   3.324e-3    0.0
+0.520    8.4e-3    -6.0e-5     0.235
+0.469     8.3e-3    -5.6e-5     0.522
+0.36      1.4e-2    -8.0e-5     -0.99
+-0.747    1.91e-2   4.0e-6      1.49 
+0.91      -3.03e-2  1.08e-4     1.03 
 0.9503    7.586e-3  -7.133e-5   0.0
 3.363     -0.0411   1.709e-4    0.0
 0.361     0.0       0.0         0.0