X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerMI.cxx;h=058afa93d119edf6b3a819443e0f7cddc3a82c01;hb=5c15b943245102e819bf686a44e76fd4695e84bd;hp=8688ab8ab7e6d940a2458e01f8ac7ebb563d3461;hpb=4ffece29647660a5592771c4544578fb9473c332;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index 8688ab8ab7e..058afa93d11 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include "AliLog.h" #include "AliGeomManager.h" @@ -56,6 +57,7 @@ #include "AliITStrackerMI.h" #include "AliMathBase.h" + ClassImp(AliITStrackerMI) AliITStrackerMI::AliITSlayer AliITStrackerMI::fgLayers[AliITSgeomTGeo::kNLayers]; // ITS layers @@ -76,6 +78,9 @@ fEsd(0), fTrackingPhase("Default"), fUseTGeo(3), fNtracks(0), +fFlagFakes(kFALSE), +fSelectBestMIP03(kFALSE), +fUseImproveKalman(kFALSE), fxOverX0Pipe(-1.), fxTimesRhoPipe(-1.), fxOverX0PipeTrks(0), @@ -91,8 +96,16 @@ fPlaneEff(0) { //Default constructor Int_t i; for(i=0;i<4;i++) fSPDdetzcentre[i]=0.; - for(i=0;i<2;i++) {fxOverX0Shield[i]=-1.;fxTimesRhoShield[i]=-1.;} + for(i=0;i<2;i++) { + fxOverX0Shield[i]=-1.; + fxTimesRhoShield[i]=-1.; + fConstraint[i]=0; + } for(i=0;i<6;i++) {fxOverX0Layer[i]=-1.;fxTimesRhoLayer[i]=-1.;} + fOriginal.SetOwner(); + for(i=0;iGetESDV0Params()->StreamLevel()>0) + fDebugStreamer = new TTreeSRedirector("ITSdebug.root"); // only for plane efficiency evaluation if (AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() && @@ -250,7 +269,14 @@ fPlaneEff(0) { if(!fPlaneEff->ReadFromCDB()) {AliWarning("AliITStrackerMI reading of AliITSPlaneEff from OCDB failed") ;} if(AliITSReconstructor::GetRecoParam()->GetHistoPlaneEff()) fPlaneEff->SetCreateHistos(kTRUE); } + // + // RS + fSelectBestMIP03 = AliITSReconstructor::GetRecoParam()->GetSelectBestMIP03(); + fFlagFakes = AliITSReconstructor::GetRecoParam()->GetFlagFakes(); + fUseImproveKalman = AliITSReconstructor::GetRecoParam()->GetUseImproveKalman(); + // } +/* //------------------------------------------------------------------------ AliITStrackerMI::AliITStrackerMI(const AliITStrackerMI &tracker):AliTracker(tracker), fI(tracker.fI), @@ -268,6 +294,8 @@ fEsd(tracker.fEsd), fTrackingPhase(tracker.fTrackingPhase), fUseTGeo(tracker.fUseTGeo), fNtracks(tracker.fNtracks), +fFlagFakes(tracker.fFlagFakes), +fSelectBestMIP03(tracker.fSelectBestMIP03), fxOverX0Pipe(tracker.fxOverX0Pipe), fxTimesRhoPipe(tracker.fxTimesRhoPipe), fxOverX0PipeTrks(0), @@ -281,6 +309,7 @@ fITSChannelStatus(tracker.fITSChannelStatus), fkDetTypeRec(tracker.fkDetTypeRec), fPlaneEff(tracker.fPlaneEff) { //Copy constructor + fOriginal.SetOwner(); Int_t i; for(i=0;i<4;i++) { fSPDdetzcentre[i]=tracker.fSPDdetzcentre[i]; @@ -294,6 +323,7 @@ fPlaneEff(tracker.fPlaneEff) { fxTimesRhoShield[i]=tracker.fxTimesRhoShield[i]; } } + //------------------------------------------------------------------------ AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){ //Assignment operator @@ -301,6 +331,7 @@ AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){ new(this) AliITStrackerMI(tracker); return *this; } +*/ //------------------------------------------------------------------------ AliITStrackerMI::~AliITStrackerMI() { @@ -345,7 +376,7 @@ void AliITStrackerMI::ReadBadFromDetTypeRec() { if(det.IsBad()) {nBadDetsPerLayer++;} } // end loop on detectors } // end loop on ladders - Info("ReadBadFromDetTypeRec",Form("Layer %d: %d bad out of %d",i-1,nBadDetsPerLayer,ndet*AliITSgeomTGeo::GetNLadders(i))); + AliInfo(Form("Layer %d: %d bad out of %d",i-1,nBadDetsPerLayer,ndet*AliITSgeomTGeo::GetNLadders(i))); } // end loop on layers return; @@ -359,6 +390,8 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) { TClonesArray *clusters = NULL; AliITSRecPointContainer* rpcont=AliITSRecPointContainer::Instance(); clusters=rpcont->FetchClusters(0,cTree); + if(!clusters) return 1; + if(!(rpcont->IsSPDActive() || rpcont->IsSDDActive() || rpcont->IsSSDActive())){ AliError("ITS is not in a known running configuration: SPD, SDD and SSD are not active"); return 1; @@ -396,11 +429,12 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) { Int_t lab[4] = {0,0,0,detector}; Int_t info[3] = {0,0,i}; Float_t q = 0.; // this identifies virtual clusters - Float_t hit[5] = {xdead, + Float_t hit[6] = {xdead, 0., AliITSReconstructor::GetRecoParam()->GetSigmaXDeadZoneHit2(), AliITSReconstructor::GetRecoParam()->GetSigmaZDeadZoneHit2(), - q}; + q, + 0.}; Bool_t local = kTRUE; Double_t zwindow = AliITSReconstructor::GetRecoParam()->GetZWindowDeadZone(); hit[1] = fSPDdetzcentre[0]+0.5*AliITSRecoParam::GetSPDdetzlength(); @@ -520,14 +554,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) continue; if (esd->GetStatus()&AliESDtrack::kITSin) continue; if (esd->GetKinkIndex(0)>0) continue; //kink daughter - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("Clusters2Tracks",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); t->GetDZ(GetX(),GetY(),GetZ(),t->GetDP()); //I.B. Double_t vdist = TMath::Sqrt(t->GetD(0)*t->GetD(0)+t->GetD(1)*t->GetD(1)); @@ -597,6 +624,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { SortTrackHypothesys(fCurrentEsdTrack,20,0); //MI change // AliITStrackMI *besttrack = GetBestHypothesys(fCurrentEsdTrack,t,15); + t->SetWinner(besttrack); if (!besttrack) continue; besttrack->SetLabel(tpcLabel); // besttrack->CookdEdx(); @@ -604,6 +632,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { besttrack->SetFakeRatio(1.); CookLabel(besttrack,0.); //For comparison only UpdateESDtrack(besttrack,AliESDtrack::kITSin); + t->SetWinner(besttrack); if (fConstraint[fPass]&&(!besttrack->IsGoldPrimary())) continue; //to be tracked also without vertex constrain @@ -613,12 +642,14 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { } GetBestHypothesysMIP(itsTracks); } // end loop on the two tracking passes - + // + if (fFlagFakes) FlagFakes(itsTracks); + // if(event->GetNumberOfV0s()>0) AliITSV0Finder::UpdateTPCV0(event,this); if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::FindV02(event,this); fAfterV0 = kTRUE; // - itsTracks.Delete(); + itsTracks.Clear(); // Int_t entries = fTrackHypothesys.GetEntriesFast(); for (Int_t ientry=0; ientryGetStatus()&AliESDtrack::kITSin)==0) continue; if (esd->GetStatus()&AliESDtrack::kITSout) continue; - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("PropagateBack",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); + t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); ResetTrackToFollow(*t); @@ -728,6 +753,9 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::RefitV02(event,this); + Bool_t doExtra=AliITSReconstructor::GetRecoParam()->GetSearchForExtraClusters(); + if(!doExtra) AliDebug(2,"Do not search for extra clusters"); + Int_t nentr=event->GetNumberOfTracks(); // Info("RefitInward", "Number of ESD tracks: %d\n", nentr); @@ -740,14 +768,8 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) if ((esd->GetStatus()&AliESDtrack::kTPCrefit)==0) continue; - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("RefitInward",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); + t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); if (!CorrectForTPCtoITSDeadZoneMaterial(t)) { delete t; @@ -757,15 +779,23 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { ResetTrackToFollow(*t); fTrackToFollow.ResetClusters(); - if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) + // ITS standalone tracks + if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) { fTrackToFollow.ResetCovariance(10.); + // protection for loopers that can have parameters screwed up + if(TMath::Abs(fTrackToFollow.GetY())>1000. || + TMath::Abs(fTrackToFollow.GetZ())>1000.) { + delete t; + continue; + } + } //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)) { + if (RefitAt(AliITSRecoParam::GetrInsideSPD1(),&fTrackToFollow,t,doExtra,pe)) { AliDebug(2," refit OK"); fTrackToFollow.SetLabel(t->GetLabel()); // fTrackToFollow.CookdEdx(); @@ -872,7 +902,7 @@ Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index, detxy[1] = det.GetR()*TMath::Sin(det.GetPhi()); Double_t alpha = t->GetAlpha(); Double_t xdetintrackframe = detxy[0]*TMath::Cos(alpha)+detxy[1]*TMath::Sin(alpha); - Float_t phi = TMath::ASin(t->GetSnpAt(xdetintrackframe,GetBz())); + Float_t phi = TMath::ASin(t->GetSnpAt(xdetintrackframe+cl->GetX(),GetBz())); phi += alpha-det.GetPhi(); Float_t tgphi = TMath::Tan(phi); @@ -966,14 +996,15 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin // //setup tree of the prolongations // - static AliITStrackMI tracks[7][100]; + const int kMaxTr = 100; //RS + static AliITStrackMI tracks[7][kMaxTr]; AliITStrackMI *currenttrack; static AliITStrackMI currenttrack1; static AliITStrackMI currenttrack2; static AliITStrackMI backuptrack; Int_t ntracks[7]; - Int_t nindexes[7][100]; - Float_t normalizedchi2[100]; + Int_t nindexes[7][kMaxTr]; + Float_t normalizedchi2[kMaxTr]; for (Int_t ilayer=0;ilayer<6;ilayer++) ntracks[ilayer]=0; otrack->SetNSkipped(0); new (&(tracks[6][0])) AliITStrackMI(*otrack); @@ -996,8 +1027,9 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin Int_t nskipped=0; Float_t nused =0; for (Int_t itrack =0; itrack=100) break; + if (ntracks[ilayer]>=kMaxTr) break; if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNSkipped()>0) nskipped++; if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNUsed()>2.) nused++; if (ntracks[ilayer]>15+ilayer){ @@ -1022,8 +1054,13 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin if (!currenttrack1.GetXYZ(trackGlobXYZ1)) continue; // Get the budget to the primary vertex for the current track being prolonged - Double_t budgetToPrimVertex = GetEffectiveThickness(); - + Double_t budgetToPrimVertex = 0; + double xMSLrs[9],x2X0MSLrs[9]; // needed for ImproveKalman + int nMSLrs = 0; + // + if (fUseImproveKalman) nMSLrs = GetEffectiveThicknessLbyL(xMSLrs,x2X0MSLrs); + else budgetToPrimVertex = GetEffectiveThickness(); + // // check if we allow a prolongation without point Int_t skip = CheckSkipLayer(¤ttrack1,ilayer,idet); if (skip) { @@ -1040,7 +1077,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin if(LocalModuleCoord(ilayer,idet,vtrack,xloc,zloc)) { // local module coords vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); } - if(constrain) vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if(constrain && AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + vtrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } ntracks[ilayer]++; continue; } @@ -1050,11 +1091,17 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin //propagate to the intersection with the detector plane const AliITSdetector &det=layer.GetDetector(idet); + /* new(¤ttrack2) AliITStrackMI(currenttrack1); if (!currenttrack1.Propagate(det.GetPhi(),det.GetR())) continue; if (!currenttrack2.Propagate(det.GetPhi(),det.GetR())) continue; currenttrack1.SetDetectorIndex(idet); currenttrack2.SetDetectorIndex(idet); + */ + if (!currenttrack1.Propagate(det.GetPhi(),det.GetR())) continue; + currenttrack1.SetDetectorIndex(idet); + new(¤ttrack2) AliITStrackMI(currenttrack1); + // if(!LocalModuleCoord(ilayer,idet,¤ttrack1,xloc,zloc)) continue; // local module coords //*************** @@ -1131,7 +1178,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin TMath::Abs(updatetrack->GetD(1)/(1.+ilayer)) > // z AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk()) isPrim=kFALSE; } - if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if (isPrim && AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + updatetrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } } updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1); if (dead) { @@ -1150,7 +1201,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin clidx=-1; // loop over clusters in the road while ((cl=layer.GetNextCluster(clidx))!=0) { - if (ntracks[ilayer]>95) break; //space for skipped clusters + if (ntracks[ilayer]>int(0.95*kMaxTr)) break; //space for skipped clusters Bool_t changedet =kFALSE; if (TMath::Abs(cl->GetQ())<1.e-13 && deadzoneSPD==kTRUE) continue; Int_t idetc=cl->GetDetectorIndex(); @@ -1164,6 +1215,9 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin (currenttrack->GetY()-cl->GetY())*(currenttrack->GetY()-cl->GetY())*msy > 1. ) { // cluster not associated to track AliDebug(2,"not associated"); + // MvL: added here as well + // bring track back to ideal detector plane + currenttrack->Propagate(xTrOrig); continue; } // bring track back to ideal detector plane @@ -1197,7 +1251,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin AliDebug(2,Form("chi2 %f max %f",chi2trkcl,AliITSReconstructor::GetRecoParam()->GetMaxChi2s(ilayer))); if (chi2trkcl < AliITSReconstructor::GetRecoParam()->GetMaxChi2s(ilayer)) { if (TMath::Abs(cl->GetQ())<1.e-13) deadzoneSPD=kTRUE; // only 1 prolongation with virtual cluster - if (ntracks[ilayer]>=100) continue; + if (ntracks[ilayer]>=kMaxTr) continue; AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack); updatetrack->SetClIndex(ilayer,-1); if (changedet) new (¤ttrack2) AliITStrackMI(backuptrack); @@ -1238,7 +1292,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin TMath::Abs(updatetrack->GetD(1)/(1.+ilayer)) > // z AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk()) isPrim=kFALSE; } - if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if (isPrim && AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + updatetrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } } //apply vertex constrain ntracks[ilayer]++; } // create new hypothesis @@ -1249,14 +1307,18 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin } // loop over possible prolongations // allow one prolongation without clusters - if (constrain && itrack<=1 && TMath::Abs(currenttrack1.GetNSkipped())<1.e-13 && deadzoneSPD==kFALSE && ntracks[ilayer]<100) { + if (constrain && itrack<=1 && TMath::Abs(currenttrack1.GetNSkipped())<1.e-13 && deadzoneSPD==kFALSE && ntracks[ilayer]SetClIndex(ilayer,-1); modstatus = 3; // skipped vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); - vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if(AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + vtrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } vtrack->IncrementNSkipped(); ntracks[ilayer]++; } @@ -1290,7 +1352,8 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin TMath::Sort(ntracks[ilayer],normalizedchi2,nindexes[ilayer],kFALSE); ntracks[ilayer] = TMath::Min(accepted,7+2*ilayer); if (ntracks[ilayer]90) ntracks[ilayer]=90; + // if (ntracks[ilayer]>90) ntracks[ilayer]=90; + if (ntracks[ilayer]>=int(kMaxTr*0.9)) ntracks[ilayer]=int(kMaxTr*0.9); } // end loop over layers @@ -1332,15 +1395,12 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin for (Int_t i=0;i + if (track.GetNormChi2(2) > AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue; - if (constrain) track.SetNSkipped(track.GetNSkipped()+2); - if (!constrain){ - track.SetD(0,track.GetD(GetX(),GetY())); - track.SetNSkipped(track.GetNSkipped()+7./(7.+8.*TMath::Abs(track.GetD(0)))); - if (track.GetNumberOfClusters()+track.GetNDeadZone()+track.GetNSkipped()>6) { - track.SetNSkipped(6-track.GetNumberOfClusters()+track.GetNDeadZone()); - } + track.SetD(0,track.GetD(GetX(),GetY())); + track.SetNSkipped(track.GetNSkipped()+7./(7.+8.*TMath::Abs(track.GetD(0)))); + if (track.GetNumberOfClusters()+track.GetNDeadZone()+track.GetNSkipped()>6) { + track.SetNSkipped(6-track.GetNumberOfClusters()+track.GetNDeadZone()); } AddTrackHypothesys(new AliITStrackMI(track), esdindex); } @@ -1379,7 +1439,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B. Int_t nearestold = GetNearestLayer(xrp); //I.B. Int_t nearest = nearestold; - for (Int_t ilayer =nearest;ilayer<8;ilayer++){ + for (Int_t ilayer =nearest;ilayer<7;ilayer++){ if (ntracks[nearest]==0){ nearest = ilayer; } @@ -1456,7 +1516,51 @@ fNMaxSigmaCl(3) fClusterTracks[0][i]=-1; fClusterTracks[1][i]=-1; fClusterTracks[2][i]=-1; - fClusterTracks[3][i]=-1; + fClusterTracks[3][i]=-1; + fY[i]=0; + fZ[i]=0; + } + fYB[0]=0; + fYB[1]=0; + + for (Int_t j=0; jGetD(0.,0.)); - for(innermostlayer=0; innermostlayerGetEventSpecie(); + ULong_t trStatus=0; + if(track->GetESDtrack()) trStatus=track->GetStatus(); + Int_t innermostlayer=0; + if((evsp&AliRecoParam::kCosmic) || (trStatus&AliESDtrack::kTPCin)) { + innermostlayer=5; + Double_t drphi = TMath::Abs(track->GetD(0.,0.)); + for(innermostlayer=0; innermostlayer= 0 ) break; + } + + AliDebug(2,Form(" drphi %f innermost %d",drphi,innermostlayer)); } - AliDebug(2,Form(" drphi %f innermost %d",drphi,innermostlayer)); Int_t modstatus=1; // found Float_t xloc,zloc; @@ -2383,7 +2600,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, track->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); - if (extra) { // search for extra clusters in overlapped modules + if (extra && clAcc) { // search for extra clusters in overlapped modules AliITStrackV2 tmp(*track); if (!ComputeRoad(track,ilayer,idet,zmin,zmax,ymin,ymax)) return kFALSE; layer.SelectClusters(zmin,zmax,ymin,ymax); @@ -2532,7 +2749,7 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) Int_t nDeadZoneWithProbNot1=(Int_t)(track->GetNDeadZone())-sumDeadZoneProbability; if(nDeadZoneWithProbNot1>0) { Float_t deadZoneProbability = track->GetNDeadZone()-(Float_t)sumDeadZoneProbability; - AliDebug(2,Form("nDeadZone %f sumDZProbability %f nDZWithProbNot1 %f deadZoneProb %f\n",track->GetNDeadZone(),sumDeadZoneProbability,nDeadZoneWithProbNot1,deadZoneProbability)); + AliDebug(2,Form("nDeadZone %f sumDZProbability %d nDZWithProbNot1 %d deadZoneProb %f\n",track->GetNDeadZone(),sumDeadZoneProbability,nDeadZoneWithProbNot1,deadZoneProbability)); deadZoneProbability /= (Float_t)nDeadZoneWithProbNot1; Float_t one = 1.; deadZoneProbability = TMath::Min(deadZoneProbability,one); @@ -2543,7 +2760,7 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) 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())); - AliDebug(2,Form("match %f deadzonefactor %f chi2 %f sum %f skipped\n",match,deadzonefactor,chi2,sum,track->GetNSkipped())); + AliDebug(2,Form("match %f deadzonefactor %f chi2 %f sum %f skipped %f\n",match,deadzonefactor,chi2,sum,track->GetNSkipped())); AliDebug(2,Form("NormChi2 %f cls %d\n",normchi2,track->GetNumberOfClusters())); return normchi2; } @@ -2762,9 +2979,9 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id Int_t l=(index & 0xf0000000) >> 28; Int_t c=(index & 0x0fffffff) >> 00; if (c>fgLayers[l].GetNumberOfClusters()) continue; - if (ny[l]<1.e-13){ - printf("problem\n"); - } + // if (ny[l]<1.e-13){ + // printf("problem\n"); + // } AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index); Float_t weight=1; // @@ -2785,6 +3002,7 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id if (fgLayers[l].GetClusterTracks(itrack,c)>=0 && fgLayers[l].GetClusterTracks(itrack,c)!=id){ list[l]=index; clist[l] = (AliITSRecPoint*)GetCluster(index); + track->SetSharedWeight(l,weight); shared+=weight; break; } @@ -2812,9 +3030,9 @@ Int_t AliITStrackerMI::GetOverlapTrack(const AliITStrackMI *track, Int_t trackID Int_t index = clusterlist[icluster]; Int_t l=(index & 0xf0000000) >> 28; Int_t c=(index & 0x0fffffff) >> 00; - if (ny[l]<1.e-13){ - printf("problem\n"); - } + // if (ny[l]<1.e-13){ + // printf("problem\n"); + // } if (c>fgLayers[l].GetNumberOfClusters()) continue; //if (l>3) continue; AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index); @@ -2918,7 +3136,8 @@ AliITStrackMI * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, AliITStrackMI * track10=(AliITStrackMI*) arr1->UncheckedAt(0); AliITStrackMI * track20=(AliITStrackMI*) arr2->UncheckedAt(0); if (track10->Pt()>0.5+track20->Pt()) return track10; - + AliITStrackMI* win = track10; + // for (Int_t itrack=0;itrackUncheckedAt(itrack); UnRegisterClusterTracks(track,trackID1); @@ -3116,12 +3335,14 @@ AliITStrackMI * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, track1->SetChi2MIP(8,index1); fBestTrackIndex[trackID1] =index1; UpdateESDtrack(track1, AliESDtrack::kITSin); + win = track1; // RS } else if (track10->GetChi2MIP(0)SetChi2MIP(5,maxconflicts); track10->SetChi2MIP(6,maxchi2); // track10->UpdateESDtrack(AliESDtrack::kITSin); UpdateESDtrack(track10,AliESDtrack::kITSin); + win = track10; // RS } for (Int_t itrack=0;itrackfChi2MIP[2]GetMaxChi2PerCluster(2)&&track20->fChi2MIP[3]GetMaxChi2PerCluster(3)){ RegisterClusterTracks(track20,trackID2); } - return track10; + return win; } //------------------------------------------------------------------------ @@ -3194,9 +3415,10 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo Int_t entries = array->GetEntriesFast(); // //- find preliminary besttrack as a reference - Float_t minchi2=10000; + Float_t minchi2=1e6; Int_t maxn=0; AliITStrackMI * besttrack=0; + // for (Int_t itrack=0;itrackGetEntriesFast();itrack++){ AliITStrackMI * track = (AliITStrackMI*)array->At(itrack); if (!track) continue; @@ -3212,6 +3434,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo if (chi2GetMaxChi2PerCluster(0)){ if (track->GetNumberOfClusters()GetNumberOfClusters(); + // if (fSelectBestMIP03 && track->GetChi2MIP(3)>0) chi2 *= track->GetChi2MIP(3); // RS if (chi2At(itrack); if (track){ - AliDebug(2,Form("track %d ncls %d\n",itrack,track->GetNumberOfClusters())); - track->SetChi2MIP(0,GetNormalizedChi2(track, mode)); - if (track->GetChi2MIP(0)GetMaxChi2PerCluster(0)) - chi2[itrack] = track->GetChi2MIP(0); + AliDebug(2,Form("track %d ncls %d\n",itrack,track->GetNumberOfClusters())); + double chi2t = GetNormalizedChi2(track, mode); + track->SetChi2MIP(0,chi2t); + if (chi2tGetMaxChi2PerCluster(0)) { + if (fSelectBestMIP03 && track->GetChi2MIP(3)>0) chi2t *= track->GetChi2MIP(3); // RS + chi2[itrack] = chi2t; + } else{ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain delete array->RemoveAt(itrack); @@ -3273,20 +3499,22 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo } // // calculate one more time with updated normalized errors - for (Int_t i=0;iAt(itrack); if (track){ - track->SetChi2MIP(0,GetNormalizedChi2(track,mode)); + double chi2t = GetNormalizedChi2(track, mode); + track->SetChi2MIP(0,chi2t); AliDebug(2,Form("track %d ncls %d\n",itrack,track->GetNumberOfClusters())); - if (track->GetChi2MIP(0)GetMaxChi2PerCluster(0)) - chi2[itrack] = track->GetChi2MIP(0)-0*(track->GetNumberOfClusters()+track->GetNDeadZone()); - else - { - if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain - delete array->RemoveAt(itrack); - } + if (track->GetChi2MIP(0)GetMaxChi2PerCluster(0)) { + if (fSelectBestMIP03 && track->GetChi2MIP(3)>0) chi2t *= track->GetChi2MIP(3); // RS + chi2[itrack] = chi2t; //-0*(track->GetNumberOfClusters()+track->GetNDeadZone()); + } + else { + if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain + delete array->RemoveAt(itrack); } + } } } entries = array->GetEntriesFast(); @@ -3358,13 +3586,14 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI //------------------------------------------------------------- // try to find best hypothesy // currently - minimal chi2 of track+backpropagated track+matching to the tpc track + // RS: optionally changing this to product of Chi2MIP(0)*Chi2MIP(3) == (chi2*chi2_interpolated) //------------------------------------------------------------- if (fTrackHypothesys.GetEntriesFast()<=esdindex) return 0; TObjArray * array = (TObjArray*) fTrackHypothesys.At(esdindex); if (!array) return 0; Int_t entries = array->GetEntriesFast(); if (!entries) return 0; - Float_t minchi2 = 100000; + Float_t minchi2 = 1e6; AliITStrackMI * besttrack=0; // AliITStrackMI * backtrack = new AliITStrackMI(*original); @@ -3388,7 +3617,10 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI backtrack = new(backtrack) AliITStrackMI(*track); if (track->GetConstrain()) { if (!CorrectForPipeMaterial(backtrack,"inward")) continue; - if (!backtrack->Improve(0,xyzVtx,ersVtx)) continue; + if (AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + if (fUseImproveKalman) {if (!backtrack->ImproveKalman(xyzVtx,ersVtx,0,0,0)) continue;} + else {if (!backtrack->Improve(0,xyzVtx,ersVtx)) continue;} + } backtrack->ResetCovariance(10.); }else{ backtrack->ResetCovariance(10.); @@ -3414,7 +3646,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI forwardtrack = new(forwardtrack) AliITStrackMI(*original); forwardtrack->ResetClusters(); x = track->GetX(); - RefitAt(x,forwardtrack,track); + if (!RefitAt(x,forwardtrack,track) && fSelectBestMIP03) continue; // w/o fwd track MIP03 is meaningless track->SetChi2MIP(2,NormalizedChi2(forwardtrack,0)); if (track->GetChi2MIP(2)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)*6.0) continue; if (!(track->GetConstrain())&&track->GetChi2MIP(2)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)) continue; @@ -3437,7 +3669,9 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI track->SetChi2MIP(3,1000); continue; } - Double_t chi2 = track->GetChi2MIP(0)+track->GetNUsed(); + Double_t chi2 = track->GetChi2MIP(0); // +track->GetNUsed(); //RS + if (fSelectBestMIP03) chi2 *= track->GetChi2MIP(3); + else chi2 += +track->GetNUsed(); // for (Int_t ichi=0;ichi<5;ichi++){ forwardtrack->SetChi2MIP(ichi, track->GetChi2MIP(ichi)); @@ -3455,6 +3689,9 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI } delete backtrack; delete forwardtrack; + + if (!besttrack) return 0; + Int_t accepted=0; for (Int_t i=0;iAt(i); @@ -3462,8 +3699,10 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI if (!track) continue; if (accepted>checkmax || track->GetChi2MIP(3)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)*6. || - (track->GetNumberOfClusters()GetNumberOfClusters()-1.)|| - track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*besttrack->GetNUsed()+3.){ + (track->GetNumberOfClusters()GetNumberOfClusters()-1.) + // RS: don't apply this cut when fSelectBestMIP03 is on + || (!fSelectBestMIP03 && (track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*besttrack->GetNUsed()+3.)) + ){ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain delete array->RemoveAt(i); continue; @@ -3497,6 +3736,9 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI longtrack =track; } //if (longtrack) besttrack=longtrack; + // + // RS do shared cluster analysis here only if the new sharing analysis is not requested + if (fFlagFakes) return besttrack; Int_t list[6]; AliITSRecPoint * clist[6]; @@ -3584,7 +3826,7 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) // AliITStrackMI* longtrack=0; Float_t minn=0; - Float_t maxchi2=1000; + Float_t maxchi2=1e6; for (Int_t j=0;jGetEntriesFast();j++){ AliITStrackMI* trackHyp = (AliITStrackMI*)array->At(j); if (!trackHyp) continue; @@ -3594,13 +3836,15 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) } if (trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone()GetChi2MIP(0); - if (fAfterV0){ + if (fSelectBestMIP03) chi2 *= trackHyp->GetChi2MIP(3); + if (trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone()>minn) maxchi2 = chi2; //trackHyp->GetChi2MIP(0); + // + if (fAfterV0){ // ??? RS if (!trackHyp->GetGoldV0()&&trackHyp->GetConstrain()==kFALSE) chi2+=5; } - if (trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone()>minn) maxchi2 = trackHyp->GetChi2MIP(0); - // if (chi2 > maxchi2) continue; - minn= trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone(); + minn = trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone(); + if (fSelectBestMIP03) minn++; // allow next to longest to win maxchi2 = chi2; longtrack=trackHyp; } @@ -3612,37 +3856,119 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) else besttrack= longtrack; // if (besttrack) { - Int_t list[6]; - AliITSRecPoint * clist[6]; - Float_t shared = GetNumberOfSharedClusters(longtrack,i,list,clist); - // - track->SetNUsed(shared); track->SetNSkipped(besttrack->GetNSkipped()); track->SetChi2MIP(0,besttrack->GetChi2MIP(0)); - if (shared>0) { - if(!AliITSReconstructor::GetRecoParam()->GetAllowSharedClusters()) continue; - Int_t nshared; - Int_t overlist[6]; + // + if (!fFlagFakes) { // will flag them in separate analysis + Int_t list[6]; + AliITSRecPoint * clist[6]; + Float_t shared = GetNumberOfSharedClusters(longtrack,i,list,clist); // - Int_t sharedtrack = GetOverlapTrack(longtrack, i, nshared, list, overlist); - //if (sharedtrack==-1) sharedtrack=0; - if (sharedtrack>=0) { - besttrack = GetBest2Tracks(i,sharedtrack,10,5.5); - } - } - if (besttrack&&fAfterV0) { + track->SetNUsed(shared); + if (shared>0) { + if(!AliITSReconstructor::GetRecoParam()->GetAllowSharedClusters()) continue; + Int_t nshared; + Int_t overlist[6]; + // + Int_t sharedtrack = GetOverlapTrack(longtrack, i, nshared, list, overlist); + //if (sharedtrack==-1) sharedtrack=0; + if (sharedtrack>=0) { + besttrack = GetBest2Tracks(i,sharedtrack,10,5.5); + if (besttrack) track->SetWinner(besttrack); + } + } + } + // + if (fAfterV0) { UpdateESDtrack(besttrack,AliESDtrack::kITSin); + track->SetWinner(besttrack); } - if (besttrack&&fConstraint[fPass]) - UpdateESDtrack(besttrack,AliESDtrack::kITSin); - if (besttrack->GetChi2MIP(0)+besttrack->GetNUsed()>1.5 && fConstraint[fPass]) { - if ( TMath::Abs(besttrack->GetD(0))>0.1 || - TMath::Abs(besttrack->GetD(1))>0.1 ) track->SetReconstructed(kFALSE); - } - - } + if (fConstraint[fPass]) { + UpdateESDtrack(besttrack,AliESDtrack::kITSin); + track->SetWinner(besttrack); + double chicut = besttrack->GetChi2MIP(0); + if (fSelectBestMIP03) chicut *= besttrack->GetChi2MIP(3); + else chicut += besttrack->GetNUsed(); + if (chicut>1.5) { + if ( TMath::Abs(besttrack->GetD(0))>0.1 || + TMath::Abs(besttrack->GetD(1))>0.1 ) track->SetReconstructed(kFALSE); + } + } + } } } + +//------------------------------------------------------------------------ +void AliITStrackerMI::FlagFakes(TObjArray &itsTracks) +{ + // + // RS: flag those tracks which are suxpected to have fake clusters + // + const double kThreshPt = 0.5; + AliRefArray *refArr[6]; + // + for (int i=0;i<6;i++) { + int ncl = fgLayers[i].GetNumberOfClusters(); + refArr[i] = new AliRefArray(ncl,TMath::Min(ncl,1000)); + } + Int_t nentries = itsTracks.GetEntriesFast(); + // + // fill cluster->track associations + for (Int_t itr=0;itrGetWinner(); + if (!trackITS) continue; + for (int il=trackITS->GetNumberOfClusters();il--;) { + int idx = trackITS->GetClusterIndex(il); + Int_t l=(idx & 0xf0000000) >> 28, c=(idx & 0x0fffffff) >> 00; + // if (c>fgLayers[l].GetNumberOfClusters()) continue; + refArr[l]->AddReference(c, itr); + } + } + // + const UInt_t kMaxRef = 100; + UInt_t crefs[kMaxRef]; + Int_t ncrefs=0; + // process tracks with shared clusters + for (int itr=0;itrGetWinner(); + if (!trackH0) continue; + AliESDtrack* esd0 = track0->GetESDtrack(); + // + for (int il=0;ilGetNumberOfClusters();il++) { + int idx = trackH0->GetClusterIndex(il); + Int_t l=(idx & 0xf0000000) >> 28, c=(idx & 0x0fffffff) >> 00; + ncrefs = refArr[l]->GetReferences(c,crefs,kMaxRef); + if (ncrefs<2) continue; // there will be always self-reference, for sharing needs at least 2 + esd0->SetITSSharedFlag(l); + for (int ir=ncrefs;ir--;) { + if (int(crefs[ir]) <= itr) continue; // ==:selfreference, <: the same pair will be checked with > + AliITStrackMI* track1 = (AliITStrackMI*)itsTracks.UncheckedAt(crefs[ir]); + AliITStrackMI* trackH1 = track1->GetWinner(); + AliESDtrack* esd1 = track1->GetESDtrack(); + esd1->SetITSSharedFlag(l); + // + double pt0 = trackH0->Pt(), pt1 = trackH1->Pt(), res = 0.; + if (pt0>kThreshPt && pt0-pt1>0.2+0.2*(pt0-kThreshPt) ) res = -100; + else if (pt1>kThreshPt && pt1-pt0>0.2+0.2*(pt1-kThreshPt) ) res = 100; + + // select the one with smallest chi2's product + res += trackH0->GetChi2MIP(0)*trackH0->GetChi2MIP(3); + res -= trackH1->GetChi2MIP(0)*trackH1->GetChi2MIP(3); + // + if (res<0) esd1->SetITSFakeFlag(); // esd0 is winner + else esd0->SetITSFakeFlag(); // esd1 is winner + } + // + } + // + } + // + for (int i=6;i--;) delete refArr[i]; +} + //------------------------------------------------------------------------ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const { //-------------------------------------------------------------------- @@ -3716,15 +4042,15 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR // // Compute predicted chi2 // + // Take into account the mis-alignment (bring track to cluster plane) + Double_t xTrOrig=track->GetX(); + if (!track->Propagate(xTrOrig+cluster->GetX())) return 1000.; 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))); + phi *= TMath::Sqrt(1./((1.-phi)*(1.+phi))); 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,covyz); // Bring the track back to detector plane in ideal geometry @@ -3797,8 +4123,9 @@ void AliITStrackerMI::GetDCASigma(const AliITStrackMI* track, Float_t & sigmarfi //to be paramterized using external parameters in future // // - sigmarfi = 0.0040+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC(); - sigmaz = 0.0110+4.37*TMath::Abs(track->GetC()); + Double_t curv=track->GetC(); + sigmarfi = 0.0040+1.4 *TMath::Abs(curv)+332.*curv*curv; + sigmaz = 0.0110+4.37*TMath::Abs(curv); } //------------------------------------------------------------------------ void AliITStrackerMI::SignDeltas(const TObjArray *clusterArray, Float_t vz) @@ -3880,9 +4207,9 @@ void AliITStrackerMI::UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const AliITStrackMI * oldtrack = (AliITStrackMI*)(track->GetESDtrack()->GetITStrack()); if (oldtrack) delete oldtrack; track->GetESDtrack()->SetITStrack(new AliITStrackMI(*track)); - if (TMath::Abs(track->GetDnorm(1))<0.000000001){ - printf("Problem\n"); - } + // if (TMath::Abs(track->GetDnorm(1))<0.000000001){ + // printf("Problem\n"); + // } } //------------------------------------------------------------------------ Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{ @@ -4434,7 +4761,7 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, // check if the road overlaps with bad chips Float_t xloc,zloc; - LocalModuleCoord(ilayer,idet,track,xloc,zloc); + if(!(LocalModuleCoord(ilayer,idet,track,xloc,zloc)))return 0; Float_t zlocmin = zloc-dz; Float_t zlocmax = zloc+dz; Float_t xlocmin = xloc-dy; @@ -4539,6 +4866,7 @@ Bool_t AliITStrackerMI::LocalModuleCoord(Int_t ilayer,Int_t idet, return kTRUE; } //------------------------------------------------------------------------ +//------------------------------------------------------------------------ Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t *clusters, Int_t ilayer) const { // // Method to be optimized further: @@ -4575,19 +4903,30 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t AliITStrackMI tmp(*track); // require a minimal number of cluster in other layers and eventually clusters in closest layers - Int_t ncl=0; - for(Int_t lay=AliITSgeomTGeo::kNLayers-1;lay>ilayer;lay--) { + Int_t ncl_out=0; Int_t ncl_in=0; + for(Int_t lay=AliITSgeomTGeo::kNLayers-1;lay>ilayer;lay--) { // count n. of cluster in outermost layers + AliDebug(2,Form("trak=%d lay=%d ; index=%d ESD label= %d",tmp.GetLabel(),lay, + tmp.GetClIndex(lay),((AliESDtrack*)tmp.GetESDtrack())->GetLabel())) ; + // if (tmp.GetClIndex(lay)>=0) ncl_out++; +if(index[lay]>=0)ncl_out++; + } + for(Int_t lay=ilayer-1; lay>=0;lay--) { // count n. of cluster in innermost layers AliDebug(2,Form("trak=%d lay=%d ; index=%d ESD label= %d",tmp.GetLabel(),lay, tmp.GetClIndex(lay),((AliESDtrack*)tmp.GetESDtrack())->GetLabel())) ; - if (tmp.GetClIndex(lay)>=0) ncl++; + if (index[lay]>=0) ncl_in++; } + Int_t ncl=ncl_out+ncl_in; Bool_t nextout = kFALSE; if(ilayer==AliITSgeomTGeo::kNLayers-1) nextout=kTRUE; // you are already on the outermost layer else nextout = ((tmp.GetClIndex(ilayer+1)>=0)? kTRUE : kFALSE ); Bool_t nextin = kFALSE; if(ilayer==0) nextin=kTRUE; // you are already on the innermost layer else nextin = ((index[ilayer-1]>=0)? kTRUE : kFALSE ); - if(nclGetMaxMissingClustersPlaneEff()) + // maximum number of missing clusters allowed in outermost layers + if(ncl_outGetMaxMissingClustersOutPlaneEff()) + return kFALSE; + // maximum number of missing clusters allowed (both in innermost and in outermost layers) + if(nclGetMaxMissingClustersPlaneEff()) return kFALSE; if(AliITSReconstructor::GetRecoParam()->GetRequireClusterInOuterLayerPlaneEff() && !nextout) return kFALSE; if(AliITSReconstructor::GetRecoParam()->GetRequireClusterInInnerLayerPlaneEff() && !nextin) return kFALSE; @@ -4617,14 +4956,11 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t //*************** // DEFINITION OF SEARCH ROAD FOR accepting a track // - //For the time being they are hard-wired, later on from AliITSRecoParam - // Double_t nsigx=AliITSRecoParam::GetNSigXFarFromBoundary(); - // Double_t nsigz=AliITSRecoParam::GetNSigZFarFromBoundary(); - Double_t nsigz=4; - Double_t nsigx=4; + Double_t nsigx=AliITSReconstructor::GetRecoParam()->GetNSigXFromBoundaryPlaneEff(); + Double_t nsigz=AliITSReconstructor::GetRecoParam()->GetNSigZFromBoundaryPlaneEff(); Double_t dx=nsigx*TMath::Sqrt(tmp.GetSigmaY2()); // those are precisions in the tracking reference system Double_t dz=nsigz*TMath::Sqrt(tmp.GetSigmaZ2()); // Use it also for the module reference system, as it is - // done for RecPoints + // done for RecPoints // exclude tracks at boundary between detectors //Double_t boundaryWidth=AliITSRecoParam::GetBoundaryWidthPlaneEff(); @@ -4632,7 +4968,6 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t AliDebug(2,Form("Tracking: track impact x=%f, y=%f, z=%f",tmp.GetX(), tmp.GetY(), tmp.GetZ())); AliDebug(2,Form("Local: track impact x=%f, z=%f",locx,locz)); AliDebug(2,Form("Search Road. Tracking: dy=%f , dz=%f",dx,dz)); - if ( (locx-dx < blockXmn+boundaryWidth) || (locx+dx > blockXmx-boundaryWidth) || (locz-dz < blockZmn+boundaryWidth) || @@ -4768,6 +5103,9 @@ void AliITStrackerMI::UseTrackForPlaneEff(const AliITStrackMI* track, Int_t ilay Float_t tr[4]={99999.,99999.,9999.,9999.}; // initialize to high values Float_t clu[4]={-99999.,-99999.,9999.,9999.}; // (in some cases GetCov fails) Int_t cltype[2]={-999,-999}; + // and the module + +Float_t AngleModTrack[3]={99999.,99999.,99999.}; // angles (phi, z and "absolute angle") between the track and the mormal to the module (see below) tr[0]=locx; tr[1]=locz; @@ -4797,7 +5135,99 @@ void AliITStrackerMI::UseTrackForPlaneEff(const AliITStrackMI* track, Int_t ilay clu[3]=TMath::Sqrt(c.GetSigmaZ2()); //} } - fPlaneEff->FillHistos(key,found,tr,clu,cltype); + // Compute the angles between the track and the module + // compute the angle "in phi direction", i.e. the angle in the transverse plane + // between the normal to the module and the projection (in the transverse plane) of the + // track trajectory + // tgphi and tglambda of the track in tracking frame with alpha=det.GetPhi + Float_t tgl = tmp.GetTgl(); + Float_t phitr = tmp.GetSnp(); + phitr = TMath::ASin(phitr); + Int_t volId = AliGeomManager::LayerToVolUIDSafe(ilayer+1 ,idet ); + + Double_t tra[3]; AliGeomManager::GetOrigTranslation(volId,tra); + Double_t rot[9]; AliGeomManager::GetOrigRotation(volId,rot); + Double_t alpha =0.; + alpha = tmp.GetAlpha(); + Double_t phiglob = alpha+phitr; + Double_t p[3]; + p[0] = TMath::Cos(phiglob); + p[1] = TMath::Sin(phiglob); + p[2] = tgl; + TVector3 pvec(p[0],p[1],p[2]); + TVector3 normvec(rot[1],rot[4],rot[7]); + Double_t angle = pvec.Angle(normvec); + + if(angle>0.5*TMath::Pi()) angle = (TMath::Pi()-angle); + angle *= 180./TMath::Pi(); + + //Trasverse Plane + TVector3 pt(p[0],p[1],0); + TVector3 normt(rot[1],rot[4],0); + Double_t anglet = pt.Angle(normt); + + Double_t phiPt = TMath::ATan2(p[1],p[0]); + if(phiPt<0)phiPt+=2.*TMath::Pi(); + Double_t phiNorm = TMath::ATan2(rot[4],rot[1]); + if(phiNorm<0) phiNorm+=2.*TMath::Pi(); + if(anglet>0.5*TMath::Pi()) anglet = (TMath::Pi()-anglet); + if(phiNorm>phiPt) anglet*=-1.;// pt-->normt clockwise: anglet>0 + if((phiNorm-phiPt)>TMath::Pi()) anglet*=-1.; + anglet *= 180./TMath::Pi(); + + AngleModTrack[2]=(Float_t) angle; + AngleModTrack[0]=(Float_t) anglet; + // now the "angle in z" (much easier, i.e. the angle between the z axis and the track momentum + 90) + AngleModTrack[1]=TMath::ACos(tgl/TMath::Sqrt(tgl*tgl+1.)); + AngleModTrack[1]-=TMath::Pi()/2.; // range of angle is -pi/2 , pi/2 + AngleModTrack[1]*=180./TMath::Pi(); // in degree + + fPlaneEff->FillHistos(key,found,tr,clu,cltype,AngleModTrack); } return; } + +Int_t AliITStrackerMI::FindClusterOfTrack(int label, int lr, int* store) const //RS +{ + // find the MC cluster for the label + return fgLayers[lr].FindClusterForLabel(label,store); +} + +/* +Int_t AliITStrackerMI::GetPattern(const AliITStrackMI* track, char* patt) +{ + // creates pattarn of hits marking fake/corrects by f/c. Used for debugging (RS) + strncpy(patt,"......",6); + int tpcLabel = 0; + if (track->GetESDtrack()) tpcLabel = track->GetESDtrack()->GetTPCLabel(); + // + int nwrong = 0; + for (Int_t i=0;iGetNumberOfClusters();i++){ + Int_t cindex = track->GetClusterIndex(i); + Int_t l=(cindex & 0xf0000000) >> 28; + AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex); + Int_t isWrong=1; + for (Int_t ind=0;ind<3;ind++) if (cl->GetLabel(ind)==TMath::Abs(tpcLabel)) isWrong=0; + patt[l] = isWrong ? 'f':'c'; + nwrong+=isWrong; + } + return nwrong; +} +*/ +//------------------------------------------------------------------------ +Int_t AliITStrackerMI::AliITSlayer::FindClusterForLabel(Int_t label, Int_t *store) { //RS + //-------------------------------------------------------------------- + + int nfound = 0; + for (int ic=0;icGetLabel(i)==label) { + if (nfound<50) { + if (store) store[nfound] = ic; + nfound++; + } + break; + } + } + return nfound; +}