X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerMI.cxx;h=fc0d275b1b72354310c29dcd03c91bc449de2b2a;hb=12d3cd377dc08ab5d3f78f9281c07b8536b010ab;hp=6ee80ca3870d8dec500415dfcfab99a0abb948ff;hpb=9fd412a804e8feefcd30490ce517967bb164fc86;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index 6ee80ca3870..fc0d275b1b7 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -233,7 +233,7 @@ fPlaneEff(0) { if (AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() && AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()>=0) { Int_t iplane=AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff(); - if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(iplane)) + if(!AliITSReconstructor::GetRecoParam()->GetLayersToSkip(iplane)==1) AliWarning(Form("Evaluation of Plane Eff for layer %d will be attempted without removing it from tracker",iplane)); if (iplane<2) fPlaneEff = new AliITSPlaneEffSPD(); else if (iplane<4) fPlaneEff = new AliITSPlaneEffSDD(); @@ -604,10 +604,8 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { GetBestHypothesysMIP(itsTracks); } // end loop on the two tracking passes - if(event->GetNumberOfV0s()>0) UpdateTPCV0(event); - if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) FindV02(event); - //if(event->GetNumberOfV0s()>0) AliITSV0Finder::UpdateTPCV0(event,this); - //if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::FindV02(event,this); + if(event->GetNumberOfV0s()>0) AliITSV0Finder::UpdateTPCV0(event,this); + if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::FindV02(event,this); fAfterV0 = kTRUE; // itsTracks.Delete(); @@ -660,7 +658,7 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) { t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); ResetTrackToFollow(*t); - + /* // propagate to vertex [SR, GSI 17.02.2003] // Start Time measurement [SR, GSI 17.02.2003], corrected by I.Belikov if (CorrectForPipeMaterial(&fTrackToFollow,"inward")) { @@ -668,7 +666,17 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) { fTrackToFollow.StartTimeIntegral(); // from vertex to outside pipe CorrectForPipeMaterial(&fTrackToFollow,"outward"); + }*/ + // Start time integral and add distance from current position to vertex + Double_t xyzTrk[3],xyzVtx[3]={GetX(),GetY(),GetZ()}; + fTrackToFollow.GetXYZ(xyzTrk); + Double_t dst2 = 0.; + for (Int_t icoord=0; icoord<3; icoord++) { + Double_t di = xyzTrk[icoord] - xyzVtx[icoord]; + dst2 += di*di; } + fTrackToFollow.StartTimeIntegral(); + fTrackToFollow.AddTimeStep(TMath::Sqrt(dst2)); fTrackToFollow.ResetCovariance(10.); fTrackToFollow.ResetClusters(); if (RefitAt(AliITSRecoParam::GetrInsideITSscreen(),&fTrackToFollow,t)) { @@ -701,8 +709,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { //-------------------------------------------------------------------- fTrackingPhase="RefitInward"; - if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) RefitV02(event); - //if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::RefitV02(event,this); + if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::RefitV02(event,this); Int_t nentr=event->GetNumberOfTracks(); Info("RefitInward", "Number of ESD tracks: %d\n", nentr); @@ -739,6 +746,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { //Refitting... Bool_t pe=(AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() && AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()>=0); + AliDebug(2,Form("Refit LABEL %d %d",t->GetLabel(),t->GetNumberOfClusters())); if (RefitAt(AliITSRecoParam::GetrInsideSPD1(),&fTrackToFollow,t,kTRUE,pe)) { AliDebug(2," refit OK"); @@ -796,6 +804,7 @@ Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const { p.SetXYZ(xyz, cov); p.SetCharge(cl->GetQ()); p.SetDriftTime(cl->GetDriftTime()); + p.SetChargeRatio(cl->GetChargeRatio()); AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; switch (l) { case 0: @@ -852,21 +861,22 @@ Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index, Float_t tgl = t->GetTgl(); // tgl about const along track Float_t expQ = TMath::Max(0.8*t->GetTPCsignal(),30.); - Float_t errlocalx,errlocalz; + Float_t errtrky,errtrkz,covyz; Bool_t addMisalErr=kFALSE; - AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errlocalx,errlocalz,addMisalErr); + AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errtrky,errtrkz,covyz,addMisalErr); Float_t xyz[3]; Float_t cov[6]; cl->GetGlobalXYZ(xyz); // cl->GetGlobalCov(cov); Float_t pos[3] = {0.,0.,0.}; - AliCluster tmpcl((UShort_t)cl->GetVolumeId(),pos[0],pos[1],pos[2],errlocalx*errlocalx,errlocalz*errlocalz,0); + AliCluster tmpcl((UShort_t)cl->GetVolumeId(),pos[0],pos[1],pos[2],errtrky*errtrky,errtrkz*errtrkz,covyz); tmpcl.GetGlobalCov(cov); p.SetXYZ(xyz, cov); p.SetCharge(cl->GetQ()); p.SetDriftTime(cl->GetDriftTime()); + p.SetChargeRatio(cl->GetChargeRatio()); AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; switch (l) { @@ -1004,6 +1014,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin // apply correction for material of the current layer CorrectForLayerMaterial(vtrack,ilayer,trackGlobXYZ1,"inward"); vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1); + vtrack->SetDeadZoneProbability(ilayer,1.); // no penalty for missing cluster vtrack->SetClIndex(ilayer,-1); modstatus = (skip==1 ? 3 : 4); // skipped : out in z if(LocalModuleCoord(ilayer,idet,vtrack,xloc,zloc)) { // local module coords @@ -1084,7 +1095,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin modstatus = 5; // no cls in road } else if (dead==1) { modstatus = 7; // holes in z in SPD - } else if (dead==2 || dead==3) { + } else if (dead==2 || dead==3 || dead==4) { modstatus = 2; // dead from OCDB } updatetrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); @@ -1102,12 +1113,16 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin } if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); } + updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1); if (dead) { - updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1); if (dead==1) { // dead zone at z=0,+-7cm in SPD - updatetrack->SetDeadZoneProbability(GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); + updatetrack->SetDeadZoneProbability(ilayer,GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); deadzoneSPD=kTRUE; - } + } else if (dead==2 || dead==3) { // dead module or chip from OCDB + updatetrack->SetDeadZoneProbability(ilayer,1.); + } else if (dead==4) { // at least a single dead channel from OCDB + updatetrack->SetDeadZoneProbability(ilayer,0.); + } } ntracks[ilayer]++; } @@ -1172,11 +1187,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin AliDebug(2,"update failed"); continue; } - updatetrack->SetSampledEdx(cl->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b. + updatetrack->SetSampledEdx(cl->GetQ(),ilayer-2); modstatus = 1; // found } else { // virtual cluster in dead zone updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1); - updatetrack->SetDeadZoneProbability(GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); + updatetrack->SetDeadZoneProbability(ilayer,GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); modstatus = 7; // holes in z in SPD } @@ -1413,6 +1428,7 @@ fYcs(0), fZcs(0), fNcs(0), fCurrentSlice(-1), +fZmin(0), fZmax(0), fYmin(0), fYmax(0), @@ -1420,7 +1436,11 @@ fI(0), fImax(0), fSkip(0), fAccepted(0), -fRoad(0){ +fRoad(0), +fMaxSigmaClY(0), +fMaxSigmaClZ(0), +fNMaxSigmaCl(3) +{ //-------------------------------------------------------------------- //default AliITSlayer constructor //-------------------------------------------------------------------- @@ -1451,6 +1471,7 @@ fYcs(0), fZcs(0), fNcs(0), fCurrentSlice(-1), +fZmin(0), fZmax(0), fYmin(0), fYmax(0), @@ -1458,7 +1479,10 @@ fI(0), fImax(0), fSkip(0), fAccepted(0), -fRoad(0) { +fRoad(0), +fMaxSigmaClY(0), +fMaxSigmaClZ(0), +fNMaxSigmaCl(3) { //-------------------------------------------------------------------- //main AliITSlayer constructor //-------------------------------------------------------------------- @@ -1483,6 +1507,7 @@ fYcs(layer.fYcs), fZcs(layer.fZcs), fNcs(layer.fNcs), fCurrentSlice(layer.fCurrentSlice), +fZmin(layer.fZmin), fZmax(layer.fZmax), fYmin(layer.fYmin), fYmax(layer.fYmax), @@ -1490,7 +1515,11 @@ fI(layer.fI), fImax(layer.fImax), fSkip(layer.fSkip), fAccepted(layer.fAccepted), -fRoad(layer.fRoad){ +fRoad(layer.fRoad), +fMaxSigmaClY(layer.fMaxSigmaClY), +fMaxSigmaClZ(layer.fMaxSigmaClZ), +fNMaxSigmaCl(layer.fNMaxSigmaCl) +{ //Copy constructor } //------------------------------------------------------------------------ @@ -1567,11 +1596,20 @@ Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *cl) { fClusters[fN]=cl; fN++; AliITSdetector &det=GetDetector(cl->GetDetectorIndex()); + //AD + Double_t nSigmaY=fNMaxSigmaCl*TMath::Sqrt(cl->GetSigmaY2()); + Double_t nSigmaZ=fNMaxSigmaCl*TMath::Sqrt(cl->GetSigmaZ2()); + if (cl->GetY()-nSigmaYGetY()-nSigmaY); + if (cl->GetY()+nSigmaY>det.GetYmax()) det.SetYmax(cl->GetY()+nSigmaY); + if (cl->GetZ()-nSigmaZGetZ()-nSigmaZ); + if (cl->GetZ()+nSigmaZ>det.GetZmax()) det.SetZmax(cl->GetZ()+nSigmaZ); + //AD + /* if (cl->GetY()GetY()); if (cl->GetY()>det.GetYmax()) det.SetYmax(cl->GetY()); if (cl->GetZ()GetZ()); if (cl->GetZ()>det.GetZmax()) det.SetZmax(cl->GetZ()); - + */ return 0; } //------------------------------------------------------------------------ @@ -1584,8 +1622,14 @@ void AliITStrackerMI::AliITSlayer::SortClusters() Float_t *z = new Float_t[fN]; Int_t * index = new Int_t[fN]; // + fMaxSigmaClY=0.; //AD + fMaxSigmaClZ=0.; //AD + for (Int_t i=0;iGetZ(); + // save largest errors in y and z for this layer + fMaxSigmaClY=TMath::Max(fMaxSigmaClY,TMath::Sqrt(fClusters[i]->GetSigmaY2())); + fMaxSigmaClZ=TMath::Max(fMaxSigmaClZ,TMath::Sqrt(fClusters[i]->GetSigmaZ2())); } TMath::Sort(fN,z,index,kFALSE); for (Int_t i=0;iy) y += rpi2; if (yfYmax) continue; + // AD + // skip clusters that are in "extended" road but they + // 3sigma error does not touch the original road + if (z+fNMaxSigmaCl*TMath::Sqrt(fClusters[i]->GetSigmaZ2())GetSigmaZ2())>fZmax-fNMaxSigmaCl*fMaxSigmaClZ) continue; + // if (fClusters[i]->GetQ()==0&&fSkip==2) continue; ci=i; if (!test) fI=i+1; @@ -2216,6 +2277,11 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, Double_t oldGlobXYZ[3]; if (!track->GetXYZ(oldGlobXYZ)) return kFALSE; + // continue if we are already beyond this layer + Double_t oldGlobR = TMath::Sqrt(oldGlobXYZ[0]*oldGlobXYZ[0]+oldGlobXYZ[1]*oldGlobXYZ[1]); + if(step>0 && oldGlobR > r) continue; // going outward + if(step<0 && oldGlobR < r) continue; // going inward + Double_t phi,z; if (!track->GetPhiZat(r,phi,z)) return kFALSE; @@ -2286,13 +2352,13 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, dy = 0.5*(ymax-ymin); Int_t dead = CheckDeadZone(track,ilayer,idet,dz,dy,kTRUE); if (dead==1) modstatus = 7; // holes in z in SPD - if (dead==2 || dead==3) modstatus = 2; // dead from OCDB + if (dead==2 || dead==3 || dead==4) modstatus = 2; // dead from OCDB } } if (clAcc) { if (!UpdateMI(track,clAcc,maxchi2,idx)) return kFALSE; - track->SetSampledEdx(clAcc->GetQ(),track->GetNumberOfClusters()-1); + track->SetSampledEdx(clAcc->GetQ(),ilayer-2); } track->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); @@ -2433,7 +2499,22 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) } } if (match<0) match=0; - Float_t deadzonefactor = (track->GetNDeadZone()>0) ? 3*(1.1-track->GetDeadZoneProbability()):0.; + + // penalty factor for missing points (NDeadZone>0), but no penalty + // for layer with deadZoneProb close to 1 (either we wanted to skip layer + // or there is a dead from OCDB) + Float_t deadzonefactor = 0.; + if (track->GetNDeadZone()>0.) { + Float_t sumDeadZoneProbability=0; + for(Int_t ilay=0;ilay<6;ilay++) sumDeadZoneProbability+=track->GetDeadZoneProbability(ilay); + Float_t nDeadZoneWithProbNot1=(Float_t)(track->GetNDeadZone())-sumDeadZoneProbability; + if(nDeadZoneWithProbNot1>0.) { + Float_t deadZoneProbability = sumDeadZoneProbability - (Float_t)((Int_t)sumDeadZoneProbability); + deadZoneProbability /= nDeadZoneWithProbNot1; + deadzonefactor = 3.*(1.1-deadZoneProbability); + } + } + Double_t normchi2 = 2*track->GetNSkipped()+match+deadzonefactor+(1+(2*track->GetNSkipped()+deadzonefactor)/track->GetNumberOfClusters())* (chi2)/TMath::Max(double(sum-track->GetNSkipped()), 1./(1.+track->GetNSkipped())); @@ -3555,12 +3636,6 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const { void AliITStrackerMI::CookdEdx(AliITStrackMI* track) { // - // - // Int_t list[6]; - //AliITSRecPoint * clist[6]; - // Int_t shared = GetNumberOfSharedClusters(track,index,list,clist); - Float_t dedx[4]; - Int_t accepted=0; track->SetChi2MIP(9,0); for (Int_t i=0;iGetNumberOfClusters();i++){ Int_t cindex = track->GetClusterIndex(i); @@ -3572,33 +3647,10 @@ void AliITStrackerMI::CookdEdx(AliITStrackMI* track) if (cl->GetLabel(ind)==lab) isWrong=0; } track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<3 && (cl->GetNy()>4) || (cl->GetNz()>4)) continue; //shared track - //if (l>3&& !(cl->GetType()==1||cl->GetType()==10)) continue; - //if (l<4&& !(cl->GetType()==1)) continue; - dedx[accepted]= track->GetSampledEdx(i); - //dedx[accepted]= track->fNormQ[l]; - accepted++; - } - if (accepted<1) { - track->SetdEdx(0); - return; } - Int_t indexes[4]; - TMath::Sort(accepted,dedx,indexes,kFALSE); Double_t low=0.; Double_t up=0.51; - Double_t nl=low*accepted, nu =up*accepted; - Float_t sumamp = 0; - Float_t sumweight =0; - for (Int_t i=0; inu-1) weight = TMath::Max(nu-i,0.); - sumamp+= dedx[indexes[i]]*weight; - sumweight+=weight; - } - track->SetdEdx(sumamp/sumweight); + track->CookdEdx(low,up); } //------------------------------------------------------------------------ void AliITStrackerMI::MakeCoefficients(Int_t ntracks){ @@ -3615,17 +3667,17 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR // // Compute predicted chi2 // - Float_t erry,errz; + Float_t erry,errz,covyz; Float_t theta = track->GetTgl(); Float_t phi = track->GetSnp(); phi = TMath::Abs(phi)*TMath::Sqrt(1./((1.-phi)*(1.+phi))); - AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz); + AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz,covyz); AliDebug(2,Form(" chi2: tr-cl %f %f tr X %f cl X %f",track->GetY()-cluster->GetY(),track->GetZ()-cluster->GetZ(),track->GetX(),cluster->GetX())); // Take into account the mis-alignment (bring track to cluster plane) Double_t xTrOrig=track->GetX(); if (!track->Propagate(xTrOrig+cluster->GetX())) return 1000.; AliDebug(2,Form(" chi2: tr-cl %f %f tr X %f cl X %f",track->GetY()-cluster->GetY(),track->GetZ()-cluster->GetZ(),track->GetX(),cluster->GetX())); - Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz); + Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz,covyz); // Bring the track back to detector plane in ideal geometry // [mis-alignment will be accounted for in UpdateMI()] if (!track->Propagate(xTrOrig)) return 1000.; @@ -3641,6 +3693,7 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR track->SetNz(layer,nz); track->SetSigmaY(layer,erry); track->SetSigmaZ(layer, errz); + track->SetSigmaYZ(layer,covyz); //track->fNormQ[layer] = cluster->GetQ()/TMath::Sqrt(1+theta*theta+phi*phi); track->SetNormQ(layer,cluster->GetQ()/TMath::Sqrt((1.+ track->GetTgl()*track->GetTgl())/((1.-track->GetSnp())*(1.+track->GetSnp())))); return chi2; @@ -3672,18 +3725,17 @@ Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,D AliDebug(2,Form(" xtr %f xcl %f",track->GetX(),cl->GetX())); if (!track->Propagate(xTrOrig+cl->GetX())) return 0; - AliCluster c(*cl); c.SetSigmaY2(track->GetSigmaY(layer)*track->GetSigmaY(layer)); c.SetSigmaZ2(track->GetSigmaZ(layer)*track->GetSigmaZ(layer)); + c.SetSigmaYZ(track->GetSigmaYZ(layer)); Int_t updated = track->UpdateMI(&c,chi2,index); - // Bring the track back to detector plane in ideal geometry if (!track->Propagate(xTrOrig)) return 0; - + if(!updated) AliDebug(2,"update failed"); return updated; } @@ -3800,831 +3852,6 @@ Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{ } return res; } - -//------------------------------------------------------------------------ -void AliITStrackerMI::UpdateTPCV0(const AliESDEvent *event){ - // - //try to update, or reject TPC V0s - // - Int_t nv0s = event->GetNumberOfV0s(); - Int_t nitstracks = fTrackHypothesys.GetEntriesFast(); - - for (Int_t i=0;iGetV0(i); - Int_t ip = vertex->GetIndex(0); - Int_t im = vertex->GetIndex(1); - // - TObjArray * arrayp = (ipAt(0):0; - AliITStrackMI * trackm = (arraym!=0) ? (AliITStrackMI*)arraym->At(0):0; - // - // - if (trackp){ - if (trackp->GetNumberOfClusters()+trackp->GetNDeadZone()>5.5){ - if (trackp->GetConstrain()&&trackp->GetChi2MIP(0)<3) vertex->SetStatus(-100); - if (!trackp->GetConstrain()&&trackp->GetChi2MIP(0)<2) vertex->SetStatus(-100); - } - } - - if (trackm){ - if (trackm->GetNumberOfClusters()+trackm->GetNDeadZone()>5.5){ - if (trackm->GetConstrain()&&trackm->GetChi2MIP(0)<3) vertex->SetStatus(-100); - if (!trackm->GetConstrain()&&trackm->GetChi2MIP(0)<2) vertex->SetStatus(-100); - } - } - if (vertex->GetStatus()==-100) continue; - // - Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B. - Int_t clayer = GetNearestLayer(xrp); //I.B. - vertex->SetNBefore(clayer); // - vertex->SetChi2Before(9*clayer); // - vertex->SetNAfter(6-clayer); // - vertex->SetChi2After(0); // - // - if (clayer >1 ){ // calculate chi2 before vertex - Float_t chi2p = 0, chi2m=0; - // - if (trackp){ - for (Int_t ilayer=0;ilayerGetClIndex(ilayer)>=0){ - chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+ - trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer)); - } - else{ - chi2p+=9; - } - } - }else{ - chi2p = 9*clayer; - } - // - if (trackm){ - for (Int_t ilayer=0;ilayerGetClIndex(ilayer)>=0){ - chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+ - trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer)); - } - else{ - chi2m+=9; - } - } - }else{ - chi2m = 9*clayer; - } - vertex->SetChi2Before(TMath::Min(chi2p,chi2m)); - if (TMath::Min(chi2p,chi2m)/Float_t(clayer)<4) vertex->SetStatus(-10); // track exist before vertex - } - - if (clayer < 5 ){ // calculate chi2 after vertex - Float_t chi2p = 0, chi2m=0; - // - if (trackp&&TMath::Abs(trackp->GetTgl())<1.){ - for (Int_t ilayer=clayer;ilayer<6;ilayer++){ - if (trackp->GetClIndex(ilayer)>=0){ - chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+ - trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer)); - } - else{ - chi2p+=9; - } - } - }else{ - chi2p = 0; - } - // - if (trackm&&TMath::Abs(trackm->GetTgl())<1.){ - for (Int_t ilayer=clayer;ilayer<6;ilayer++){ - if (trackm->GetClIndex(ilayer)>=0){ - chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+ - trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer)); - } - else{ - chi2m+=9; - } - } - }else{ - chi2m = 0; - } - vertex->SetChi2After(TMath::Max(chi2p,chi2m)); - if (TMath::Max(chi2m,chi2p)/Float_t(6-clayer)>9) vertex->SetStatus(-20); // track not found in ITS - } - } - // -} -//------------------------------------------------------------------------ -void AliITStrackerMI::FindV02(AliESDEvent *event) -{ - // - // V0 finder - // - // Cuts on DCA - R dependent - // max distance DCA between 2 tracks cut - // maxDist = TMath::Min(kMaxDist,kMaxDist0+pvertex->GetRr()*kMaxDist); - // - const Float_t kMaxDist0 = 0.1; - const Float_t kMaxDist1 = 0.1; - const Float_t kMaxDist = 1; - const Float_t kMinPointAngle = 0.85; - const Float_t kMinPointAngle2 = 0.99; - const Float_t kMinR = 0.5; - const Float_t kMaxR = 220; - //const Float_t kCausality0Cut = 0.19; - //const Float_t kLikelihood01Cut = 0.25; - //const Float_t kPointAngleCut = 0.9996; - const Float_t kCausality0Cut = 0.19; - const Float_t kLikelihood01Cut = 0.45; - const Float_t kLikelihood1Cut = 0.5; - const Float_t kCombinedCut = 0.55; - - // - // - TTreeSRedirector &cstream = *fDebugStreamer; - Int_t ntracks = event->GetNumberOfTracks(); - Int_t nitstracks = fTrackHypothesys.GetEntriesFast(); - fOriginal.Expand(ntracks); - fTrackHypothesys.Expand(ntracks); - fBestHypothesys.Expand(ntracks); - // - AliHelix * helixes = new AliHelix[ntracks+2]; - TObjArray trackarray(ntracks+2); //array with tracks - with vertex constrain - TObjArray trackarrayc(ntracks+2); //array of "best tracks" - without vertex constrain - TObjArray trackarrayl(ntracks+2); //array of "longest tracks" - without vertex constrain - Bool_t * forbidden = new Bool_t [ntracks+2]; - Int_t *itsmap = new Int_t [ntracks+2]; - Float_t *dist = new Float_t[ntracks+2]; - Float_t *normdist0 = new Float_t[ntracks+2]; - Float_t *normdist1 = new Float_t[ntracks+2]; - Float_t *normdist = new Float_t[ntracks+2]; - Float_t *norm = new Float_t[ntracks+2]; - Float_t *maxr = new Float_t[ntracks+2]; - Float_t *minr = new Float_t[ntracks+2]; - Float_t *minPointAngle= new Float_t[ntracks+2]; - // - AliV0 *pvertex = new AliV0; - AliITStrackMI * dummy= new AliITStrackMI; - dummy->SetLabel(0); - AliITStrackMI trackat0; //temporary track for DCA calculation - // - Float_t primvertex[3]={GetX(),GetY(),GetZ()}; - // - // make ITS - ESD map - // - for (Int_t itrack=0;itrackGetESDtrack()->GetID(); - itsmap[esdindex] = itrack; - } - // - // create ITS tracks from ESD tracks if not done before - // - for (Int_t itrack=0;itrack=0) continue; - AliITStrackMI * tpctrack = new AliITStrackMI(*(event->GetTrack(itrack))); - //tpctrack->fD[0] = tpctrack->GetD(GetX(),GetY()); - //tpctrack->fD[1] = tpctrack->GetZat(GetX())-GetZ(); - tpctrack->GetDZ(GetX(),GetY(),GetZ(),tpctrack->GetDP()); //I.B. - if (tpctrack->GetD(0)<20 && tpctrack->GetD(1)<20){ - // tracks which can reach inner part of ITS - // propagate track to outer its volume - with correction for material - CorrectForTPCtoITSDeadZoneMaterial(tpctrack); - } - itsmap[itrack] = nitstracks; - fOriginal.AddAt(tpctrack,nitstracks); - nitstracks++; - } - // - // fill temporary arrays - // - for (Int_t itrack=0;itrackGetTrack(itrack); - Int_t itsindex = itsmap[itrack]; - AliITStrackMI *original = (AliITStrackMI*)fOriginal.At(itsmap[itrack]); - if (!original) continue; - AliITStrackMI *bestConst = 0; - AliITStrackMI *bestLong = 0; - AliITStrackMI *best = 0; - // - // - TObjArray * array = (TObjArray*) fTrackHypothesys.At(itsindex); - Int_t hentries = (array==0) ? 0 : array->GetEntriesFast(); - // Get best track with vertex constrain - for (Int_t ih=0;ihAt(ih); - if (!trackh->GetConstrain()) continue; - if (!bestConst) bestConst = trackh; - if (trackh->GetNumberOfClusters()>5.0){ - bestConst = trackh; // full track - with minimal chi2 - break; - } - if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()) continue; - bestConst = trackh; - break; - } - // Get best long track without vertex constrain and best track without vertex constrain - for (Int_t ih=0;ihAt(ih); - if (trackh->GetConstrain()) continue; - if (!best) best = trackh; - if (!bestLong) bestLong = trackh; - if (trackh->GetNumberOfClusters()>5.0){ - bestLong = trackh; // full track - with minimal chi2 - break; - } - if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()) continue; - bestLong = trackh; - } - if (!best) { - best = original; - bestLong = original; - } - //I.B. trackat0 = *bestLong; - new (&trackat0) AliITStrackMI(*bestLong); - Double_t xx,yy,zz,alpha; - if (!bestLong->GetGlobalXYZat(bestLong->GetX(),xx,yy,zz)) continue; - alpha = TMath::ATan2(yy,xx); - if (!trackat0.Propagate(alpha,0)) continue; - // calculate normalized distances to the vertex - // - Float_t ptfac = (1.+100.*TMath::Abs(trackat0.GetC())); - if ( bestLong->GetNumberOfClusters()>3 ){ - dist[itsindex] = trackat0.GetY(); - norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2()); - normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]); - normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2()))); - normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]); - if (!bestConst){ - if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<6) normdist[itsindex]*=2.; - if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<5) normdist[itsindex]*=2.; - if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<4) normdist[itsindex]*=2.; - }else{ - if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<6) normdist[itsindex]*=1.5; - if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<5) normdist[itsindex]*=1.5; - } - } - else{ - if (bestConst&&bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5){ - dist[itsindex] = bestConst->GetD(0); - norm[itsindex] = bestConst->GetDnorm(0); - normdist0[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]); - normdist1[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]); - normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]); - }else{ - dist[itsindex] = trackat0.GetY(); - norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2()); - normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]); - normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2()))); - normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]); - if (TMath::Abs(trackat0.GetTgl())>1.05){ - if (normdist[itsindex]<3) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]>3) { - minr[itsindex] = TMath::Max(Float_t(40.),minr[itsindex]); - } - } - } - } - // - //----------------------------------------------------------- - //Forbid primary track candidates - - // - //treetr->SetAlias("forbidden0","Tr0.fN<4&&Tr1.fN+Tr1.fNDeadZone>4.5"); - //treetr->SetAlias("forbidden1","ND<3&&Tr1.fN+Tr1.fNDeadZone>5.5"); - //treetr->SetAlias("forbidden2","ND<2&&Tr1.fClIndex[0]>0&&Tr1.fClIndex[0]>0"); - //treetr->SetAlias("forbidden3","ND<1&&Tr1.fClIndex[0]>0"); - //treetr->SetAlias("forbidden4","ND<4&&Tr1.fNormChi2[0]<2"); - //treetr->SetAlias("forbidden5","ND<5&&Tr1.fNormChi2[0]<1"); - //----------------------------------------------------------- - if (bestConst){ - if (bestLong->GetNumberOfClusters()<4 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]<3 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>5.5) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]<2 && bestConst->GetClIndex(0)>=0 && bestConst->GetClIndex(1)>=0 ) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]<1 && bestConst->GetClIndex(0)>=0) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]<4 && bestConst->GetNormChi2(0)<2) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]<5 && bestConst->GetNormChi2(0)<1) forbidden[itsindex]=kTRUE; - if (bestConst->GetNormChi2(0)<2.5) { - minPointAngle[itsindex]= 0.9999; - maxr[itsindex] = 10; - } - } - // - //forbid daughter kink candidates - // - if (esdtrack->GetKinkIndex(0)>0) forbidden[itsindex] = kTRUE; - Bool_t isElectron = kTRUE; - Bool_t isProton = kTRUE; - Double_t pid[5]; - esdtrack->GetESDpid(pid); - for (Int_t i=1;i<5;i++){ - if (pid[0]2) forbidden[itsindex]=kFALSE; - normdist[itsindex]*=-1; - } - - // - // Causality cuts in TPC volume - // - if (esdtrack->GetTPCdensity(0,10) >0.6) maxr[itsindex] = TMath::Min(Float_t(110),maxr[itsindex]); - if (esdtrack->GetTPCdensity(10,30)>0.6) maxr[itsindex] = TMath::Min(Float_t(120),maxr[itsindex]); - if (esdtrack->GetTPCdensity(20,40)>0.6) maxr[itsindex] = TMath::Min(Float_t(130),maxr[itsindex]); - if (esdtrack->GetTPCdensity(30,50)>0.6) maxr[itsindex] = TMath::Min(Float_t(140),maxr[itsindex]); - // - if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->GetNumberOfClusters()<3) minr[itsindex]=100; - // - // - if (kFALSE){ - cstream<<"Track"<< - "Tr0.="<GetSign()>0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue; - AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0); - // - for (Int_t iesd1=iesd0+1;iesd1GetSign()<0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue; - Bool_t isGold = kFALSE; - if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){ - isGold = kTRUE; - } - AliITStrackMI *trackc1 = (AliITStrackMI*)trackarrayc.At(itrack1); - AliHelix &h1 = helixes[itrack0]; - AliHelix &h2 = helixes[itrack1]; - // - // find linear distance - Double_t rmin =0; - // - // - // - Double_t phase[2][2],radius[2]; - Int_t points = h1.GetRPHIintersections(h2, phase, radius); - if (points==0) continue; - Double_t delta[2]={1000000,1000000}; - rmin = radius[0]; - h1.ParabolicDCA(h2,phase[0][0],phase[0][1],radius[0],delta[0]); - if (points==2){ - if (radius[1]TMath::Min(maxr[itrack0],maxr[itrack1])) continue; - Float_t maxDist = TMath::Min(kMaxDist,Float_t(kMaxDist0+radiusC*kMaxDist1)); - if (distance>maxDist) continue; - Float_t pointAngle = h1.GetPointAngle(h2,phase[iphase],primvertex); - if (pointAnglemaxDist) continue; - // if (pvertex->GetRr()GetRr()>kMaxR) continue; - AliITStrackMI * track0=btrack0; - AliITStrackMI * track1=btrack1; - // if (pvertex->GetRr()<3.5){ - if (radiusC<3.5){ - //use longest tracks inside the pipe - track0 = (AliITStrackMI*)trackarrayl.At(itrack0); - track1 = (AliITStrackMI*)trackarrayl.At(itrack1); - } - // - // - pvertex->SetParamN(*track0); - pvertex->SetParamP(*track1); - pvertex->Update(primvertex); - pvertex->SetClusters(track0->ClIndex(),track1->ClIndex()); // register clusters - - if (pvertex->GetRr()GetRr()>kMaxR) continue; - if (pvertex->GetV0CosineOfPointingAngle()GetDist2()>maxDist) continue; - if (pvertex->GetDcaV0Daughters()>maxDist) continue; -//Bo: pvertex->SetLab(0,track0->GetLabel()); -//Bo: pvertex->SetLab(1,track1->GetLabel()); - pvertex->SetIndex(0,track0->GetESDtrack()->GetID()); - pvertex->SetIndex(1,track1->GetESDtrack()->GetID()); - // - AliITStrackMI * htrackc0 = trackc0 ? trackc0:dummy; - AliITStrackMI * htrackc1 = trackc1 ? trackc1:dummy; - - // - // - TObjArray * array0b = (TObjArray*)fBestHypothesys.At(itrack0); - if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->GetTgl())<1.1) { - fCurrentEsdTrack = itrack0; - FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack0),itrack0, kFALSE); - } - TObjArray * array1b = (TObjArray*)fBestHypothesys.At(itrack1); - if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->GetTgl())<1.1) { - fCurrentEsdTrack = itrack1; - FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack1),itrack1, kFALSE); - } - // - AliITStrackMI * track0b = (AliITStrackMI*)fOriginal.At(itrack0); - AliITStrackMI * track1b = (AliITStrackMI*)fOriginal.At(itrack1); - AliITStrackMI * track0l = (AliITStrackMI*)fOriginal.At(itrack0); - AliITStrackMI * track1l = (AliITStrackMI*)fOriginal.At(itrack1); - - Float_t minchi2before0=16; - Float_t minchi2before1=16; - Float_t minchi2after0 =16; - Float_t minchi2after1 =16; - Double_t xrp[3]; pvertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B. - Int_t maxLayer = GetNearestLayer(xrp); //I.B. - - if (array0b) for (Int_t i=0;i<5;i++){ - // best track after vertex - AliITStrackMI * btrack = (AliITStrackMI*)array0b->At(i); - if (!btrack) continue; - if (btrack->GetNumberOfClusters()>track0l->GetNumberOfClusters()) track0l = btrack; - // if (btrack->fXGetRr()-2.-0.5/(0.1+pvertex->GetAnglep()[2])) { - if (btrack->GetX()GetRr()-2.) { - if ( (maxLayer>i+2|| (i==0)) && btrack->GetNumberOfClusters()==(6-i)&&i<3){ - Float_t sumchi2= 0; - Float_t sumn = 0; - if (maxLayer<3){ // take prim vertex as additional measurement - if (normdist[itrack0]>0 && htrackc0){ - sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack0]*normdist[itrack0],16.); - }else{ - sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack0]*normdist[itrack0]+3.),16.); - } - sumn += 3-maxLayer; - } - for (Int_t ilayer=i;ilayerGetClIndex(ilayer)<0){ - sumchi2+=25; - continue; - }else{ - Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff); - for (Int_t itrack=0;itrack<4;itrack++){ - if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack0){ - sumchi2+=18.; //shared cluster - break; - } - } - sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer)); - sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer)); - } - } - sumchi2/=sumn; - if (sumchi2GetNormChi2(i); - break; - } - if (array1b) for (Int_t i=0;i<5;i++){ - // best track after vertex - AliITStrackMI * btrack = (AliITStrackMI*)array1b->At(i); - if (!btrack) continue; - if (btrack->GetNumberOfClusters()>track1l->GetNumberOfClusters()) track1l = btrack; - // if (btrack->fXGetRr()-2-0.5/(0.1+pvertex->GetAnglep()[2])){ - if (btrack->GetX()GetRr()-2){ - if ((maxLayer>i+2 || (i==0))&&btrack->GetNumberOfClusters()==(6-i)&&(i<3)){ - Float_t sumchi2= 0; - Float_t sumn = 0; - if (maxLayer<3){ // take prim vertex as additional measurement - if (normdist[itrack1]>0 && htrackc1){ - sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack1]*normdist[itrack1],16.); - }else{ - sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack1]*normdist[itrack1]+3.),16.); - } - sumn += 3-maxLayer; - } - for (Int_t ilayer=i;ilayerGetClIndex(ilayer)<0){ - sumchi2+=30; - continue; - }else{ - Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff); - for (Int_t itrack=0;itrack<4;itrack++){ - if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack1){ - sumchi2+=18.; //shared cluster - break; - } - } - sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer)); - sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer)); - } - } - sumchi2/=sumn; - if (sumchi2GetNormChi2(i); - break; - } - // - // position resolution - used for DCA cut - Float_t sigmad = track0b->GetSigmaY2()+track0b->GetSigmaZ2()+track1b->GetSigmaY2()+track1b->GetSigmaZ2()+ - (track0b->GetX()-pvertex->GetRr())*(track0b->GetX()-pvertex->GetRr())*(track0b->GetSigmaSnp2()+track0b->GetSigmaTgl2())+ - (track1b->GetX()-pvertex->GetRr())*(track1b->GetX()-pvertex->GetRr())*(track1b->GetSigmaSnp2()+track1b->GetSigmaTgl2()); - sigmad =TMath::Sqrt(sigmad)+0.04; - if (pvertex->GetRr()>50){ - Double_t cov0[15],cov1[15]; - track0b->GetESDtrack()->GetInnerExternalCovariance(cov0); - track1b->GetESDtrack()->GetInnerExternalCovariance(cov1); - sigmad = cov0[0]+cov0[2]+cov1[0]+cov1[2]+ - (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov0[5]+cov0[9])+ - (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov1[5]+cov1[9]); - sigmad =TMath::Sqrt(sigmad)+0.05; - } - // - AliV0 vertex2; - vertex2.SetParamN(*track0b); - vertex2.SetParamP(*track1b); - vertex2.Update(primvertex); - //Bo: if (vertex2.GetDist2()<=pvertex->GetDist2()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){ - if (vertex2.GetDcaV0Daughters()<=pvertex->GetDcaV0Daughters()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){ - pvertex->SetParamN(*track0b); - pvertex->SetParamP(*track1b); - pvertex->Update(primvertex); - pvertex->SetClusters(track0b->ClIndex(),track1b->ClIndex()); // register clusters - pvertex->SetIndex(0,track0->GetESDtrack()->GetID()); - pvertex->SetIndex(1,track1->GetESDtrack()->GetID()); - } - pvertex->SetDistSigma(sigmad); - //Bo: pvertex->SetDistNorm(pvertex->GetDist2()/sigmad); - pvertex->SetNormDCAPrim(normdist[itrack0],normdist[itrack1]); - // - // define likelihhod and causalities - // - Float_t pa0=1, pa1=1, pb0=0.26, pb1=0.26; - if (maxLayer<1){ - Float_t fnorm0 = normdist[itrack0]; - if (fnorm0<0) fnorm0*=-3; - Float_t fnorm1 = normdist[itrack1]; - if (fnorm1<0) fnorm1*=-3; - if ((pvertex->GetAnglep()[2]>0.1) || ( (pvertex->GetRr()<10.5)&& pvertex->GetAnglep()[2]>0.05 ) || (pvertex->GetRr()<3)){ - pb0 = TMath::Exp(-TMath::Min(fnorm0,Float_t(16.))/12.); - pb1 = TMath::Exp(-TMath::Min(fnorm1,Float_t(16.))/12.); - } - pvertex->SetChi2Before(normdist[itrack0]); - pvertex->SetChi2After(normdist[itrack1]); - pvertex->SetNAfter(0); - pvertex->SetNBefore(0); - }else{ - pvertex->SetChi2Before(minchi2before0); - pvertex->SetChi2After(minchi2before1); - if (pvertex->GetAnglep()[2]>0.1 || ( pvertex->GetRr()<10.5 && pvertex->GetAnglep()[2]>0.05) || pvertex->GetRr()<3){ - pb0 = TMath::Exp(-TMath::Min(minchi2before0,Float_t(16))/12.); - pb1 = TMath::Exp(-TMath::Min(minchi2before1,Float_t(16))/12.); - } - pvertex->SetNAfter(maxLayer); - pvertex->SetNBefore(maxLayer); - } - if (pvertex->GetRr()<90){ - 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; - pa1 *= (0.2+TMath::Exp(-TMath::Min(minchi2after1,Float_t(16))/8.))/1.2; - } - // - pvertex->SetCausality(pb0,pb1,pa0,pa1); - // - // Likelihood calculations - apply cuts - // - Bool_t v0OK = kTRUE; - Float_t p12 = pvertex->GetParamP()->GetParameter()[4]*pvertex->GetParamP()->GetParameter()[4]; - p12 += pvertex->GetParamN()->GetParameter()[4]*pvertex->GetParamN()->GetParameter()[4]; - p12 = TMath::Sqrt(p12); // "mean" momenta - Float_t sigmap0 = 0.0001+0.001/(0.1+pvertex->GetRr()); - 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],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(); - Float_t likelihood0 = (TMath::Exp(-lDistNorm)+0.1) *(pvertex->GetDcaV0Daughters()<0.5)*(lDistNorm<5); - - Float_t likelihood1 = TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/sigmap)+ - 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(4.*sigmap))+ - 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(8.*sigmap))+ - 0.1*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/0.01); - // - if (causalityAGetLabel())-TMath::Abs(track1->GetLabel()))==1; - cstream<<"It0"<< - "Tr0.="<SetStatus(0); - // if (rejectBase) { - // pvertex->SetStatus(-100); - //} - if (pvertex->GetV0CosineOfPointingAngle()>kMinPointAngle2) { - //Bo: pvertex->SetESDindexes(track0->GetESDtrack()->GetID(),track1->GetESDtrack()->GetID()); - pvertex->SetIndex(0,track0->GetESDtrack()->GetID());//Bo: consistency 0 for neg - pvertex->SetIndex(1,track1->GetESDtrack()->GetID());//Bo: consistency 1 for pos - if (v0OK){ - // AliV0vertex vertexjuri(*track0,*track1); - // vertexjuri.SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID()); - // event->AddV0(&vertexjuri); - pvertex->SetStatus(100); - } - pvertex->SetOnFlyStatus(kTRUE); - pvertex->ChangeMassHypothesis(kK0Short); - event->AddV0(pvertex); - } - } - } - // - // - // delete temporary arrays - // - delete[] forbidden; - delete[] minPointAngle; - delete[] maxr; - delete[] minr; - delete[] norm; - delete[] normdist; - delete[] normdist1; - delete[] normdist0; - delete[] dist; - delete[] itsmap; - delete[] helixes; - delete pvertex; -} -//------------------------------------------------------------------------ -void AliITStrackerMI::RefitV02(const AliESDEvent *event) -{ - // - //try to refit V0s in the third path of the reconstruction - // - TTreeSRedirector &cstream = *fDebugStreamer; - // - Int_t nv0s = event->GetNumberOfV0s(); - Float_t primvertex[3]={GetX(),GetY(),GetZ()}; - AliV0 v0temp; - for (Int_t iv0 = 0; iv0GetV0(iv0); - if (!v0mi) continue; - Int_t itrack0 = v0mi->GetIndex(0); - Int_t itrack1 = v0mi->GetIndex(1); - AliESDtrack *esd0 = event->GetTrack(itrack0); - AliESDtrack *esd1 = event->GetTrack(itrack1); - if (!esd0||!esd1) continue; - AliITStrackMI tpc0(*esd0); - AliITStrackMI tpc1(*esd1); - Double_t x,y,z; v0mi->GetXYZ(x,y,z); //I.B. - Double_t alpha =TMath::ATan2(y,x); //I.B. - if (v0mi->GetRr()>85){ - if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){ - v0temp.SetParamN(tpc0); - v0temp.SetParamP(tpc1); - v0temp.Update(primvertex); - if (kFALSE) cstream<<"Refit"<< - "V0.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - v0mi->SetParamN(tpc0); - v0mi->SetParamP(tpc1); - v0mi->Update(primvertex); - } - } - continue; - } - if (v0mi->GetRr()>35){ - CorrectForTPCtoITSDeadZoneMaterial(&tpc0); - CorrectForTPCtoITSDeadZoneMaterial(&tpc1); - if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){ - v0temp.SetParamN(tpc0); - v0temp.SetParamP(tpc1); - v0temp.Update(primvertex); - if (kFALSE) cstream<<"Refit"<< - "V0.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - v0mi->SetParamN(tpc0); - v0mi->SetParamP(tpc1); - v0mi->Update(primvertex); - } - } - continue; - } - CorrectForTPCtoITSDeadZoneMaterial(&tpc0); - CorrectForTPCtoITSDeadZoneMaterial(&tpc1); - // if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){ - if (RefitAt(v0mi->GetRr(),&tpc0, v0mi->GetClusters(0)) && RefitAt(v0mi->GetRr(),&tpc1, v0mi->GetClusters(1))){ - v0temp.SetParamN(tpc0); - v0temp.SetParamP(tpc1); - v0temp.Update(primvertex); - if (kFALSE) cstream<<"Refit"<< - "V0.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - v0mi->SetParamN(tpc0); - v0mi->SetParamP(tpc1); - v0mi->Update(primvertex); - } - } - } -} - //------------------------------------------------------------------------ void AliITStrackerMI::BuildMaterialLUT(TString material) { //-------------------------------------------------------------------- @@ -4833,6 +4060,13 @@ Int_t AliITStrackerMI::CorrectForShieldMaterial(AliITStrackMI *t, Error("CorrectForShieldMaterial"," Wrong shield name\n"); return 0; } + + // do nothing if we are already beyond the shield + Double_t rTrack = TMath::Sqrt(t->GetX()*t->GetX()+t->GetY()*t->GetY()); + if(dir<0 && rTrack > rToGo) return 1; // going outward + if(dir>0 && rTrack < rToGo) return 1; // going inward + + Double_t xToGo; if (!t->GetLocalXat(rToGo,xToGo)) return 0; @@ -5072,7 +4306,8 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, // In this case the return value is > 0: // return 1: dead zone at z=0,+-7cm in SPD // return 2: all road is "bad" (dead or noisy) from the OCDB - // return 3: something "bad" (dead or noisy) from the OCDB + // return 3: at least a chip is "bad" (dead or noisy) from the OCDB + // return 4: at least a single channel is "bad" (dead or noisy) from the OCDB //----------------------------------------------------------------- // check dead zones at z=0,+-7cm in the SPD @@ -5170,18 +4405,17 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, if (!AliITSReconstructor::GetRecoParam()->GetUseSingleBadChannelsFromOCDB() - || ilayer==4 || ilayer==5 // SSD || !noClusters) return 0; // There are no clusters in road: check if there is at least - // a bad SPD pixel or SDD anode + // a bad SPD pixel or SDD anode or SSD strips on both sides Int_t idetInITS=idet; for(Int_t l=0;lAnyBadInRoad(idetInITS,zlocmin,zlocmax,xlocmin,xlocmax)) { AliDebug(2,Form("Bad channel in det %d of layer %d\n",idet,ilayer)); - return 3; + return 4; } //if (fITSChannelStatus->FractionOfBadInRoad(idet,zlocmin,zlocmax,xlocmin,xlocmax) > AliITSReconstructor::GetRecoParam()->GetMinFractionOfBadInRoad()) return 3;