From: masera Date: Wed, 5 Nov 2003 08:05:40 +0000 (+0000) Subject: Changes to obey our coding conventions X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=e75c69cdf92b1235d358000caa43884495759934;p=u%2Fmrichter%2FAliRoot.git Changes to obey our coding conventions --- diff --git a/ITS/AliITSPid.cxx b/ITS/AliITSPid.cxx index e095cd581b6..aa7c31d204e 100644 --- a/ITS/AliITSPid.cxx +++ b/ITS/AliITSPid.cxx @@ -1,10 +1,15 @@ #include "AliITSPid.h" #include "TMath.h" -#include "AliITSIOTrack.h" #include +#include +#include +#include "AliTPCtrack.h" +#include "AliITStrackV2.h" +#include + ClassImp(AliITSPid) // -Float_t AliITSPid::qtrm(Int_t track) +Float_t AliITSPid::Qtrm(Int_t track) { TVector q(*( this->GetVec(track) )); Int_t ml=(Int_t)q(0); @@ -31,7 +36,7 @@ Float_t AliITSPid::qtrm(Int_t track) return (q(6)); } -Float_t AliITSPid::qtrm(Float_t qarr[6],Int_t narr) +Float_t AliITSPid::Qtrm(Float_t qarr[6],Int_t narr) { Float_t q[6],qm,qmin; Int_t nl,ml; @@ -55,7 +60,7 @@ Float_t AliITSPid::qtrm(Float_t qarr[6],Int_t narr) return qm; } -Int_t AliITSPid::wpik(Float_t pm,Float_t q) +Int_t AliITSPid::Wpik(Float_t pm,Float_t q) { Double_t par[6]; for(int i=0;i<6;i++){par[i]=fGGpi[i]->Eval(pm);} @@ -83,7 +88,7 @@ Int_t AliITSPid::wpik(Float_t pm,Float_t q) }else{return 0;} } //----------------------------------------------------------- -Int_t AliITSPid::wpikp(Float_t pm,Float_t q) +Int_t AliITSPid::Wpikp(Float_t pm,Float_t q) { Double_t par[6]; for(int i=0;i<6;i++){par[i]=fGGpi[i]->Eval(pm);} @@ -132,8 +137,8 @@ Int_t AliITSPid::GetPcode(AliTPCtrack *track) if (phi<-TMath::Pi()) phi+=2*TMath::Pi(); if (phi>=TMath::Pi()) phi-=2*TMath::Pi(); Float_t lam=TMath::ATan(par[3]); - Float_t pt_1=TMath::Abs(par[4]); - Float_t mom=1./(pt_1*TMath::Cos(lam)); + Float_t pt1=TMath::Abs(par[4]); + Float_t mom=1./(pt1*TMath::Cos(lam)); Float_t dedx=track->GetdEdx(); Int_t pcode=GetPcode(dedx/40.,mom); // cout<<"TPCtrack dedx,mom,pcode="<PropagateToVertex(); Double_t xk,par[5]; track->GetExternalParameters(xk,par); Float_t lam=TMath::ATan(par[3]); - Float_t pt_1=TMath::Abs(par[4]); + Float_t pt1=TMath::Abs(par[4]); Float_t mom=0.; - if( (pt_1*TMath::Cos(lam))!=0. ){ mom=1./(pt_1*TMath::Cos(lam)); }else{mom=0.;}; + if( (pt1*TMath::Cos(lam))!=0. ){ mom=1./(pt1*TMath::Cos(lam)); }else{mom=0.;}; Float_t dedx=track->GetdEdx(); -// cout<<"lam,pt_1,mom,dedx="<Eval(pm) ) - {return pion();} + {return Pion();} else{ if( qEval(pm) ) - {return kaon();} - else{return proton();} + {return Kaon();} + else{return Proton();} } } if ( pm<=0.750 ) if ( q>fCutPr->Eval(pm) ) - {return proton();} else {return wpik(pm,q);}; - if( pm<=1.10 ){ return wpikp(pm,q); } + {return Proton();} else {return Wpik(pm,q);}; + if( pm<=1.10 ){ return Wpikp(pm,q); } return fPcode; } //----------------------------------------------------------- void AliITSPid::SetCut(Int_t n,Float_t pm,Float_t pilo,Float_t pihi, Float_t klo,Float_t khi,Float_t plo,Float_t phi) { - cut[n][0]=pm; - cut[n][1]=pilo; - cut[n][2]=pihi; - cut[n][3]=klo; - cut[n][4]=khi; - cut[n][5]=plo; - cut[n][6]=phi; + fCut[n][0]=pm; + fCut[n][1]=pilo; + fCut[n][2]=pihi; + fCut[n][3]=klo; + fCut[n][4]=khi; + fCut[n][5]=plo; + fCut[n][6]=phi; return ; } //------------------------------------------------------------ void AliITSPid::SetVec(Int_t ntrack,TVector info) { -TClonesArray& arr=*trs; +TClonesArray& arr=*fTrs; new( arr[ntrack] ) TVector(info); } //----------------------------------------------------------- TVector* AliITSPid::GetVec(Int_t ntrack) { -TClonesArray& arr=*trs; +TClonesArray& arr=*fTrs; return (TVector*)arr[ntrack]; } //----------------------------------------------------------- void AliITSPid::SetEdep(Int_t track,Float_t Edep) { TVector xx(0,11); - if( ((TVector*)trs->At(track))->IsValid() ) - {TVector yy( *((TVector*)trs->At(track)) );xx=yy; } + if( ((TVector*)fTrs->At(track))->IsValid() ) + {TVector yy( *((TVector*)fTrs->At(track)) );xx=yy; } Int_t j=(Int_t)xx(0); if(j>4)return; xx(++j)=Edep;xx(0)=j; - TClonesArray &arr=*trs; + TClonesArray &arr=*fTrs; new(arr[track])TVector(xx); } //----------------------------------------------------------- void AliITSPid::SetPmom(Int_t track,Float_t Pmom) { TVector xx(0,11); - if( ((TVector*)trs->At(track))->IsValid() ) - {TVector yy( *((TVector*)trs->At(track)) );xx=yy; } + if( ((TVector*)fTrs->At(track))->IsValid() ) + {TVector yy( *((TVector*)fTrs->At(track)) );xx=yy; } xx(10)=Pmom; - TClonesArray &arr=*trs; + TClonesArray &arr=*fTrs; new(arr[track])TVector(xx); } //----------------------------------------------------------- void AliITSPid::SetPcod(Int_t track,Int_t partcode) { TVector xx(0,11); - if( ((TVector*)trs->At(track))->IsValid() ) - {TVector yy( *((TVector*)trs->At(track)) );xx=yy; } + if( ((TVector*)fTrs->At(track))->IsValid() ) + {TVector yy( *((TVector*)fTrs->At(track)) );xx=yy; } if(xx(11)==0) - {xx(11)=partcode; mxtrs++; - TClonesArray &arr=*trs; + {xx(11)=partcode; fMxtrs++; + TClonesArray &arr=*fTrs; new(arr[track])TVector(xx); } } //----------------------------------------------------------- void AliITSPid::Print(Int_t track) -{cout<At(track))->IsValid() ) - {TVector xx( *((TVector*)trs->At(track)) ); +{cout<At(track))->IsValid() ) + {TVector xx( *((TVector*)fTrs->At(track)) ); xx.Print(); } else @@ -263,21 +268,21 @@ void AliITSPid::Print(Int_t track) //----------------------------------------------------------- void AliITSPid::Tab(void) { -if(trs->GetEntries()==0){cout<<"No entries in TAB"<GetEntries()==0){cout<<"No entries in TAB"<GetEntries();i++) +for(Int_t i=0;iGetEntries();i++) { - TVector xx( *((TVector*)trs->At(i)) ); + TVector xx( *((TVector*)fTrs->At(i)) ); if( xx.IsValid() && xx(0)>0 ) { - TVector xx( *((TVector*)trs->At(i)) ); + TVector xx( *((TVector*)fTrs->At(i)) ); if(xx(0)>=2) { // 1)Calculate Qtrm - xx(6)=(this->qtrm(i)); + xx(6)=(this->Qtrm(i)); }else{ xx(6)=xx(1); @@ -297,7 +302,7 @@ for(Int_t i=0;iGetEntries();i++) cout<GetEntries();i++) } void AliITSPid::Reset(void) { - for(Int_t i=0;iGetEntries();i++){ + for(Int_t i=0;iGetEntries();i++){ TVector xx(0,11); - TClonesArray &arr=*trs; + TClonesArray &arr=*fTrs; new(arr[i])TVector(xx); } } @@ -316,10 +321,10 @@ void AliITSPid::Reset(void) AliITSPid::AliITSPid(Int_t ntrack) { fSigmin=0.01; - trs = new TClonesArray("TVector",ntrack); - TClonesArray &arr=*trs; + fTrs = new TClonesArray("TVector",ntrack); + TClonesArray &arr=*fTrs; for(Int_t i=0;iSetParameters(parpi_0); + fGGpi[0]->SetParameters(parpi0); fGGpi[1]=new TF1("fp2pi","[0]/x/x+[1]",0.34,1.2); - Double_t parpi_1[10]={ 1.0791668283e-02, 9.7347716496e-01 }; - fGGpi[1]->SetParameters(parpi_1); + Double_t parpi1[10]={ 1.0791668283e-02, 9.7347716496e-01 }; + fGGpi[1]->SetParameters(parpi1); fGGpi[2]=new TF1("fp3pi","[0]/x/x+[1]",0.34,1.2); - Double_t parpi_2[10]={ 5.8191602279e-04, 9.7285601334e-02 }; - fGGpi[2]->SetParameters(parpi_2); + Double_t parpi2[10]={ 5.8191602279e-04, 9.7285601334e-02 }; + fGGpi[2]->SetParameters(parpi2); fGGpi[3]=new TF1("fp4pi","pol4",0.34,1.2); - Double_t parpi_3[10]={ 6.6267353195e+02, 7.1595101104e+02, -5.3095111914e+03, + Double_t parpi3[10]={ 6.6267353195e+02, 7.1595101104e+02, -5.3095111914e+03, 6.2900977606e+03, -2.2935862292e+03 }; - fGGpi[3]->SetParameters(parpi_3); + fGGpi[3]->SetParameters(parpi3); fGGpi[4]=new TF1("fp5pi","[0]/x/x+[1]",0.34,1.2); - Double_t parpi_4[10]={ 9.0419011783e-03, 1.1628922525e+00 }; - fGGpi[4]->SetParameters(parpi_4); + Double_t parpi4[10]={ 9.0419011783e-03, 1.1628922525e+00 }; + fGGpi[4]->SetParameters(parpi4); fGGpi[5]=new TF1("fp6pi","[0]/x/x+[1]",0.34,1.2); - Double_t parpi_5[10]={ 1.8324872519e-03, 2.1503968838e-01 }; - fGGpi[5]->SetParameters(parpi_5); + Double_t parpi5[10]={ 1.8324872519e-03, 2.1503968838e-01 }; + fGGpi[5]->SetParameters(parpi5); }//End Pions {//Kaons fGGka[0]=new TF1("fp1ka","pol4",0.24,1.2); - Double_t parka_0[20]={ + Double_t parka0[20]={ -1.1204243395e+02,4.6716191428e+01,2.2584059281e+03, -3.7123338009e+03,1.6003647641e+03 }; - fGGka[0]->SetParameters(parka_0); + fGGka[0]->SetParameters(parka0); fGGka[1]=new TF1("fp2ka","[0]/x/x+[1]",0.24,1.2); - Double_t parka_1[20]={ + Double_t parka1[20]={ 2.5181172905e-01,8.7566001814e-01 }; - fGGka[1]->SetParameters(parka_1); + fGGka[1]->SetParameters(parka1); fGGka[2]=new TF1("fp3ka","pol6",0.24,1.2); - Double_t parka_2[20]={ + Double_t parka2[20]={ 8.6236021573e+00,-7.0970427531e+01,2.4846827669e+02, -4.6094401290e+02,4.7546751408e+02,-2.5807112462e+02, 5.7545491696e+01 }; - fGGka[2]->SetParameters(parka_2); + fGGka[2]->SetParameters(parka2); }//End Kaons {//Protons fGGpr[0]=new TF1("fp1pr","pol4",0.4,1.2); - Double_t parpr_0[10]={ + Double_t parpr0[10]={ 6.0150106543e+01,-8.8176206410e+02,3.1222644604e+03, -3.5269200901e+03,1.2859128345e+03 }; - fGGpr[0]->SetParameters(parpr_0); + fGGpr[0]->SetParameters(parpr0); fGGpr[1]=new TF1("fp2pr","[0]/x/x+[1]",0.4,1.2); - Double_t parpr_1[10]={ + Double_t parpr1[10]={ 9.4970837607e-01,7.3573504201e-01 }; - fGGpr[1]->SetParameters(parpr_1); + fGGpr[1]->SetParameters(parpr1); fGGpr[2]=new TF1("fp3pr","[0]/x/x+[1]",0.4,1.2); - Double_t parpr_2[10]={ + Double_t parpr2[10]={ 1.2498403757e-01,2.7845072306e-02 }; - fGGpr[2]->SetParameters(parpr_2); + fGGpr[2]->SetParameters(parpr2); }//End Protons //----------- end fit ----------- @@ -391,36 +396,36 @@ fGGpr[2]=new TF1("fp3pr","[0]/x/x+[1]",0.4,1.2); fggka=new TF1("ggka","gaus",0.4,1.2); //------------------------------------------------- -const int inf=10; +const int kInf=10; // Ncut Pmom pilo pihi klo khi plo phi // cut[j] [0] [1] [2] [3] [4] [5] [6] //---------------------------------------------------------------- - SetCut( 1, 0.12 , 0. , 0. , inf , inf , inf , inf ); - SetCut( 2, 0.20 , 0. , 6.0 , 6.0 , inf , inf , inf ); - SetCut( 3, 0.30 , 0. , 3.5 , 3.5 , 9.0 , 9.0 , inf ); - SetCut( 4, 0.41 , 0. , 1.9 , 1.9 , 4.0 , 4.0 , inf ); + SetCut( 1, 0.12 , 0. , 0. , kInf , kInf , kInf , kInf ); + SetCut( 2, 0.20 , 0. , 6.0 , 6.0 , kInf , kInf , kInf ); + SetCut( 3, 0.30 , 0. , 3.5 , 3.5 , 9.0 , 9.0 , kInf ); + SetCut( 4, 0.41 , 0. , 1.9 , 1.9 , 4.0 , 4.0 , kInf ); //---------------------------------------------------------------- - SetCut( 5, 0.47 , 0.935, 0.139, 1.738 , 0.498 , 3.5 , inf ); //410-470 - SetCut( 6, 0.53 , 0.914, 0.136, 1.493 , 0.436 , 3.0 , inf ); //470-530 + SetCut( 5, 0.47 , 0.935, 0.139, 1.738 , 0.498 , 3.5 , kInf ); //410-470 + SetCut( 6, 0.53 , 0.914, 0.136, 1.493 , 0.436 , 3.0 , kInf ); //470-530 //---------------------------------------------------------------- - SetCut( 7, 0.59 , 0.895, 0.131, 1.384 , 0.290 , 2.7 , inf ); //530-590 - SetCut( 8, 0.65 , 0.887, 0.121, 1.167 , 0.287 , 2.5 , inf ); //590-650 - SetCut( 9, 0.73 , 0.879, 0.120, 1.153 , 0.257 , 2.0 , inf ); //650-730 + SetCut( 7, 0.59 , 0.895, 0.131, 1.384 , 0.290 , 2.7 , kInf ); //530-590 + SetCut( 8, 0.65 , 0.887, 0.121, 1.167 , 0.287 , 2.5 , kInf ); //590-650 + SetCut( 9, 0.73 , 0.879, 0.120, 1.153 , 0.257 , 2.0 , kInf ); //650-730 //---------------------------------------------------------------- SetCut( 10, 0.83 , 0.880, 0.126, 1.164 , 0.204 , 2.308 , 0.297 ); //730-830 SetCut( 11, 0.93 , 0.918, 0.145, 1.164 , 0.204 , 2.00 , 0.168 ); //830-930 SetCut( 12, 1.03 , 0.899, 0.128, 1.164 , 0.204 ,1.80 , 0.168); //------------------------ pi,K --------------------- - aprob[0][0]=1212; aprob[1][0]=33.; // aprob[0][i] - const for pions,cut[i+5] - aprob[0][1]=1022; aprob[1][1]=46.2 ; // aprob[1][i] - kaons + fAprob[0][0]=1212; fAprob[1][0]=33.; // fAprob[0][i] - const for pions,cut[i+5] + fAprob[0][1]=1022; fAprob[1][1]=46.2 ; // fAprob[1][i] - kaons //--------------------------------------------------- - aprob[0][2]= 889.7; aprob[1][2]=66.58; aprob[2][2]=14.53; - aprob[0][3]= 686.; aprob[1][3]=88.8; aprob[2][3]=19.27; - aprob[0][4]= 697.; aprob[1][4]=125.6; aprob[2][4]=28.67; + fAprob[0][2]= 889.7; fAprob[1][2]=66.58; fAprob[2][2]=14.53; + fAprob[0][3]= 686.; fAprob[1][3]=88.8; fAprob[2][3]=19.27; + fAprob[0][4]= 697.; fAprob[1][4]=125.6; fAprob[2][4]=28.67; //------------------------ pi,K,p ------------------- - aprob[0][5]= 633.7; aprob[1][5]=100.1; aprob[2][5]=37.99; // aprob[2][i] - protons - aprob[0][6]= 469.5; aprob[1][6]=20.74; aprob[2][6]=25.43; - aprob[0][7]= 355.; aprob[1][7]= - 355.*(20.74/469.5); aprob[2][7]=34.08; + fAprob[0][5]= 633.7; fAprob[1][5]=100.1; fAprob[2][5]=37.99; // fAprob[2][i] - protons + fAprob[0][6]= 469.5; fAprob[1][6]=20.74; fAprob[2][6]=25.43; + fAprob[0][7]= 355.; fAprob[1][7]= + 355.*(20.74/469.5); fAprob[2][7]=34.08; } //End AliITSPid.cxx diff --git a/ITS/AliITSPid.h b/ITS/AliITSPid.h index f08b5dc2ad8..093fcff68a0 100644 --- a/ITS/AliITSPid.h +++ b/ITS/AliITSPid.h @@ -1,13 +1,15 @@ #ifndef ALIITSPID_H #define ALIITSPID_H + #include -#include -#include -#include "../TPC/AliTPCtrack.h" #include "AliITSIOTrack.h" -#include "AliITStrackV2.h" -#include -#include + +class TClonesArray; +class TVector; +class AliTPCtrack; +class AliITStrackV2; +class TF1; + //___________________________________________________________________________ class AliITSPid : public TObject { @@ -23,39 +25,36 @@ public: void Reset(void); void SetVec(Int_t track,TVector info); TVector* GetVec(Int_t track); - Int_t GetPcode(TClonesArray*,Float_t); - Int_t GetPcode(Float_t,Float_t); - Int_t GetPcode(AliTPCtrack*); - Int_t GetPcode(AliITSIOTrack*); - Int_t GetPcode(AliITStrackV2*); - void SetCut(Int_t,Float_t,Float_t,Float_t, - Float_t,Float_t,Float_t,Float_t); - void SetAProb(Int_t ivar,Int_t icut,Float_t apro){ aprob[ivar][icut]=apro; } - Float_t GetAProb(Int_t ivar,Int_t icut){ return aprob[ivar][icut]; } + Int_t GetPcode(TClonesArray* rps,Float_t pm); + Int_t GetPcode(Float_t p,Float_t pm); + Int_t GetPcode(AliTPCtrack* track); + Int_t GetPcode(AliITSIOTrack* track); + Int_t GetPcode(AliITStrackV2* track); + void SetCut(Int_t n,Float_t pm,Float_t pilo,Float_t pihi, + Float_t klo,Float_t khi,Float_t plo,Float_t phi); + void SetAProb(Int_t ivar,Int_t icut,Float_t apro){ fAprob[ivar][icut]=apro; } + Float_t GetAProb(Int_t ivar,Int_t icut){ return fAprob[ivar][icut]; } Float_t GetWpi(){return fWpi;} Float_t GetWk(){return fWk;} Float_t GetWp(){return fWp;} Int_t GetPid(){return fPcode;}; protected: -public: - Float_t cut[13][7],aprob[3][8]; - Int_t mxtrs; - TClonesArray *trs; - Float_t qtot; + Float_t fCut[13][7],fAprob[3][8]; + Int_t fMxtrs; + TClonesArray *fTrs; Float_t fWpi,fWk,fWp; Float_t fRpik,fRppi,fRpka,fRp; Int_t fPcode; -//private: -public: - int qcomp(Float_t* qa,Float_t* qb){return qa[0]>qb[0]?1:0;} - Float_t qtrm(Int_t track); - Float_t qtrm(Float_t qarr[6],Int_t narr); + + int Qcomp(Float_t* qa,Float_t* qb){return qa[0]>qb[0]?1:0;} + Float_t Qtrm(Int_t track); + Float_t Qtrm(Float_t qarr[6],Int_t narr); Float_t fSigmin; - Int_t wpik(Float_t,Float_t); - Int_t wpikp(Float_t,Float_t); - Int_t pion(){return fWpi=1.,fPcode=211;} - Int_t kaon(){return fWk=1.,fPcode=321;} - Int_t proton(){return fWp=1.,fPcode=2212;} + Int_t Wpik(Float_t pm,Float_t q); + Int_t Wpikp(Float_t pm,Float_t q); + Int_t Pion(){return fWpi=1.,fPcode=211;} + Int_t Kaon(){return fWk=1.,fPcode=321;} + Int_t Proton(){return fWp=1.,fPcode=2212;} Int_t fSilent; TF1* fCutKa; TF1* fCutPr; @@ -65,7 +64,7 @@ public: TF1* fggpi; TF1* fggka; TF1* fggpr; -public: + ClassDef(AliITSPid,2) // Class for ITS PID };