// (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];
if ((status & AliESDtrack::kTRDout) != 0) 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)){
seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop);
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++;
}
// update calibration references using this track
if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track);
// save calibration object
- if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 &&
-fkRecoParam->IsOverPtThreshold(track.Pt())){
+ if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0) {
AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
calibTrack->SetOwner();
seed->AddCalibObject(calibTrack);
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 (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0 && fkRecoParam->IsOverPtThreshold(track.Pt())){
+ if (fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){
TObject *o = NULL; Int_t ic = 0;
AliTRDtrackV1 *calibTrack = NULL;
while((o = seed->GetCalibObject(ic++))){
if(!(calibTrack = dynamic_cast<AliTRDtrackV1*>(o))) continue;
- calibTrack->SetTrackHigh(track.GetTrackHigh());
+ calibTrack->SetTrackOut(&track);
}
}
+
+ // Prolongate to TPC
+ if (PropagateToX(track, xTPC, fgkMaxStep)) { // -with update
+ seed->UpdateTrackParams(&track, AliESDtrack::kTRDrefit);
+ found++;
+ kUPDATE = kTRUE;
+ }
}
// Prolongate to TPC without update
// Debug level 2
//
- Bool_t kStoreIn = kTRUE;
Int_t nClustersExpected = 0;
for (Int_t iplane = kNPlanes; iplane--;) {
Int_t index(-1);
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 (chi2 < 1e+10 && ((AliExternalTrackParam&)t).Update(p, cov)){
+ // Register info to track
+ t.SetNumberOfClusters();
+ t.UpdateChi2(chi2);
nClustersExpected += tracklet->GetN();
}
}
Int_t debugLevel = fkReconstructor->IsDebugStreaming() ? fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) : 0;
TTreeSRedirector *cstreamer = fkReconstructor->IsDebugStreaming() ? fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker) : 0x0;
- Bool_t kStoreIn(kTRUE), //
- kPropagateIn(kTRUE), //
+ 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
t.UnsetTracklet(ip);
if(tracklets[ip]->IsOK()) startLayer=ip;
kStandAlone = kTRUE;
+ kUseTRD = kTRUE;
}
AliDebug(4, Form("SA[%c] Start[%d]\n"
" [0]idx[%d] traklet[%p]\n"
}
// mark track as entering the FIDUCIAL volume of TRD
if(kStoreIn){
- t.SetTrackLow();
+ t.SetTrackIn();
kStoreIn = kFALSE;
}
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));
ptrTracklet->SetX0(glb[0]+driftLength);
- if(!tracklet.Init(&t)){
+ if(!ptrTracklet->Init(&t)){
n=-1;
t.SetStatus(AliTRDtrackV1::kTrackletInit);
AliDebug(4, "Failed Tracklet Init");
break;
}
- if(!tracklet.AttachClusters(chamber, kTRUE)){
+ if(!ptrTracklet->AttachClusters(chamber, kTRUE)){
t.SetStatus(AliTRDtrackV1::kNoAttach, ily);
if(debugLevel>3){
AliTRDseedV1 trackletCp(*ptrTracklet);
AliDebug(4, "Failed Attach Clusters");
continue;
}
- AliDebug(3, Form("Number of Clusters in Tracklet: %d", tracklet.GetN()));
- if(tracklet.GetN() < fgNTimeBins*fkRecoParam ->GetFindableClusters()){
+ AliDebug(3, Form("Number of Clusters in Tracklet: %d", ptrTracklet->GetN()));
+ if(ptrTracklet->GetN() < fgNTimeBins*fkRecoParam->GetFindableClusters()){
t.SetStatus(AliTRDtrackV1::kNoClustersTracklet, ily);
if(debugLevel>3){
AliTRDseedV1 trackletCp(*ptrTracklet);
} else AliDebug(2, Form("Use external tracklet ly[%d]", ily));
// propagate track to the radial position of the tracklet
- // fit tracklet no tilt correction
- if(!ptrTracklet->Fit(kFALSE)){
+ // fit tracklet
+ // tilt correction options
+ // 0 : no correction
+ // 2 : pseudo tilt correction
+ if(!ptrTracklet->Fit(2)){
t.SetStatus(AliTRDtrackV1::kNoFit, ily);
AliDebug(4, "Failed Tracklet Fit");
continue;
AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp));
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);
AliDebug(4, Form("Failed Chi2[%f]", chi2));
continue;
}
- if(!t.Update(p, cov, chi2, kUseTRD)) {
- 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";
+ if(kUseTRD){
+ if(!((AliExternalTrackParam&)t).Update(p, cov)) {
+ 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";
+ }
+ 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
+ // register tracklet with the tracker and track
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));
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();
for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){
if(!(cl = tracklets[ipl].GetClusters(itb))) continue;
if(!cl->IsInChamber()) continue;
- //if (!tracklets[ipl].IsUsable(itb)) continue;
+ if (!tracklets[ipl].IsUsable(itb)) continue;
x = cl->GetX();
y = cl->GetY();
z = cl->GetZ();
nPoints++;
}
}
- fitter->Eval();
+ if (fitter->Eval()) return 1.e10;
zfitter.Eval();
Double_t offset = fitter->GetParameter(3);
//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++) {
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
}
//_________________________________________________________________________
-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.
if (!t.PropagateTo(x, param[1], param[0]*param[4])) return 0;
// Rotate the track if necessary
- AdjustSector(&t);
+ if(!AdjustSector(&t)) return 0;
// New track X-position
xpos = t.GetX();
//_____________________________________________________________________________
-Int_t AliTRDtrackerV1::ReadClusters(TClonesArray* &array, TTree *clusterTree) const
+Bool_t AliTRDtrackerV1::ReadClusters(TTree *clusterTree)
{
//
// Reads AliTRDclusters from the file.
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 = 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);
}
// Loop through all entries in the tree
new((*fClusters)[ncl++]) AliTRDcluster(*c);
delete (clusterArray->RemoveAt(iCluster));
}
-
}
delete clusterArray;
- return 0;
+ return kTRUE;
}
//_____________________________________________________________________________
if(!fkReconstructor->IsWritingClusters()){
fClusters = AliTRDReconstructor::GetClusters();
} else {
- if (ReadClusters(fClusters, cTree)) {
+ if(!ReadClusters(cTree)) {
AliError("Problem with reading the clusters !");
return 1;
}
{
// 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();
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; isector<AliTRDgeometry::kNsector; isector++){
if(!fTrSec[isector].GetNChambers()) continue;
- fTrSec[isector].Init(fkReconstructor, cal);
+ fTrSec[isector].Init(fkReconstructor);
}
return nin;
// 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
do{
// Loop over seeding configurations
ntracks = 0; ntracks1 = 0;
- for (Int_t iconf = 0; iconf<3; iconf++) {
+ for (Int_t iconf = 0; iconf<fkRecoParam->GetNumberOfSeedConfigs(); iconf++) {
pars[0] = configs[iconf];
pars[1] = ntracks;
pars[2] = istack;
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:");
break;
case 1: // select shorter primary tracks, good quality
- if(findable<4){skip = kTRUE; break;}
+ //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;
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(fkRecoParam->GetStreamLevel(AliTRDrecoParam::kTracker) > 10){
}
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]]));
for(int iLayer=0; iLayer<kNPlanes; iLayer++,cIter++){
if(!(*cIter)) continue;
if(!(matrix = fGeom->GetClusterMatrix((*cIter)->GetDetector()))){
- continue;
x0[iLayer] = fgkX0[iLayer];
+ continue;
}
matrix->LocalToMaster(loc, glb);
x0[iLayer] = glb[0];
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;
chi2Vals[0] = FitTiltedRieman(&cseed[0], kTRUE);
for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
Int_t jLayer = planes[iLayer];
- cseed[jLayer].Fit(kTRUE);
+ cseed[jLayer].Fit(1);
}
Double_t like = CookLikelihood(&cseed[0], planes); // to be checked
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;
chi2Vals[0] = FitTiltedRieman(cseed, kTRUE);
- cseed[jLayer].Fit(kTRUE);
+ cseed[jLayer].Fit(1);
elayers++;
}
// offline case perform a full Kalman filter on the already found tracklets (see AliTRDtrackerV1::FollowBackProlongation()
// for details). Do also MC label calculation and PID if propagation successfully.
-
+ if(fkReconstructor->IsHLT()) FitTiltedRiemanConstraint(tracklet, 0);
Double_t alpha = AliTRDgeometry::GetAlpha();
Double_t shift = AliTRDgeometry::GetAlpha()/2.0;
return NULL;
}
- Double_t dx(3.5);
- Double_t x(tracklet[idx].GetX() - dx);
+ 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(1) // curvature -> 1/pt
+ ,tracklet[idx].GetC(fkReconstructor->IsHLT()?1:0) // curvature -> 1/pt
};
Int_t sector(fGeom->GetSector(tracklet[idx].GetDetector()));
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;
}
AliTRDseedV1 bseed[AliTRDgeometry::kNlayer];
Float_t quality(1.e3),
- lQuality[] = {1.e3, 1.e3, 1.e3, 1.e3, 1.e3, 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];
for (Int_t iter = 0; iter < 4; iter++) {
// 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);
//____________________________________________________________________
void AliTRDtrackerV1::UnsetTrackletsTrack(const AliTRDtrackV1 * const track)
{
+// Remove tracklets from tracker list attached to "track"
Int_t idx(-1);
for(Int_t il(0); il<kNPlanes; il++){
if((idx = track->GetTrackletIndex(il)) < 0) continue;
//
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]);
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff