X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDtrackerV1.cxx;h=cca2e272c60cdff952b2577fc3d13ea8ca7fa72c;hb=f3c8e1f4b06d3388003b532098b09c685ebd6d1e;hp=5d68103f88bf4532ffc00963783623167b8362e8;hpb=b1135f96fe91dd5cf99ce701776b687783f565f7;p=u%2Fmrichter%2FAliRoot.git diff --git a/TRD/AliTRDtrackerV1.cxx b/TRD/AliTRDtrackerV1.cxx index 5d68103f88b..cca2e272c60 100644 --- a/TRD/AliTRDtrackerV1.cxx +++ b/TRD/AliTRDtrackerV1.cxx @@ -61,11 +61,7 @@ ClassImp(AliTRDtrackerV1) ClassImp(AliTRDtrackerV1::AliTRDLeastSquare) ClassImp(AliTRDtrackerV1::AliTRDtrackFitterRieman) -const Float_t AliTRDtrackerV1::fgkMinClustersInTrack = 0.5; // -const Float_t AliTRDtrackerV1::fgkLabelFraction = 0.8; // -const Double_t AliTRDtrackerV1::fgkMaxChi2 = 12.0; // -const Double_t AliTRDtrackerV1::fgkMaxSnp = 0.95; // Maximum local sine of the azimuthal angle -const Double_t AliTRDtrackerV1::fgkMaxStep = 2.0; // Maximal step size in propagation +AliTRDtrackerV1::ETRDtrackerV1BetheBloch AliTRDtrackerV1::fgBB = AliTRDtrackerV1::kGeant; Double_t AliTRDtrackerV1::fgTopologicQA[kNConfigs] = { 0.5112, 0.5112, 0.5112, 0.0786, 0.0786, 0.0786, 0.0786, 0.0579, 0.0579, 0.0474, @@ -73,21 +69,25 @@ Double_t AliTRDtrackerV1::fgTopologicQA[kNConfigs] = { }; const Double_t AliTRDtrackerV1::fgkX0[kNPlanes] = { 300.2, 312.8, 325.4, 338.0, 350.6, 363.2}; +// Number of Time Bins/chamber should be also stored independently by the traker +// (also in AliTRDReconstructor) in oder to be able to run HLT. Fix TODO Int_t AliTRDtrackerV1::fgNTimeBins = 0; AliRieman* AliTRDtrackerV1::fgRieman = NULL; TLinearFitter* AliTRDtrackerV1::fgTiltedRieman = NULL; TLinearFitter* AliTRDtrackerV1::fgTiltedRiemanConstrained = NULL; //____________________________________________________________________ -AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec) +AliTRDtrackerV1::AliTRDtrackerV1(const AliTRDReconstructor *rec) :AliTracker() ,fkReconstructor(NULL) + ,fkRecoParam(NULL) ,fGeom(NULL) ,fClusters(NULL) ,fTracklets(NULL) ,fTracks(NULL) ,fTracksESD(NULL) ,fSieveSeeding(0) + ,fEventInFile(-1) { // // Default constructor. @@ -133,7 +133,7 @@ AliTRDtrackerV1::~AliTRDtrackerV1() // // Destructor // - + if(fgRieman) delete fgRieman; fgRieman = NULL; if(fgTiltedRieman) delete fgTiltedRieman; fgTiltedRieman = NULL; if(fgTiltedRiemanConstrained) delete fgTiltedRiemanConstrained; fgTiltedRiemanConstrained = NULL; @@ -141,7 +141,8 @@ AliTRDtrackerV1::~AliTRDtrackerV1() if(fTracksESD){ fTracksESD->Delete(); delete fTracksESD; } if(fTracks) {fTracks->Delete(); delete fTracks;} if(fTracklets) {fTracklets->Delete(); delete fTracklets;} - if(fClusters) { + if(IsClustersOwner() && fClusters) { + AliInfo(Form("tracker[%p] removing %d own clusters @ %p", (void*)this, fClusters->GetEntries(), (void*)fClusters)); fClusters->Delete(); delete fClusters; } if(fGeom) delete fGeom; @@ -165,7 +166,7 @@ Int_t AliTRDtrackerV1::Clusters2Tracks(AliESDEvent *esd) // See AliTRDtrackerV1::Clusters2TracksSM() for details. // - if(!fkReconstructor->GetRecoParam() ){ + if(!fkRecoParam){ AliError("Reconstruction configuration not initialized. Call first AliTRDReconstructor::SetRecoParam()."); return 0; } @@ -269,12 +270,17 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) // 5. Propagation to TOF. If track propagation fails the AliESDtrack::kTRDStop is set. // + if(!fClusters || !fClusters->GetEntriesFast()){ + AliInfo("No TRD clusters"); + return 0; + } AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance(); // Calibration monitor - if (!calibra) AliInfo("Could not get Calibra instance\n"); - if(!fgNTimeBins) CookNTimeBins(); + if (!calibra) AliInfo("Could not get Calibra instance"); + if (!fgNTimeBins) fgNTimeBins = fkReconstructor->GetNTimeBins(); // Define scalers Int_t nFound = 0, // number of tracks found + nBacked = 0, // number of tracks backed up for refit nSeeds = 0, // total number of ESD seeds nTRDseeds= 0, // number of seeds in the TRD acceptance nTPCseeds= 0; // number of TPC seeds @@ -282,12 +288,13 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) Float_t *quality = NULL; Int_t *index = NULL; + fEventInFile = event->GetEventNumberInFile(); nSeeds = event->GetNumberOfTracks(); // Sort tracks according to quality // (covariance in the yz plane) if(nSeeds){ quality = new Float_t[nSeeds]; - index = new Int_t[nSeeds]; + index = new Int_t[4*nSeeds]; for (Int_t iSeed = nSeeds; iSeed--;) { AliESDtrack *seed = event->GetTrack(iSeed); Double_t covariance[15]; @@ -308,12 +315,26 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) // Check the seed status ULong_t status = seed->GetStatus(); - if ((status & AliESDtrack::kTPCout) == 0) continue; if ((status & AliESDtrack::kTRDout) != 0) continue; + if ((status & AliESDtrack::kTPCout)){ + AliDebug(3, Form("Prolongate seed[%2d] which is TPC.", iSeed)); + // set steering parameters for TPC + //fkRecoParam->SetTrackParam(kTPC); +/* } else { + if ((status & AliESDtrack::kITSout)){ + AliDebug(3, Form("Prolongate seed[%2d] which is ITS.", iSeed)); + // set steering parameters for ITS + //fkRecoParam->SetTrackParam(kITS); + // rotate + Float_t globalToTracking = AliTRDgeometry::GetAlpha()*(Int_t(seed->GetAlpha()/AliTRDgeometry::GetAlpha()) + (seed->GetAlpha()>0. ? 0.5 : -0.5)); + if(!seed->Rotate(globalToTracking)) continue; + } else continue;*/ + } else continue; // Propagate to the entrance in the TRD mother volume + track.~AliTRDtrackV1(); new(&track) AliTRDtrackV1(*seed); - if(AliTRDgeometry::GetXtrdBeg() > (fgkMaxStep + track.GetX()) && !PropagateToX(track, AliTRDgeometry::GetXtrdBeg(), fgkMaxStep)){ + if(AliTRDgeometry::GetXtrdBeg() > (AliTRDReconstructor::GetMaxStep() + track.GetX()) && !PropagateToX(track, AliTRDgeometry::GetXtrdBeg(), AliTRDReconstructor::GetMaxStep())){ seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; } @@ -321,22 +342,22 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; } - if(TMath::Abs(track.GetSnp()) > fgkMaxSnp) { + if(TMath::Abs(track.GetSnp()) > AliTRDReconstructor::GetMaxSnp()) { seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; } - nTPCseeds++; - + AliDebug(2, Form("TRD propagate TPC seed[%d] = %d.", iSeed, index[iSeed])); // store track status at TRD entrance seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup); // prepare track and do propagation in the TRD track.SetReconstructor(fkReconstructor); track.SetKink(Bool_t(seed->GetKinkIndex(0))); + track.SetPrimary(status & AliESDtrack::kTPCin); expectedClr = FollowBackProlongation(track); // check if track entered the TRD fiducial volume - if(track.GetTrackLow()){ + if(track.GetTrackIn()){ seed->UpdateTrackParams(&track, AliESDtrack::kTRDin); nTRDseeds++; } @@ -344,33 +365,29 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) if (expectedClr<0){ seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; - } - - if(expectedClr){ + } else { nFound++; - // computes PID for track + // compute PID track.CookPID(); + //compute MC label + track.CookLabel(1. - AliTRDReconstructor::GetLabelFraction()); // update calibration references using this track if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track); // save calibration object - if (fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ) { AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track); calibTrack->SetOwner(); seed->AddCalibObject(calibTrack); } //update ESD track - if ((track.GetNumberOfClusters() > 15) && (track.GetNumberOfClusters() > 0.5*expectedClr)) { - seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); - track.UpdateESDtrack(seed); - } + seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); + track.UpdateESDtrack(seed); } - if ((TMath::Abs(track.GetC(track.GetBz()) - p4) / TMath::Abs(p4) < 0.2) ||(track.Pt() > 0.8)) { - - // Make backup for back propagation + // Make backup for back propagation + if ((TMath::Abs(track.GetC(track.GetBz()) - p4) / TMath::Abs(p4) < 0.2) || (track.Pt() > 0.8)) { Int_t foundClr = track.GetNumberOfClusters(); if (foundClr >= foundMin) { - track.CookLabel(1. - fgkLabelFraction); //if(track.GetBackupTrack()) UseClusters(track.GetBackupTrack()); // Sign only gold tracks @@ -382,7 +399,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) // Full gold track if (track.GetChi2() / track.GetNumberOfClusters() < 5) { if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup); - + nBacked++; isGold = kTRUE; } @@ -390,13 +407,14 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) if ((!isGold) && (track.GetNCross() == 0) && (track.GetChi2() / track.GetNumberOfClusters() < 7)) { //seed->UpdateTrackParams(track, AliESDtrack::kTRDbackup); if (track.GetBackupTrack()) seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup); - + nBacked++; isGold = kTRUE; } if ((!isGold) && (track.GetBackupTrack())) { if ((track.GetBackupTrack()->GetNumberOfClusters() > foundMin) && ((track.GetBackupTrack()->GetChi2()/(track.GetBackupTrack()->GetNumberOfClusters()+1)) < 7)) { seed->UpdateTrackParams(track.GetBackupTrack(),AliESDtrack::kTRDbackup); + nBacked++; isGold = kTRUE; } } @@ -424,7 +442,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) xtof = TMath::Sqrt(glob[0]*glob[0]+glob[1]*glob[1]); } } - if(xtof > (fgkMaxStep + track.GetX()) && !PropagateToX(track, xtof, fgkMaxStep)){ + if(xtof > (AliTRDReconstructor::GetMaxStep() + track.GetX()) && !PropagateToX(track, xtof, AliTRDReconstructor::GetMaxStep())){ seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; } @@ -432,11 +450,11 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; } - if(TMath::Abs(track.GetSnp()) > fgkMaxSnp){ + if(TMath::Abs(track.GetSnp()) > AliTRDReconstructor::GetMaxSnp()){ seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; } - seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); + //seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); // TODO obsolete - delete seed->SetTRDQuality(track.StatusForTOF()); } @@ -446,7 +464,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) if(quality) delete [] quality; AliInfo(Form("Number of seeds: TPCout[%d] TRDin[%d]", nTPCseeds, nTRDseeds)); - AliInfo(Form("Number of tracks: TRDout[%d]", nFound)); + AliInfo(Form("Number of tracks: TRDout[%d] TRDbackup[%d]", nFound, nBacked)); // run stand alone tracking if (fkReconstructor->IsSeeding()) Clusters2Tracks(event); @@ -470,11 +488,16 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event) Int_t found = 0; // contor for updated TRD tracks + if(!fClusters || !fClusters->GetEntriesFast()){ + AliInfo("No TRD clusters"); + return 0; + } AliTRDtrackV1 track; for (Int_t itrack = 0; itrack < event->GetNumberOfTracks(); itrack++) { AliESDtrack *seed = event->GetTrack(itrack); - new(&track) AliTRDtrackV1(*seed); + ULong_t status = seed->GetStatus(); + new(&track) AliTRDtrackV1(*seed); if (track.GetX() < 270.0) { seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup); continue; @@ -482,7 +505,6 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event) // reject tracks which failed propagation in the TRD or // are produced by the TRD stand alone tracker - ULong_t status = seed->GetStatus(); if(!(status & AliESDtrack::kTRDout)) continue; if(!(status & AliESDtrack::kTRDin)) continue; nseed++; @@ -493,28 +515,28 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event) Bool_t kUPDATE = kFALSE; Double_t xTPC = 250.0; if(FollowProlongation(track)){ - // Prolongate to TPC - if (PropagateToX(track, xTPC, fgkMaxStep)) { // -with update - seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit); - found++; - kUPDATE = kTRUE; - } - // Update the friend track - if (fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ){ TObject *o = NULL; Int_t ic = 0; AliTRDtrackV1 *calibTrack = NULL; while((o = seed->GetCalibObject(ic++))){ if(!(calibTrack = dynamic_cast(o))) continue; - calibTrack->SetTrackHigh(track.GetTrackHigh()); + calibTrack->SetTrackOut(&track); } } + + // Prolongate to TPC + if (PropagateToX(track, xTPC, AliTRDReconstructor::GetMaxStep())) { // -with update + seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit); + found++; + kUPDATE = kTRUE; + } } // Prolongate to TPC without update if(!kUPDATE) { AliTRDtrackV1 tt(*seed); - if (PropagateToX(tt, xTPC, fgkMaxStep)) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDbackup); + if (PropagateToX(tt, xTPC, AliTRDReconstructor::GetMaxStep())) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDbackup); } } AliInfo(Form("Number of seeds: TRDout[%d]", nseed)); @@ -550,7 +572,6 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t) // Debug level 2 // - Bool_t kStoreIn = kTRUE; Int_t nClustersExpected = 0; for (Int_t iplane = kNPlanes; iplane--;) { Int_t index(-1); @@ -563,12 +584,12 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t) } Double_t x = tracklet->GetX();//GetX0(); // reject tracklets which are not considered for inward refit - if(x > t.GetX()+fgkMaxStep) continue; + if(x > t.GetX()+AliTRDReconstructor::GetMaxStep()) continue; // append tracklet to track t.SetTracklet(tracklet, index); - if (x < (t.GetX()-fgkMaxStep) && !PropagateToX(t, x+fgkMaxStep, fgkMaxStep)) break; + if (x < (t.GetX()-AliTRDReconstructor::GetMaxStep()) && !PropagateToX(t, x+AliTRDReconstructor::GetMaxStep(), AliTRDReconstructor::GetMaxStep())) break; if (!AdjustSector(&t)) break; // Start global position @@ -599,20 +620,46 @@ Int_t AliTRDtrackerV1::FollowProlongation(AliTRDtrackV1 &t) t.PropagateTo(x, xx0, xrho); if (!AdjustSector(&t)) break; } - if(kStoreIn){ - t.SetTrackHigh(); - kStoreIn = kFALSE; - } Double_t cov[3]; tracklet->GetCovAt(x, cov); Double_t p[2] = { tracklet->GetY(), tracklet->GetZ()}; Double_t chi2 = ((AliExternalTrackParam)t).GetPredictedChi2(p, cov); - if (chi2 < 1e+10 && t.Update(p, cov, chi2)){ + + if(fkReconstructor->IsDebugStreaming()){ + Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); + TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); + AliExternalTrackParam param0(t); + AliExternalTrackParam param1(t); + param1.Update(p, cov); + TVectorD vcov(3,cov); + TVectorD vpar(3,p); + cstreamer << "FollowProlongationInfo" + << "EventNumber=" << eventNumber + << "iplane="< dXY: %+e %+e | chi2:%.2f pT:%.2f alp:%.3f", + iplane,x,t.GetX(),p[0],p[1],cov[0],cov[1],cov[2], + p[0]-t.GetY(),p[1]-t.GetZ(), + chi2,t.Pt()*t.Charge(),t.GetAlpha())); + */ + if (chi2 < fkRecoParam->GetChi2Cut() && ((AliExternalTrackParam&)t).Update(p, cov)){ // MI parameterizad chi2 cut 03.05.2014 + // if (chi2 < 1e+10 && ((AliExternalTrackParam&)t).Update(p, cov)){ + // Register info to track + t.SetNumberOfClusters(); + t.UpdateChi2(chi2); nClustersExpected += tracklet->GetN(); } } - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 1){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 1 || AliTRDReconstructor::GetStreamLevel()>1){ Int_t index; for(int iplane=0; iplaneIsDebugStreaming() ? fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) : 0; + Int_t debugLevel = fkReconstructor->IsDebugStreaming() ? fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) : 0; + if ( AliTRDReconstructor::GetStreamLevel()>0) debugLevel= AliTRDReconstructor::GetStreamLevel(); TTreeSRedirector *cstreamer = fkReconstructor->IsDebugStreaming() ? fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker) : 0x0; + Bool_t kStoreIn(kTRUE), // toggel store track params. at TRD entry + kStandAlone(kFALSE), // toggle tracker awarness of stand alone seeding + kUseTRD(fkRecoParam->IsOverPtThreshold(t.Pt()));// use TRD measurment to update Kalman + + Int_t startLayer(0); AliTRDseedV1 tracklet, *ptrTracklet = NULL; - // in case of stand alone tracking we store all the pointers to the tracklets in a temporary array + // Special case for stand alone tracking + // - store all tracklets found by seeding + // - start propagation from first tracklet found AliTRDseedV1 *tracklets[kNPlanes]; memset(tracklets, 0, sizeof(AliTRDseedV1 *) * kNPlanes); - for(Int_t ip = 0; ip < kNPlanes; ip++){ - tracklets[ip] = t.GetTracklet(ip); + for(Int_t ip(kNPlanes); ip--;){ + if(!(tracklets[ip] = t.GetTracklet(ip))) continue; t.UnsetTracklet(ip); + if(tracklets[ip]->IsOK()) startLayer=ip; + kStandAlone = kTRUE; + kUseTRD = kTRUE; } - Bool_t kStoreIn = kTRUE, kPropagateIn = kTRUE; + AliDebug(4, Form("SA[%c] Start[%d]\n" + " [0]idx[%d] traklet[%p]\n" + " [1]idx[%d] traklet[%p]\n" + " [2]idx[%d] traklet[%p]\n" + " [3]idx[%d] traklet[%p]\n" + " [4]idx[%d] traklet[%p]\n" + " [5]idx[%d] traklet[%p]" + , kStandAlone?'y':'n', startLayer + , t.GetTrackletIndex(0), (void*)tracklets[0] + , t.GetTrackletIndex(1), (void*)tracklets[1] + , t.GetTrackletIndex(2), (void*)tracklets[2] + , t.GetTrackletIndex(3), (void*)tracklets[3] + , t.GetTrackletIndex(4), (void*)tracklets[4] + , t.GetTrackletIndex(5), (void*)tracklets[5])); // Loop through the TRD layers TGeoHMatrix *matrix = NULL; - Double_t x, y, z; - for (Int_t ily=0, sm=-1, stk=-1, det=-1; ily < AliTRDgeometry::kNlayer; ily++) { + Double_t x(0.), y(0.), z(0.); + for (Int_t ily=startLayer, sm=-1, stk=-1, det=-1; ily < AliTRDgeometry::kNlayer; ily++) { AliDebug(2, Form("Propagate to x[%d] = %7.2f", ily, fR[ily])); // rough estimate of the entry point if (!t.GetProlongation(fR[ily], y, z)){ n=-1; - t.SetStatus(AliTRDtrackV1::kProlongation); + t.SetErrStat(AliTRDtrackV1::kProlongation); AliDebug(4, Form("Failed Rough Prolongation to ly[%d] x[%7.2f] y[%7.2f] z[%7.2f]", ily, fR[ily], y, z)); break; } @@ -715,7 +786,6 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) stk = fGeom->GetStack(z, ily); det = stk>=0 ? AliTRDgeometry::GetDetector(ily, stk, sm) : -1; matrix = det>=0 ? fGeom->GetClusterMatrix(det) : NULL; - AliDebug(3, Form("Propagate to det[%3d]", det)); // check if supermodule/chamber is installed if( !fGeom->GetSMstatus(sm) || @@ -724,25 +794,25 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) !matrix ){ AliDebug(4, Form("Missing Geometry ly[%d]. Guess radial position", ily)); // propagate to the default radial position - if(fR[ily] > (fgkMaxStep + t.GetX()) && !PropagateToX(t, fR[ily], fgkMaxStep)){ + if(fR[ily] > (AliTRDReconstructor::GetMaxStep() + t.GetX()) && !PropagateToX(t, fR[ily], AliTRDReconstructor::GetMaxStep())){ n=-1; - t.SetStatus(AliTRDtrackV1::kPropagation); + t.SetErrStat(AliTRDtrackV1::kPropagation); AliDebug(4, "Failed Propagation [Missing Geometry]"); break; } if(!AdjustSector(&t)){ n=-1; - t.SetStatus(AliTRDtrackV1::kAdjustSector); + t.SetErrStat(AliTRDtrackV1::kAdjustSector); AliDebug(4, "Failed Adjust Sector [Missing Geometry]"); break; } - if(TMath::Abs(t.GetSnp()) > fgkMaxSnp){ + if(TMath::Abs(t.GetSnp()) > AliTRDReconstructor::GetMaxSnp()){ n=-1; - t.SetStatus(AliTRDtrackV1::kSnp); + t.SetErrStat(AliTRDtrackV1::kSnp); AliDebug(4, "Failed Max Snp [Missing Geometry]"); break; } - t.SetStatus(AliTRDtrackV1::kGeometry, ily); + t.SetErrStat(AliTRDtrackV1::kGeometry, ily); continue; } @@ -750,25 +820,26 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) Double_t loc[] = {AliTRDgeometry::AnodePos()- driftLength, 0., 0.}; Double_t glb[] = {0., 0., 0.}; matrix->LocalToMaster(loc, glb); + AliDebug(3, Form("Propagate to det[%3d] x_anode[%7.2f] (%f %f)", det, glb[0]+driftLength, glb[1], glb[2])); // Propagate to the radial distance of the current layer - x = glb[0] - fgkMaxStep; - if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)){ + x = glb[0] - AliTRDReconstructor::GetMaxStep(); + if(x > (AliTRDReconstructor::GetMaxStep() + t.GetX()) && !PropagateToX(t, x, AliTRDReconstructor::GetMaxStep())){ n=-1; - t.SetStatus(AliTRDtrackV1::kPropagation); + t.SetErrStat(AliTRDtrackV1::kPropagation); AliDebug(4, Form("Failed Initial Propagation to x[%7.2f]", x)); break; } if(!AdjustSector(&t)){ n=-1; - t.SetStatus(AliTRDtrackV1::kAdjustSector); + t.SetErrStat(AliTRDtrackV1::kAdjustSector); AliDebug(4, "Failed Adjust Sector Start"); break; } - if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) { + if(TMath::Abs(t.GetSnp()) > AliTRDReconstructor::GetMaxSnp()) { n=-1; - t.SetStatus(AliTRDtrackV1::kSnp); - AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp)); + t.SetErrStat(AliTRDtrackV1::kSnp); + AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), AliTRDReconstructor::GetMaxSnp())); break; } Bool_t doRecalculate = kFALSE; @@ -783,76 +854,79 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) if(doRecalculate){ det = AliTRDgeometry::GetDetector(ily, stk, sm); if(!(matrix = fGeom->GetClusterMatrix(det))){ - t.SetStatus(AliTRDtrackV1::kGeometry, ily); + t.SetErrStat(AliTRDtrackV1::kGeometry, ily); AliDebug(4, Form("Failed Geometry Matrix ly[%d]", ily)); continue; } matrix->LocalToMaster(loc, glb); - x = glb[0] - fgkMaxStep; + x = glb[0] - AliTRDReconstructor::GetMaxStep(); } // check if track is well inside fiducial volume - if (!t.GetProlongation(x+fgkMaxStep, y, z)) { + if (!t.GetProlongation(x+AliTRDReconstructor::GetMaxStep(), y, z)) { n=-1; - t.SetStatus(AliTRDtrackV1::kProlongation); - AliDebug(4, Form("Failed Prolongation to x[%7.2f] y[%7.2f] z[%7.2f]", x+fgkMaxStep, y, z)); + t.SetErrStat(AliTRDtrackV1::kProlongation); + AliDebug(4, Form("Failed Prolongation to x[%7.2f] y[%7.2f] z[%7.2f]", x+AliTRDReconstructor::GetMaxStep(), y, z)); break; } if(fGeom->IsOnBoundary(det, y, z, .5)){ - t.SetStatus(AliTRDtrackV1::kBoundary, ily); + t.SetErrStat(AliTRDtrackV1::kBoundary, ily); AliDebug(4, "Failed Track on Boundary"); continue; } - // mark track as entering the FIDUCIAL volume of TRD - if(kStoreIn){ - t.SetTrackLow(); - kStoreIn = kFALSE; - } + Float_t prod(t.GetBz()*t.Charge()); ptrTracklet = tracklets[ily]; if(!ptrTracklet){ // BUILD TRACKLET AliDebug(3, Form("Building tracklet det[%d]", det)); // check data in supermodule if(!fTrSec[sm].GetNChambers()){ - t.SetStatus(AliTRDtrackV1::kNoClusters, ily); + t.SetErrStat(AliTRDtrackV1::kNoClusters, ily); AliDebug(4, "Failed NoClusters"); continue; } if(fTrSec[sm].GetX(ily) < 1.){ - t.SetStatus(AliTRDtrackV1::kNoClusters, ily); + t.SetErrStat(AliTRDtrackV1::kNoClusters, ily); AliDebug(4, "Failed NoX"); continue; } // check data in chamber if(!(chamber = fTrSec[sm].GetChamber(stk, ily))){ - t.SetStatus(AliTRDtrackV1::kNoClusters, ily); + t.SetErrStat(AliTRDtrackV1::kNoClusters, ily); AliDebug(4, "Failed No Detector"); continue; } - if(chamber->GetNClusters() < fgNTimeBins*fkReconstructor->GetRecoParam() ->GetFindableClusters()){ - t.SetStatus(AliTRDtrackV1::kNoClusters, ily); + if(chamber->GetNClusters() < fgNTimeBins*fkRecoParam ->GetFindableClusters()){ + t.SetErrStat(AliTRDtrackV1::kNoClusters, ily); AliDebug(4, "Failed Not Enough Clusters in Detector"); continue; } // build tracklet + tracklet.~AliTRDseedV1(); ptrTracklet = new(&tracklet) AliTRDseedV1(det); ptrTracklet->SetReconstructor(fkReconstructor); ptrTracklet->SetKink(t.IsKink()); + ptrTracklet->SetPrimary(t.IsPrimary()); ptrTracklet->SetPadPlane(fGeom->GetPadPlane(ily, stk)); + //set first approximation of radial position of anode wire corresponding to middle chamber y=0, z=0 + // the uncertainty is given by the actual position of the tracklet (y,z) and chamber inclination ptrTracklet->SetX0(glb[0]+driftLength); - if(!tracklet.Init(&t)){ + if(!ptrTracklet->Init(&t)){ n=-1; - t.SetStatus(AliTRDtrackV1::kTrackletInit); + t.SetErrStat(AliTRDtrackV1::kTrackletInit); AliDebug(4, "Failed Tracklet Init"); break; } - if(!tracklet.AttachClusters(chamber, kTRUE)){ - t.SetStatus(AliTRDtrackV1::kNoAttach, ily); + // Select attachment base on track to B field sign not only track charge which is buggy + // mark kFALSE same sign tracks and kTRUE opposite sign tracks + // A.Bercuci 3.11.2011 + if(!ptrTracklet->AttachClusters(chamber, kTRUE, prod<0.?kTRUE:kFALSE, fEventInFile)){ + t.SetErrStat(AliTRDtrackV1::kNoAttach, ily); if(debugLevel>3){ AliTRDseedV1 trackletCp(*ptrTracklet); UChar_t status(t.GetStatusTRD(ily)); - (*cstreamer) << "FollowBackProlongation2" + (*cstreamer) << "FollowBackProlongation4" <<"status=" << status <<"tracklet.=" << &trackletCp << "\n"; @@ -860,13 +934,13 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) AliDebug(4, "Failed Attach Clusters"); continue; } - AliDebug(3, Form("Number of Clusters in Tracklet: %d", tracklet.GetN())); - if(tracklet.GetN() < fgNTimeBins*fkReconstructor->GetRecoParam() ->GetFindableClusters()){ - t.SetStatus(AliTRDtrackV1::kNoClustersTracklet, ily); + AliDebug(3, Form("Number of Clusters in Tracklet: %d", ptrTracklet->GetN())); + if(ptrTracklet->GetN() < fgNTimeBins*fkRecoParam->GetFindableClusters()){ + t.SetErrStat(AliTRDtrackV1::kNoClustersTracklet, ily); if(debugLevel>3){ AliTRDseedV1 trackletCp(*ptrTracklet); UChar_t status(t.GetStatusTRD(ily)); - (*cstreamer) << "FollowBackProlongation2" + (*cstreamer) << "FollowBackProlongation4" <<"status=" << status <<"tracklet.=" << &trackletCp << "\n"; @@ -877,48 +951,78 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) ptrTracklet->UpdateUsed(); } else AliDebug(2, Form("Use external tracklet ly[%d]", ily)); // propagate track to the radial position of the tracklet - ptrTracklet->UseClusters(); // TODO ? do we need this here ? - // fit tracklet no tilt correction - if(!ptrTracklet->Fit(kFALSE)){ - t.SetStatus(AliTRDtrackV1::kNoFit, ily); + + // fit tracklet in the local chamber coordinate system + // tilt correction options + // 0 : no correction + // 2 : pseudo tilt correction + if(!ptrTracklet->FitRobust(fGeom->GetPadPlane(ily, stk), matrix, t.GetBz(), t.Charge())){ + t.SetErrStat(AliTRDtrackV1::kNoFit, ily); AliDebug(4, "Failed Tracklet Fit"); continue; } + // Calculate tracklet position in tracking coordinates + // A.Bercuci 27.11.2013 + ptrTracklet->SetXYZ(matrix); + x = ptrTracklet->GetX(); //GetX0(); - if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)) { + if(x > (AliTRDReconstructor::GetMaxStep() + t.GetX()) && !PropagateToX(t, x, AliTRDReconstructor::GetMaxStep())) { n=-1; - t.SetStatus(AliTRDtrackV1::kPropagation); + t.SetErrStat(AliTRDtrackV1::kPropagation); AliDebug(4, Form("Failed Propagation to Tracklet x[%7.2f]", x)); break; } if(!AdjustSector(&t)) { n=-1; - t.SetStatus(AliTRDtrackV1::kAdjustSector); + t.SetErrStat(AliTRDtrackV1::kAdjustSector); AliDebug(4, "Failed Adjust Sector"); break; } - if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) { + if(TMath::Abs(t.GetSnp()) > AliTRDReconstructor::GetMaxSnp()) { n=-1; - t.SetStatus(AliTRDtrackV1::kSnp); - AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp)); + t.SetErrStat(AliTRDtrackV1::kSnp); + AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), AliTRDReconstructor::GetMaxSnp())); break; } - if(kPropagateIn){ - t.SetTrackLow(); - kPropagateIn = kFALSE; - } Double_t cov[3]; ptrTracklet->GetCovAt(x, cov); Double_t p[2] = { ptrTracklet->GetY(), ptrTracklet->GetZ()}; Double_t chi2 = ((AliExternalTrackParam)t).GetPredictedChi2(p, cov); - // update Kalman with the TRD measurement - if(chi2>1e+10){ // TODO - t.SetStatus(AliTRDtrackV1::kChi2, ily); + /* + AliInfo(Form("Pl:%d X:%+e : %+e P: %+e %+e Cov:%+e %+e %+e -> dXY: %+e %+e | chi2:%.2f pT:%.2f alp:%.3f", + ily,x,t.GetX(),p[0],p[1],cov[0],cov[1],cov[2], + p[0]-t.GetY(),p[1]-t.GetZ(), + chi2,t.Pt()*t.Charge(),t.GetAlpha())); + */ + + if(fkReconstructor->IsDebugStreaming()){ + Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); + // TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); + AliExternalTrackParam param0(t); + AliExternalTrackParam param1(t); + param1.Update(p, cov); + TVectorD vcov(3,cov); + TVectorD vpar(3,p); + (*cstreamer) << "FollowBackProlongationInfo" + << "EventNumber=" << eventNumber + << "chi2="< fkRecoParam->GetChi2Cut()){ // MI parameterizad chi2 cut 03.05.2014 + t.SetErrStat(AliTRDtrackV1::kChi2, ily); if(debugLevel > 2){ UChar_t status(t.GetStatusTRD()); AliTRDseedV1 trackletCp(*ptrTracklet); AliTRDtrackV1 trackCp(t); trackCp.SetOwner(); - (*cstreamer) << "FollowBackProlongation1" + (*cstreamer) << "FollowBackProlongation3" << "status=" << status << "tracklet.=" << &trackletCp << "track.=" << &trackCp @@ -927,32 +1031,47 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) AliDebug(4, Form("Failed Chi2[%f]", chi2)); continue; } - if(!t.Update(p, cov, chi2)) { - n=-1; - t.SetStatus(AliTRDtrackV1::kUpdate); - if(debugLevel > 2){ - UChar_t status(t.GetStatusTRD()); - AliTRDseedV1 trackletCp(*ptrTracklet); - AliTRDtrackV1 trackCp(t); - trackCp.SetOwner(); - (*cstreamer) << "FollowBackProlongation1" - << "status=" << status - << "tracklet.=" << &trackletCp - << "track.=" << &trackCp - << "\n"; + // mark track as entering the FIDUCIAL volume of TRD + if(kStoreIn){ + t.SetTrackIn(); + kStoreIn = kFALSE; + } + if(kUseTRD){ + if(!((AliExternalTrackParam&)t).Update(p, cov)) { + n=-1; + t.SetErrStat(AliTRDtrackV1::kUpdate); + if(debugLevel > 2){ + UChar_t status(t.GetStatusTRD()); + AliTRDseedV1 trackletCp(*ptrTracklet); + AliTRDtrackV1 trackCp(t); + trackCp.SetOwner(); + (*cstreamer) << "FollowBackProlongation3" + << "status=" << status + << "tracklet.=" << &trackletCp + << "track.=" << &trackCp + << "\n"; + } + AliDebug(4, Form("Failed Track Update @ y[%7.2f] z[%7.2f] s2y[%f] s2z[%f] covyz[%f]", p[0], p[1], cov[0], cov[2], cov[1])); + break; } - AliDebug(4, Form("Failed Track Update @ y[%7.2f] z[%7.2f] s2y[%f] s2z[%f] covyz[%f]", p[0], p[1], cov[0], cov[2], cov[1])); - break; } + if(!kStandAlone) ptrTracklet->UseClusters(); // fill residuals ?! AliTracker::FillResiduals(&t, p, cov, ptrTracklet->GetVolumeId()); - // load tracklet to the tracker - ptrTracklet->Update(&t); + // register tracklet with the tracker and track + // Save inside the tracklet the track parameters BEFORE track update. + // Commented out their overwriting AFTER track update + // A.Bercuci 3.11.2011 + //ptrTracklet->Update(&t); ptrTracklet = SetTracklet(ptrTracklet); Int_t index(fTracklets->GetEntriesFast()-1); t.SetTracklet(ptrTracklet, index); + // Register info to track + t.SetNumberOfClusters(); + t.UpdateChi2(chi2); + n += ptrTracklet->GetN(); AliDebug(2, Form("Setting Tracklet[%d] @ Idx[%d]", ily, index)); @@ -960,31 +1079,19 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) // if(ilayer>0 && t.GetTracklet(ilayer-1) && ptrTracklet->GetN() + t.GetTracklet(ilayer-1)->GetN() > 20) t.SetBudget(2, 0.); // Make backup of the track until is gold - // TO DO update quality check of the track. - // consider comparison with fTimeBinsRange - Float_t ratio0 = ptrTracklet->GetN() / Float_t(fgNTimeBins); - //Float_t ratio1 = Float_t(t.GetNumberOfClusters()+1) / Float_t(t.GetNExpected()+1); - - if( (chi2 < 18.0) && - (ratio0 > 0.8) && - //(ratio1 > 0.6) && - //(ratio0+ratio1 > 1.5) && - (t.GetNCross() == 0) && - (TMath::Abs(t.GetSnp()) < 0.85) && - (t.GetNumberOfClusters() > 20)){ - t.MakeBackupTrack(); - } + Int_t failed(0); + if(!kStandAlone && (failed = t.MakeBackupTrack())) AliDebug(2, Form("Failed backup on cut[%d]", failed)); + } // end layers loop //printf("clusters[%d] chi2[%f] x[%f] status[%d ", n, t.GetChi2(), t.GetX(), t.GetStatusTRD()); //for(int i=0; i<6; i++) printf("%d ", t.GetStatusTRD(i)); printf("]\n"); - if(debugLevel > 1){ - Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); + if(n && debugLevel > 1){ + //Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); AliTRDtrackV1 track(t); track.SetOwner(); - (*cstreamer) << "FollowBackProlongation0" - << "EventNumber=" << eventNumber - << "ncl=" << n + (*cstreamer) << "FollowBackProlongation2" + << "EventNumber=" << fEventInFile << "track.=" << &track << "\n"; } @@ -1106,7 +1213,7 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub if(!tracklets[ilr].IsOK()) continue; for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){ if(!tracklets[ilr].IsUsable(itb)) continue; - cl = tracklets[ilr].GetClusters(itb); + if(!(cl = tracklets[ilr].GetClusters(itb))) continue; if(!cl->IsInChamber()) continue; x = cl->GetX(); y = cl->GetY(); @@ -1129,9 +1236,14 @@ Float_t AliTRDtrackerV1::FitTiltedRiemanConstraint(AliTRDseedV1 *tracklets, Doub Double_t b = fitter->GetParameter(1); Double_t curvature = a/TMath::Sqrt(b*b + 1); - Float_t chi2track = fitter->GetChisquare()/Double_t(nPoints); + Float_t chi2track = 0.0; + if (nPoints > 0) { + chi2track = fitter->GetChisquare()/Double_t(nPoints); + } for(Int_t ip = 0; ip < AliTRDtrackerV1::kNPlanes; ip++) - tracklets[ip].SetC(curvature); + tracklets[ip].SetC(curvature, 1); + + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitTiltedRiemanConstraint: Chi2[%f] C[%5.2e] pt[%8.3f]\n", chi2track, curvature, GetBz()*kB2C/curvature); /* if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker()) >= 5){ //Linear Model on z-direction @@ -1237,7 +1349,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro nPoints++; } } - fitter->Eval(); + if (fitter->Eval()) return 1.e10; zfitter.Eval(); Double_t offset = fitter->GetParameter(3); @@ -1270,8 +1382,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro Double_t b = fitter->GetParameter(1); Double_t c = fitter->GetParameter(2); Double_t curvature = 1.0 + b*b - c*a; - if (curvature > 0.0) - curvature = a / TMath::Sqrt(curvature); + if (curvature > 0.0) curvature = a / TMath::Sqrt(curvature); Double_t chi2track = fitter->GetChisquare()/Double_t(nPoints); @@ -1288,13 +1399,13 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro covarPolZ.Invert(); // Update the tracklets - Double_t x1, dy, dz; + Double_t dy, dz; Double_t cov[15]; memset(cov, 0, sizeof(Double_t) * 15); for(Int_t iLayer = 0; iLayer < AliTRDtrackerV1::kNPlanes; iLayer++) { x = tracklets[iLayer].GetX0(); - x1 = x - xref; +// x1 = x - xref; y = 0; z = 0; dy = 0; @@ -1352,6 +1463,7 @@ Float_t AliTRDtrackerV1::FitTiltedRieman(AliTRDseedV1 *tracklets, Bool_t sigErro tracklets[iLayer].SetCovRef(cov); tracklets[iLayer].SetChi2(chi2track); } + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitTiltedRieman: Chi2[%f] C[%5.2e] pt[%8.3f]\n", chi2track, curvature, GetBz()*kB2C/curvature); /* if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >=5){ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); @@ -1512,6 +1624,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1 } Double_t xref = CalculateReferenceX(tracklets); + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitRiemanTilt:\nx0[(0)%6.2f (1)%6.2f (2)%6.2f (3)%6.2f (4)%6.2f (5)%6.2f] xref[%6.2f]", tracklets[0].GetX0(), tracklets[1].GetX0(), tracklets[2].GetX0(), tracklets[3].GetX0(), tracklets[4].GetX0(), tracklets[5].GetX0(), xref); Double_t x, y, z, t, tilt, dx, w, we; Double_t uvt[4]; Int_t nPoints = 0; @@ -1520,7 +1633,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1 if(!tracklets[ipl].IsOK()) continue; for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){ if(!(cl = tracklets[ipl].GetClusters(itb))) continue; - if (!tracklets[ipl].IsUsable(itb)) continue; + //if (!tracklets[ipl].IsUsable(itb)) continue; x = cl->GetX(); y = cl->GetY(); z = cl->GetZ(); @@ -1584,6 +1697,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1 // Calculate chi2 of the fit Double_t chi2 = fitter->GetChisquare()/Double_t(nPoints); + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>3) printf("D-AliTRDtrackerV1::FitRiemanTilt:x0[%6.2f] y0[%6.2f] R[%6.2f] chi2[%f]\n", x0, y0, radius, chi2); // Update the tracklets if(!track){ @@ -1639,7 +1753,8 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t //if(points) printf("First marker point @ x[%d] = %f\n", ip, points[ip].GetX()); - AliTRDseedV1 tracklet, *ptrTracklet = NULL; + AliTRDseedV1 tracklet; + AliTRDseedV1 *ptrTracklet = NULL; //Loop through the TRD planes for (Int_t jplane = 0; jplane < kNPlanes; jplane++) { @@ -1662,8 +1777,8 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t while(ip < np){ //don't do anything if next marker is after next update point. - if((up?-1:1) * (points[ip].GetX() - x) - fgkMaxStep < 0) break; - if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), fgkMaxStep)) return -1.; + if((up?-1:1) * (points[ip].GetX() - x) - AliTRDReconstructor::GetMaxStep() < 0) break; + if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), AliTRDReconstructor::GetMaxStep())) return -1.; Double_t xyz[3]; // should also get the covariance track->GetXYZ(xyz); @@ -1674,10 +1789,10 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t // printf("plane[%d] tracklet[%p] x[%f]\n", iplane, ptrTracklet, x); // Propagate closer to the next update point - if(((up?-1:1) * (x - track->GetX()) + fgkMaxStep < 0) && !PropagateToX(*track, x + (up?-1:1)*fgkMaxStep, fgkMaxStep)) return -1.; + if(((up?-1:1) * (x - track->GetX()) + AliTRDReconstructor::GetMaxStep() < 0) && !PropagateToX(*track, x + (up?-1:1)*AliTRDReconstructor::GetMaxStep(), AliTRDReconstructor::GetMaxStep())) return -1.; if(!AdjustSector(track)) return -1; - if(TMath::Abs(track->GetSnp()) > fgkMaxSnp) return -1; + if(TMath::Abs(track->GetSnp()) > AliTRDReconstructor::GetMaxSnp()) return -1; //load tracklet to the tracker and the track /* Int_t index; @@ -1703,7 +1818,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t xyz1[0] = x * TMath::Cos(alpha) - y * TMath::Sin(alpha); xyz1[1] = +x * TMath::Sin(alpha) + y * TMath::Cos(alpha); xyz1[2] = z; - if((xyz0[0] - xyz1[9] < 1e-3) && (xyz0[0] - xyz1[9] < 1e-3)) continue; // check wheter we are at the same global x position + if(TMath::Abs(xyz0[0] - xyz1[0]) < 1e-3 && TMath::Abs(xyz0[1] - xyz1[1]) < 1e-3) continue; // check wheter we are at the same global x position Double_t param[7]; if(AliTracker::MeanMaterialBudget(xyz0, xyz1, param) <=0.) break; Double_t xrho = param[0]*param[4]; // density*length @@ -1717,7 +1832,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t Double_t cov[3]; ptrTracklet->GetCovAt(x, cov); Double_t p[2] = { ptrTracklet->GetY(), ptrTracklet->GetZ()}; Double_t chi2 = ((AliExternalTrackParam*)track)->GetPredictedChi2(p, cov); - if(chi2<1e+10) track->Update(p, cov, chi2); + if(chi2<1e+10) ((AliExternalTrackParam*)track)->Update(p, cov); if(!up) continue; //Reset material budget if 2 consecutive gold @@ -1726,7 +1841,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t // extrapolation while(ip < np){ - if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), fgkMaxStep)) return -1.; + if(((up?-1:1) * (points[ip].GetX() - track->GetX()) < 0) && !PropagateToX(*track, points[ip].GetX(), AliTRDReconstructor::GetMaxStep())) return -1.; Double_t xyz[3]; // should also get the covariance track->GetXYZ(xyz); @@ -1739,7 +1854,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t } //_________________________________________________________________________ -Float_t AliTRDtrackerV1::CalculateChi2Z(AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref) +Float_t AliTRDtrackerV1::CalculateChi2Z(const AliTRDseedV1 *tracklets, Double_t offset, Double_t slope, Double_t xref) { // // Calculates the chi2-value of the track in z-Direction including tilting pad correction. @@ -1767,20 +1882,19 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m { // // Starting from current X-position of track this function - // extrapolates the track up to radial position . + // extrapolates the track up to radial position in steps of . // Returns 1 if track reaches the plane, and 0 otherwise // - const Double_t kEpsilon = 0.00001; - // Current track X-position - Double_t xpos = t.GetX(); + Double_t xpos = t.GetX()/*, + mass = t.GetMass()*/; // Direction: inward or outward Double_t dir = (xpos < xToGo) ? 1.0 : -1.0; - while (((xToGo - xpos) * dir) > kEpsilon) { - + while (((xToGo - xpos) * dir) > AliTRDReconstructor::GetEpsilon()) { +// printf("to go %f\n", (xToGo - xpos) * dir); Double_t xyz0[3]; Double_t xyz1[3]; Double_t param[7]; @@ -1808,12 +1922,47 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m // Calculate the mean material budget between start and // end point of this prolongation step if(AliTracker::MeanMaterialBudget(xyz0, xyz1, param)<=0.) return 0; - + // Propagate the track to the X-position after the next step if (!t.PropagateTo(x, param[1], param[0]*param[4])) return 0; +/* // Correct for mean material budget + Double_t dEdx(0.), + bg(TMath::Abs(t.GetP()/mass)); + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>=3){ + const char *pn[] = {"rho", "x/X0", "", "", "L", "", "Nb"}; + printf("D-AliTRDtrackerV1::PropagateTo(): x[%6.2f] bg[%6.2f]\n", xpos, bg); + printf(" param :: %s[%e] %s[%e] %s[%e] %s[%e] %s[%e] %s[%e] %s[%e]\n" + , pn[0], param[0] + , pn[1], param[1] + , pn[2], param[2] + , pn[3], param[3] + , pn[4], param[4] + , pn[5], param[5] + , pn[6], param[6]); + } + switch(fgBB){ + case kSolid: + dEdx = AliExternalTrackParam::BetheBlochSolid(bg); + break; + case kGas: + dEdx = AliExternalTrackParam::BetheBlochGas(bg); + break; + case kGeant: + { // mean exitation energy (GeV) + Double_t mee = ((param[3] < 13.) ? (12. * param[3] + 7.) : (9.76 * param[3] + 58.8 * TMath::Power(param[3],-0.19))) * 1.e-9; + Double_t mZA = param[5]>1.e-5?param[5]:(param[3]/param[2]); + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>=3) printf("D-AliTRDtrackerV1::PropagateTo(): Mee[%e] [%e]\n", mee, mZA); + // protect against failed calculation of rho in MeanMaterialBudget() + dEdx = AliExternalTrackParam::BetheBlochGeant(bg, param[0]>1.e-6?param[0]:2.33, 0.2, 3., mee, mZA); + } + break; + } + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")>=2) printf("D-AliTRDtrackerV1::PropagateTo(): dEdx(bg=%e, m=%e)= %e[GeV/cm]\n", bg, mass, dEdx); + if (!t.CorrectForMeanMaterialdEdx(param[1], dir*param[0]*param[4], mass, dEdx)) return 0; +*/ // Rotate the track if necessary - AdjustSector(&t); + if(!AdjustSector(&t)) return 0; // New track X-position xpos = t.GetX(); @@ -1824,9 +1973,8 @@ Int_t AliTRDtrackerV1::PropagateToX(AliTRDtrackV1 &t, Double_t xToGo, Double_t m } - //_____________________________________________________________________________ -Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) const +Bool_t AliTRDtrackerV1::ReadClusters(TTree *clusterTree) { // // Reads AliTRDclusters from the file. @@ -1840,15 +1988,17 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co TBranch *branch = clusterTree->GetBranch("TRDcluster"); if (!branch) { AliError("Can't get the branch !"); - return 1; + return kFALSE; } branch->SetAddress(&clusterArray); - + if(!fClusters){ - Float_t nclusters = fkReconstructor->GetRecoParam()->GetNClusters(); + Float_t nclusters = fkRecoParam->GetNClusters(); if(fkReconstructor->IsHLT()) nclusters /= AliTRDgeometry::kNsector; - array = new TClonesArray("AliTRDcluster", Int_t(nclusters)); - array->SetOwner(kTRUE); + fClusters = new TClonesArray("AliTRDcluster", Int_t(nclusters)); + fClusters->SetOwner(kTRUE); + SetClustersOwner(); + AliInfo(Form("Tracker owning clusters @ %p", (void*)fClusters)); } // Loop through all entries in the tree @@ -1867,11 +2017,10 @@ Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) co new((*fClusters)[ncl++]) AliTRDcluster(*c); delete (clusterArray->RemoveAt(iCluster)); } - } delete clusterArray; - return 0; + return kTRUE; } //_____________________________________________________________________________ @@ -1881,27 +2030,28 @@ Int_t AliTRDtrackerV1::LoadClusters(TTree *cTree) // Fills clusters into TRD tracking sectors // - if(!fkReconstructor->IsWritingClusters()){ - fClusters = AliTRDReconstructor::GetClusters(); + fkRecoParam = fkReconstructor->GetRecoParam(); // load reco param for this event + +// if(!fkReconstructor->IsWritingClusters()) AliInfo(Form("IsWritingClusters[%c]", fkReconstructor->IsWritingClusters()?'y':'n')); + if(!(fClusters = AliTRDReconstructor::GetClusters())){ + AliWarning("Clusters unavailable from TRD reconstructor. Trying reading from tree ..."); } else { - if (ReadClusters(fClusters, cTree)) { - AliError("Problem with reading the clusters !"); + if(!ReadClusters(cTree)) { + AliError("Reading clusters from tree failed."); return 1; } } - SetClustersOwner(); if(!fClusters || !fClusters->GetEntriesFast()){ AliInfo("No TRD clusters"); return 1; - } + } else AliInfo(Form("Using :: clusters[%d] onl.tracklets[%d] onl.tracks[%d]", + fClusters?fClusters->GetEntriesFast():0, + AliTRDReconstructor::GetTracklets()?AliTRDReconstructor::GetTracklets()->GetEntriesFast():0, + AliTRDReconstructor::GetTracks()?AliTRDReconstructor::GetTracks()->GetEntriesFast():0)); - //Int_t nin = BuildTrackingContainers(); - //Int_t ncl = fClusters->GetEntriesFast(); - //AliInfo(Form("Clusters %d [%6.2f %% in the active volume]", ncl, 100.*float(nin)/ncl)); - return 0; } @@ -1915,17 +2065,14 @@ Int_t AliTRDtrackerV1::LoadClusters(TClonesArray * const clusters) if(!clusters || !clusters->GetEntriesFast()){ AliInfo("No TRD clusters"); return 1; - } + } else AliInfo(Form("Using :: external.clusters[%d]", clusters->GetEntriesFast())); + fClusters = clusters; - SetClustersOwner(); - //Int_t nin = + fkRecoParam = fkReconstructor->GetRecoParam(); // load reco param for this event BuildTrackingContainers(); - //Int_t ncl = fClusters->GetEntriesFast(); - //AliInfo(Form("Clusters %d [%6.2f %% in the active volume]", ncl, 100.*float(nin)/ncl)); - return 0; } @@ -1935,9 +2082,9 @@ Int_t AliTRDtrackerV1::BuildTrackingContainers() { // Building tracking containers for clusters - Int_t nin =0, icl = fClusters->GetEntriesFast(); - while (icl--) { - AliTRDcluster *c = (AliTRDcluster *) fClusters->UncheckedAt(icl); + Int_t nin(0), ncl(fClusters->GetEntriesFast()); + while (ncl--) { + AliTRDcluster *c = (AliTRDcluster *) fClusters->UncheckedAt(ncl); if(c->IsInChamber()) nin++; if(fkReconstructor->IsHLT()) c->SetRPhiMethod(AliTRDcluster::kCOG); Int_t detector = c->GetDetector(); @@ -1945,13 +2092,12 @@ Int_t AliTRDtrackerV1::BuildTrackingContainers() Int_t stack = fGeom->GetStack(detector); Int_t layer = fGeom->GetLayer(detector); - fTrSec[sector].GetChamber(stack, layer, kTRUE)->InsertCluster(c, icl); + fTrSec[sector].GetChamber(stack, layer, kTRUE)->InsertCluster(c, ncl); } - const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det(); for(int isector =0; isectorDelete(); if(HasRemoveContainers()){delete fTracklets; fTracklets = NULL;} } - if(fClusters){ - if(IsClustersOwner()) fClusters->Delete(); - - // save clusters array in the reconstructor for further use. - if(!fkReconstructor->IsWritingClusters()){ - AliTRDReconstructor::SetClusters(fClusters); - SetClustersOwner(kFALSE); - } else AliTRDReconstructor::SetClusters(NULL); + if(fClusters && IsClustersOwner()){ + AliInfo(Form("tracker[%p] clearing %d own clusters @ %p", (void*)this, fClusters->GetEntries(), (void*)fClusters)); + fClusters->Delete(); +// +// // save clusters array in the reconstructor for further use. +// if(!fkReconstructor->IsWritingClusters()){ +// AliTRDReconstructor::SetClusters(fClusters); +// SetClustersOwner(kFALSE); +// } else AliTRDReconstructor::SetClusters(NULL); } for (int i = 0; i < AliTRDgeometry::kNsector; i++) fTrSec[i].Clear(); @@ -2037,7 +2184,7 @@ Bool_t AliTRDtrackerV1::AdjustSector(AliTRDtrackV1 *const track) //____________________________________________________________________ -AliTRDseedV1* AliTRDtrackerV1::GetTracklet(AliTRDtrackV1 *const track, Int_t p, Int_t &idx) +AliTRDseedV1* AliTRDtrackerV1::GetTracklet(const AliTRDtrackV1 *const track, Int_t p, Int_t &idx) { // Find tracklet for TRD track // Parameters @@ -2079,33 +2226,6 @@ AliTRDseedV1* AliTRDtrackerV1::SetTracklet(const AliTRDseedV1 * const tracklet) return new ((*fTracklets)[nentries]) AliTRDseedV1(*tracklet); } -//____________________________________________________________________ -void AliTRDtrackerV1::CookNTimeBins() -{ - // Initialize number of time bins - - if(fgNTimeBins){ - // first look if set by hand - AliDebug(2, Form("NTimeBins [%d] (set by user)", fgNTimeBins)); - } else if(fkReconstructor && fkReconstructor->HasDigitsParam()) { - // second look into digits param to avoid DB query - fgNTimeBins = fkReconstructor->GetDigitsParam()->GetNTimeBins(); - AliDebug(2, Form("NTimeBins [%d] (set from digits param)", fgNTimeBins)); - } else { // third query DB - AliTRDcalibDB *trd(NULL); - if((trd = AliTRDcalibDB::Instance())) { - if((fgNTimeBins = trd->GetNumberOfTimeBinsDCS()) <= 0){ - AliError("Corrupted DCS Object in OCDB"); - fgNTimeBins = 24; - AliDebug(2, Form("NTimeBins [%d] (set to default)", fgNTimeBins)); - } else AliDebug(2, Form("NTimeBins [%d] (set from DB)", fgNTimeBins)); - } else AliFatal("Could not get DB."); - } - if(fgNTimeBins<=0){ - AliFatal("Could not get number of time bins."); - } -} - //____________________________________________________________________ AliTRDtrackV1* AliTRDtrackerV1::SetTrack(const AliTRDtrackV1 * const track) { @@ -2161,7 +2281,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd) nChambers = 0; for(int ilayer=0; ilayerGetNClusters() < fgNTimeBins * fkReconstructor->GetRecoParam() ->GetFindableClusters()) continue; + if(chamber->GetNClusters() < fgNTimeBins * fkRecoParam->GetFindableClusters()) continue; nChambers++; //AliInfo(Form("sector %d stack %d layer %d clusters %d", sector, istack, ilayer, chamber->GetNClusters())); } @@ -2169,10 +2289,24 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd) //AliInfo(Form("Doing stack %d", istack)); nTracks += Clusters2TracksStack(stack, fTracksESD); } - //AliInfo(Form("Found %d tracks in SM %d [%d]\n", nTracks, sector, esd->GetNumberOfTracks())); - - for(int itrack=0; itrackAddTrack((AliESDtrack*)(fTracksESD->operator[](itrack))); + if(nTracks) AliDebug(2, Form("Number of tracks: SM_%02d[%d]", sector, nTracks)); + + for(int itrack=0; itrackoperator[](itrack))); + Int_t id = esd->AddTrack(esdTrack); + + // set ESD id to stand alone TRD tracks + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ){ + esdTrack=esd->GetTrack(id); + TObject *o(NULL); Int_t ic(0); + AliTRDtrackV1 *calibTrack(NULL); + while((o = esdTrack->GetCalibObject(ic++))){ + if(!(calibTrack = dynamic_cast(o))) continue; + calibTrack->SetESDid(esdTrack->GetID()); + break; + } + } + } // Reset Track and Candidate Number AliTRDtrackerDebug::SetCandidateNumber(0); @@ -2212,7 +2346,6 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon // 8. Build ESD track and register it to the output list // - const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det(); AliTRDtrackingChamber *chamber = NULL; AliTRDtrackingChamber **ci = NULL; AliTRDseedV1 sseed[kMaxTracksStack*6]; // to be initialized @@ -2231,7 +2364,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon // Build initial seeding configurations Double_t quality = BuildSeedingConfigs(stack, configs); - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 10){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10 || AliTRDReconstructor::GetStreamLevel()>10){ AliInfo(Form("Plane config %d %d %d Quality %f" , configs[0], configs[1], configs[2], quality)); } @@ -2252,7 +2385,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon do{ // Loop over seeding configurations ntracks = 0; ntracks1 = 0; - for (Int_t iconf = 0; iconf<3; iconf++) { + for (Int_t iconf = 0; iconfGetNumberOfSeedConfigs(); iconf++) { pars[0] = configs[iconf]; pars[1] = ntracks; pars[2] = istack; @@ -2261,12 +2394,18 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon if(ntracks == kMaxTracksStack) break; } AliDebug(2, Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding)); - if(!ntracks) break; // Sort the seeds according to their quality - Int_t sort[kMaxTracksStack]; + Int_t sort[kMaxTracksStack+1]; TMath::Sort(ntracks, fTrackQuality, sort, kTRUE); + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1") > 2){ + AliDebug(3, "Track candidates classification:"); + for (Int_t it(0); it < ntracks; it++) { + Int_t jt(sort[it]); + printf(" %2d idx[%d] Quality[%e]\n", it, jt, fTrackQuality[jt]); + } + } // Initialize number of tracks so far and logic switches Int_t ntracks0 = esdTrackList->GetEntriesFast(); @@ -2279,18 +2418,13 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon //AliInfo("Selecting track candidates ..."); // Sieve clusters in decreasing order of track quality - Double_t trackParams[7]; - // AliTRDseedV1 *lseed = NULL; - Int_t jSieve = 0, candidates; + Int_t jSieve(0), rejectedCandidates(0); do{ - //AliInfo(Form("\t\tITER = %i ", jSieve)); - // Check track candidates - candidates = 0; + rejectedCandidates=0; for (Int_t itrack = 0; itrack < ntracks; itrack++) { Int_t trackIndex = sort[itrack]; if (signedTrack[trackIndex] || fakeTrack[trackIndex]) continue; - // Calculate track parameters from tracklets seeds Int_t ncl = 0; @@ -2299,80 +2433,79 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon Int_t findable = 0; for (Int_t jLayer = 0; jLayer < kNPlanes; jLayer++) { Int_t jseed = kNPlanes*trackIndex+jLayer; + sseed[jseed].UpdateUsed(); if(!sseed[jseed].IsOK()) continue; + // check if primary candidate if (TMath::Abs(sseed[jseed].GetYref(0) / sseed[jseed].GetX0()) < 0.158) findable++; - // TODO here we get a sig fault which should never happen ! - sseed[jseed].UpdateUsed(); - ncl += sseed[jseed].GetN2(); + ncl += sseed[jseed].GetN(); nused += sseed[jseed].GetNUsed(); nlayers++; } // Filter duplicated tracks if (nused > 30){ - //printf("Skip %d nused %d\n", trackIndex, nused); + AliDebug(4, Form("REJECTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused)); fakeTrack[trackIndex] = kTRUE; continue; } if (ncl>0 && Float_t(nused)/ncl >= .25){ - //printf("Skip %d nused/ncl >= .25\n", trackIndex); + AliDebug(4, Form("REJECTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d] used/ncl[%f]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused, Float_t(nused)/ncl)); fakeTrack[trackIndex] = kTRUE; continue; } + AliDebug(4, Form("Candidate[%d] Quality[%e] Tracklets[%d] Findable[%d] Ncl[%d] Nused[%d]", trackIndex, fTrackQuality[trackIndex], nlayers, findable, ncl, nused)); + // Classify tracks Bool_t skip = kFALSE; switch(jSieve){ - case 0: - if(nlayers < 6) {skip = kTRUE; break;} + case 0: // select 6 tracklets primary tracks, good quality + if(nlayers > findable || nlayers < kNPlanes) {skip = kTRUE; break;} if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;} break; - case 1: + case 1: // select shorter primary tracks, good quality + //if(findable<4){skip = kTRUE; break;} if(nlayers < findable){skip = kTRUE; break;} if(TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -4.){skip = kTRUE; break;} break; - case 2: - if ((nlayers == findable) || (nlayers == 6)) { skip = kTRUE; break;} + case 2: // select 6 tracklets secondary tracks + if(nlayers < kNPlanes) { skip = kTRUE; break;} if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -6.0){skip = kTRUE; break;} break; - case 3: + case 3: // select shorter tracks, good quality + if (nlayers<4){skip = kTRUE; break;} if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) < -5.){skip = kTRUE; break;} break; - case 4: - if (nlayers == 3){skip = kTRUE; break;} + case 4: // select anything with at least 4 tracklets + if (nlayers<4){skip = kTRUE; break;} //if (TMath::Log(1.E-9+fTrackQuality[trackIndex]) - nused/(nlayers-3.0) < -15.0){skip = kTRUE; break;} break; } if(skip){ - candidates++; + rejectedCandidates++; AliDebug(4, Form("REJECTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused)); continue; } else AliDebug(4, Form("ACCEPTED : %d idx[%d] quality[%e] tracklets[%d] usedClusters[%d]", itrack, trackIndex, fTrackQuality[trackIndex], nlayers, nused)); signedTrack[trackIndex] = kTRUE; - // Build track parameters - AliTRDseedV1 *lseed =&sseed[trackIndex*6]; - /* Int_t idx = 0; - while(idx<3 && !lseed->IsOK()) { - idx++; - lseed++; - }*/ - Double_t x = lseed->GetX0();// - 3.5; - trackParams[0] = x; //NEW AB - trackParams[1] = lseed->GetYref(0); // lseed->GetYat(x); - trackParams[2] = lseed->GetZref(0); // lseed->GetZat(x); - trackParams[3] = TMath::Sin(TMath::ATan(lseed->GetYref(1))); - trackParams[4] = lseed->GetZref(1) / TMath::Sqrt(1. + lseed->GetYref(1) * lseed->GetYref(1)); - trackParams[5] = lseed->GetC(); - Int_t ich = 0; while(!(chamber = stack[ich])) ich++; - trackParams[6] = fGeom->GetSector(chamber->GetDetector());/* *alpha+shift; // Supermodule*/ - - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 1 && fkReconstructor->IsDebugStreaming()){ + AliTRDseedV1 *lseed =&sseed[trackIndex*kNPlanes]; + AliTRDtrackV1 *track = MakeTrack(lseed); + if(!track){ + AliDebug(1, "Track building failed."); + continue; + } else { + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1") > 1){ + Int_t ich = 0; while(!(chamber = stack[ich])) ich++; + AliDebug(2, Form("Track pt=%7.2fGeV/c SM[%2d] Done.", track->Pt(), fGeom->GetSector(chamber->GetDetector()))); + } + } + + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 1 && fkReconstructor->IsDebugStreaming()){ //AliInfo(Form("Track %d [%d] nlayers %d trackQuality = %e nused %d, yref = %3.3f", itrack, trackIndex, nlayers, fTrackQuality[trackIndex], nused, trackParams[1])); AliTRDseedV1 *dseed[6]; @@ -2384,44 +2517,31 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); cstreamer << "Clusters2TracksStack" - << "EventNumber=" << eventNumber - << "TrackNumber=" << trackNumber - << "CandidateNumber=" << candidateNumber - << "Iter=" << fSieveSeeding - << "Like=" << fTrackQuality[trackIndex] - << "S0.=" << dseed[0] - << "S1.=" << dseed[1] - << "S2.=" << dseed[2] - << "S3.=" << dseed[3] - << "S4.=" << dseed[4] - << "S5.=" << dseed[5] - << "p0=" << trackParams[0] - << "p1=" << trackParams[1] - << "p2=" << trackParams[2] - << "p3=" << trackParams[3] - << "p4=" << trackParams[4] - << "p5=" << trackParams[5] - << "p6=" << trackParams[6] - << "Ncl=" << ncl - << "NLayers=" << nlayers - << "Findable=" << findable - << "NUsed=" << nused + << "EventNumber=" << eventNumber + << "TrackNumber=" << trackNumber + << "CandidateNumber=" << candidateNumber + << "Iter=" << fSieveSeeding + << "Like=" << fTrackQuality[trackIndex] + << "S0.=" << dseed[0] + << "S1.=" << dseed[1] + << "S2.=" << dseed[2] + << "S3.=" << dseed[3] + << "S4.=" << dseed[4] + << "S5.=" << dseed[5] + << "Ncl=" << ncl + << "NLayers=" << nlayers + << "Findable=" << findable + << "NUsed=" << nused << "\n"; } - AliTRDtrackV1 *track = MakeTrack(&sseed[trackIndex*kNPlanes], trackParams); - if(!track){ - AliDebug(1, "Track building failed."); - continue; - } - - //AliInfo("End of MakeTrack()"); + AliESDtrack *esdTrack = new ((*esdTrackList)[ntracks0++]) AliESDtrack(); esdTrack->UpdateTrackParams(track, AliESDtrack::kTRDout); esdTrack->SetLabel(track->GetLabel()); track->UpdateESDtrack(esdTrack); // write ESD-friends if neccessary - if (fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ + if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 || AliTRDReconstructor::GetStreamLevel()>0 ){ AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track); calibTrack->SetOwner(); esdTrack->AddCalibObject(calibTrack); @@ -2431,7 +2551,7 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon } jSieve++; - } while(jSieve<5 && candidates); // end track candidates sieve + } while(jSieve<5 && rejectedCandidates); // end track candidates sieve if(!ntracks1) break; // increment counters @@ -2446,10 +2566,10 @@ Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClon for(Int_t ip = 0; ip < kNPlanes; ip++){ if(!(chamber = stack[ip])) continue; - chamber->Build(fGeom, cal);//Indices(fSieveSeeding); + chamber->Build(fGeom);//Indices(fSieveSeeding); } - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 10){ + if(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10 || AliTRDReconstructor::GetStreamLevel()>10){ AliInfo(Form("Sieve level %d Plane config %d %d %d Quality %f", fSieveSeeding, configs[0], configs[1], configs[2], quality)); } } while(fSieveSeeding<10); // end stack clusters sieve @@ -2504,7 +2624,7 @@ Double_t AliTRDtrackerV1::BuildSeedingConfigs(AliTRDtrackingChamber **stack, Int } TMath::Sort((Int_t)kNConfigs, tconfig, configs, kTRUE); - // AliInfo(Form("q[%d] = %f", configs[0], tconfig[configs[0]])); + // AliInfo(Form("q[%d] = %f", configs[0], tconfig[configs[0]])); // AliInfo(Form("q[%d] = %f", configs[1], tconfig[configs[1]])); // AliInfo(Form("q[%d] = %f", configs[2], tconfig[configs[2]])); @@ -2585,7 +2705,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c Double_t chi2[4]; // this should be data member of AliTRDtrack TODO - Double_t seedQuality[kMaxTracksStack]; +// Double_t seedQuality[kMaxTracksStack]; // unpack control parameters Int_t config = ipar[0]; @@ -2617,8 +2737,8 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c for(int iLayer=0; iLayerGetClusterMatrix((*cIter)->GetDetector()))){ - continue; x0[iLayer] = fgkX0[iLayer]; + continue; } matrix->LocalToMaster(loc, glb); x0[iLayer] = glb[0]; @@ -2690,7 +2810,8 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c } Bool_t isFake = kFALSE; - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ + if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()) + ||AliTRDReconstructor::GetStreamLevel()>=2 ){ if (c[0]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE; if (c[1]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE; if (c[2]->GetLabel(0) != c[3]->GetLabel(0)) isFake = kTRUE; @@ -2733,12 +2854,12 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c <<"RiemanFitter.=" << rim <<"\n"; } - if(chi2[0] > fkReconstructor->GetRecoParam() ->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){ + if(chi2[0] > fkRecoParam->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){ AliDebug(3, Form("Filter on chi2Z [%f].", chi2[0])); AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1); continue; } - if(chi2[1] > fkReconstructor->GetRecoParam() ->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){ + if(chi2[1] > fkRecoParam->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){ AliDebug(3, Form("Filter on chi2Y [%f].", chi2[1])); AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1); continue; @@ -2783,6 +2904,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c if(!cseed[jLayer].AttachClusters(chamber, kTRUE)) continue; cseed[jLayer].Fit(); } + //FitTiltedRiemanConstraint(&cseed[0], GetZ()); fTrackQuality[ntracks] = 1.; // dummy value ntracks++; if(ntracks == kMaxTracksStack) return ntracks; @@ -2793,22 +2915,23 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c // Update Seeds and calculate Likelihood // fit tracklets and cook likelihood - FitTiltedRieman(&cseed[0], kTRUE); + Double_t chi2Vals[4]; + chi2Vals[0] = FitTiltedRieman(&cseed[0], kTRUE); for(int iLayer=0; iLayerGetRecoParam() ->GetTrackLikelihood()){ + if (TMath::Log(1.E-9 + like) < fkRecoParam->GetTrackLikelihood()){ AliDebug(3, Form("Filter on likelihood %f[%e].", TMath::Log(1.E-9 + like), like)); AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1); continue; } //AliInfo(Form("Passed likelihood %f[%e].", TMath::Log(1.E-9 + like), like)); - // book preliminary results - seedQuality[ntracks] = like; + // book preliminry results + //seedQuality[ntracks] = like; fSeedLayer[ntracks] = config;/*sLayer;*/ // attach clusters to the extrapolation seeds @@ -2822,16 +2945,17 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c if ((jLayer == 5) && !(cseed[4].IsOK())) continue; AliTRDseedV1 pseed = cseed[jLayer]; if(!pseed.AttachClusters(chamber, kTRUE)) continue; - pseed.Fit(kTRUE); + pseed.Fit(1); cseed[jLayer] = pseed; - FitTiltedRieman(cseed, kTRUE); - cseed[jLayer].Fit(kTRUE); + chi2Vals[0] = FitTiltedRieman(cseed, kTRUE); + cseed[jLayer].Fit(1); elayers++; } // AliInfo("Extrapolation done."); // Debug Stream containing all the 6 tracklets - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ + if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()) + ||AliTRDReconstructor::GetStreamLevel()>=2){ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); TLinearFitter *tiltedRieman = GetTiltedRiemanFitter(); Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); @@ -2849,39 +2973,24 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c << "\n"; } - if(fkReconstructor->GetRecoParam()->HasImproveTracklets()){ - AliTRDseedV1 bseed[AliTRDgeometry::kNlayer]; - for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) bseed[jLayer] = cseed[jLayer]; - - if(ImproveSeedQuality(stack, cseed) < mlayers+elayers){ + if(fkRecoParam->HasImproveTracklets()){ + if(!ImproveSeedQuality(stack, cseed, chi2Vals[0])){ AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1); - AliDebug(3, "Filter on improve seeds."); - } else { - // store results - for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) cseed[jLayer] = bseed[jLayer]; + AliDebug(3, "ImproveSeedQuality() failed."); } } - //AliInfo("Improve seed quality done."); - - // fit full track and cook likelihoods - // Double_t curv = FitRieman(&cseed[0], chi2); - // Double_t chi2ZF = chi2[0] / TMath::Max((mlayers - 3.), 1.); - // Double_t chi2RF = chi2[1] / TMath::Max((mlayers - 3.), 1.); - // do the final track fitting (Once with vertex constraint and once without vertex constraint) - Double_t chi2Vals[3]; - chi2Vals[0] = FitTiltedRieman(&cseed[0], kTRUE); - if(fkReconstructor->GetRecoParam()->IsVertexConstrained()) - chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ()); // Do Vertex Constrained fit if desired - else - chi2Vals[1] = 1.; - chi2Vals[2] = GetChi2Z(&cseed[0]) / TMath::Max((mlayers - 3.), 1.); - // Chi2 definitions in testing stage - //chi2Vals[2] = GetChi2ZTest(&cseed[0]); - fTrackQuality[ntracks] = CalculateTrackLikelihood(&cseed[0], &chi2Vals[0]); - //AliInfo("Hyperplane fit done\n"); + // do track fitting with vertex constraint + if(fkRecoParam->IsVertexConstrained()) chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ()); + else chi2Vals[1] = -1.; + chi2Vals[2] = GetChi2Z(&cseed[0]); + chi2Vals[3] = GetChi2Phi(&cseed[0]); + + // calculate track quality + fTrackQuality[ntracks] = CalculateTrackLikelihood(&chi2Vals[0]); - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ + if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()) + ||AliTRDReconstructor::GetStreamLevel()>=2){ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); @@ -2909,7 +3018,29 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * c << "FitterTC.=" << fitterTC << "\n"; } - + if(AliLog::GetDebugLevel("TRD", "AliTRDtrackerV1")){ + Double_t pt[]={0., 0.}; + for(Int_t il(0); ilIsHLT()) FitTiltedRiemanConstraint(tracklet, 0); Double_t alpha = AliTRDgeometry::GetAlpha(); Double_t shift = AliTRDgeometry::GetAlpha()/2.0; - Double_t c[15]; + // find first good tracklet + Int_t idx(0); while(idx2){ AliDebug(1, Form("Found suspect track start @ layer idx[%d]\n" + " %c[0] x0[%f] n[%d] nu[%d] OK[%c]\n" + " %c[1] x0[%f] n[%d] nu[%d] OK[%c]\n" + " %c[2] x0[%f] n[%d] nu[%d] OK[%c]\n" + " %c[3] x0[%f] n[%d] nu[%d] OK[%c]\n" + " %c[4] x0[%f] n[%d] nu[%d] OK[%c]\n" + " %c[5] x0[%f] n[%d] nu[%d] OK[%c]" + ,idx + ,idx==0?'*':' ', tracklet[0].GetX0(), tracklet[0].GetN(), tracklet[0].GetNUsed(), tracklet[0].IsOK()?'y':'n' + ,idx==1?'*':' ', tracklet[1].GetX0(), tracklet[1].GetN(), tracklet[1].GetNUsed(), tracklet[1].IsOK()?'y':'n' + ,idx==2?'*':' ', tracklet[2].GetX0(), tracklet[2].GetN(), tracklet[2].GetNUsed(), tracklet[2].IsOK()?'y':'n' + ,idx==3?'*':' ', tracklet[3].GetX0(), tracklet[3].GetN(), tracklet[3].GetNUsed(), tracklet[3].IsOK()?'y':'n' + ,idx==4?'*':' ', tracklet[4].GetX0(), tracklet[4].GetN(), tracklet[4].GetNUsed(), tracklet[4].IsOK()?'y':'n' + ,idx==5?'*':' ', tracklet[5].GetX0(), tracklet[5].GetN(), tracklet[5].GetNUsed(), tracklet[5].IsOK()?'y':'n')); + return NULL; + } + + Double_t dx(5.); + Double_t x(tracklet[idx].GetX0() - dx); + // Build track parameters + Double_t params[] = { + tracklet[idx].GetYref(0) - dx*tracklet[idx].GetYref(1) // y + ,tracklet[idx].GetZref(0) - dx*tracklet[idx].GetZref(1) // z + ,TMath::Sin(TMath::ATan(tracklet[idx].GetYref(1))) // snp + ,tracklet[idx].GetZref(1) / TMath::Sqrt(1. + tracklet[idx].GetYref(1) * tracklet[idx].GetYref(1)) // tgl + ,tracklet[idx].GetC(fkReconstructor->IsHLT()?1:0) // curvature -> 1/pt + }; + Int_t sector(fGeom->GetSector(tracklet[idx].GetDetector())); + + Double_t c[15]; c[ 0] = 0.2; // s^2_y c[ 1] = 0.0; c[ 2] = 2.0; // s^2_z c[ 3] = 0.0; c[ 4] = 0.0; c[ 5] = 0.02; // s^2_snp c[ 6] = 0.0; c[ 7] = 0.0; c[ 8] = 0.0; c[ 9] = 0.1; // s^2_tgl - c[10] = 0.0; c[11] = 0.0; c[12] = 0.0; c[13] = 0.0; c[14] = params[5]*params[5]*0.01; // s^2_1/pt + c[10] = 0.0; c[11] = 0.0; c[12] = 0.0; c[13] = 0.0; c[14] = params[4]*params[4]*0.01; // s^2_1/pt + + AliTRDtrackV1 track(tracklet, params, c, x, sector*alpha+shift); - AliTRDtrackV1 track(seeds, ¶ms[1], c, params[0], params[6]*alpha+shift); - track.PropagateTo(params[0]-5.0); AliTRDseedV1 *ptrTracklet = NULL; // skip Kalman filter for HLT if(/*fkReconstructor->IsHLT()*/kFALSE){ for (Int_t jLayer = 0; jLayer < AliTRDgeometry::kNlayer; jLayer++) { track.UnsetTracklet(jLayer); - ptrTracklet = &seeds[jLayer]; + ptrTracklet = &tracklet[jLayer]; if(!ptrTracklet->IsOK()) continue; if(TMath::Abs(ptrTracklet->GetYref(1) - ptrTracklet->GetYfit(1)) >= .2) continue; // check this condition with Marian ptrTracklet = SetTracklet(ptrTracklet); @@ -2985,55 +3147,62 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 * const seeds, Double_t * } // prevent the error message in AliTracker::MeanMaterialBudget: "start point out of geometry" - if(TMath::Abs(track.GetX()) + TMath::Abs(track.GetY()) + TMath::Abs(track.GetZ()) > 10000) - return NULL; + if(TMath::Abs(track.GetX()) + TMath::Abs(track.GetY()) + TMath::Abs(track.GetZ()) > 10000) return NULL; track.ResetCovariance(1); Int_t nc = TMath::Abs(FollowBackProlongation(track)); - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 5 && fkReconstructor->IsDebugStreaming()){ + if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 5 && fkReconstructor->IsDebugStreaming()) + ||AliTRDReconstructor::GetStreamLevel()>5){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); Double_t p[5]; // Track Params for the Debug Stream - track.GetExternalParameters(params[0], p); + track.GetExternalParameters(x, p); TTreeSRedirector &cs = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); cs << "MakeTrack" << "EventNumber=" << eventNumber << "CandidateNumber=" << candidateNumber << "nc=" << nc - << "X=" << params[0] + << "X=" << x << "Y=" << p[0] << "Z=" << p[1] << "snp=" << p[2] << "tnd=" << p[3] << "crv=" << p[4] - << "Yin=" << params[1] - << "Zin=" << params[2] - << "snpin=" << params[3] - << "tndin=" << params[4] - << "crvin=" << params[5] + << "Yin=" << params[0] + << "Zin=" << params[1] + << "snpin=" << params[2] + << "tndin=" << params[3] + << "crvin=" << params[4] << "track.=" << &track << "\n"; } - if (nc < 30) return NULL; - + if (nc < 30){ + UnsetTrackletsTrack(&track); + return NULL; + } AliTRDtrackV1 *ptrTrack = SetTrack(&track); ptrTrack->SetReconstructor(fkReconstructor); ptrTrack->CookLabel(.9); - + for(Int_t il(kNPlanes); il--;){ + if(!(ptrTracklet = ptrTrack->GetTracklet(il))) continue; + ptrTracklet->UseClusters(); + } + // computes PID for track ptrTrack->CookPID(); // update calibration references using this track AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance(); - if (!calibra){ - AliInfo("Could not get Calibra instance\n"); - if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(ptrTrack); + if(!calibra){ + AliInfo("Could not get Calibra instance."); + } else if(calibra->GetHisto2d()){ + calibra->UpdateHistogramsV1(ptrTrack); } return ptrTrack; } //____________________________________________________________________ -Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDseedV1 *cseed) +Bool_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDseedV1 *cseed, Double_t &chi2) { // // Sort tracklets according to "quality" and try to "improve" the first 4 worst @@ -3058,8 +3227,8 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs AliTRDtrackingChamber *chamber = NULL; AliTRDseedV1 bseed[AliTRDgeometry::kNlayer]; - Float_t quality(0.), - lQuality[] = {1.e3, 1.e3, 1.e3, 1.e3, 1.e3, 1.e3}; + Float_t quality(1.e3), + lQuality[AliTRDgeometry::kNlayer] = {1.e3, 1.e3, 1.e3, 1.e3, 1.e3, 1.e3}; Int_t rLayers(0); for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;){ bseed[jLayer] = cseed[jLayer]; @@ -3068,21 +3237,22 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs lQuality[jLayer] = bseed[jLayer].GetQuality(kTRUE); quality += lQuality[jLayer]; } - Float_t chi2 = FitTiltedRieman(bseed, kTRUE); + if (rLayers > 0) { + quality /= rLayers; + } + AliDebug(2, Form("Start N[%d] Q[%f] chi2[%f]", rLayers, quality, chi2)); for (Int_t iter = 0; iter < 4; iter++) { - AliDebug(2, Form("Iter[%d] Q[%f] chi2[%f]", iter, quality, chi2)); - // Try better cluster set Int_t nLayers(0); Float_t qualitynew(0.); - Int_t indexes[6]; + Int_t indexes[4*AliTRDgeometry::kNlayer]; TMath::Sort(Int_t(AliTRDgeometry::kNlayer), lQuality, indexes, kFALSE); for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) { Int_t bLayer = indexes[jLayer]; bseed[bLayer].Reset("c"); if(!(chamber = stack[bLayer])) continue; if(!bseed[bLayer].AttachClusters(chamber, kTRUE)) continue; - bseed[bLayer].Fit(kTRUE); + bseed[bLayer].Fit(1); if(!bseed[bLayer].IsOK()) continue; nLayers++; lQuality[jLayer] = bseed[jLayer].GetQuality(kTRUE); @@ -3090,28 +3260,29 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs } if(rLayers > nLayers){ AliDebug(1, Form("Lost %d tracklets while improving.", rLayers-nLayers)); - break; + return iter>0?kTRUE:kFALSE; } else rLayers=nLayers; + qualitynew /= rLayers; - if(qualitynew >= quality){ - AliDebug(4, Form("Quality worsen in iter[%d].", iter)); - break; + if(qualitynew > quality){ + AliDebug(4, Form("Quality[%f] worsen in iter[%d] to ref[%f].", qualitynew, iter, quality)); + return iter>0?kTRUE:kFALSE; } else quality = qualitynew; // try improve track parameters - AliTRDseedV1 tseed[AliTRDgeometry::kNlayer]; - for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) tseed[jLayer]=bseed[jLayer]; - Float_t chi2new = FitTiltedRieman(tseed, kTRUE); + Float_t chi2new = FitTiltedRieman(bseed, kTRUE); if(chi2new > chi2){ - AliDebug(4, Form("Chi2 worsen in iter[%d].", iter)); - break; + AliDebug(4, Form("Chi2[%f] worsen in iter[%d] to ref[%f].", chi2new, iter, chi2)); + return iter>0?kTRUE:kFALSE; } else chi2 = chi2new; // store better tracklets - for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) bseed[jLayer]=tseed[jLayer]; + for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) cseed[jLayer]=bseed[jLayer]; + AliDebug(2, Form("Iter[%d] Q[%f] chi2[%f]", iter, quality, chi2)); - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 7 && fkReconstructor->IsDebugStreaming()){ + if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 7 && fkReconstructor->IsDebugStreaming()) + ||AliTRDReconstructor::GetStreamLevel()>=7){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); TLinearFitter *tiltedRieman = GetTiltedRiemanFitter(); @@ -3120,22 +3291,23 @@ Int_t AliTRDtrackerV1::ImproveSeedQuality(AliTRDtrackingChamber **stack, AliTRDs << "EventNumber=" << eventNumber << "CandidateNumber=" << candidateNumber << "Iteration=" << iter - << "S0.=" << &bseed[0] - << "S1.=" << &bseed[1] - << "S2.=" << &bseed[2] - << "S3.=" << &bseed[3] - << "S4.=" << &bseed[4] - << "S5.=" << &bseed[5] + << "S0.=" << &cseed[0] + << "S1.=" << &cseed[1] + << "S2.=" << &cseed[2] + << "S3.=" << &cseed[3] + << "S4.=" << &cseed[4] + << "S5.=" << &cseed[5] << "FitterT.=" << tiltedRieman << "\n"; } } // Loop: iter - // we are sure that at least 2 tracklets are OK ! - return rLayers; + + // we are sure that at least 4 tracklets are OK ! + return kTRUE; } //_________________________________________________________________________ -Double_t AliTRDtrackerV1::CalculateTrackLikelihood(const AliTRDseedV1 *const tracklets, Double_t *chi2){ +Double_t AliTRDtrackerV1::CalculateTrackLikelihood(Double_t *chi2){ // // Calculates the Track Likelihood value. This parameter serves as main quality criterion for // the track selection @@ -3153,23 +3325,40 @@ Double_t AliTRDtrackerV1::CalculateTrackLikelihood(const AliTRDseedV1 *const tra // // debug level 2 // - - Double_t chi2phi = 0, nLayers = 0; - for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) { - if(!tracklets[iLayer].IsOK()) continue; - chi2phi += tracklets[iLayer].GetChi2Phi(); - nLayers++; - } - chi2phi /= Float_t (nLayers - 2.0); - Double_t likeChi2Z = TMath::Exp(-chi2[2] * 0.14); // Chi2Z - Double_t likeChi2TC = (fkReconstructor->GetRecoParam()->IsVertexConstrained()) ? - TMath::Exp(-chi2[1] * 0.677) : 1; // Constrained Tilted Riemann - Double_t likeChi2TR = TMath::Exp(-chi2[0] * 0.0078); // Non-constrained Tilted Riemann - Double_t likeChi2Phi= TMath::Exp(-chi2phi * 3.23);//3.23 - Double_t trackLikelihood = likeChi2Z * likeChi2TR * likeChi2Phi; - - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ + // Non-constrained Tilted Riemann + Double_t likeChi2TR = TMath::Exp(-chi2[0] * 0.0078); + // Constrained Tilted Riemann + Double_t likeChi2TC(1.); + if(chi2[1]>0.){ + likeChi2TC = TMath::Exp(-chi2[1] * 0.677); + Double_t r = likeChi2TC/likeChi2TR; + if(r>1.e2){;} // -> a primary track use TC + else if(r<1.e2) // -> a secondary track use TR + likeChi2TC =1.; + else{;} // -> test not conclusive + } + // Chi2 only on Z direction + Double_t likeChi2Z = TMath::Exp(-chi2[2] * 0.14); + // Chi2 angular resolution + Double_t likeChi2Phi= TMath::Exp(-chi2[3] * 3.23); + + Double_t trackLikelihood = likeChi2Z * likeChi2TR * likeChi2TC * likeChi2Phi; + + AliDebug(2, Form("Likelihood [%e]\n" + " Rieman : chi2[%f] likelihood[%6.2e]\n" + " Vertex : chi2[%f] likelihood[%6.2e]\n" + " Z : chi2[%f] likelihood[%6.2e]\n" + " Phi : chi2[%f] likelihood[%6.2e]" + , trackLikelihood + , chi2[0], likeChi2TR + , chi2[1], likeChi2TC + , chi2[2], likeChi2Z + , chi2[3], likeChi2Phi + )); + + if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()) + ||AliTRDReconstructor::GetStreamLevel()>=2){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker); @@ -3215,8 +3404,6 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]) // // ratio of the total number of clusters/track which are expected to be found by the tracker. - const AliTRDrecoParam *fRecoPars = fkReconstructor->GetRecoParam(); - Double_t chi2y = GetChi2Y(&cseed[0]); Double_t chi2z = GetChi2Z(&cseed[0]); @@ -3229,14 +3416,15 @@ Double_t AliTRDtrackerV1::CookLikelihood(AliTRDseedV1 *cseed, Int_t planes[4]) } nclusters *= .25; - Double_t likea = TMath::Exp(-sumda * fRecoPars->GetPhiSlope()); + Double_t likea = TMath::Exp(-sumda * fkRecoParam->GetPhiSlope()); Double_t likechi2y = 0.0000000001; - if (fkReconstructor->IsCosmic() || chi2y < fRecoPars->GetChi2YCut()) likechi2y += TMath::Exp(-TMath::Sqrt(chi2y) * fRecoPars->GetChi2YSlope()); - Double_t likechi2z = TMath::Exp(-chi2z * fRecoPars->GetChi2ZSlope()); - Double_t likeN = TMath::Exp(-(fRecoPars->GetNMeanClusters() - nclusters) / fRecoPars->GetNSigmaClusters()); + if (fkReconstructor->IsCosmic() || chi2y < fkRecoParam->GetChi2YCut()) likechi2y += TMath::Exp(-TMath::Sqrt(chi2y) * fkRecoParam->GetChi2YSlope()); + Double_t likechi2z = TMath::Exp(-chi2z * fkRecoParam->GetChi2ZSlope()); + Double_t likeN = TMath::Exp(-(fkRecoParam->GetNMeanClusters() - nclusters) / fkRecoParam->GetNSigmaClusters()); Double_t like = likea * likechi2y * likechi2z * likeN; - if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){ + if((fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()) + ||AliTRDReconstructor::GetStreamLevel()>=2){ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber(); Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber(); Int_t nTracklets = 0; Float_t meanNcls = 0; @@ -3623,6 +3811,21 @@ Float_t AliTRDtrackerV1::GetChi2Z(const AliTRDseedV1 *const tracklets) const return n ? chi2/n : 0.; } +//_____________________________________________________________________________ +Float_t AliTRDtrackerV1::GetChi2Phi(const AliTRDseedV1 *const tracklets) const +{ + // Calculates normalized chi2 for angular resolution + // chi2 = Sum chi2 / n_tracklets + + Double_t chi2 = 0; Int_t n = 0; + for (Int_t iLayer = 0; iLayer < kNPlanes; iLayer++) { + if(!tracklets[iLayer].IsOK()) continue; + chi2 += tracklets[iLayer].GetChi2Phi(); + n++; + } + return n ? chi2/n: 0.; +} + //____________________________________________________________________ Float_t AliTRDtrackerV1::CalculateReferenceX(const AliTRDseedV1 *const tracklets){ // @@ -3705,6 +3908,18 @@ Double_t AliTRDtrackerV1::FitTiltedRiemanV1(AliTRDseedV1 *const tracklets){ return chi2; } +//____________________________________________________________________ +void AliTRDtrackerV1::UnsetTrackletsTrack(const AliTRDtrackV1 * const track) +{ +// Remove tracklets from tracker list attached to "track" + Int_t idx(-1); + for(Int_t il(0); ilGetTrackletIndex(il)) < 0) continue; + delete (fTracklets->RemoveAt(idx)); + } +} + + /////////////////////////////////////////////////////// // // // Resources of class AliTRDLeastSquare // @@ -3783,7 +3998,7 @@ Bool_t AliTRDtrackerV1::AliTRDLeastSquare::Eval(){ // Double_t det = fSums[0] * fSums[4] - fSums[1] *fSums[1]; - if(det==0) return kFALSE; + if(TMath::Abs(det)<1.e-30) return kFALSE; // for(Int_t isum = 0; isum < 5; isum++) // printf("fSums[%d] = %f\n", isum, fSums[isum]); @@ -3954,7 +4169,7 @@ Double_t AliTRDtrackerV1::AliTRDtrackFitterRieman::Eval(){ } //_____________________________________________________________________________ -void AliTRDtrackerV1::AliTRDtrackFitterRieman::UpdateFitters(AliTRDseedV1 * const tracklet){ +void AliTRDtrackerV1::AliTRDtrackFitterRieman::UpdateFitters(const AliTRDseedV1 * const tracklet){ // // Does the transformations and updates the fitters // The following transformation is applied