#include "AliITSUReconstructor.h"
#include "AliITSReconstructor.h"
#include "AliITSUSeed.h"
-#include "AliITSUAux.h"
#include "AliITSUClusterPix.h"
#include "AliITSUGeomTGeo.h"
#include "AliCodeTimer.h"
+#include "AliRefArray.h"
using namespace AliITSUAux;
using namespace TMath;
,fWorkHyp(0)
,fSeedsPool("AliITSUSeed",0)
,fFreeSeedsID(0)
+ ,fESDIndex(0)
,fNFreeSeeds(0)
,fLastSeedID(0)
,fNLrActive(0)
,fCurrActLrID(-1)
,fCurrLayer(0)
,fTrackPhase(-1)
- ,fClInfo(0)
-#ifdef _FILL_CONTROL_HISTOS_
- ,fCHistoArr(0)
+#ifdef _ITSU_TUNING_MODE_
+ ,fCHistoArrCorr(0)
+ ,fCHistoArrFake(0)
#endif
{
// Default constructor
{
// Default destructor
//
- delete[] fClInfo;
+ delete[] fLayerCandidates;
+ if (fWorkHyp) fWorkHyp->SetTPCSeed(0); // this hypothesis does not own the seed
+ delete fWorkHyp;
//
-#ifdef _FILL_CONTROL_HISTOS_
- if (fCHistoArr) {
+#ifdef _ITSU_TUNING_MODE_
+ if (fCHistoArrCorr || fCHistoArrFake) {
TFile* ctrOut = TFile::Open("itsuControlHistos.root","recreate");
ctrOut->cd();
AliInfo("Storing control histos");
- fCHistoArr->Print();
// ctrOut->WriteObject(fCHistoArr,"controlH","kSingleKey");
- fCHistoArr->Write();
+ if (fCHistoArrCorr) {
+ fCHistoArrCorr->Write();
+ delete fCHistoArrCorr;
+ }
+ if (fCHistoArrFake) {
+ fCHistoArrFake->Write();
+ delete fCHistoArrFake;
+ }
ctrOut->Close();
delete ctrOut;
- fCHistoArr = 0;
+ fCHistoArrCorr = 0;
+ fCHistoArrFake = 0;
}
#endif
//
//
fITS = rec->GetITSInterface();
fNLrActive = fITS->GetNLayersActive();
- fClInfo = new Int_t[fNLrActive*2];
fWorkHyp = new AliITSUTrackHyp(fNLrActive);
//
if (fLayerMaxCandidates<1) fLayerMaxCandidates = 1000;
fLayerCandidates = new AliITSUSeed*[fLayerMaxCandidates];
fSeedsPool.ExpandCreateFast(1000); // RS TOCHECK
fFreeSeedsID.Set(1000);
+ fESDIndex.Set(1000);
+
//
}
//
cond->SetNLayers(fNLrActive);
cond->AddNewCondition(fNLrActive);
- cond->AddGroupPattern( 0xffff ); // require all layers hit
+ cond->AddGroupPattern( 0xffff, fNLrActive ); // require all layers hit
cond->Init();
//
fDefTrackConds.AddLast(cond);
AliCodeTimerAuto("",0);
SetTrackingPhase(kClus2Tracks);
//
-#ifdef _FILL_CONTROL_HISTOS_
- if (!fCHistoArr) BookControlHistos();
+#ifdef _ITSU_TUNING_MODE_
+ if (!fCHistoArrCorr) BookControlHistos("Corr");
+ if (!fCHistoArrFake) BookControlHistos("Fake");
#endif
static int evID = 0;
- static TArrayI esdTrInd;
- static TArrayF esdTrPt;
+ static TArrayF esdTrPt(fESDIndex.GetSize());
//
TObjArray *trackConds = 0;
//
//
fITS->ProcessClusters();
//
-#ifdef _FILL_CONTROL_HISTOS_
+#ifdef _ITSU_TUNING_MODE_
FlagSplitClusters(); // tmp RS
#endif
//
// the tracks will be reconstructed in decreasing pt order, sort them
- if (esdTrInd.GetSize()<nTrESD) {
- esdTrInd.Set(nTrESD+200);
+ if (fESDIndex.GetSize()<nTrESD) {
+ fESDIndex.Set(nTrESD+200);
esdTrPt.Set(nTrESD+200);
}
- int* esdTrackIndex = esdTrInd.GetArray();
+ int* esdTrackIndex = fESDIndex.GetArray();
float* trPt = esdTrPt.GetArray();
for (int itr=nTrESD;itr--;) trPt[itr] = esdEv->GetTrack(itr)->Pt();
Sort(nTrESD,trPt,esdTrackIndex,kTRUE);
//
if (!NeedToProlong(fCurrESDtrack)) continue; // are we interested in this track?
/*
- // if speceific tracks should be checked, create a global array int wtc[] = {evITS*10000+trID, ...};
+ // if specific tracks should be checked, create a global array int wtc[] = {evITS*10000+trID, ...};
Bool_t dbg = kFALSE;
int nwtc = sizeof(wtc)/sizeof(int);
AliLog::SetClassDebugLevel("AliITSUTrackerGlo",dbg ? 10:0);
*/
- AliDebug(1,Form("Processing track %d(esd%d) | M=%.3f Pt=%.3f | MCLabel: %d",trID,itr,fCurrESDtrack->GetMass(kTRUE),fCurrESDtrack->Pt(),fCurrESDtrMClb));//RS
+ AliDebug(1,Form("Processing track %d(esd%d) | M=%.3f Pt=%.3f | MCLabel: %d",itr,trID,fCurrESDtrack->GetMass(kTRUE),fCurrESDtrack->Pt(),fCurrESDtrMClb));//RS
FindTrack(fCurrESDtrack, trID);
}
//
//
double bz0 = GetBz();
Double_t xyzTrk[3],xyzVtx[3]={GetX(),GetY(),GetZ()};
- AliITSUTrackHyp dummyTr,*currTr=0;
+ AliITSUTrackHyp dummyTr;
const double kWatchStep=10.; // for larger steps watch arc vs segment difference
Double_t times[AliPID::kSPECIES];
//
- //
for (int itr=0;itr<nTrESD;itr++) {
fCurrESDtrack = esdEv->GetTrack(itr);
fCurrESDtrMClb = fCurrESDtrack->GetLabel();
continue;
}
//
- currTr = GetTrackHyp(itr);
- currTr->StartTimeIntegral();
- currTr->AddTimeStep(dst);
- // printf("Before resetCov: "); currTr->AliExternalTrackParam::Print();
- currTr->ResetCovariance(10000);
- if (RefitTrack(currTr,fITS->GetRMax())) { // propagate to exit from the ITS/TPC screen
- UpdateESDTrack(currTr,AliESDtrack::kITSout);
- fCountITSout++;
+ fCurrHyp = GetTrackHyp(itr);
+ fCurrMass = fCurrHyp->GetMass();
+ fCurrHyp->StartTimeIntegral();
+ fCurrHyp->AddTimeStep(dst);
+ fCurrHyp->ResetCovariance(10000);
+ double chi2 = RefitTrack(fCurrHyp,fITS->GetRMax());
+ if (chi2>0) { // propagate to exit from the ITS/TPC screen
+ int ndf = fCurrHyp->GetWinner()->GetNLayersHit()*2-5;
+ if (ndf>0) chi2 /= ndf;
+ fCurrHyp->SetChi2(chi2);
+ UpdateESDTrack(fCurrHyp,AliESDtrack::kITSout);
}
else {
AliDebug(2,Form("Refit Failed for track %d | ESDtrack#%d (MClb:%d)",itr,fCurrESDtrack->GetID(),fCurrESDtrMClb));
- //currTr->AliExternalTrackParam::Print();
- //currTr->GetWinner()->Print();
+ //fCurrHyp->AliExternalTrackParam::Print();
+ //fCurrHyp->GetWinner()->Print();
}
//
}
// AliLog::SetClassDebugLevel("AliITSUTrackerGlo",10);
AliDebug(1,Form("Will refit inward %d tracks",nTrESD));
- AliITSUTrackHyp *currTr=0;
//
for (int itr=0;itr<nTrESD;itr++) {
fCurrESDtrack = esdEv->GetTrack(itr);
if ( trStat & AliESDtrack::kITSrefit ) continue; // already done
if ( (trStat & AliESDtrack::kTPCout) && !(trStat & AliESDtrack::kTPCrefit) ) continue;
//
- currTr = GetTrackHyp(itr);
- currTr->AliExternalTrackParam::operator=(*fCurrESDtrack); // fetch current ESDtrack kinematics
- if (RefitTrack(currTr,fITS->GetRMin())) { // propagate up to inside radius of the beam pipe
- UpdateESDTrack(currTr,AliESDtrack::kITSrefit);
- fCountITSrefit++;
+ fCurrHyp = GetTrackHyp(itr);
+ fCurrHyp->AliExternalTrackParam::operator=(*fCurrESDtrack); // fetch current ESDtrack kinematics
+ fCurrMass = fCurrHyp->GetMass();
+ //
+ double chi2 = RefitTrack(fCurrHyp,fITS->GetRMin());
+ if (chi2>0) { // propagate up to inside radius of the beam pipe
+ fCurrHyp->SetChi2(chi2);
+ UpdateESDTrack(fCurrHyp,AliESDtrack::kITSrefit);
}
else {
AliDebug(2,Form("Refit Failed for track %d |ESDtrack#%d (MClb:%d)",itr,fCurrESDtrack->GetID(),fCurrESDtrMClb));
AliITSUSeed seedT; // transient seed between the seedUC and new prolongation hypothesis
//
AliITSUTrackHyp* hypTr = InitHypothesis(esdTr,esdID); // initialize prolongations hypotheses tree
+ if (!hypTr || hypTr->GetSkip()) return;
+ //
fCurrHyp = fWorkHyp;
fCurrHyp->InitFrom(hypTr);
//
AliITSUSeed* seedU;
if (ilaUp==fNLrActive) {
seedU = 0;
- seedUC.InitFromESDTrack(esdTr);
+ seedUC.InitFromSeed(fCurrHyp->GetTPCSeed()); // init with TPC seed from ref.R
}
else {
seedU = fCurrHyp->GetSeed(ilaUp,isd); // seed on prev.active layer to prolong
seedUC.ResetFMatrix(); // reset the matrix for propagation to next layer
// go till next active layer
AliDebug(2,Form("working on Lr:%d Seed:%d of %d for esdID=%d (MClb:%d) | pT=%.3f",ila,isd,nSeedsUp,esdID,fCurrESDtrMClb,seedUC.Pt()));
- if (!TransportToLayer(&seedUC, fITS->GetLrIDActive(ilaUp), fITS->GetLrIDActive(ila)) ) {
+ if (!TransportToLayer(&seedUC, fITS->GetLrIDActive(ilaUp), fITS->GetLrIDActive(ila)) ) { // external seed already prolonged
//
AliDebug(2,Form("Transport failed | esdID=%d (MClb:%d)",esdID,fCurrESDtrMClb));
// Check if the seed satisfies to track definition
double penalty = -fCurrTrackCond->GetMissPenalty(ila);
// to do: make penalty to account for probability to miss the cluster for good reason
seedSkp->SetChi2Cl(penalty);
- AddSeedBranch(seedSkp);
- // AddProlongationHypothesis(seedSkp,ila);
+ if (seedSkp->GetChi2GloNrm()>fCurrTrackCond->GetMaxChi2GloNrm(ila)) {
+ MarkSeedFree(seedSkp);
+ }
+ else AddSeedBranch(seedSkp);
}
// transfer the new branches of the seed to the hypothesis container
if (fNBranchesAdded) ValidateAllowedBranches(maxNBranches);
hyp->SetESDTrack(esdTr);
hyp->SetUniqueID(esdID);
hyp->SetMass(fCurrMass);
+ hyp->SetTPCSeed( new AliExternalTrackParam(*esdTr) );
SetTrackHyp(hyp,esdID);
+
+ if (!TransportToLayer(hyp->GetTPCSeed(),fITS->GetNLayers(), fITS->GetLrIDActive(fNLrActive-1), fITS->GetRITSTPCRef())) hyp->SetSkip(); // propagate to outer R of ITS
//
return hyp;
// TO DO
}
//_________________________________________________________________________
-Bool_t AliITSUTrackerGlo::TransportToLayer(AliITSUSeed* seed, Int_t lFrom, Int_t lTo)
+Bool_t AliITSUTrackerGlo::TransportToLayer(AliITSUSeed* seed, Int_t lFrom, Int_t lTo, Double_t rLim)
{
- // transport seed from layerFrom to the entrance (along the direction of the track) of layerTo
+ // transport seed from layerFrom to the entrance (along the direction of the track) of layerTo or to rLim (if>0), wathever is closer
//
//
if (lTo==lFrom) AliFatal(Form("was called with lFrom=%d lTo=%d",lFrom,lTo));
int dir = lTo > lFrom ? 1:-1;
AliITSURecoLayer* lrFr = fITS->GetLayer(lFrom); // this can be 0 when extrapolation from TPC to ITS is requested
Bool_t checkFirst = kTRUE;
+ Bool_t limReached = kFALSE;
while(lFrom!=lTo) {
if (lrFr) {
- if (!GoToExitFromLayer(seed,lrFr,dir,checkFirst)) {
- //printf("FailHere0 Dir=%d\n",dir);
- //seed->Print("etp");
- return kFALSE; // go till the end of current layer
- }
+ if (!GoToExitFromLayer(seed,lrFr,dir,checkFirst)) return kFALSE; // go till the end of current layer
checkFirst = kFALSE;
}
AliITSURecoLayer* lrTo = fITS->GetLayer( (lFrom+=dir) );
//
// go the entrance of the layer, assuming no materials in between
double xToGo = lrTo->GetR(-dir);
+ if (rLim>0) {
+ if (dir>0) {
+ if (rLim<xToGo) {xToGo = rLim; limReached = kTRUE;}
+ }
+ else {
+ if (rLim>xToGo) {xToGo = rLim; limReached = kTRUE;}
+ }
+ }
// double xts = xToGo;
if (!seed->GetXatLabR(xToGo,xToGo,GetBz(),dir)) {
//printf("FailHere1: %f %f %d\n",xts,xToGo,dir);
//seed->Print("etp");
- //
-
+ //
return kFALSE;
}
AliDebug(2,Form("go in dir=%d to R=%.4f(X:%.4f)",dir,lrTo->GetR(-dir), xToGo));
return kFALSE;
}
lrFr = lrTo;
+ if (limReached) break;
}
return kTRUE;
//
}
//_________________________________________________________________________
-Bool_t AliITSUTrackerGlo::TransportToLayer(AliExternalTrackParam* seed, Int_t lFrom, Int_t lTo)
+Bool_t AliITSUTrackerGlo::TransportToLayer(AliExternalTrackParam* seed, Int_t lFrom, Int_t lTo, Double_t rLim)
{
- // transport track from layerFrom to the entrance of layerTo
+ // transport track from layerFrom to the entrance of layerTo or to rLim (if>0), wathever is closer
//
if (lTo==lFrom) AliFatal(Form("was called with lFrom=%d lTo=%d",lFrom,lTo));
//
int dir = lTo > lFrom ? 1:-1;
AliITSURecoLayer* lrFr = fITS->GetLayer(lFrom); // this can be 0 when extrapolation from TPC to ITS is requested
Bool_t checkFirst = kTRUE;
+ Bool_t limReached = kFALSE;
while(lFrom!=lTo) {
if (lrFr) {
if (!GoToExitFromLayer(seed,lrFr,dir,checkFirst)) return kFALSE; // go till the end of current layer
//
// go the entrance of the layer, assuming no materials in between
double xToGo = lrTo->GetR(-dir);
+ if (rLim>0) {
+ if (dir>0) {
+ if (rLim<xToGo) {xToGo = rLim; limReached = kTRUE;}
+ }
+ else {
+ if (rLim>xToGo) {xToGo = rLim; limReached = kTRUE;}
+ }
+ }
// double xts = xToGo;
if (!seed->GetXatLabR(xToGo,xToGo,GetBz(),dir)) {
// printf("FailHere1: %f %f %d\n",xts,xToGo,dir);
return kFALSE;
}
lrFr = lrTo;
+ if (limReached) break;
}
return kTRUE;
//
fTrImpData[kTrPhi0] = phi0;
fTrImpData[kTrZ0] = 0.5*(fTrImpData[kTrZOut]+fTrImpData[kTrZIn]);
- fTrImpData[kTrDPhi] = dphi0 + sgy/lrA->GetR();
+ dphi0 += sgy/lrA->GetR();
+ fTrImpData[kTrDPhi] = dphi0<PiOver2() ? dphi0 : PiOver2();
fTrImpData[kTrDZ] = 0.5*Abs(fTrImpData[kTrZOut]-fTrImpData[kTrZIn]) + sgz;
//
return kTRUE;
if (cl->GetLabel(0)>=0) {
for (int i=0;i<3;i++) if (cl->GetLabel(i)>=0 && cl->GetLabel(i)==currLabel) {goodCl = kTRUE; break;}
}
- Bool_t goodSeed = !track->ContainsFake();
//
if (TMath::Abs(cl->GetX())>kTolerX) { // if due to the misalingment X is large, propagate track only
if (!track->PropagateParamOnlyTo(track->GetX()+cl->GetX(),GetBz())) {
- if (goodCl&&goodSeed && AliDebugLevelClass()>2 ) {
+ //
+ if (AliDebugLevelClass()>2 && goodCl && !track->ContainsFake()) {
AliDebug(2,Form("Lost good cl on L:%d failed propagation. |ESDtrack#%d (MClb:%d)",lr,fCurrESDtrack->GetID(),fCurrESDtrMClb));
track->Print("etp");
cl->Print();
double dy = cl->GetY()-track->GetY();
double dz = cl->GetZ()-track->GetZ();
//
-#ifdef _FILL_CONTROL_HISTOS_
- int hcOffs = (1+fTrackPhase)*kHistosPhase + lr;
- double htrPt=-1;
- if (goodCl && (((AliITSUClusterPix*)cl)->GetNPix()>1 || !((AliITSUClusterPix*)cl)->IsSplit()) && goodSeed && fCHistoArr /* && track->GetChi2Penalty()<1e-5*/) {
- htrPt = track->Pt();
- ((TH2*)fCHistoArr->At(kHResY+hcOffs))->Fill(htrPt,dy);
- ((TH2*)fCHistoArr->At(kHResZ+hcOffs))->Fill(htrPt,dz);
- double errY = track->GetSigmaY2();
- double errZ = track->GetSigmaZ2();
- if (errY>0) ((TH2*)fCHistoArr->At(kHResYP+hcOffs))->Fill(htrPt,dy/Sqrt(errY));
- if (errZ>0) ((TH2*)fCHistoArr->At(kHResZP+hcOffs))->Fill(htrPt,dz/Sqrt(errZ));
- }
-#endif
- //
double dy2 = dy*dy;
double tol2 = (track->GetSigmaY2() + AliITSUReconstructor::GetRecoParam()->GetSigmaY2(lr))*
fCurrTrackCond->GetNSigmaRoadY(lr)*fCurrTrackCond->GetNSigmaRoadY(lr); // RS TOOPTIMIZE
if (dy2>tol2) { // the clusters are sorted in Z(col) then in Y(row).
- if (goodCl&&goodSeed && AliDebugLevelClass()>2) {
+ //
+ if (AliDebugLevelClass()>2 && goodCl && !track->ContainsFake()) {
AliDebug(2,Form("Lost good cl: dy2=%e > tol2=%e |ESDtrack#%d (MClb:%d)",dy2,tol2,fCurrESDtrack->GetID(),fCurrESDtrMClb));
track->Print("etp");
cl->Print();
tol2 = (track->GetSigmaZ2() + AliITSUReconstructor::GetRecoParam()->GetSigmaZ2(lr))*
fCurrTrackCond->GetNSigmaRoadZ(lr)*fCurrTrackCond->GetNSigmaRoadZ(lr); // RS TOOPTIMIZE
if (dz2>tol2) {
- if (goodCl&&goodSeed && AliDebugLevelClass()>2) {
+ if (AliDebugLevelClass()>2 && goodCl && !track->ContainsFake()) {
AliDebug(2,Form("Lost good cl on L:%d : dz2=%e > tol2=%e |ESDtrack#%d (MClb:%d)",lr,dz2,tol2,fCurrESDtrack->GetID(),fCurrESDtrMClb));
track->Print("etp");
cl->Print();
Double_t cov[3]={cl->GetSigmaY2(), cl->GetSigmaYZ(), cl->GetSigmaZ2()};
double chi2 = track->GetPredictedChi2(p,cov);
//
-#ifdef _FILL_CONTROL_HISTOS_
- if (htrPt>0) {
- ((TH2*)fCHistoArr->At(kHChi2Cl+hcOffs))->Fill(htrPt,chi2);
- }
-#endif
- //
if (chi2>fCurrTrackCond->GetMaxTr2ClChi2(lr)) {
- if (goodCl&&goodSeed && AliDebugLevelClass()>2) {
+ if (AliDebugLevelClass()>2 && goodCl && !track->ContainsFake()) {
AliDebug(2,Form("Lost good cl on L:%d : Chi2=%e > Chi2Max=%e |dy: %+.3e dz: %+.3e |ESDtrack#%d (MClb:%d)\n",
lr,chi2,fCurrTrackCond->GetMaxTr2ClChi2(lr),dy,dz,fCurrESDtrack->GetID(),fCurrESDtrMClb));
track->Print("etp");
//
track = NewSeedFromPool(track); // input track will be reused, use its clone for updates
if (!track->Update()) {
- if (goodCl&&goodSeed && AliDebugLevelClass()>2) {
+ if (AliDebugLevelClass()>2 && goodCl && !track->ContainsFake()) {
AliDebug(2,Form("Lost good cluster on L:%d : failed to update",lr));
track->Print("etp");
cl->Print("");
}
track->SetChi2Cl(chi2);
track->SetLrClusterID(lr,clID);
+ //
+ if (track->GetChi2GloNrm()>fCurrTrackCond->GetMaxChi2GloNrm(lr)) {
+ if (AliDebugLevelClass()>2 && goodCl && !track->ContainsFake()) {
+ AliDebug(2,Form("Lost good cl on L:%d : Chi2Glo=%e > Chi2Max=%e |dy: %+.3e dz: %+.3e |ESDtrack#%d (MClb:%d)\n",
+ lr,track->GetChi2GloNrm(),fCurrTrackCond->GetMaxChi2GloNrm(lr),dy,dz,fCurrESDtrack->GetID(),fCurrESDtrMClb));
+ track->Print("etp");
+ cl->Print("");
+ PrintSeedClusters(track);
+ }
+ MarkSeedFree(track);
+ return kClusterNotMatching;
+ }
// cl->IncreaseClusterUsage(); // do this only for winners
//
track->SetFake(!goodCl);
goodCl,clID,lr,dy,dz2,cl->GetLabel(0),cl->GetLabel(1),cl->GetLabel(2), chi2, track->IsFake() ? '-':'+'));
//
AddSeedBranch(track);
-#ifdef _FILL_CONTROL_HISTOS_
- if (htrPt>0) {
- ((TH2*)fCHistoArr->At(kHChi2Nrm+hcOffs))->Fill(htrPt,track->GetChi2GloNrm());
- }
-#endif
//
return kClusterMatching;
}
return kTRUE;
}
+//______________________________________________________________________________
+Bool_t AliITSUTrackerGlo::FinalizeHypothesis(AliITSUTrackHyp* hyp)
+{
+ // finalize single TPC track hypothesis
+ if (!hyp || hyp->GetESDTrack()->IsOn(AliESDtrack::kITSin)) return kFALSE;
+ AliITSUSeed* winner = 0;
+ fCurrHyp = hyp;
+ fCurrMass = hyp->GetMass();
+ if (!(winner=hyp->DefineWinner())) return kFALSE;
+ CookMCLabel(hyp);
+ //
+#ifdef _ITSU_TUNING_MODE_ // fill tuning histos
+ TObjArray* dest = hyp->GetLabel()>=0 ? fCHistoArrCorr : fCHistoArrFake;
+ if (dest) {
+ AliITSUSeed* sd = winner;
+ double htrPt = hyp->Pt();
+ do {
+ int clID,lrID;
+ if ( (clID=sd->GetLrCluster(lrID))<0 ) continue;
+ int hcOffs = (1+fTrackPhase)*kHistosPhase + lrID;
+ ((TH2*)dest->At(kHChi2Nrm+hcOffs))->Fill(htrPt,sd->GetChi2GloNrm());
+ ((TH2*)dest->At(kHBestInBranch+hcOffs))->Fill(htrPt,sd->GetOrdBranch());
+ ((TH2*)dest->At(kHBestInCand+hcOffs))->Fill(htrPt, sd->GetOrdCand());
+ //
+ if (dest==fCHistoArrFake && !sd->IsFake()) continue; // for the fake seeds fill only fake clusters part
+ //
+ ((TH2*)dest->At(kHResY+hcOffs))->Fill(htrPt,sd->GetResidY());
+ ((TH2*)dest->At(kHResZ+hcOffs))->Fill(htrPt,sd->GetResidZ());
+ ((TH2*)dest->At(kHResYP+hcOffs))->Fill(htrPt,sd->GetPullY());
+ ((TH2*)dest->At(kHResZP+hcOffs))->Fill(htrPt,sd->GetPullZ());
+ ((TH2*)dest->At(kHChi2Cl+hcOffs))->Fill(htrPt,sd->GetChi2Cl());
+ //
+ } while((sd=(AliITSUSeed*)sd->GetParent()));
+ //
+ ((TH2*)dest->At(kHChiMatch))->Fill(htrPt,winner->GetChi2ITSTPC());
+ ((TH2*)dest->At(kHChiITSSA))->Fill(htrPt,winner->GetChi2ITSSA());
+ }
+ //
+#endif
+ //
+ CheckClusterSharingConflicts(hyp);
+ return hyp->GetWinner(); // winner might change of disappear after resolving conflicts
+ //
+}
+
//______________________________________________________________________________
void AliITSUTrackerGlo::FinalizeHypotheses()
{
// select winner for each hypothesis, remove cl. sharing conflicts
+ AliCodeTimerAuto("",0);
AliDebug(2,"TODO");
//
int nh = fHypStore.GetEntriesFast();
+ for (int ih=0;ih<nh;ih++) FinalizeHypothesis(GetTrackHyp(ih));
+ //
+ for (int ih=0;ih<nh;ih++) UpdateESDTrack(GetTrackHyp(ih),AliESDtrack::kITSin);
+ //
+}
+
+//______________________________________________________________________________
+void AliITSUTrackerGlo::CheckClusterSharingConflicts(AliITSUTrackHyp* hyp)
+{
+ // remove eventual cluster sharing conflicts
AliITSUSeed* winner = 0;
- for (int ih=0;ih<nh;ih++) {
- AliITSUTrackHyp* hyp = (AliITSUTrackHyp*) fHypStore.UncheckedAt(ih);
- if (!hyp) continue; // removed
- if (hyp->GetESDTrack()->IsOn(AliESDtrack::kITSin)) continue; // winner already defined
+ if (!(winner=hyp->GetWinner())) return;
+ UShort_t idH = (UShort_t)hyp->GetUniqueID()+1;
+ int lrID,clID;
+ AliITSUSeed* winSD=winner;
+ do {
+ if ( (clID=winSD->GetLrCluster(lrID))<0 ) continue;
+ AliITSUClusterPix* cl = (AliITSUClusterPix*)fITS->GetLayerActive(lrID)->GetCluster(clID);
+ Int_t refID = cl->GetRecoInfo(); // was it already referred by some track (with refID-1 if >0)
+ if (!refID) {cl->SetRecoInfo(idH); continue;} // if not, refer from track to cluster
+ if (refID==idH) continue; // ignore reference to itself
+ // the cluster is already used by other track, need to resolve the conflict
+ AliITSUTrackHyp* hypC = GetTrackHyp(refID-1); // competitor
+ // printf("Ref to %d (%p) from %d Cl %d %d\n",refID-1,hypC, idH-1,clID,lrID);
+ AliITSUSeed* winnerC = hypC->GetWinner();
+ if (!winnerC) {
+ printf("Missing winner, ERROR\n");
+ continue;
+ }
//
- if (!(winner=hyp->DefineWinner())) continue; // failed to find winner
- FlagSeedClusters(winner,kTRUE);
- fCountITSin++;
- CookMCLabel(hyp);
- UpdateESDTrack(hyp,AliESDtrack::kITSin);
- }
- //
-#ifdef _FILL_CONTROL_HISTOS_
- // if requested, collect cluster sharing statistics
- TH2* hShare = 0;
- if (fCHistoArr && (hShare=(TH2*)fCHistoArr->At(kHClShare))) {
- for (int ih=0;ih<nh;ih++) {
- AliITSUTrackHyp* hyp = (AliITSUTrackHyp*) fHypStore.UncheckedAt(ih);
- if (!hyp || !(winner=hyp->GetWinner())) continue;
- int lrID = 0;
- double pt = hyp->Pt();
+ if (AliDebugLevelClass()>1) { //------------------------ DEBUG -------------------
+ AliInfo(Form("Shared cl#%4d on Lr:%d: Hyp%3d/Q:%6.3f vs Hyp%3d/Q:%6.3f",
+ clID,lrID,idH-1,winner->GetQualityVar(),refID-1,winnerC->GetQualityVar()));
+ // dump winner of hyp
+ printf("#%4d Pt:%.3f Chi:%6.3f/%6.3f/%6.3f Ncl:%d MCits%+5d MCtpc:%+5d |",
+ idH-1,winner->Pt(),winner->GetChi2GloNrm(),winner->GetChi2ITSTPC(),winner->GetChi2ITSSA(),
+ winner->GetNLayersHit(),hyp->GetITSLabel(),hyp->GetESDTrack()->GetTPCLabel());
+ int prevL=-1;
+ AliITSUSeed* sd = winner;
do {
- int clID = winner->GetLrCluster(lrID);
- if (clID<0) continue;
- AliITSUClusterPix* cl = (AliITSUClusterPix*)fITS->GetLayerActive(lrID)->GetCluster(clID);
- if (!cl->IsClusterShared()) continue;
- hShare->Fill(pt,winner->IsFake() ? lrID+fNLrActive : lrID);
- } while ((winner=(AliITSUSeed*)winner->GetParent()));
- }
- }
-#endif
-
+ int lrs;
+ int clIDt = sd->GetLrCluster(lrs);
+ if (clIDt<0) continue;
+ while( lrs>++prevL ) printf("%4s ","----");
+ printf("%4d (%5.1f)",clIDt,sd->GetChi2Cl());
+ } while ((sd=(AliITSUSeed*)sd->GetParent()));
+ printf("|\n");
+ // dump winner of hypC
+ printf("#%4d Pt:%.3f Chi:%6.3f/%6.3f/%6.3f Ncl:%d MCits%+5d MCtpc:%+5d |",
+ refID-1,winnerC->Pt(),winnerC->GetChi2GloNrm(),winnerC->GetChi2ITSTPC(),winnerC->GetChi2ITSSA(),
+ winnerC->GetNLayersHit(),hypC->GetITSLabel(),hypC->GetESDTrack()->GetTPCLabel());
+ prevL=-1;
+ sd = winnerC;
+ do {
+ int lrs;
+ int clIDt = sd->GetLrCluster(lrs);
+ if (clIDt<0) continue;
+ while( lrs>++prevL ) printf("%4s ","----");
+ printf("%4d (%5.1f)",clIDt,sd->GetChi2Cl());
+ } while ((sd=(AliITSUSeed*)sd->GetParent()));
+ printf("|\n");
+ } //-------------------------------------------------- DEBUG -------------------
+ //
+ if (winner->GetQualityVar()<winnerC->GetQualityVar()) { // current tracks is better then competitor track
+ FlagSeedClusters(winnerC,kFALSE,refID); // unflag cluster usage by loser
+ cl->SetRecoInfo(idH);
+ //
+ //if ( hypC->GetLabel()>=0) AliInfo(Form("KILLING CORRECT: %d",refID-1));
+ winnerC->Kill();
+ if (hypC->DefineWinner()) { // find new winner instead of suppressed candidate
+ CookMCLabel(hypC);
+ CheckClusterSharingConflicts(hypC); // and check its sharing conflicts again
+ if (winner->IsKilled()) break; // the current winner might have been killed during check of new winner of hypC!
+ }
+ }
+ else { // competitor hypC is better than the hyp
+ FlagSeedClusters(winner,kFALSE,idH); // unflag cluster usage by loser
+ winner->Kill();
+ //if ( hyp->GetLabel()>=0) AliInfo(Form("KILLING CORRECT: %d",idH-1));
+ if (hyp->DefineWinner()) {
+ CookMCLabel(hyp);
+ CheckClusterSharingConflicts(hyp);
+ }
+ break;
+ }
+ //
+ } while ((winSD=(AliITSUSeed*)winSD->GetParent()));
+ //
+ return;
}
//______________________________________________________________________________
void AliITSUTrackerGlo::UpdateESDTrack(AliITSUTrackHyp* hyp,Int_t flag)
{
// update ESD track with current best hypothesis
+ if (!hyp) return;
AliESDtrack* esdTr = hyp->GetESDTrack();
if (!esdTr) return;
AliITSUSeed* win = hyp->GetWinner();
- if (!win) return;
+ if (!win || win->IsKilled()) return;
+ double chiSav;
+ //
switch (flag) {
case AliESDtrack::kITSin:
esdTr->UpdateTrackParams(hyp,flag); // update kinematics
+ fCountITSin++;
// TODO: set cluster info
break;
//
case AliESDtrack::kITSout:
+ // here the stored chi2 will correspond to backward ITS-SA fit
esdTr->UpdateTrackParams(hyp,flag); // update kinematics
+ fCountITSout++;
// TODO: avoid setting friend
break;
//
case AliESDtrack::kITSrefit:
+
+ // at the moment fill as a chi2 the TPC-ITS matching chi2
+ chiSav = hyp->GetChi2();
+ hyp->SetChi2(win->GetChi2ITSTPC());
esdTr->UpdateTrackParams(hyp,flag); // update kinematics
+ hyp->SetChi2(chiSav);
+ fCountITSrefit++;
// TODO: avoid setting cluster info
break;
default:
}
//______________________________________________________________________________
-Bool_t AliITSUTrackerGlo::RefitTrack(AliITSUTrackHyp* trc, Double_t rDest, Bool_t stopAtLastCl)
+Double_t AliITSUTrackerGlo::RefitTrack(AliExternalTrackParam* trc, Double_t rDest, Int_t stopCond)
{
- // refit track till radius rDest
- AliITSUTrackHyp tmpTr;
+ // refit track till radius rDest. The cluster,mass info is taken from fCurrHyp (and its winner seed)
+ // if stopCond<0 : propagate till last cluster then stop
+ // if stopCond==0: propagate till last cluster then try to go till limiting rDest, don't mind if fail
+ // if stopCond>0 : rDest must be reached
//
double rCurr = Sqrt(trc->GetX()*trc->GetX() + trc->GetY()*trc->GetY());
int dir,lrStart,lrStop;
//
dir = rCurr<rDest ? 1 : -1;
lrStart = fITS->FindFirstLayerID(rCurr,dir);
- lrStop = fITS->FindLastLayerID(rDest,dir);
+ lrStop = fITS->FindLastLayerID(rDest,dir); // lr id before which we have to stop
+ //
if (AliDebugLevelClass()>2) {
printf("Refit %d: Lr:%d (%f) -> Lr:%d (%f)\n",dir,lrStart,rCurr, lrStop,rDest);
- printf("Before refit: "); trc->AliExternalTrackParam::Print();
+ printf("Before refit: "); trc->Print();
}
if (lrStop<0 || lrStart<0) AliFatal(Form("Failed to find start(%d) or last(%d) layers. Track from %.3f to %.3f",lrStart,lrStop,rCurr,rDest));
//
- int ncl = trc->FetchClusterInfo(fClInfo);
- fCurrMass = trc->GetMass();
- tmpTr.AliKalmanTrack::operator=(*trc);
- tmpTr.SetChi2(0);
+ Int_t clInfo[2*AliITSUAux::kMaxLayers];
+ Int_t nCl = fCurrHyp->FetchClusterInfo(clInfo);
+ fCurrMass = fCurrHyp->GetMass();
+ AliExternalTrackParam tmpTr(*trc);
+ double chi2 = 0;
int iclLr[2],nclLr,clCount=0;
//
- for (int ilr=lrStart;ilr!=lrStop;ilr+=dir) {
+ int lrStop1 = lrStop+1;
+ for (int ilr=lrStart;ilr!=lrStop1;ilr+=dir) {
AliITSURecoLayer* lr = fITS->GetLayer(ilr);
if ( dir*(rCurr-lr->GetR(dir))>0) continue; // this layer is already passed
int ilrA2,ilrA = lr->GetActiveID();
// passive layer or active w/o hits will be traversed on the way to next cluster
- if (!lr->IsActive() || fClInfo[ilrA2=(ilrA<<1)]<0) continue;
+ if (!lr->IsActive() || clInfo[ilrA2=(ilrA<<1)]<0) continue;
//
// select the order in which possible 2 clusters (in case of the overlap) will be traversed and fitted
nclLr=0;
if (dir>0) { // clusters are stored in increasing radius order
- iclLr[nclLr++]=fClInfo[ilrA2++];
- if (fClInfo[ilrA2]>=0) iclLr[nclLr++]=fClInfo[ilrA2];
+ iclLr[nclLr++]=clInfo[ilrA2++];
+ if (clInfo[ilrA2]>=0) iclLr[nclLr++]=clInfo[ilrA2];
}
else {
- if ( fClInfo[ilrA2+1]>=0 ) iclLr[nclLr++]=fClInfo[ilrA2+1];
- iclLr[nclLr++]=fClInfo[ilrA2];
+ if ( clInfo[ilrA2+1]>=0 ) iclLr[nclLr++]=clInfo[ilrA2+1];
+ iclLr[nclLr++]=clInfo[ilrA2];
}
//
Bool_t transportedToLayer = kFALSE;
AliITSUClusterPix* clus = (AliITSUClusterPix*)lr->GetCluster(iclLr[icl]);
AliITSURecoSens* sens = lr->GetSensorFromID(clus->GetVolumeId());
if (!tmpTr.Rotate(sens->GetPhiTF())) {
- AliDebug(2,Form("Failed on rotate to %f | ESDtrack#%d (MClb:%d)",sens->GetPhiTF(),fCurrESDtrack->GetID(),fCurrESDtrMClb));
- return kFALSE;
+ AliESDtrack* trESD = fCurrHyp->GetESDTrack();
+ AliDebug(2,Form("Failed on rotate to %f | ESDtrack#%d (MClb:%d)",sens->GetPhiTF(),trESD->GetID(),trESD->GetTPCLabel()));
+ return -1;
}
//
double xClus = sens->GetXTF()+clus->GetX();
if (!transportedToLayer) {
if (ilr!=lrStart && !TransportToLayerX(&tmpTr,lrStart,ilr,xClus)) {
- AliDebug(2,Form("Failed to transport %d -> %d | ESDtrack#%d (MClb:%d)\n",lrStart,ilr,fCurrESDtrack->GetID(),fCurrESDtrMClb));
- //tmpTr.AliExternalTrackParam::Print(); trc->GetWinner()->Print("etp");
- return kFALSE; // go to the entrance to the layer
+ AliESDtrack* trESD = fCurrHyp->GetESDTrack();
+ AliDebug(2,Form("Failed to transport %d -> %d | ESDtrack#%d (MClb:%d)\n",lrStart,ilr,trESD->GetID(),trESD->GetTPCLabel()));
+ return -1; // go to the entrance to the layer
}
lrStart = ilr;
transportedToLayer = kTRUE;
//
if (AliDebugLevelClass()>1) {
AliDebug(2,Form("Propagate to cl:%d on lr %d Need to go %.4f -> %.4f",icl,ilrA,tmpTr.GetX(),xClus));
- // printf("Before: "); tmpTr.AliExternalTrackParam::Print();
}
//
if (!PropagateSeed(&tmpTr,xClus,fCurrMass)) {
- AliDebug(2,Form("Failed on propagate to %f (dir=%d) | ESDtrack#%d (MClb:%d)",xClus,dir,fCurrESDtrack->GetID(),fCurrESDtrMClb));
- //tmpTr.AliExternalTrackParam::Print(""); trc->GetWinner()->Print("etp");
- return kFALSE;
+ AliESDtrack* trESD = fCurrHyp->GetESDTrack();
+ AliDebug(2,Form("Failed on propagate to %f (dir=%d) | ESDtrack#%d (MClb:%d)",xClus,dir,trESD->GetID(),trESD->GetTPCLabel()));
+ return -1;
}
//
-#ifdef _FILL_CONTROL_HISTOS_
- int hcOffs = (1+fTrackPhase)*kHistosPhase + ilrA;
- double htrPt=-1;
- if (fCHistoArr && trc->GetLabel()>=0/* && trc->Charge()>0*/) {
- htrPt = tmpTr.Pt();
- double dy = clus->GetY()-tmpTr.GetY();
- double dz = clus->GetZ()-tmpTr.GetZ();
- ((TH2*)fCHistoArr->At(kHResY+hcOffs))->Fill(htrPt,dy);
- ((TH2*)fCHistoArr->At(kHResZ+hcOffs))->Fill(htrPt,dz);
+ Double_t p[2]={clus->GetY(), clus->GetZ()};
+ Double_t cov[3]={clus->GetSigmaY2(), clus->GetSigmaYZ(), clus->GetSigmaZ2()};
+ double chi2cl = tmpTr.GetPredictedChi2(p,cov);
+ chi2 += chi2cl;
+ //
+#ifdef _ITSU_TUNING_MODE_
+ TObjArray* dest = trc->GetLabel()>=0 ? fCHistoArrCorr : fCHistoArrFake;
+ if (dest && fTrackPhase>kClus2Tracks) {
+ int hcOffs = (1+fTrackPhase)*kHistosPhase + ilrA;
+ //
+ double htrPt = tmpTr.Pt();
+ double dy = p[0]-tmpTr.GetY();
+ double dz = p[1]-tmpTr.GetZ();
+ ((TH2*)dest->At(kHResY+hcOffs))->Fill(htrPt,dy);
+ ((TH2*)dest->At(kHResZ+hcOffs))->Fill(htrPt,dz);
double errY = tmpTr.GetSigmaY2();
double errZ = tmpTr.GetSigmaZ2();
- if (errY>0) ((TH2*)fCHistoArr->At(kHResYP+hcOffs))->Fill(htrPt,dy/Sqrt(errY));
- if (errZ>0) ((TH2*)fCHistoArr->At(kHResZP+hcOffs))->Fill(htrPt,dz/Sqrt(errZ));
+ if (errY>0) ((TH2*)dest->At(kHResYP+hcOffs))->Fill(htrPt,dy/Sqrt(errY));
+ if (errZ>0) ((TH2*)dest->At(kHResZP+hcOffs))->Fill(htrPt,dz/Sqrt(errZ));
+ ((TH2*)dest->At(kHChi2Cl+hcOffs))->Fill(htrPt,chi2cl);
}
#endif
- //
- double chi2;
- if ( (chi2=tmpTr.Update(clus))<0 ) {
- AliDebug(2,Form("Failed on Update | ESDtrack#%d (MClb:%d)",fCurrESDtrack->GetID(),fCurrESDtrMClb));
- return kFALSE;
+ //
+ if ( !tmpTr.Update(p,cov) ) {
+ AliESDtrack* trESD = fCurrHyp->GetESDTrack();
+ AliDebug(2,Form("Failed on Update | ESDtrack#%d (MClb:%d)",trESD->GetID(),trESD->GetTPCLabel()));
+ return -1;
}
-#ifdef _FILL_CONTROL_HISTOS_
- if (htrPt>0) {
- ((TH2*)fCHistoArr->At(kHChi2Cl+hcOffs))->Fill(htrPt,chi2);
- }
-#endif
if (AliDebugLevelClass()>1) {
- printf("AfterRefit: "); tmpTr.AliExternalTrackParam::Print();
+ printf("AfterRefit: "); tmpTr.Print();
+ }
+ if (++clCount==nCl && stopCond<0) {
+ *trc = tmpTr;
+ return chi2; // it was requested to not propagate after last update
}
- if (stopAtLastCl && ++clCount==ncl) return kTRUE; // it was requested to not propagate after last update
}
//
}
// Still, try to go as close as possible to rDest.
//
if (lrStart!=lrStop) {
- //printf("Going to last layer %d -> %d\n",lrStart,lrStop);
if (!TransportToLayer(&tmpTr,lrStart,lrStop)) {
- AliDebug(1,Form("Failed on TransportToLayer %d->%d | ESDtrack#%d (MClb:%d)",lrStart,lrStop,fCurrESDtrack->GetID(),fCurrESDtrMClb));
- //tmpTr.AliExternalTrackParam::Print();
- //trc->GetWinner()->Print("etp");
- return kTRUE;
+ AliDebug(1,Form("Failed on TransportToLayer %d->%d | ESDtrack#%d (MClb:%d), X=%f",lrStart,lrStop,fCurrESDtrack->GetID(),fCurrESDtrMClb,tmpTr.GetX()));
+ return (stopCond>0) ? -chi2 : chi2; // rDest was obligatory
}
if (!GoToExitFromLayer(&tmpTr,fITS->GetLayer(lrStop),dir)) {
- AliDebug(3,Form("Failed on GoToExitFromLayer %d | ESDtrack#%d (MClb:%d)",lrStop,fCurrESDtrack->GetID(),fCurrESDtrMClb));
- return kTRUE; // go till the exit from layer
+ AliDebug(1,Form("Failed on GoToExitFromLayer %d | ESDtrack#%d (MClb:%d), X=%f",lrStop,fCurrESDtrack->GetID(),fCurrESDtrMClb,tmpTr.GetX()));
+ return (stopCond>0) ? -chi2 : chi2; // rDest was obligatory
}
- //
- //printf("On exit from last layer\n");
- //tmpTr.AliExternalTrackParam::Print();
- // go to the destination radius
- if (!tmpTr.GetXatLabR(rDest,rDest,GetBz(),dir)) return kTRUE;
- if (!PropagateSeed(&tmpTr,rDest,fCurrMass, 100, kFALSE)) return kTRUE;
}
- trc->AliKalmanTrack::operator=(tmpTr);
+ // go to the destination radius. Note that here we don't select direction to avoid precision problems
+ if (!tmpTr.GetXatLabR(rDest,rDest,GetBz(),0) || !PropagateSeed(&tmpTr,rDest,fCurrMass, 100, kFALSE)) {
+ return (stopCond>0) ? -chi2 : chi2; // rDest was obligatory
+ }
+ *trc=tmpTr;
if (AliDebugLevelClass()>2) {
- printf("After refit (now at lr %d): ",lrStop); trc->AliExternalTrackParam::Print();
+ printf("After refit (now at lr %d): ",lrStop); trc->Print();
}
- return kTRUE;
+ return chi2;
}
//__________________________________________________________________
void AliITSUTrackerGlo::ValidateAllowedBranches(Int_t acceptMax)
{
// keep allowed number of branches for current seed and disable extras
+ AliCodeTimerAuto("",0);
int nb = Min(fNBranchesAdded,acceptMax);
// if (nb<fNBranchesAdded) printf("ValidateAllowedBranches: %d of %d (%d) on lr %d\n",nb,fNBranchesAdded,fNCandidatesAdded,ilr);
// disable unused branches
AliITSUSeed** branches = &fLayerCandidates[fNCandidatesAdded];
-#ifdef _FILL_CONTROL_HISTOS_
- int bestID = -1;
- for (int ib=0;ib<fNBranchesAdded;ib++) {
- AliITSUSeed* sd = branches[ib];
- if (!sd->ContainsFake() && (bestID<0 || sd->Compare(branches[bestID])<0) ) bestID = ib;
- }
- if (bestID>=0) {
- TH2* hb = (TH2*)fCHistoArr->At(kHBestInBranch + (1+fTrackPhase)*kHistosPhase + fCurrActLrID);
- if (hb) hb->Fill(branches[bestID]->Pt(), bestID);
- }
+ //
+#ifdef _ITSU_TUNING_MODE_
+ for (int ib=0;ib<fNBranchesAdded;ib++) branches[ib]->SetOrdBranch(ib);
#endif
//
- for (int ib=nb;ib<fNBranchesAdded;ib++) {
- //
-#ifdef _FILL_CONTROL_HISTOS_
- if (AliDebugLevelClass()>-2 && !branches[ib]->ContainsFake() /*&& branches[ib]->GetNLayersHit()*/
- && (bestID<0 || branches[ib]->Compare(branches[bestID])<0 ) ) {
- printf("Suppress good branch as %d of %d |",ib,fNBranchesAdded); branches[ib]->Print();
- // printf("Survivors : \n");
- // for (int j=0;j<nb;j++) branches[j]->Print();
- }
-#endif
- MarkSeedFree(branches[ib]);
- }
+ for (int ib=nb;ib<fNBranchesAdded;ib++) MarkSeedFree(branches[ib]);
fNCandidatesAdded += nb; // update total candidates counter
fNBranchesAdded = 0; // reset branches counter
//
{
// transfer allowed number of branches to hypothesis container
//
+ AliCodeTimerAuto("",0);
// sort candidates in increasing order of chi2
static int lastSize = 0;
static int *index = 0;
for (int i=fNCandidatesAdded;i--;) chi2[i] = fLayerCandidates[i]->GetChi2GloNrm();
Sort(fNCandidatesAdded,chi2,index,kFALSE);
//
-#ifdef _FILL_CONTROL_HISTOS_
- int bestID = -1;
- for (int ib=0;ib<fNCandidatesAdded;ib++) {
- AliITSUSeed* sd = fLayerCandidates[index[ib]];
- if (!sd->ContainsFake() && (bestID<0 || sd->Compare(fLayerCandidates[index[bestID]])<0) ) bestID = ib;
+ int nacc=0,nb=0;
+ if (ilr>0) { // just take 1st acceptMax candidates
+ nb = Min(fNCandidatesAdded,acceptMax);
+ for (int ib=0;ib<nb;ib++) AddProlongationHypothesis(fLayerCandidates[index[ib]],ilr);
}
- if (bestID>=0) {
- TH2* hb = (TH2*)fCHistoArr->At(kHBestInCand + (1+fTrackPhase)*kHistosPhase + fCurrActLrID);
- if (hb) hb->Fill(fLayerCandidates[index[bestID]]->Pt(), bestID);
+ else { // for innermost layer test ITS SA backward chi2 and matching to TPC
+ AliITSUSeed* wn0 = fCurrHyp->GetWinner(); // in principle, should be NULL
+ for (nb=0;nb<fNCandidatesAdded;nb++) {
+ AliITSUSeed* sd = fLayerCandidates[index[nb]];
+ fCurrHyp->SetWinner(sd);
+ if (!CheckBackwardMatching(sd)) MarkSeedFree(sd); // discard bad backward tracks
+ else {
+ AddProlongationHypothesis(sd,ilr);
+ if (++nacc==acceptMax) {nb++; break;} // the rest will be discarded
+ }
+ }
+ fCurrHyp->SetWinner(wn0); // restore original winner (NULL?)
}
-#endif
- //
- int nb = Min(fNCandidatesAdded,acceptMax);
- //
- for (int ib=0;ib<nb;ib++) AddProlongationHypothesis(fLayerCandidates[index[ib]],ilr);
// disable unused candidates
- for (int ib=nb;ib<fNCandidatesAdded;ib++) {
- //
-#ifdef _FILL_CONTROL_HISTOS_
- if (AliDebugLevelClass()>-2 && !fLayerCandidates[index[ib]]->ContainsFake() /*&& fLayerCandidates[index[ib]]->GetNLayersHit()*/
- && (bestID<0 || fLayerCandidates[index[ib]]->Compare(fLayerCandidates[index[bestID]])<0 ) ) {
- printf("Suppress good candidate as %d of %d |",index[ib],fNCandidatesAdded); fLayerCandidates[index[ib]]->Print();
+ for (int ib=nb;ib<fNCandidatesAdded;ib++) MarkSeedFree(fLayerCandidates[index[ib]]);
+ fNCandidatesAdded = 0; // reset candidates counter
+ //
+}
+
+//__________________________________________________________________
+Bool_t AliITSUTrackerGlo::CheckBackwardMatching(AliITSUSeed* seed)
+{
+ // check seed backward propagation chi2 and matching to TPC
+ double bz0 = GetBz();
+ double rDest = fITS->GetRITSTPCRef(); // reference radius for comparison
+ static AliExternalTrackParam trback;
+ trback = *seed;
+ trback.ResetCovariance(10000);
+ int ndf = seed->GetNLayersHit()*2-5;
+ double chi2sa = RefitTrack(&trback,rDest,1);
+ if (chi2sa<0) return kFALSE;
+ if (ndf>0) chi2sa /= ndf;
+ if (chi2sa>fCurrTrackCond->GetMaxITSSAChi2()) return kFALSE;
+ //
+ // relate to TPC track at outer layer
+ AliExternalTrackParam* tpcSeed = fCurrHyp->GetTPCSeed();
+ if (!trback.Rotate(tpcSeed->GetAlpha()) || !trback.PropagateParamOnlyTo(tpcSeed->GetX(),bz0)) {
+ if (AliDebugLevelClass()>+1 && !seed->ContainsFake()) {
+ AliInfo(Form("Failed to propagate seed to TPC track @ X:%.3f Alpha:%.3f",tpcSeed->GetX(),tpcSeed->GetAlpha()));
+ seed->Print("etp");
+ trback.Print();
}
-#endif
- MarkSeedFree(fLayerCandidates[index[ib]]);
+ return kFALSE;
}
- fNCandidatesAdded = 0; // reset candidates counter
+ double chi2Match = trback.GetPredictedChi2(tpcSeed)/5;
+ if (chi2Match>fCurrTrackCond->GetMaxITSTPCMatchChi2()) return kFALSE;
//
+ seed->SetChi2ITSSA(chi2sa);
+ seed->SetChi2ITSTPC(chi2Match);
+ return kTRUE;
}
//__________________________________________________________________
}
//__________________________________________________________________
-void AliITSUTrackerGlo::FlagSeedClusters(const AliITSUSeed* seed, Bool_t flg)
+void AliITSUTrackerGlo::FlagSeedClusters(const AliITSUSeed* seed, Bool_t flg, UShort_t ref)
{
// mark used clusters
int lrID,clID;
while (seed) {
- if ( (clID=seed->GetLrCluster(lrID))>=0 ) ((AliITSUClusterPix*)fITS->GetLayerActive(lrID)->GetCluster(clID))->ModClUsage(flg);
+ if ( (clID=seed->GetLrCluster(lrID))>=0 ) {
+ AliITSUClusterPix* cl = (AliITSUClusterPix*)fITS->GetLayerActive(lrID)->GetCluster(clID);
+ if (ref) { // do we need to set or delete cluster->track ref?
+ if (flg) {
+ if (!cl->GetRecoInfo()) cl->SetRecoInfo(ref); // set ref only if cluster already does not refer to other track, inc.counter
+ }
+ else {
+ if (cl->GetRecoInfo()==ref) cl->SetRecoInfo(0); // unset reference only if it refers to ref, decrease counter
+ }
+ }
+ }
seed = (AliITSUSeed*)seed->GetParent();
}
//
}
-
-
-#ifdef _FILL_CONTROL_HISTOS_
+#ifdef _ITSU_TUNING_MODE_
//__________________________________________________________________
-void AliITSUTrackerGlo::BookControlHistos()
+void AliITSUTrackerGlo::BookControlHistos(const char* pref)
{
// book special control histos
- if (fCHistoArr) return;
+ TString prefS = pref;
+ prefS.ToLower();
+ TObjArray* dest = 0;
+ if (prefS=="corr") dest = fCHistoArrCorr = new TObjArray();
+ else if (prefS=="fake") dest = fCHistoArrFake = new TObjArray();
+ else {AliError(Form("Unknown histo set %s is requested",pref)); return;}
+ dest->SetOwner(kTRUE);
+ //
const int kNResDef=7;
const double kResDef[kNResDef]={0.05,0.05,0.3, 0.05,1,0.5,1.5};
- fCHistoArr = new TObjArray();
- fCHistoArr->SetOwner(kTRUE);
const double ptMax=10;
const double plMax=10;
const double chiMax=100;
for (int ilr=0;ilr<fNLrActive;ilr++) {
int hoffs = (1+stp)*kHistosPhase + ilr;
double mxdf = ilr>=kNResDef ? kResDef[kNResDef-1] : kResDef[ilr];
- ttl = Form("S%d_residY%d",stp,ilr);
+ ttl = Form("S%d_residY%d_%s",stp,ilr,pref);
TH2F* hdy = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax,nresbins,-mxdf,mxdf);
- fCHistoArr->AddAtAndExpand(hdy,hoffs + kHResY);
+ dest->AddAtAndExpand(hdy,hoffs + kHResY);
hdy->SetDirectory(0);
//
- ttl = Form("S%d_residYPull%d",stp,ilr);
+ ttl = Form("S%d_residYPull%d_%s",stp,ilr,pref);
TH2F* hdyp = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax,nplbins,-plMax,plMax);
- fCHistoArr->AddAtAndExpand(hdyp,hoffs + kHResYP);
+ dest->AddAtAndExpand(hdyp,hoffs + kHResYP);
hdyp->SetDirectory(0);
//
- ttl = Form("S%d_residZ%d",stp,ilr);
+ ttl = Form("S%d_residZ%d_%s",stp,ilr,pref);
TH2F* hdz = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax,nresbins,-mxdf,mxdf);
- fCHistoArr->AddAtAndExpand(hdz,hoffs + kHResZ);
+ dest->AddAtAndExpand(hdz,hoffs + kHResZ);
hdz->SetDirectory(0);
//
- ttl = Form("S%d_residZPull%d",stp,ilr);
+ ttl = Form("S%d_residZPull%d_%s",stp,ilr,pref);
TH2F* hdzp = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax,nplbins,-plMax,plMax);
hdzp->SetDirectory(0);
- fCHistoArr->AddAtAndExpand(hdzp,hoffs + kHResZP);
+ dest->AddAtAndExpand(hdzp,hoffs + kHResZP);
//
- ttl = Form("S%d_chi2Cl%d",stp,ilr);
+ ttl = Form("S%d_chi2Cl%d_%s",stp,ilr,pref);
TH2F* hchi = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax, nchbins,0.,chiMax);
hchi->SetDirectory(0);
- fCHistoArr->AddAtAndExpand(hchi,hoffs + kHChi2Cl);
+ dest->AddAtAndExpand(hchi,hoffs + kHChi2Cl);
//
- ttl = Form("S%d_chi2Nrm%d",stp,ilr);
+ ttl = Form("S%d_chi2Nrm%d_%s",stp,ilr,pref);
TH2F* hchiN = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax, nchbins,0.,chiMax);
hchiN->SetDirectory(0);
- fCHistoArr->AddAtAndExpand(hchiN,hoffs + kHChi2Nrm);
+ dest->AddAtAndExpand(hchiN,hoffs + kHChi2Nrm);
//
if (stp==0) { // these histos make sense only for clusters2tracks stage
- ttl = Form("S%d_bestInBranch%d",stp,ilr);
+ ttl = Form("S%d_bestInBranch%d_%s",stp,ilr,pref);
TH2* hnbr = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax, maxBr,-0.5,maxBr-0.5);
hnbr->SetDirectory(0);
- fCHistoArr->AddAtAndExpand(hnbr,hoffs + kHBestInBranch);
+ dest->AddAtAndExpand(hnbr,hoffs + kHBestInBranch);
//
- ttl = Form("S%d_bestInCands%d",stp,ilr);
+ ttl = Form("S%d_bestInCands%d_%s",stp,ilr,pref);
TH2* hncn = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax, maxCand,-0.5,maxCand-0.5);
hncn->SetDirectory(0);
- fCHistoArr->AddAtAndExpand(hncn,hoffs + kHBestInCand);
+ dest->AddAtAndExpand(hncn,hoffs + kHBestInCand);
//
}
}
}
// custom histos
- ttl = Form("ClSharing");
- TH2* hclShare = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax, 2*fNLrActive,0,2*fNLrActive);
- hclShare->SetDirectory(0);
- fCHistoArr->AddAtAndExpand(hclShare,kHClShare);
//
+ TH2* hchiMatch = 0;
+ ttl = Form("Chi2Match_%s",pref);
+ hchiMatch = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax, nchbins,0.,chiMax);
+ hchiMatch->SetDirectory(0);
+ dest->AddAtAndExpand(hchiMatch,kHChiMatch);
+ //
+ TH2* hchiSA = 0;
+ ttl = Form("Chi2ITSSA_%s",pref);
+ hchiSA = new TH2F(ttl.Data(),ttl.Data(),nptbins,0,ptMax, nchbins/2,0.,chiMax/2);
+ hchiSA->SetDirectory(0);
+ dest->AddAtAndExpand(hchiSA,kHChiITSSA);
+ //
}
#endif
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff