X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TPC%2FAliTPCPid.cxx;h=3d7d3c34a68d669100945505784a698e6a900b88;hb=83decb5f97a9170379eec64cef3179390406e806;hp=5cb6ff7bbf6b51ce9f3a2a2cbd75930b001af1a4;hpb=179c6296933f765a926e55ebbf1188a75d495c62;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TPC/AliTPCPid.cxx b/TPC/AliTPCPid.cxx
index 5cb6ff7bbf6..3d7d3c34a68 100644
--- a/TPC/AliTPCPid.cxx
+++ b/TPC/AliTPCPid.cxx
@@ -23,6 +23,8 @@
 //#include "AliITSIOTrack.h"
 #include "AliKalmanTrack.h"
 #include "Riostream.h"
+#include <cassert>
+
 ClassImp(AliTPCPid)
 // Correction 13.01.2003 Z.S.,Dubna
 //            22.01.2003
@@ -70,7 +72,9 @@ AliTPCPid & AliTPCPid::operator =(const AliTPCPid & param)
   //
   // assignment operator - dummy
   //
-  fSigmin=param.fSigmin;
+  if(this!=&param){
+     fSigmin=param.fSigmin;
+  }
   return (*this);
 }
 //-----------------------------------------------------------
@@ -266,45 +270,45 @@ Int_t	AliTPCPid::GetPcode(Float_t q,Float_t pm)
 	{ if( q<fCutKa->Eval(pm) ){fWpi=1.; return Pion(); } 
 	                     else {fWk =1.; return  Kaon();} }
 //3)----------------------200-400 Mev/c -------------
-    if ( pm<=fcut[3][0] )
+    if ( pm<=fcut[3][0] ){
 	if( q<fCutKa->Eval(pm) )
 		{ fWpi=1.;return Pion(); }
 	     else
 		{ if ( q<=fCutPr->Eval(pm) ) 
 			     {fWk=1.;return Kaon();} 
 			else {fWp=1.;return Proton();}
-		}
+		}}
 //4)----------------------400-450 Mev/c -------------
-    if ( pm<=fcut[4][0] )
+    if ( pm<=fcut[4][0] ){
 	if( q<fCutKaTune*fCutKa->Eval(pm) )
 		{ fWpi=1.;return Pion(); }
 	    else
 		{ if( q<fCutPr->Eval(pm) ) 
                   {fWk=1.;return Kaon();} else {fWp=1.;return Proton(); }
-                }
+                }}
 //5)----------------------450-500 Mev/c -------------
-    if ( pm<=fcut[5][0] )
+    if ( pm<=fcut[5][0] ){
 	if ( q>fCutPr->Eval(pm) )
-           {fWp=1.;return Proton();} else {return Wpik(5,q);};
+	  {fWp=1.;return Proton();} else {return Wpik(5,q);}}
 //6)----------------------500-550 Mev/c -------------
-    if ( pm<=fcut[6][0] )
+    if ( pm<=fcut[6][0] ){
 	if ( q>fCutPr->Eval(pm) )
-           {fWp=1.;return Proton();} else {return Wpik(6,q);};
+	  {fWp=1.;return Proton();} else {return Wpik(6,q);}}
 //7)----------------------550-600 Mev/c -------------
-    if ( pm<=fcut[7][0] )
+    if ( pm<=fcut[7][0] ){
 	if ( q>fCutPr->Eval(pm) )
-           {fWp=1.;return Proton();} else {return Wpik(7,q);};
+	  {fWp=1.;return Proton();} else {return Wpik(7,q);}}
 //8)----------------------600-650 Mev/c -------------
-    if ( pm<=fcut[8][0] )
-      if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();} 
+    if ( pm<=fcut[8][0] ){
+      if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();}}
                                      else {return Wpik(8,q);};
 //9)----------------------650-730 Mev/c -------------
-    if ( pm<=fcut[9][0] )
+    if ( pm<=fcut[9][0] ){
       if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();}
-                                     else {return Wpik(9,q);};
+      else {return Wpik(9,q);}}
 //10)----------------------730-830 Mev/c -------------
-    if( pm<=fcut[10][0] )
-      if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();}
+    if( pm<=fcut[10][0] ){
+      if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();}}
                                      else {return Wpik(10,q);};
 //11)----------------------830-930 Mev/c -------------
     if( pm<=fcut[11][0] ){ return Wpikp(11,q); }
@@ -420,7 +424,6 @@ for(Int_t i=0;i<trs->GetEntries();i++)
   TVector xx( *((TVector*)trs->At(i)) );     
     if( xx.IsValid() && xx(0)>0 )
 	{
-	    TVector xx( *((TVector*)trs->At(i)) );
 	    if(xx(0)>=2)
 		{
 //       1)Calculate Qtrm	
@@ -488,9 +491,9 @@ AliTPCPid::AliTPCPid(Int_t ntrack):TObject(),
 
     //fCutKa = new TF1("fkaons","[0]/x/x+[1]",0.1,1.2);
     //fCutPr = new TF1("fprotons","[0]/x/x +[1]",0.2,1.2);
-    TF1 *frmska=0;
+    //TF1 *frmska=0;
     
-    frmska = new TF1("x_frmska","1.46-7.82*x+16.78*x^2-15.53*x^3+5.24*x^4 ",
+    TF1 frmska("x_frmska","1.46-7.82*x+16.78*x^2-15.53*x^3+5.24*x^4 ",
 	        0.1,1.2);
     fCutKa = new TF1("fkaons",
 	   "1.25+0.044/x/x+1.25+0.044*x-13.87*x^2+22.37*x^3-10.05*x^4-2.5*x_frmska",