#include "AliTRDrecoParam.h"
#include "AliTRDcluster.h"
+#include "AliTRDdigitsParam.h"
#include "AliTRDseedV1.h"
#include "AliTRDtrackV1.h"
#include "AliTRDtrackerV1.h"
#include "AliTRDchamberTimeBin.h"
ClassImp(AliTRDtrackerV1)
+ClassImp(AliTRDtrackerV1::AliTRDLeastSquare)
+ClassImp(AliTRDtrackerV1::AliTRDtrackFitterRieman)
const Float_t AliTRDtrackerV1::fgkMinClustersInTrack = 0.5; //
const Float_t AliTRDtrackerV1::fgkLabelFraction = 0.8; //
fR[ily] = glb[0]+ AliTRDgeometry::AnodePos()-.5*AliTRDgeometry::AmThick() - AliTRDgeometry::DrThick();
}
- // initialize calibration values
- AliTRDcalibDB *trd = NULL;
- if (!(trd = AliTRDcalibDB::Instance())) {
- AliFatal("Could not get calibration.");
- }
- if(!fgNTimeBins) fgNTimeBins = trd->GetNumberOfTimeBins();
-
// initialize cluster containers
for (Int_t isector = 0; isector < AliTRDgeometry::kNsector; isector++) new(&fTrSec[isector]) AliTRDtrackingSector(fGeom, isector);
//AliInfo(Form("Processing supermodule %i ...", ism));
ntracks += Clusters2TracksSM(ism, esd);
}
- AliInfo(Form("Number of found tracks : %d", ntracks));
+ AliInfo(Form("Number of tracks: !TRDin[%d]", ntracks));
return ntracks;
}
AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance(); // Calibration monitor
if (!calibra) AliInfo("Could not get Calibra instance\n");
-
+ if(!fgNTimeBins) CookNTimeBins();
+
// Define scalers
Int_t nFound = 0, // number of tracks found
nSeeds = 0, // total number of ESD seeds
if (PropagateToX(tt, xTPC, fgkMaxStep)) seed->UpdateTrackParams(&tt, AliESDtrack::kTRDbackup);
}
}
- AliInfo(Form("Number of loaded seeds: %d",nseed));
- AliInfo(Form("Number of found tracks from loaded seeds: %d",found));
+ AliInfo(Form("Number of seeds: TRDout[%d]", nseed));
+ AliInfo(Form("Number of tracks: TRDrefit[%d]", found));
return 0;
}
Bool_t kStoreIn = kTRUE;
Int_t nClustersExpected = 0;
for (Int_t iplane = kNPlanes; iplane--;) {
- Int_t index = 0;
+ Int_t index(-1);
AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
+ AliDebug(2, Form("Tracklet[%p] ly[%d] idx[%d]", (void*)tracklet, iplane, index));
if(!tracklet) continue;
- if(!tracklet->IsOK()) AliWarning("tracklet not OK");
-
+ if(!tracklet->IsOK()){
+ AliDebug(1, Form("Tracklet Det[%d] !OK", tracklet->GetDetector()));
+ continue;
+ }
Double_t x = tracklet->GetX();//GetX0();
// reject tracklets which are not considered for inward refit
if(x > t.GetX()+fgkMaxStep) continue;
TGeoHMatrix *matrix = NULL;
Double_t x, y, z;
for (Int_t ily=0, 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);
+ AliDebug(4, Form("Failed Rough Prolongation to ly[%d] x[%7.2f] y[%7.2f] z[%7.2f]", ily, fR[ily], y, z));
break;
}
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) ||
stk<0. ||
fGeom->IsHole(ily, stk, sm) ||
!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)){
n=-1;
t.SetStatus(AliTRDtrackV1::kPropagation);
+ AliDebug(4, "Failed Propagation [Missing Geometry]");
break;
}
if(!AdjustSector(&t)){
n=-1;
t.SetStatus(AliTRDtrackV1::kAdjustSector);
+ AliDebug(4, "Failed Adjust Sector [Missing Geometry]");
break;
}
if(TMath::Abs(t.GetSnp()) > fgkMaxSnp){
n=-1;
t.SetStatus(AliTRDtrackV1::kSnp);
+ AliDebug(4, "Failed Max Snp [Missing Geometry]");
break;
}
t.SetStatus(AliTRDtrackV1::kGeometry, ily);
if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)){
n=-1;
t.SetStatus(AliTRDtrackV1::kPropagation);
+ AliDebug(4, Form("Failed Initial Propagation to x[%7.2f]", x));
break;
}
if(!AdjustSector(&t)){
n=-1;
t.SetStatus(AliTRDtrackV1::kAdjustSector);
+ AliDebug(4, "Failed Adjust Sector Start");
break;
}
if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
n=-1;
t.SetStatus(AliTRDtrackV1::kSnp);
+ AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp));
break;
}
Bool_t doRecalculate = kFALSE;
det = AliTRDgeometry::GetDetector(ily, stk, sm);
if(!(matrix = fGeom->GetClusterMatrix(det))){
t.SetStatus(AliTRDtrackV1::kGeometry, ily);
+ AliDebug(4, Form("Failed Geometry Matrix ly[%d]", ily));
continue;
}
matrix->LocalToMaster(loc, glb);
if (!t.GetProlongation(x+fgkMaxStep, 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));
break;
}
if(fGeom->IsOnBoundary(det, y, z, .5)){
t.SetStatus(AliTRDtrackV1::kBoundary, ily);
+ AliDebug(4, "Failed Track on Boundary");
continue;
}
// mark track as entering the FIDUCIAL volume of TRD
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);
+ AliDebug(4, "Failed NoClusters");
continue;
}
if(fTrSec[sm].GetX(ily) < 1.){
t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+ AliDebug(4, "Failed NoX");
continue;
}
// check data in chamber
if(!(chamber = fTrSec[sm].GetChamber(stk, ily))){
t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+ AliDebug(4, "Failed No Detector");
continue;
}
if(chamber->GetNClusters() < fgNTimeBins*fkReconstructor->GetRecoParam() ->GetFindableClusters()){
t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
+ AliDebug(4, "Failed Not Enough Clusters in Detector");
continue;
}
// build tracklet
if(!tracklet.Init(&t)){
n=-1;
t.SetStatus(AliTRDtrackV1::kTrackletInit);
+ AliDebug(4, "Failed Tracklet Init");
break;
}
if(!tracklet.AttachClusters(chamber, kTRUE)){
<<"tracklet.=" << &trackletCp
<< "\n";
}
+ 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);
if(debugLevel>3){
<<"tracklet.=" << &trackletCp
<< "\n";
}
+ AliDebug(4, "Failed N Clusters Attached");
continue;
}
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);
+ AliDebug(4, "Failed Tracklet Fit");
continue;
}
x = ptrTracklet->GetX(); //GetX0();
if(x > (fgkMaxStep + t.GetX()) && !PropagateToX(t, x, fgkMaxStep)) {
n=-1;
t.SetStatus(AliTRDtrackV1::kPropagation);
+ AliDebug(4, Form("Failed Propagation to Tracklet x[%7.2f]", x));
break;
}
if(!AdjustSector(&t)) {
n=-1;
t.SetStatus(AliTRDtrackV1::kAdjustSector);
+ AliDebug(4, "Failed Adjust Sector");
break;
}
if(TMath::Abs(t.GetSnp()) > fgkMaxSnp) {
n=-1;
t.SetStatus(AliTRDtrackV1::kSnp);
+ AliDebug(4, Form("Failed Max Snp[%f] MaxSnp[%f]", t.GetSnp(), fgkMaxSnp));
break;
}
if(kPropagateIn){
<< "track.=" << &trackCp
<< "\n";
}
+ AliDebug(4, Form("Failed Chi2[%f]", chi2));
continue;
}
if(!t.Update(p, cov, chi2)) {
<< "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;
}
// fill residuals ?!
// load tracklet to the tracker
ptrTracklet->Update(&t);
ptrTracklet = SetTracklet(ptrTracklet);
- t.SetTracklet(ptrTracklet, fTracklets->GetEntriesFast()-1);
+ Int_t index(fTracklets->GetEntriesFast()-1);
+ t.SetTracklet(ptrTracklet, index);
n += ptrTracklet->GetN();
+ AliDebug(2, Form("Setting Tracklet[%d] @ Idx[%d]", ily, index));
// Reset material budget if 2 consecutive gold
// if(ilayer>0 && t.GetTracklet(ilayer-1) && ptrTracklet->GetN() + t.GetTracklet(ilayer-1)->GetN() > 20) t.SetBudget(2, 0.);
while (icl--) {
AliTRDcluster *c = (AliTRDcluster *) fClusters->UncheckedAt(icl);
if(c->IsInChamber()) nin++;
+ if(fkReconstructor->IsHLT()) c->SetRPhiMethod(AliTRDcluster::kCOG);
Int_t detector = c->GetDetector();
Int_t sector = fGeom->GetSector(detector);
Int_t stack = fGeom->GetStack(detector);
// Detailed description
//
idx = track->GetTrackletIndex(p);
- AliTRDseedV1 *tracklet = (idx==0xffff) ? NULL : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
+ AliTRDseedV1 *tracklet = (idx<0) ? NULL : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
return 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)
{
//AliInfo(Form("Number of Tracks after iteration step %d: %d\n", iconf, ntracks));
if(ntracks == kMaxTracksStack) break;
}
- if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 1) AliInfo(Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
+ AliDebug(2, Form("Candidate TRD tracks %d in iteration %d.", ntracks, fSieveSeeding));
if(!ntracks) break;
AliTRDtrackV1 *track = MakeTrack(&sseed[trackIndex*kNPlanes], trackParams);
if(!track){
- AliWarning("Fail to build a TRD Track.");
+ AliDebug(1, "Track building failed.");
continue;
}
x0[iLayer] = glb[0];
}
- if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 2){
- AliInfo(Form("Making seeds Stack[%d] Config[%d] Tracks[%d]...", istack, config, ntracks));
- }
+ AliDebug(2, Form("Making seeds Stack[%d] Config[%d] Tracks[%d]...", istack, config, ntracks));
// Build seeding layers
ResetSeedTB();
c[2] = fSeedTB[2]->GetNearestCluster(cond2);
//printf("Found c[1] candidate 2 %p\n", c[2]);
if(!c[2]) continue;
-
- //AliInfo("Seeding clusters found. Building seeds ...");
- //for(Int_t i = 0; i < kNSeedPlanes; i++) printf("%i. coordinates: x = %6.3f, y = %6.3f, z = %6.3f\n", i, c[i]->GetX(), c[i]->GetY(), c[i]->GetZ());
+
+ AliDebug(3, Form("Seeding clusters\n 0[%6.3f %6.3f %6.3f]\n 1[%6.3f %6.3f %6.3f]\n 2[%6.3f %6.3f %6.3f]\n 3[%6.3f %6.3f %6.3f].",
+ c[0]->GetX(), c[0]->GetY(), c[0]->GetZ(),
+ c[1]->GetX(), c[1]->GetY(), c[1]->GetZ(),
+ c[2]->GetX(), c[2]->GetY(), c[2]->GetZ(),
+ c[3]->GetX(), c[3]->GetY(), c[3]->GetZ()));
for (Int_t il = 0; il < kNPlanes; il++) cseed[il].Reset();
<<"\n";
}
if(chi2[0] > fkReconstructor->GetRecoParam() ->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
- //AliInfo(Form("Failed chi2 filter on chi2Z [%f].", chi2[0]));
+ 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*/){
- //AliInfo(Form("Failed chi2 filter on chi2Y [%f].", chi2[1]));
+ AliDebug(3, Form("Filter on chi2Y [%f].", chi2[1]));
AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
continue;
}
// try attaching clusters to tracklets
Int_t mlayers = 0;
- AliTRDcluster *cl = NULL;
+ AliTRDcluster *cl = NULL;
for(int iLayer=0; iLayer<kNSeedPlanes; iLayer++){
Int_t jLayer = planes[iLayer];
- Int_t nNotInChamber = 0;
+ Int_t nNotInChamber = 0;
if(!cseed[jLayer].AttachClusters(stack[jLayer], kTRUE)) continue;
- if(/*fkReconstructor->IsHLT()*/kFALSE){
- cseed[jLayer].UpdateUsed();
- if(!cseed[jLayer].IsOK()) continue;
- }else{
- cseed[jLayer].Fit();
- cseed[jLayer].UpdateUsed();
- cseed[jLayer].ResetClusterIter();
- while((cl = cseed[jLayer].NextCluster())){
- if(!cl->IsInChamber()) nNotInChamber++;
- }
- //printf("clusters[%d], used[%d], not in chamber[%d]\n", cseed[jLayer].GetN(), cseed[jLayer].GetNUsed(), nNotInChamber);
- if(cseed[jLayer].GetN() - (cseed[jLayer].GetNUsed() + nNotInChamber) < 5) continue; // checking for Cluster which are not in chamber is a much stronger restriction on real data
- }
+ if(/*fkReconstructor->IsHLT()*/kFALSE){
+ cseed[jLayer].UpdateUsed();
+ if(!cseed[jLayer].IsOK()) continue;
+ }else{
+ cseed[jLayer].Fit();
+ cseed[jLayer].UpdateUsed();
+ cseed[jLayer].ResetClusterIter();
+ while((cl = cseed[jLayer].NextCluster())){
+ if(!cl->IsInChamber()) nNotInChamber++;
+ }
+ //printf("clusters[%d], used[%d], not in chamber[%d]\n", cseed[jLayer].GetN(), cseed[jLayer].GetNUsed(), nNotInChamber);
+ if(cseed[jLayer].GetN() - (cseed[jLayer].GetNUsed() + nNotInChamber) < 5) continue; // checking for Cluster which are not in chamber is a much stronger restriction on real data
+ }
mlayers++;
}
if(mlayers < kNSeedPlanes){
- //AliInfo(Form("Failed updating all seeds %d [%d].", mlayers, kNSeedPlanes));
+ AliDebug(2, Form("Found only %d tracklets out of %d. Skip.", mlayers, kNSeedPlanes));
AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
continue;
}
for(int iLayer=0; iLayer<kNPlanes-kNSeedPlanes; iLayer++){
Int_t jLayer = planesExt[iLayer];
if(!(chamber = stack[jLayer])) continue;
- cseed[jLayer].AttachClusters(chamber, kTRUE);
+ if(!cseed[jLayer].AttachClusters(chamber, kTRUE)) continue;
cseed[jLayer].Fit();
}
fTrackQuality[ntracks] = 1.; // dummy value
Double_t like = CookLikelihood(&cseed[0], planes); // to be checked
if (TMath::Log(1.E-9 + like) < fkReconstructor->GetRecoParam() ->GetTrackLikelihood()){
- //AliInfo(Form("Failed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
+ AliDebug(3, Form("Filter on likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
continue;
}
fSeedLayer[ntracks] = config;/*sLayer;*/
// attach clusters to the extrapolation seeds
+ Int_t elayers(0);
for(int iLayer=0; iLayer<kNPlanes-kNSeedPlanes; iLayer++){
Int_t jLayer = planesExt[iLayer];
if(!(chamber = stack[jLayer])) continue;
cseed[jLayer] = pseed;
FitTiltedRieman(cseed, kTRUE);
cseed[jLayer].Fit(kTRUE);
+ elayers++;
}
// AliInfo("Extrapolation done.");
<< "\n";
}
- if(fkReconstructor->GetRecoParam()->HasImproveTracklets() && ImproveSeedQuality(stack, cseed) < 4){
- AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
- continue;
+ 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){
+ 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];
+ }
}
//AliInfo("Improve seed quality done.");
return ptrTrack;
}
+ if(TMath::Abs(track.GetY())>1000)
+ return NULL;
+
track.ResetCovariance(1);
Int_t nc = TMath::Abs(FollowBackProlongation(track));
if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 5 && fkReconstructor->IsDebugStreaming()){
// make a local working copy
AliTRDtrackingChamber *chamber = NULL;
- AliTRDseedV1 bseed[6];
- Int_t nLayers = 0;
- for (Int_t jLayer = 0; jLayer < 6; jLayer++) bseed[jLayer] = cseed[jLayer];
-
- Float_t lastquality = 10000.0;
- Float_t lastchi2 = 10000.0;
- Float_t chi2 = 1000.0;
+ AliTRDseedV1 bseed[AliTRDgeometry::kNlayer];
+
+ Float_t quality(0.),
+ lQuality[] = {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];
+ if(!bseed[jLayer].IsOK()) continue;
+ rLayers++;
+ lQuality[jLayer] = bseed[jLayer].GetQuality(kTRUE);
+ quality += lQuality[jLayer];
+ }
+ Float_t chi2 = FitTiltedRieman(bseed, kTRUE);
for (Int_t iter = 0; iter < 4; iter++) {
- Float_t sumquality = 0.0;
- Float_t squality[6];
- Int_t sortindexes[6];
-
- for (Int_t jLayer = 0; jLayer < 6; jLayer++) {
- squality[jLayer] = bseed[jLayer].IsOK() ? bseed[jLayer].GetQuality(kTRUE) : 1000.;
- sumquality += squality[jLayer];
- }
- if ((sumquality >= lastquality) || (chi2 > lastchi2)) break;
-
- nLayers = 0;
- lastquality = sumquality;
- lastchi2 = chi2;
- if (iter > 0) for (Int_t jLayer = 0; jLayer < 6; jLayer++) cseed[jLayer] = bseed[jLayer];
-
- TMath::Sort(6, squality, sortindexes, kFALSE);
- for (Int_t jLayer = 5; jLayer > 1; jLayer--) {
- Int_t bLayer = sortindexes[jLayer];
+ 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];
+ 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;
- bseed[bLayer].AttachClusters(chamber, kTRUE);
+ if(!bseed[bLayer].AttachClusters(chamber, kTRUE)) continue;
bseed[bLayer].Fit(kTRUE);
- if(bseed[bLayer].IsOK()) nLayers++;
+ if(!bseed[bLayer].IsOK()) continue;
+ nLayers++;
+ lQuality[jLayer] = bseed[jLayer].GetQuality(kTRUE);
+ qualitynew += lQuality[jLayer];
}
+ if(rLayers > nLayers){
+ AliDebug(1, Form("Lost %d tracklets while improving.", rLayers-nLayers));
+ break;
+ } else rLayers=nLayers;
+
+ if(qualitynew >= quality){
+ AliDebug(4, Form("Quality worsen in iter[%d].", iter));
+ break;
+ } 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);
+ if(chi2new > chi2){
+ AliDebug(4, Form("Chi2 worsen in iter[%d].", iter));
+ break;
+ } else chi2 = chi2new;
+
+ // store better tracklets
+ for(Int_t jLayer=AliTRDgeometry::kNlayer; jLayer--;) bseed[jLayer]=tseed[jLayer];
+
- chi2 = FitTiltedRieman(bseed, kTRUE);
if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 7 && fkReconstructor->IsDebugStreaming()){
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
cstreamer << "ImproveSeedQuality"
- << "EventNumber=" << eventNumber
- << "CandidateNumber=" << candidateNumber
- << "Iteration=" << iter
- << "S0.=" << &bseed[0]
- << "S1.=" << &bseed[1]
- << "S2.=" << &bseed[2]
- << "S3.=" << &bseed[3]
- << "S4.=" << &bseed[4]
- << "S5.=" << &bseed[5]
- << "FitterT.=" << tiltedRieman
- << "\n";
+ << "EventNumber=" << eventNumber
+ << "CandidateNumber=" << candidateNumber
+ << "Iteration=" << iter
+ << "S0.=" << &bseed[0]
+ << "S1.=" << &bseed[1]
+ << "S2.=" << &bseed[2]
+ << "S3.=" << &bseed[3]
+ << "S4.=" << &bseed[4]
+ << "S5.=" << &bseed[5]
+ << "FitterT.=" << tiltedRieman
+ << "\n";
}
} // Loop: iter
// we are sure that at least 2 tracklets are OK !
- return nLayers+2;
+ return rLayers;
}
//_________________________________________________________________________
//_____________________________________________________________________________
AliTRDtrackerV1::AliTRDLeastSquare::AliTRDLeastSquare(){
- //
- // Constructor of the nested class AliTRDtrackFitterLeastSquare
- //
+//
+// Constructor of the nested class AliTRDtrackFitterLeastSquare
+//
+// Fast solving linear regresion in 2D
+// y=a + bx
+// The data members have the following meaning
+// fParams[0] : a
+// fParams[1] : b
+//
+// fSums[0] : S
+// fSums[1] : Sx
+// fSums[2] : Sy
+// fSums[3] : Sxy
+// fSums[4] : Sxx
+// fSums[5] : Syy
+//
+// fCovarianceMatrix[0] : s2a
+// fCovarianceMatrix[1] : s2b
+// fCovarianceMatrix[2] : cov(ab)
+
memset(fParams, 0, sizeof(Double_t) * 2);
memset(fSums, 0, sizeof(Double_t) * 6);
memset(fCovarianceMatrix, 0, sizeof(Double_t) * 3);
}
//_____________________________________________________________________________
-void AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
+Bool_t AliTRDtrackerV1::AliTRDLeastSquare::Eval(){
//
// Evaluation of the fit:
// Calculation of the parameters
// Calculation of the covariance matrix
//
- Double_t denominator = fSums[0] * fSums[4] - fSums[1] *fSums[1];
- if(denominator==0) return;
+ Double_t det = fSums[0] * fSums[4] - fSums[1] *fSums[1];
+ if(det==0) return kFALSE;
// for(Int_t isum = 0; isum < 5; isum++)
// printf("fSums[%d] = %f\n", isum, fSums[isum]);
// printf("denominator = %f\n", denominator);
- fParams[0] = (fSums[2] * fSums[4] - fSums[1] * fSums[3])/ denominator;
- fParams[1] = (fSums[0] * fSums[3] - fSums[1] * fSums[2]) / denominator;
+ fParams[0] = (fSums[2] * fSums[4] - fSums[1] * fSums[3])/det;
+ fParams[1] = (fSums[0] * fSums[3] - fSums[1] * fSums[2])/det;
// printf("fParams[0] = %f, fParams[1] = %f\n", fParams[0], fParams[1]);
// Covariance matrix
- fCovarianceMatrix[0] = fSums[4] / fSums[0] - fSums[1] * fSums[1] / (fSums[0] * fSums[0]);
+ Double_t den = fSums[0]*fSums[4] - fSums[1]*fSums[1];
+ fCovarianceMatrix[0] = fSums[4] / den;
+ fCovarianceMatrix[1] = fSums[0] / den;
+ fCovarianceMatrix[2] = -fSums[1] / den;
+/* fCovarianceMatrix[0] = fSums[4] / fSums[0] - fSums[1] * fSums[1] / (fSums[0] * fSums[0]);
fCovarianceMatrix[1] = fSums[5] / fSums[0] - fSums[2] * fSums[2] / (fSums[0] * fSums[0]);
- fCovarianceMatrix[2] = fSums[3] / fSums[0] - fSums[1] * fSums[2] / (fSums[0] * fSums[0]);
+ fCovarianceMatrix[2] = fSums[3] / fSums[0] - fSums[1] * fSums[2] / (fSums[0] * fSums[0]);*/
+
+
+
+ return kTRUE;
}
//_____________________________________________________________________________
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff