// //
///////////////////////////////////////////////////////////////////////////////
-// #include <Riostream.h>
-// #include <stdio.h>
-// #include <string.h>
-
#include <TBranch.h>
#include <TDirectory.h>
#include <TLinearFitter.h>
#include "AliTRDrecoParam.h"
#include "AliTRDcluster.h"
+#include "AliTRDdigitsParam.h"
#include "AliTRDseedV1.h"
#include "AliTRDtrackV1.h"
#include "AliTRDtrackerV1.h"
#include "AliTRDtrackingChamber.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; //
const Double_t AliTRDtrackerV1::fgkX0[kNPlanes] = {
300.2, 312.8, 325.4, 338.0, 350.6, 363.2};
Int_t AliTRDtrackerV1::fgNTimeBins = 0;
-AliRieman* AliTRDtrackerV1::fgRieman = 0x0;
-TLinearFitter* AliTRDtrackerV1::fgTiltedRieman = 0x0;
-TLinearFitter* AliTRDtrackerV1::fgTiltedRiemanConstrained = 0x0;
+AliRieman* AliTRDtrackerV1::fgRieman = NULL;
+TLinearFitter* AliTRDtrackerV1::fgTiltedRieman = NULL;
+TLinearFitter* AliTRDtrackerV1::fgTiltedRiemanConstrained = NULL;
//____________________________________________________________________
AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec)
:AliTracker()
- ,fReconstructor(0x0)
- ,fGeom(0x0)
- ,fClusters(0x0)
- ,fTracklets(0x0)
- ,fTracks(0x0)
+ ,fkReconstructor(NULL)
+ ,fGeom(NULL)
+ ,fClusters(NULL)
+ ,fTracklets(NULL)
+ ,fTracks(NULL)
,fSieveSeeding(0)
{
//
}
fGeom = new AliTRDgeometry();
fGeom->CreateClusterMatrixArray();
- TGeoHMatrix *matrix = 0x0;
+ TGeoHMatrix *matrix = NULL;
Double_t loc[] = {0., 0., 0.};
Double_t glb[] = {0., 0., 0.};
for(Int_t ily=kNPlanes; ily--;){
fR[ily] = glb[0]+ AliTRDgeometry::AnodePos()-.5*AliTRDgeometry::AmThick() - AliTRDgeometry::DrThick();
}
- // initialize calibration values
- AliTRDcalibDB *trd = 0x0;
- 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);
// Destructor
//
- if(fgRieman) delete fgRieman; fgRieman = 0x0;
- if(fgTiltedRieman) delete fgTiltedRieman; fgTiltedRieman = 0x0;
- if(fgTiltedRiemanConstrained) delete fgTiltedRiemanConstrained; fgTiltedRiemanConstrained = 0x0;
+ if(fgRieman) delete fgRieman; fgRieman = NULL;
+ if(fgTiltedRieman) delete fgTiltedRieman; fgTiltedRieman = NULL;
+ if(fgTiltedRiemanConstrained) delete fgTiltedRiemanConstrained; fgTiltedRiemanConstrained = NULL;
for(Int_t isl =0; isl<kNSeedPlanes; isl++) if(fSeedTB[isl]) delete fSeedTB[isl];
if(fTracks) {fTracks->Delete(); delete fTracks;}
if(fTracklets) {fTracklets->Delete(); delete fTracklets;}
// See AliTRDtrackerV1::Clusters2TracksSM() for details.
//
- if(!fReconstructor->GetRecoParam() ){
+ if(!fkReconstructor->GetRecoParam() ){
AliError("Reconstruction configuration not initialized. Call first AliTRDReconstructor::SetRecoParam().");
return 0;
}
//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
nTPCseeds= 0; // number of TPC seeds
Float_t foundMin = 20.0;
- Float_t *quality = 0x0;
- Int_t *index = 0x0;
+ Float_t *quality = NULL;
+ Int_t *index = NULL;
nSeeds = event->GetNumberOfTracks();
// Sort tracks according to quality
// (covariance in the yz plane)
seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup);
// prepare track and do propagation in the TRD
- track.SetReconstructor(fReconstructor);
+ track.SetReconstructor(fkReconstructor);
track.SetKink(Bool_t(seed->GetKinkIndex(0)));
expectedClr = FollowBackProlongation(track);
// check if track entered the TRD fiducial volume
// update calibration references using this track
if(calibra->GetHisto2d()) calibra->UpdateHistogramsV1(&track);
// save calibration object
- if (fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){
+ if (fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){
AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(track);
calibTrack->SetOwner();
seed->AddCalibObject(calibTrack);
//(with the help of Annalisa de Caro Mar-17-2009)
if(gGeoManager){
gGeoManager->cd(Form("/ALIC_1/B077_1/BSEGMO%d_1/BTOF%d_1", sm, sm));
- TGeoHMatrix *m = 0x0;
+ TGeoHMatrix *m = NULL;
Double_t loc[]={0., 0., -.5*29.05}, glob[3];
if((m=gGeoManager->GetCurrentMatrix())){
AliInfo(Form("Number of tracks: TRDout[%d]", nFound));
// run stand alone tracking
- if (fReconstructor->IsSeeding()) Clusters2Tracks(event);
+ if (fkReconstructor->IsSeeding()) Clusters2Tracks(event);
return 0;
}
}
// Update the friend track
- if (fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){
- TObject *o = 0x0; Int_t ic = 0;
- AliTRDtrackV1 *calibTrack = 0x0;
+ if (fkReconstructor->GetRecoParam()->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());
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;
}
Int_t index = 0;
AliTRDseedV1 *tracklet = GetTracklet(&t, 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;
}
}
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 1){
Int_t index;
for(int iplane=0; iplane<AliTRDgeometry::kNlayer; iplane++){
AliTRDseedV1 *tracklet = GetTracklet(&t, iplane, index);
t.SetTracklet(tracklet, index);
}
- Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
- AliTRDtrackV1 track(t);
- track.SetOwner();
- cstreamer << "FollowProlongation"
- << "EventNumber=" << eventNumber
- << "ncl=" << nClustersExpected
- << "track.=" << &track
- << "\n";
+ if(fkReconstructor->IsDebugStreaming()){
+ Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
+ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
+ AliTRDtrackV1 track(t);
+ track.SetOwner();
+ cstreamer << "FollowProlongation"
+ << "EventNumber=" << eventNumber
+ << "ncl=" << nClustersExpected
+ << "track.=" << &track
+ << "\n";
+ }
}
-
return nClustersExpected;
}
Int_t n = 0;
Double_t driftLength = .5*AliTRDgeometry::AmThick() + AliTRDgeometry::DrThick();
- AliTRDtrackingChamber *chamber = 0x0;
+ AliTRDtrackingChamber *chamber = NULL;
- AliTRDseedV1 tracklet, *ptrTracklet = 0x0;
+ Int_t debugLevel = fkReconstructor->IsDebugStreaming() ? fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) : 0;
+ TTreeSRedirector *cstreamer = fkReconstructor->IsDebugStreaming() ? fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker) : 0x0;
+
+ AliTRDseedV1 tracklet, *ptrTracklet = NULL;
// in case of stand alone tracking we store all the pointers to the tracklets in a temporary array
AliTRDseedV1 *tracklets[kNPlanes];
memset(tracklets, 0, sizeof(AliTRDseedV1 *) * kNPlanes);
Bool_t kStoreIn = kTRUE, kPropagateIn = kTRUE;
// Loop through the TRD layers
- TGeoHMatrix *matrix = 0x0;
+ TGeoHMatrix *matrix = NULL;
Double_t x, y, z;
for (Int_t ily=0, sm=-1, stk=-1, det=-1; ily < AliTRDgeometry::kNlayer; ily++) {
// rough estimate of the entry point
// TODO cross check with y value !
stk = fGeom->GetStack(z, ily);
det = stk>=0 ? AliTRDgeometry::GetDetector(ily, stk, sm) : -1;
- matrix = det>=0 ? fGeom->GetClusterMatrix(det) : 0x0;
+ matrix = det>=0 ? fGeom->GetClusterMatrix(det) : NULL;
// check if supermodule/chamber is installed
if( !fGeom->GetSMstatus(sm) ||
t.SetStatus(AliTRDtrackV1::kSnp);
break;
}
- Bool_t RECALCULATE = kFALSE;
+ Bool_t doRecalculate = kFALSE;
if(sm != t.GetSector()){
sm = t.GetSector();
- RECALCULATE = kTRUE;
+ doRecalculate = kTRUE;
}
if(stk != fGeom->GetStack(z, ily)){
stk = fGeom->GetStack(z, ily);
- RECALCULATE = kTRUE;
+ doRecalculate = kTRUE;
}
- if(RECALCULATE){
+ if(doRecalculate){
det = AliTRDgeometry::GetDetector(ily, stk, sm);
if(!(matrix = fGeom->GetClusterMatrix(det))){
t.SetStatus(AliTRDtrackV1::kGeometry, ily);
ptrTracklet = tracklets[ily];
if(!ptrTracklet){ // BUILD TRACKLET
+ AliDebug(2, Form("Building tracklet ly[%d]", ily));
// check data in supermodule
if(!fTrSec[sm].GetNChambers()){
t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
continue;
}
- if(chamber->GetNClusters() < fgNTimeBins*fReconstructor->GetRecoParam() ->GetFindableClusters()){
+ if(chamber->GetNClusters() < fgNTimeBins*fkReconstructor->GetRecoParam() ->GetFindableClusters()){
t.SetStatus(AliTRDtrackV1::kNoClusters, ily);
continue;
}
// build tracklet
ptrTracklet = new(&tracklet) AliTRDseedV1(det);
- ptrTracklet->SetReconstructor(fReconstructor);
+ ptrTracklet->SetReconstructor(fkReconstructor);
ptrTracklet->SetKink(t.IsKink());
ptrTracklet->SetPadPlane(fGeom->GetPadPlane(ily, stk));
ptrTracklet->SetX0(glb[0]+driftLength);
}
if(!tracklet.AttachClusters(chamber, kTRUE)){
t.SetStatus(AliTRDtrackV1::kNoAttach, ily);
+ if(debugLevel>3){
+ AliTRDseedV1 trackletCp(*ptrTracklet);
+ UChar_t status(t.GetStatusTRD(ily));
+ (*cstreamer) << "FollowBackProlongation2"
+ <<"status=" << status
+ <<"tracklet.=" << &trackletCp
+ << "\n";
+ }
continue;
}
- if(tracklet.GetN() < fgNTimeBins*fReconstructor->GetRecoParam() ->GetFindableClusters()){
+ if(tracklet.GetN() < fgNTimeBins*fkReconstructor->GetRecoParam() ->GetFindableClusters()){
t.SetStatus(AliTRDtrackV1::kNoClustersTracklet, ily);
+ if(debugLevel>3){
+ AliTRDseedV1 trackletCp(*ptrTracklet);
+ UChar_t status(t.GetStatusTRD(ily));
+ (*cstreamer) << "FollowBackProlongation2"
+ <<"status=" << status
+ <<"tracklet.=" << &trackletCp
+ << "\n";
+ }
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
Double_t cov[3]; ptrTracklet->GetCovAt(x, cov);
Double_t p[2] = { ptrTracklet->GetY(), ptrTracklet->GetZ()};
Double_t chi2 = ((AliExternalTrackParam)t).GetPredictedChi2(p, cov);
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 2){
- Double_t ytrack = ptrTracklet->GetYref(0);
- Double_t ztrack = ptrTracklet->GetZref(0);
- Double_t ytracklet = ptrTracklet->GetYfit(0);
- Double_t ztracklet = ptrTracklet->GetZfit(0);
- Double_t phitrack = ptrTracklet->GetYref(1);
- Double_t phitracklet = ptrTracklet->GetYfit(1);
- Double_t thetatrack = ptrTracklet->GetZref(1);
- Double_t thetatracklet = ptrTracklet->GetZfit(1);
-
- TTreeSRedirector &mystreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
- mystreamer << "FollowBackProlongation1"
- << "il=" << ily
- << "x=" << x
- << "ytrack=" << ytrack
- << "ztrack=" << ztrack
- << "ytracklet=" << ytracklet
- << "ztracklet=" << ztracklet
- << "phitrack=" << phitrack
- << "thetatrack=" << thetatrack
- << "phitracklet=" << phitracklet
- << "thetatracklet=" << thetatracklet
- << "chi2=" << chi2
- << "\n";
- }
// update Kalman with the TRD measurement
if(chi2>1e+10){ // TODO
t.SetStatus(AliTRDtrackV1::kChi2, ily);
+ 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";
+ }
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";
+ }
break;
}
// fill residuals ?!
//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(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ if(debugLevel > 1){
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
AliTRDtrackV1 track(t);
track.SetOwner();
- cstreamer << "FollowBackProlongation"
+ (*cstreamer) << "FollowBackProlongation0"
<< "EventNumber=" << eventNumber
<< "ncl=" << n
<< "track.=" << &track
}
//_________________________________________________________________________
-Float_t AliTRDtrackerV1::FitRieman(AliTRDseedV1 *tracklets, Double_t *chi2, Int_t *planes){
+Float_t AliTRDtrackerV1::FitRieman(AliTRDseedV1 *tracklets, Double_t *chi2, Int_t *const planes){
//
// Fits a Riemann-circle to the given points without tilting pad correction.
// The fit is performed using an instance of the class AliRieman (equations
TLinearFitter *fitter = GetTiltedRiemanFitterConstraint();
fitter->StoreData(kTRUE);
fitter->ClearPoints();
- AliTRDcluster *cl = 0x0;
+ AliTRDcluster *cl = NULL;
Float_t x, y, z, w, t, error, tilt;
Double_t uvt[2];
for(Int_t ip = 0; ip < AliTRDtrackerV1::kNPlanes; ip++)
tracklets[ip].SetC(curvature);
-/* if(fReconstructor->GetStreamLevel() >= 5){
+/* if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker()) >= 5){
//Linear Model on z-direction
Double_t xref = CalculateReferenceX(tracklets); // Relative to the middle of the stack
Double_t slope = fitter->GetParameter(2);
Float_t chi2Z = CalculateChi2Z(tracklets, zref, slope, xref);
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
- TTreeSRedirector &treeStreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ TTreeSRedirector &treeStreamer = *fkReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
treeStreamer << "FitTiltedRiemanConstraint"
<< "EventNumber=" << eventNumber
<< "CandidateNumber=" << candidateNumber
fitter->StoreData(kTRUE);
fitter->ClearPoints();
AliTRDLeastSquare zfitter;
- AliTRDcluster *cl = 0x0;
+ AliTRDcluster *cl = NULL;
Double_t xref = CalculateReferenceX(tracklets);
Double_t x, y, z, t, tilt, dx, w, we, erry, errz;
tracklets[iLayer].SetChi2(chi2track);
}
-/* if(fReconstructor->GetStreamLevel() >=5){
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+/* if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >=5){
+ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
Double_t chi2z = CalculateChi2Z(tracklets, offset, slope, xref);
//____________________________________________________________________
Double_t AliTRDtrackerV1::FitLine(const AliTRDtrackV1 *track, AliTRDseedV1 *tracklets, Bool_t err, Int_t np, AliTrackPoint *points)
{
+ //
+ // Fit track with a staight line
+ // Fills an AliTrackPoint array with np points
+ // Function should be used to refit tracks when no magnetic field was on
+ //
AliTRDLeastSquare yfitter, zfitter;
- AliTRDcluster *cl = 0x0;
+ AliTRDcluster *cl = NULL;
- AliTRDseedV1 work[kNPlanes], *tracklet = 0x0;
+ AliTRDseedV1 work[kNPlanes], *tracklet = NULL;
if(!tracklets){
for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
if(!(tracklet = track->GetTracklet(ipl))) continue;
fitter->StoreData(kTRUE);
fitter->ClearPoints();
AliTRDLeastSquare zfitter;
- AliTRDcluster *cl = 0x0;
+ AliTRDcluster *cl = NULL;
- AliTRDseedV1 work[kNPlanes], *tracklet = 0x0;
+ AliTRDseedV1 work[kNPlanes], *tracklet = NULL;
if(!tracklets){
for(Int_t ipl = 0; ipl < kNPlanes; ipl++){
if(!(tracklet = track->GetTracklet(ipl))) continue;
Double_t x0 = -b * y0;
Double_t tmp = y0*y0 + x0*x0 - c*y0;
if(tmp<=0.) return 1.E10;
- Double_t R = TMath::Sqrt(tmp);
- Double_t C = 1.0 + b*b - c*a;
- if (C > 0.0) C = a / TMath::Sqrt(C);
+ Double_t radius = TMath::Sqrt(tmp);
+ Double_t curvature = 1.0 + b*b - c*a;
+ if (curvature > 0.0) curvature = a / TMath::Sqrt(curvature);
// Calculate chi2 of the fit
Double_t chi2 = fitter->GetChisquare()/Double_t(nPoints);
if(!track){
for(Int_t ip = 0; ip < kNPlanes; ip++) {
x = tracklets[ip].GetX0();
- tmp = R*R-(x-x0)*(x-x0);
+ tmp = radius*radius-(x-x0)*(x-x0);
if(tmp <= 0.) continue;
tmp = TMath::Sqrt(tmp);
tracklets[ip].SetYref(1, (x - x0) / tmp);
tracklets[ip].SetZref(0, z0 + dzdx * (x - xref));
tracklets[ip].SetZref(1, dzdx);
- tracklets[ip].SetC(C);
+ tracklets[ip].SetC(curvature);
tracklets[ip].SetChi2(chi2);
}
}
Float_t xyz[3];
for(int ip=0; ip<np; ip++){
points[ip].GetXYZ(xyz);
- xyz[1] = TMath::Abs(xyz[0] - x0) > R ? 100. : y0 - (y0>0.?1.:-1.)*TMath::Sqrt((R-(xyz[0]-x0))*(R+(xyz[0]-x0)));
+ xyz[1] = TMath::Abs(xyz[0] - x0) > radius ? 100. : y0 - (y0>0.?1.:-1.)*TMath::Sqrt((radius-(xyz[0]-x0))*(radius+(xyz[0]-x0)));
xyz[2] = z0 + dzdx * (xyz[0] - xref);
points[ip].SetXYZ(xyz);
}
//____________________________________________________________________
-Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 *tracklets, Bool_t up, Int_t np, AliTrackPoint *points)
+Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const tracklets, Bool_t up, Int_t np, AliTrackPoint *points)
{
// Kalman filter implementation for the TRD.
// It returns the positions of the fit in the array "points"
//if(points) printf("First marker point @ x[%d] = %f\n", ip, points[ip].GetX());
- AliTRDseedV1 tracklet, *ptrTracklet = 0x0;
+ AliTRDseedV1 tracklet, *ptrTracklet = NULL;
//Loop through the TRD planes
for (Int_t jplane = 0; jplane < kNPlanes; jplane++) {
if(!(ptrTracklet = &tracklets[iplane])) continue;
}else{
if(!(ptrTracklet = track->GetTracklet(iplane))){
- /*AliTRDtrackerV1 *tracker = 0x0;
- if(!(tracker = dynamic_cast<AliTRDtrackerV1*>( AliTRDReconstructor::Tracker()))) continue;
+ /*AliTRDtrackerV1 *tracker = NULL;
+ if(!(tracker = dynamic_cast<AliTRDtrackerV1*>( AliTRDrecoParam:Tracker()))) continue;
ptrTracklet = new(&tracklet) AliTRDseedV1(iplane);
if(!tracker->MakeTracklet(ptrTracklet, track)) */
continue;
branch->SetAddress(&clusterArray);
if(!fClusters){
- Float_t nclusters = fReconstructor->GetRecoParam()->GetNClusters();
- if(fReconstructor->IsHLT()) nclusters /= AliTRDgeometry::kNsector;
+ Float_t nclusters = fkReconstructor->GetRecoParam()->GetNClusters();
+ if(fkReconstructor->IsHLT()) nclusters /= AliTRDgeometry::kNsector;
array = new TClonesArray("AliTRDcluster", Int_t(nclusters));
array->SetOwner(kTRUE);
}
Int_t nEntries = (Int_t) clusterTree->GetEntries();
Int_t nbytes = 0;
Int_t ncl = 0;
- AliTRDcluster *c = 0x0;
+ AliTRDcluster *c = NULL;
for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {
// Import the tree
nbytes += clusterTree->GetEvent(iEntry);
// Fills clusters into TRD tracking sectors
//
- if(!fReconstructor->IsWritingClusters()){
+ if(!fkReconstructor->IsWritingClusters()){
fClusters = AliTRDReconstructor::GetClusters();
} else {
if (ReadClusters(fClusters, cTree)) {
}
//_____________________________________________________________________________
-Int_t AliTRDtrackerV1::LoadClusters(TClonesArray *clusters)
+Int_t AliTRDtrackerV1::LoadClusters(TClonesArray * const clusters)
{
//
// Fills clusters into TRD tracking sectors
const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det();
for(int isector =0; isector<AliTRDgeometry::kNsector; isector++){
if(!fTrSec[isector].GetNChambers()) continue;
- fTrSec[isector].Init(fReconstructor, cal);
+ fTrSec[isector].Init(fkReconstructor, cal);
}
return nin;
if(fTracks){
fTracks->Delete();
- if(HasRemoveContainers()){delete fTracks; fTracks = 0x0;}
+ if(HasRemoveContainers()){delete fTracks; fTracks = NULL;}
}
if(fTracklets){
fTracklets->Delete();
- if(HasRemoveContainers()){delete fTracklets; fTracklets = 0x0;}
+ if(HasRemoveContainers()){delete fTracklets; fTracklets = NULL;}
}
if(fClusters){
if(IsClustersOwner()) fClusters->Delete();
// save clusters array in the reconstructor for further use.
- if(!fReconstructor->IsWritingClusters()){
+ if(!fkReconstructor->IsWritingClusters()){
AliTRDReconstructor::SetClusters(fClusters);
SetClustersOwner(kFALSE);
- } else AliTRDReconstructor::SetClusters(0x0);
+ } else AliTRDReconstructor::SetClusters(NULL);
}
for (int i = 0; i < AliTRDgeometry::kNsector; i++) fTrSec[i].Clear();
// const AliTRDtrackV1 *track = dynamic_cast<const AliTRDtrackV1*>(t);
// if(!track) return;
//
-// AliTRDseedV1 *tracklet = 0x0;
+// AliTRDseedV1 *tracklet = NULL;
// for(Int_t ily=AliTRDgeometry::kNlayer; ily--;){
// if(!(tracklet = track->GetTracklet(ily))) continue;
-// AliTRDcluster *c = 0x0;
+// AliTRDcluster *c = NULL;
// for(Int_t ic=AliTRDseed::kNclusters; ic--;){
// if(!(c=tracklet->GetClusters(ic))) continue;
// c->Use();
//
//_____________________________________________________________________________
-Bool_t AliTRDtrackerV1::AdjustSector(AliTRDtrackV1 *track)
+Bool_t AliTRDtrackerV1::AdjustSector(AliTRDtrackV1 *const track)
{
//
// Rotates the track when necessary
//____________________________________________________________________
-AliTRDseedV1* AliTRDtrackerV1::GetTracklet(AliTRDtrackV1 *track, Int_t p, Int_t &idx)
+AliTRDseedV1* AliTRDtrackerV1::GetTracklet(AliTRDtrackV1 *const track, Int_t p, Int_t &idx)
{
// Find tracklet for TRD track <track>
// Parameters
// Detailed description
//
idx = track->GetTrackletIndex(p);
- AliTRDseedV1 *tracklet = (idx==0xffff) ? 0x0 : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
+ AliTRDseedV1 *tracklet = (idx==0xffff) ? NULL : (AliTRDseedV1*)fTracklets->UncheckedAt(idx);
return tracklet;
}
//____________________________________________________________________
-AliTRDseedV1* AliTRDtrackerV1::SetTracklet(AliTRDseedV1 *tracklet)
+AliTRDseedV1* AliTRDtrackerV1::SetTracklet(const AliTRDseedV1 * const tracklet)
{
// Add this tracklet to the list of tracklets stored in the tracker
//
}
//____________________________________________________________________
-AliTRDtrackV1* AliTRDtrackerV1::SetTrack(AliTRDtrackV1 *track)
+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)
{
// Add this track to the list of tracks stored in the tracker
//
Int_t nTracks = 0;
Int_t nChambers = 0;
- AliTRDtrackingChamber **stack = 0x0, *chamber = 0x0;
+ AliTRDtrackingChamber **stack = NULL, *chamber = NULL;
for(int istack = 0; istack<AliTRDgeometry::kNstack; istack++){
if(!(stack = fTrSec[sector].GetStack(istack))) continue;
nChambers = 0;
for(int ilayer=0; ilayer<AliTRDgeometry::kNlayer; ilayer++){
if(!(chamber = stack[ilayer])) continue;
- if(chamber->GetNClusters() < fgNTimeBins * fReconstructor->GetRecoParam() ->GetFindableClusters()) continue;
+ if(chamber->GetNClusters() < fgNTimeBins * fkReconstructor->GetRecoParam() ->GetFindableClusters()) continue;
nChambers++;
//AliInfo(Form("sector %d stack %d layer %d clusters %d", sector, istack, ilayer, chamber->GetNClusters()));
}
}
//____________________________________________________________________
-Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClonesArray *esdTrackList)
+Int_t AliTRDtrackerV1::Clusters2TracksStack(AliTRDtrackingChamber **stack, TClonesArray * const esdTrackList)
{
//
// Make tracks in one TRD stack.
//
const AliTRDCalDet *cal = AliTRDcalibDB::Instance()->GetT0Det();
- AliTRDtrackingChamber *chamber = 0x0;
- AliTRDtrackingChamber **ci = 0x0;
+ AliTRDtrackingChamber *chamber = NULL;
+ AliTRDtrackingChamber **ci = NULL;
AliTRDseedV1 sseed[kMaxTracksStack*6]; // to be initialized
Int_t pars[4]; // MakeSeeds parameters
// Build initial seeding configurations
Double_t quality = BuildSeedingConfigs(stack, configs);
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 10){
AliInfo(Form("Plane config %d %d %d Quality %f"
, configs[0], configs[1], configs[2], quality));
}
//AliInfo(Form("Number of Tracks after iteration step %d: %d\n", iconf, ntracks));
if(ntracks == kMaxTracksStack) break;
}
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::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;
// Sieve clusters in decreasing order of track quality
Double_t trackParams[7];
- // AliTRDseedV1 *lseed = 0x0;
+ // AliTRDseedV1 *lseed = NULL;
Int_t jSieve = 0, candidates;
do{
//AliInfo(Form("\t\tITER = %i ", jSieve));
Int_t ich = 0; while(!(chamber = stack[ich])) ich++;
trackParams[6] = fGeom->GetSector(chamber->GetDetector());/* *alpha+shift; // Supermodule*/
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 1){
+ if(fkReconstructor->GetRecoParam()->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];
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t trackNumber = AliTRDtrackerDebug::GetTrackNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
cstreamer << "Clusters2TracksStack"
<< "EventNumber=" << eventNumber
<< "TrackNumber=" << trackNumber
AliTRDtrackV1 *track = MakeTrack(&sseed[trackIndex*kNPlanes], trackParams);
if(!track){
- AliWarning("Fail to build a TRD Track.");
+ AliDebug(1, "Track building failed.");
continue;
}
esdTrack->SetLabel(track->GetLabel());
track->UpdateESDtrack(esdTrack);
// write ESD-friends if neccessary
- if (fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 0){
+ if (fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){
AliTRDtrackV1 *calibTrack = new AliTRDtrackV1(*track);
calibTrack->SetOwner();
esdTrack->AddCalibObject(calibTrack);
// increment counters
ntracks2 += ntracks1;
- if(fReconstructor->IsHLT()) break;
+ if(fkReconstructor->IsHLT()) break;
fSieveSeeding++;
// Rebuild plane configurations and indices taking only unused clusters into account
quality = BuildSeedingConfigs(stack, configs);
- if(quality < 1.E-7) break; //fReconstructor->GetRecoParam() ->GetPlaneQualityThreshold()) break;
+ if(quality < 1.E-7) break; //fkReconstructor->GetRecoParam() ->GetPlaneQualityThreshold()) break;
for(Int_t ip = 0; ip < kNPlanes; ip++){
if(!(chamber = stack[ip])) continue;
chamber->Build(fGeom, cal);//Indices(fSieveSeeding);
}
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 10){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 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
//
Double_t chamberQ[kNPlanes];memset(chamberQ, 0, kNPlanes*sizeof(Double_t));
- AliTRDtrackingChamber *chamber = 0x0;
+ AliTRDtrackingChamber *chamber = NULL;
for(int iplane=0; iplane<kNPlanes; iplane++){
if(!(chamber = stack[iplane])) continue;
chamberQ[iplane] = (chamber = stack[iplane]) ? chamber->GetQuality() : 0.;
}
//____________________________________________________________________
-Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *sseed, Int_t *ipar)
+Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 * const sseed, const Int_t * const ipar)
{
//
// Seed tracklets and build candidate TRD tracks. The procedure is used during barrel tracking to account for tracks which are
// Alexandru Bercuci <A.Bercuci@gsi.de>
// Markus Fasel <M.Fasel@gsi.de>
- AliTRDtrackingChamber *chamber = 0x0;
- AliTRDcluster *c[kNSeedPlanes] = {0x0, 0x0, 0x0, 0x0}; // initilize seeding clusters
+ AliTRDtrackingChamber *chamber = NULL;
+ AliTRDcluster *c[kNSeedPlanes] = {NULL, NULL, NULL, NULL}; // initilize seeding clusters
AliTRDseedV1 *cseed = &sseed[0]; // initialize tracklets for first track
Int_t ncl, mcl; // working variable for looping over clusters
Int_t index[AliTRDchamberTimeBin::kMaxClustersLayer], jndex[AliTRDchamberTimeBin::kMaxClustersLayer];
Double_t hL[kNPlanes]; // Tilting angle
Float_t padlength[kNPlanes]; // pad lenghts
Float_t padwidth[kNPlanes]; // pad widths
- AliTRDpadPlane *pp = 0x0;
+ AliTRDpadPlane *pp = NULL;
for(int iplane=0; iplane<kNPlanes; iplane++){
pp = fGeom->GetPadPlane(iplane, istack);
hL[iplane] = TMath::Tan(TMath::DegToRad()*pp->GetTiltingAngle());
// Init anode wire position for chambers
Double_t x0[kNPlanes], // anode wire position
driftLength = .5*AliTRDgeometry::AmThick() - AliTRDgeometry::DrThick(); // drift length
- TGeoHMatrix *matrix = 0x0;
+ TGeoHMatrix *matrix = NULL;
Double_t loc[] = {AliTRDgeometry::AnodePos(), 0., 0.};
Double_t glb[] = {0., 0., 0.};
AliTRDtrackingChamber **cIter = &stack[0];
x0[iLayer] = glb[0];
}
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::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();
Int_t nlayers = 0;
for(int isl=0; isl<kNSeedPlanes; isl++){
if(!(chamber = stack[planes[isl]])) continue;
- if(!chamber->GetSeedingLayer(fSeedTB[isl], fGeom, fReconstructor)) continue;
+ if(!chamber->GetSeedingLayer(fSeedTB[isl], fGeom, fkReconstructor)) continue;
nlayers++;
}
if(nlayers < kNSeedPlanes) return ntracks;
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();
tseed->SetTilt(hL[iLayer]);
tseed->SetPadLength(padlength[iLayer]);
tseed->SetPadWidth(padwidth[iLayer]);
- tseed->SetReconstructor(fReconstructor);
+ tseed->SetReconstructor(fkReconstructor);
tseed->SetX0(det<0 ? fR[iLayer]+driftLength : x0[iLayer]);
tseed->Init(GetRiemanFitter());
tseed->SetStandAlone(kTRUE);
}
Bool_t isFake = kFALSE;
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
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;
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
AliRieman *rim = GetRiemanFitter();
- TTreeSRedirector &cs0 = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ TTreeSRedirector &cs0 = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
cs0 << "MakeSeeds0"
<<"EventNumber=" << eventNumber
<<"CandidateNumber=" << candidateNumber
<<"RiemanFitter.=" << rim
<<"\n";
}
- if(chi2[0] > fReconstructor->GetRecoParam() ->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
- //AliInfo(Form("Failed chi2 filter on chi2Z [%f].", chi2[0]));
+ if(chi2[0] > fkReconstructor->GetRecoParam() ->GetChi2Z()/*7./(3. - sLayer)*//*iter*/){
+ AliDebug(3, Form("Filter on chi2Z [%f].", chi2[0]));
AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1);
continue;
}
- if(chi2[1] > fReconstructor->GetRecoParam() ->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
- //AliInfo(Form("Failed chi2 filter on chi2Y [%f].", chi2[1]));
+ if(chi2[1] > fkReconstructor->GetRecoParam() ->GetChi2Y()/*1./(3. - sLayer)*//*iter*/){
+ 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;
- 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;
}
// temporary exit door for the HLT
- if(fReconstructor->IsHLT()){
+ if(fkReconstructor->IsHLT()){
// attach clusters to extrapolation chambers
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) < fReconstructor->GetRecoParam() ->GetTrackLikelihood()){
- //AliInfo(Form("Failed likelihood %f[%e].", TMath::Log(1.E-9 + like), like));
+ if (TMath::Log(1.E-9 + like) < fkReconstructor->GetRecoParam() ->GetTrackLikelihood()){
+ 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.");
// Debug Stream containing all the 6 tracklets
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
+ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
<< "\n";
}
- if(fReconstructor->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.");
// 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(fReconstructor->HasVertexConstrained())
+ if(fkReconstructor->GetRecoParam()->IsVertexConstrained())
chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ()); // Do Vertex Constrained fit if desired
else
chi2Vals[1] = 1.;
fTrackQuality[ntracks] = CalculateTrackLikelihood(&cseed[0], &chi2Vals[0]);
//AliInfo("Hyperplane fit done\n");
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
+ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
TLinearFitter *fitterTC = GetTiltedRiemanFitterConstraint();
}
//_____________________________________________________________________________
-AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 *seeds, Double_t *params)
+AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 * const seeds, Double_t *params)
{
//
// Build a TRD track out of tracklet candidates
AliTRDtrackV1 track(seeds, ¶ms[1], c, params[0], params[6]*alpha+shift);
track.PropagateTo(params[0]-5.0);
- AliTRDseedV1 *ptrTracklet = 0x0;
+ AliTRDseedV1 *ptrTracklet = NULL;
// skip Kalman filter for HLT
- if(fReconstructor->IsHLT()){
+ if(/*fkReconstructor->IsHLT()*/kFALSE){
for (Int_t jLayer = 0; jLayer < AliTRDgeometry::kNlayer; jLayer++) {
track.UnsetTracklet(jLayer);
ptrTracklet = &seeds[jLayer];
}
AliTRDtrackV1 *ptrTrack = SetTrack(&track);
ptrTrack->CookPID();
- ptrTrack->SetReconstructor(fReconstructor);
+ ptrTrack->CookLabel(.9);
+ ptrTrack->SetReconstructor(fkReconstructor);
return ptrTrack;
}
+ if(TMath::Abs(track.GetY())>1000)
+ return NULL;
+
track.ResetCovariance(1);
Int_t nc = TMath::Abs(FollowBackProlongation(track));
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) > 5){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 5 && fkReconstructor->IsDebugStreaming()){
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);
- TTreeSRedirector &cs = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ TTreeSRedirector &cs = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
cs << "MakeTrack"
<< "EventNumber=" << eventNumber
<< "CandidateNumber=" << candidateNumber
<< "track.=" << &track
<< "\n";
}
- if (nc < 30) return 0x0;
+ if (nc < 30) return NULL;
AliTRDtrackV1 *ptrTrack = SetTrack(&track);
- ptrTrack->SetReconstructor(fReconstructor);
+ ptrTrack->SetReconstructor(fkReconstructor);
ptrTrack->CookLabel(.9);
// computes PID for track
//
// make a local working copy
- AliTRDtrackingChamber *chamber = 0x0;
- 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;
+ AliTRDtrackingChamber *chamber = NULL;
+ 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(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 7){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 7 && fkReconstructor->IsDebugStreaming()){
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
TLinearFitter *tiltedRieman = GetTiltedRiemanFitter();
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ 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;
}
//_________________________________________________________________________
-Double_t AliTRDtrackerV1::CalculateTrackLikelihood(AliTRDseedV1 *tracklets, Double_t *chi2){
+Double_t AliTRDtrackerV1::CalculateTrackLikelihood(const AliTRDseedV1 *const tracklets, Double_t *chi2){
//
// Calculates the Track Likelihood value. This parameter serves as main quality criterion for
// the track selection
chi2phi /= Float_t (nLayers - 2.0);
Double_t likeChi2Z = TMath::Exp(-chi2[2] * 0.14); // Chi2Z
- Double_t likeChi2TC = (fReconstructor->HasVertexConstrained()) ?
+ 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(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
cstreamer << "CalculateTrackLikelihood0"
<< "EventNumber=" << eventNumber
<< "CandidateNumber=" << candidateNumber
//
// ratio of the total number of clusters/track which are expected to be found by the tracker.
- const AliTRDrecoParam *fRecoPars = fReconstructor->GetRecoParam();
+ const AliTRDrecoParam *fRecoPars = fkReconstructor->GetRecoParam();
Double_t chi2y = GetChi2Y(&cseed[0]);
Double_t chi2z = GetChi2Z(&cseed[0]);
Double_t likea = TMath::Exp(-sumda * fRecoPars->GetPhiSlope());
Double_t likechi2y = 0.0000000001;
- if (fReconstructor->IsCosmic() || chi2y < fRecoPars->GetChi2YCut()) likechi2y += TMath::Exp(-TMath::Sqrt(chi2y) * fRecoPars->GetChi2YSlope());
+ 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());
Double_t like = likea * likechi2y * likechi2z * likeN;
- if(fReconstructor->GetStreamLevel(AliTRDReconstructor::kTracker) >= 2){
+ if(fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) >= 2 && fkReconstructor->IsDebugStreaming()){
Int_t eventNumber = AliTRDtrackerDebug::GetEventNumber();
Int_t candidateNumber = AliTRDtrackerDebug::GetCandidateNumber();
- Int_t nTracklets = 0; Float_t mean_ncls = 0;
+ Int_t nTracklets = 0; Float_t meanNcls = 0;
for(Int_t iseed=0; iseed < kNPlanes; iseed++){
if(!cseed[iseed].IsOK()) continue;
nTracklets++;
- mean_ncls += cseed[iseed].GetN2();
+ meanNcls += cseed[iseed].GetN2();
}
- if(nTracklets) mean_ncls /= nTracklets;
+ if(nTracklets) meanNcls /= nTracklets;
// The Debug Stream contains the seed
- TTreeSRedirector &cstreamer = *fReconstructor->GetDebugStream(AliTRDReconstructor::kTracker);
+ TTreeSRedirector &cstreamer = *fkReconstructor->GetDebugStream(AliTRDrecoParam::kTracker);
cstreamer << "CookLikelihood"
<< "EventNumber=" << eventNumber
<< "CandidateNumber=" << candidateNumber
<< "nclusters=" << nclusters
<< "likeN=" << likeN
<< "like=" << like
- << "meanncls=" << mean_ncls
+ << "meanncls=" << meanNcls
<< "\n";
}
AliCluster* AliTRDtrackerV1::GetCluster(Int_t idx) const
{
Int_t ncls = fClusters->GetEntriesFast();
- return idx >= 0 && idx < ncls ? (AliCluster*)fClusters->UncheckedAt(idx) : 0x0;
+ return idx >= 0 && idx < ncls ? (AliCluster*)fClusters->UncheckedAt(idx) : NULL;
}
//____________________________________________________________________
AliTRDseedV1* AliTRDtrackerV1::GetTracklet(Int_t idx) const
{
Int_t ntrklt = fTracklets->GetEntriesFast();
- return idx >= 0 && idx < ntrklt ? (AliTRDseedV1*)fTracklets->UncheckedAt(idx) : 0x0;
+ return idx >= 0 && idx < ntrklt ? (AliTRDseedV1*)fTracklets->UncheckedAt(idx) : NULL;
}
//____________________________________________________________________
AliKalmanTrack* AliTRDtrackerV1::GetTrack(Int_t idx) const
{
Int_t ntrk = fTracks->GetEntriesFast();
- return idx >= 0 && idx < ntrk ? (AliKalmanTrack*)fTracks->UncheckedAt(idx) : 0x0;
+ return idx >= 0 && idx < ntrk ? (AliKalmanTrack*)fTracks->UncheckedAt(idx) : NULL;
}
//_____________________________________________________________________________
-Float_t AliTRDtrackerV1::GetChi2Y(AliTRDseedV1 *tracklets) const
+Float_t AliTRDtrackerV1::GetChi2Y(const AliTRDseedV1 * const tracklets) const
{
// Calculates normalized chi2 in y-direction
// chi2 = Sum chi2 / n_tracklets
}
//_____________________________________________________________________________
-Float_t AliTRDtrackerV1::GetChi2Z(AliTRDseedV1 *tracklets) const
+Float_t AliTRDtrackerV1::GetChi2Z(const AliTRDseedV1 *const tracklets) const
{
// Calculates normalized chi2 in z-direction
// chi2 = Sum chi2 / n_tracklets
}
//____________________________________________________________________
-Float_t AliTRDtrackerV1::CalculateReferenceX(AliTRDseedV1 *tracklets){
+Float_t AliTRDtrackerV1::CalculateReferenceX(const AliTRDseedV1 *const tracklets){
//
// Calculates the reference x-position for the tilted Rieman fit defined as middle
// of the stack (middle between layers 2 and 3). For the calculation all the tracklets
}
//_____________________________________________________________________________
-Double_t AliTRDtrackerV1::FitTiltedRiemanV1(AliTRDseedV1 *tracklets){
+Double_t AliTRDtrackerV1::FitTiltedRiemanV1(AliTRDseedV1 *const tracklets){
//
// Track Fitter Function using the new class implementation of
// the Rieman fit
//_____________________________________________________________________________
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) * 5);
+ memset(fSums, 0, sizeof(Double_t) * 6);
memset(fCovarianceMatrix, 0, sizeof(Double_t) * 3);
}
//_____________________________________________________________________________
-void AliTRDtrackerV1::AliTRDLeastSquare::AddPoint(Double_t *x, Double_t y, Double_t sigmaY){
+void AliTRDtrackerV1::AliTRDLeastSquare::AddPoint(const Double_t *const x, Double_t y, Double_t sigmaY){
//
// Adding Point to the fitter
//
- Double_t weight = 1/(sigmaY * sigmaY);
- Double_t &xpt = *x;
+
+ Double_t weight = 1/(sigmaY > 1e-9 ? sigmaY : 1e-9);
+ weight *= weight;
+ const Double_t &xpt = *x;
// printf("Adding point x = %f, y = %f, sigma = %f\n", xpt, y, sigmaY);
fSums[0] += weight;
fSums[1] += weight * xpt;
}
//_____________________________________________________________________________
-void AliTRDtrackerV1::AliTRDLeastSquare::RemovePoint(Double_t *x, Double_t y, Double_t sigmaY){
+void AliTRDtrackerV1::AliTRDLeastSquare::RemovePoint(const Double_t *const x, Double_t y, Double_t sigmaY){
//
// Remove Point from the sample
//
- Double_t weight = 1/(sigmaY * sigmaY);
- Double_t &xpt = *x;
+
+ Double_t weight = 1/(sigmaY > 1e-9 ? sigmaY : 1e-9);
+ weight *= weight;
+ const Double_t &xpt = *x;
fSums[0] -= weight;
fSums[1] -= weight * xpt;
fSums[2] -= weight * y;
}
//_____________________________________________________________________________
-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
- Double_t sqrnorm = fSums[0] * fSums[0];
- fCovarianceMatrix[0] = fSums[4] / fSums[0] - fSums[1] * fSums[1] / sqrnorm;
- fCovarianceMatrix[1] = fSums[5] / fSums[0] - fSums[2] * fSums[2] / sqrnorm;
- fCovarianceMatrix[2] = fSums[3] / fSums[0] - fSums[1] * fSums[2] / sqrnorm;
+ 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]);*/
+
+
+
+ return kTRUE;
}
//_____________________________________________________________________________
-Double_t AliTRDtrackerV1::AliTRDLeastSquare::GetFunctionValue(Double_t *xpos) const {
+Double_t AliTRDtrackerV1::AliTRDLeastSquare::GetFunctionValue(const Double_t *const xpos) const {
//
// Returns the Function value of the fitted function at a given x-position
//
}
//_____________________________________________________________________________
-void AliTRDtrackerV1::AliTRDtrackFitterRieman::UpdateFitters(AliTRDseedV1 *tracklet){
+void AliTRDtrackerV1::AliTRDtrackFitterRieman::UpdateFitters(AliTRDseedV1 * const tracklet){
//
// Does the transformations and updates the fitters
// The following transformation is applied