From: hristov Date: Tue, 9 Oct 2007 09:03:09 +0000 (+0000) Subject: Changes required by the modifications in STEER (Christian) X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=f941f7fa04339c4327b87140677b4a39cc744af9 Changes required by the modifications in STEER (Christian) --- diff --git a/ESDCheck/AliPHOSQATask.cxx b/ESDCheck/AliPHOSQATask.cxx index 2f322652e98..243513374b9 100644 --- a/ESDCheck/AliPHOSQATask.cxx +++ b/ESDCheck/AliPHOSQATask.cxx @@ -166,7 +166,7 @@ void AliPHOSQATask::Exec(Option_t *) fhPHOSPos->Fill( pos[0], pos[1], pos[2] ) ; fhPHOSDigits->Fill(entry, caloCluster->GetNumberOfDigits() ) ; numberOfDigitsInPhos += caloCluster->GetNumberOfDigits() ; - Float_t * pid = caloCluster->GetPid() ; + Double_t * pid = caloCluster->GetPid() ; if(pid[AliPID::kPhoton] > 0.9) { phosVector[numberOfPhotonsInPhos] = new TVector3(pos[0],pos[1],pos[2]) ; phosPhotonsEnergy[numberOfPhotonsInPhos]=caloCluster->E() ; diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index f704c5fc004..f5ed74074e6 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -4350,8 +4350,8 @@ void AliITStrackerMI::FindV02(AliESDEvent *event) pvertex->SetNBefore(maxLayer); } if (pvertex->GetRr()<90){ - pa0 *= TMath::Min(track0->GetESDtrack()->GetTPCdensity(0,60),Float_t(1.)); - pa1 *= TMath::Min(track1->GetESDtrack()->GetTPCdensity(0,60),Float_t(1.)); + pa0 *= TMath::Min(track0->GetESDtrack()->GetTPCdensity(0,60),Double_t(1.)); + pa1 *= TMath::Min(track1->GetESDtrack()->GetTPCdensity(0,60),Double_t(1.)); } if (pvertex->GetRr()<20){ pa0 *= (0.2+TMath::Exp(-TMath::Min(minchi2after0,Float_t(16))/8.))/1.2; @@ -4370,8 +4370,8 @@ void AliITStrackerMI::FindV02(AliESDEvent *event) Float_t sigmap = 0.5*sigmap0*(0.6+0.4*p12); // "resolution: of point angle - as a function of radius and momenta Float_t causalityA = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]); - Float_t causalityB = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Float_t(0.7))* - TMath::Min(pvertex->GetCausalityP()[3],Float_t(0.7))); + Float_t causalityB = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Double_t(0.7))* + TMath::Min(pvertex->GetCausalityP()[3],Double_t(0.7))); // //Bo: Float_t likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5); Float_t lDistNorm = pvertex->GetDcaV0Daughters()/pvertex->GetDistSigma(); diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx index 576b6dad5d9..9d519cc3945 100644 --- a/TPC/AliTPCtrackerMI.cxx +++ b/TPC/AliTPCtrackerMI.cxx @@ -5769,10 +5769,8 @@ void AliTPCtrackerMI::UpdateKinkQualityM(AliTPCseed * seed){ if (index>=0) break; index = TMath::Abs(index)-1; AliESDkink * kink = fEvent->GetKink(index); - //kink->fTPCdensity2[0][0]=-1; - //kink->fTPCdensity2[0][1]=-1; - kink->SetTPCDensity2(-1,0,0); - kink->SetTPCDensity2(1,0,1); + kink->SetTPCDensity(-1,0,0); + kink->SetTPCDensity(1,0,1); // Int_t row0 = kink->GetTPCRow0() - 2 - Int_t( 0.5/ (0.05+kink->GetAngle(2))); if (row0<15) row0=15; @@ -5782,9 +5780,9 @@ void AliTPCtrackerMI::UpdateKinkQualityM(AliTPCseed * seed){ // Int_t found,foundable,shared; seed->GetClusterStatistic(0,row0, found, foundable,shared,kFALSE); - if (foundable>5) kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),0,0); + if (foundable>5) kink->SetTPCDensity(Float_t(found)/Float_t(foundable),0,0); seed->GetClusterStatistic(row1,155, found, foundable,shared,kFALSE); - if (foundable>5) kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),0,1); + if (foundable>5) kink->SetTPCDensity(Float_t(found)/Float_t(foundable),0,1); } } @@ -5799,8 +5797,8 @@ void AliTPCtrackerMI::UpdateKinkQualityD(AliTPCseed * seed){ if (index<=0) break; index = TMath::Abs(index)-1; AliESDkink * kink = fEvent->GetKink(index); - kink->SetTPCDensity2(-1,1,0); - kink->SetTPCDensity2(-1,1,1); + kink->SetTPCDensity(-1,1,0); + kink->SetTPCDensity(-1,1,1); // Int_t row0 = kink->GetTPCRow0() -2 - Int_t( 0.5/ (0.05+kink->GetAngle(2))); if (row0<15) row0=15; @@ -5810,9 +5808,9 @@ void AliTPCtrackerMI::UpdateKinkQualityD(AliTPCseed * seed){ // Int_t found,foundable,shared; seed->GetClusterStatistic(0,row0, found, foundable,shared,kFALSE); - if (foundable>5) kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),1,0); + if (foundable>5) kink->SetTPCDensity(Float_t(found)/Float_t(foundable),1,0); seed->GetClusterStatistic(row1,155, found, foundable,shared,kFALSE); - if (foundable>5) kink->SetTPCDensity2(Float_t(found)/Float_t(foundable),1,1); + if (foundable>5) kink->SetTPCDensity(Float_t(found)/Float_t(foundable),1,1); } }