X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRDtrackerV1.cxx;h=ba28453b5720ef7acbb4b2138d8a66d24902f367;hb=f4d11ac8d5898450f374a5e765f5e7610a588fdd;hp=50a60faef870d6f0909ccbe180303207b06e82a4;hpb=5ef88e0042b1f427c36c5f8fed9ed50370d00800;p=u%2Fmrichter%2FAliRoot.git diff --git a/TRD/AliTRDtrackerV1.cxx b/TRD/AliTRDtrackerV1.cxx index 50a60faef87..ba28453b572 100644 --- a/TRD/AliTRDtrackerV1.cxx +++ b/TRD/AliTRDtrackerV1.cxx @@ -86,6 +86,7 @@ AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec) ,fClusters(NULL) ,fTracklets(NULL) ,fTracks(NULL) + ,fTracksESD(NULL) ,fSieveSeeding(0) { // @@ -122,6 +123,8 @@ AliTRDtrackerV1::AliTRDtrackerV1(AliTRDReconstructor *rec) memset(fTrackQuality, 0, kMaxTracksStack*sizeof(Double_t)); memset(fSeedLayer, 0, kMaxTracksStack*sizeof(Int_t)); memset(fSeedTB, 0, kNSeedPlanes*sizeof(AliTRDchamberTimeBin*)); + fTracksESD = new TClonesArray("AliESDtrack", 2*kMaxTracksStack); + fTracksESD->SetOwner(); } //____________________________________________________________________ @@ -135,6 +138,7 @@ AliTRDtrackerV1::~AliTRDtrackerV1() if(fgTiltedRieman) delete fgTiltedRieman; fgTiltedRieman = NULL; if(fgTiltedRiemanConstrained) delete fgTiltedRiemanConstrained; fgTiltedRiemanConstrained = NULL; for(Int_t isl =0; islDelete(); delete fTracksESD; } if(fTracks) {fTracks->Delete(); delete fTracks;} if(fTracklets) {fTracklets->Delete(); delete fTracklets;} if(fClusters) { @@ -265,8 +269,12 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) // 5. Propagation to TOF. If track propagation fails the AliESDtrack::kTRDStop is set. // + if(!fClusters || !fClusters->GetEntriesFast()){ + AliInfo("No TRD clusters"); + return 0; + } AliTRDCalibraFillHisto *calibra = AliTRDCalibraFillHisto::Instance(); // Calibration monitor - if (!calibra) AliInfo("Could not get Calibra instance\n"); + if (!calibra) AliInfo("Could not get Calibra instance"); if(!fgNTimeBins) CookNTimeBins(); // Define scalers @@ -355,10 +363,8 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) seed->AddCalibObject(calibTrack); } //update ESD track - if ((track.GetNumberOfClusters() > 15) && (track.GetNumberOfClusters() > 0.5*expectedClr)) { - seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); - track.UpdateESDtrack(seed); - } + seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); + track.UpdateESDtrack(seed); } if ((TMath::Abs(track.GetC(track.GetBz()) - p4) / TMath::Abs(p4) < 0.2) ||(track.Pt() > 0.8)) { @@ -432,7 +438,7 @@ Int_t AliTRDtrackerV1::PropagateBack(AliESDEvent *event) seed->UpdateTrackParams(&track, AliESDtrack::kTRDStop); continue; } - seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); + //seed->UpdateTrackParams(&track, AliESDtrack::kTRDout); // TODO obsolete - delete seed->SetTRDQuality(track.StatusForTOF()); } @@ -466,11 +472,16 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event) Int_t found = 0; // contor for updated TRD tracks + if(!fClusters || !fClusters->GetEntriesFast()){ + AliInfo("No TRD clusters"); + return 0; + } AliTRDtrackV1 track; for (Int_t itrack = 0; itrack < event->GetNumberOfTracks(); itrack++) { AliESDtrack *seed = event->GetTrack(itrack); - new(&track) AliTRDtrackV1(*seed); + ULong_t status = seed->GetStatus(); + new(&track) AliTRDtrackV1(*seed); if (track.GetX() < 270.0) { seed->UpdateTrackParams(&track, AliESDtrack::kTRDbackup); continue; @@ -478,7 +489,6 @@ Int_t AliTRDtrackerV1::RefitInward(AliESDEvent *event) // reject tracks which failed propagation in the TRD or // are produced by the TRD stand alone tracker - ULong_t status = seed->GetStatus(); if(!(status & AliESDtrack::kTRDout)) continue; if(!(status & AliESDtrack::kTRDin)) continue; nseed++; @@ -1508,6 +1518,8 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1 } Double_t xref = CalculateReferenceX(tracklets); + AliDebugGeneral("AliTRDtrackerV1::FitRiemanTilt()", 4, + Form("\nx0[(0)%6.2f (1)%6.2f (2)%6.2f (3)%6.2f (4)%6.2f (5)%6.2f] xref[%6.2f]", tracklets[0].GetX0(), tracklets[1].GetX0(), tracklets[2].GetX0(), tracklets[3].GetX0(), tracklets[4].GetX0(), tracklets[5].GetX0(), xref)); Double_t x, y, z, t, tilt, dx, w, we; Double_t uvt[4]; Int_t nPoints = 0; @@ -1516,7 +1528,7 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1 if(!tracklets[ipl].IsOK()) continue; for(Int_t itb = 0; itb < AliTRDseedV1::kNclusters; itb++){ if(!(cl = tracklets[ipl].GetClusters(itb))) continue; - if (!tracklets[ipl].IsUsable(itb)) continue; + //if (!tracklets[ipl].IsUsable(itb)) continue; x = cl->GetX(); y = cl->GetY(); z = cl->GetZ(); @@ -1580,6 +1592,8 @@ Double_t AliTRDtrackerV1::FitRiemanTilt(const AliTRDtrackV1 *track, AliTRDseedV1 // Calculate chi2 of the fit Double_t chi2 = fitter->GetChisquare()/Double_t(nPoints); + AliDebugGeneral("AliTRDtrackerV1::FitRiemanTilt()", 4, + Form("x0[%6.2f] y0[%6.2f] R[%6.2f] chi2[%f]\n", x0, y0, radius, chi2)); // Update the tracklets if(!track){ @@ -1699,7 +1713,7 @@ Double_t AliTRDtrackerV1::FitKalman(AliTRDtrackV1 *track, AliTRDseedV1 * const t xyz1[0] = x * TMath::Cos(alpha) - y * TMath::Sin(alpha); xyz1[1] = +x * TMath::Sin(alpha) + y * TMath::Cos(alpha); xyz1[2] = z; - if((xyz0[0] - xyz1[9] < 1e-3) && (xyz0[0] - xyz1[9] < 1e-3)) continue; // check wheter we are at the same global x position + if(TMath::Abs(xyz0[0] - xyz1[0]) < 1e-3 && TMath::Abs(xyz0[1] - xyz1[1]) < 1e-3) continue; // check wheter we are at the same global x position Double_t param[7]; if(AliTracker::MeanMaterialBudget(xyz0, xyz1, param) <=0.) break; Double_t xrho = param[0]*param[4]; // density*length @@ -2086,19 +2100,24 @@ void AliTRDtrackerV1::CookNTimeBins() } 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 + if(fgNTimeBins>0) AliDebug(2, Form("NTimeBins [%d] (set from digits param)", fgNTimeBins)); + else AliWarning(Form("NTimeBins [%d] failed from digits param.", fgNTimeBins)); + } + + if(!fgNTimeBins){ // 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)); + AliDebug(2, Form("NTimeBins [%d] (set to default 24)", 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."); + AliError("NTimeBins failed all settings. Use default 24 !"); + fgNTimeBins = 24; } } @@ -2149,10 +2168,6 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd) // 3. Pack results in the ESD event. // - // allocate space for esd tracks in this SM - TClonesArray esdTrackList("AliESDtrack", 2*kMaxTracksStack); - esdTrackList.SetOwner(); - Int_t nTracks = 0; Int_t nChambers = 0; AliTRDtrackingChamber **stack = NULL, *chamber = NULL; @@ -2167,16 +2182,33 @@ Int_t AliTRDtrackerV1::Clusters2TracksSM(Int_t sector, AliESDEvent *esd) } if(nChambers < 4) continue; //AliInfo(Form("Doing stack %d", istack)); - nTracks += Clusters2TracksStack(stack, &esdTrackList); + nTracks += Clusters2TracksStack(stack, fTracksESD); + } + if(nTracks) AliDebug(2, Form("Number of tracks: SM_%02d[%d]", sector, nTracks)); + + for(int itrack=0; itrackoperator[](itrack))); + Int_t id = esd->AddTrack(esdTrack); + + // set ESD id to stand alone TRD tracks + if (fkReconstructor->GetRecoParam()->GetStreamLevel(AliTRDrecoParam::kTracker) > 0){ + esdTrack=esd->GetTrack(id); + TObject *o(NULL); Int_t ic(0); + AliTRDtrackV1 *calibTrack(NULL); + while((o = esdTrack->GetCalibObject(ic++))){ + if(!(calibTrack = dynamic_cast(o))) continue; + calibTrack->SetESDid(esdTrack->GetID()); + break; + } + } } - //AliInfo(Form("Found %d tracks in SM %d [%d]\n", nTracks, sector, esd->GetNumberOfTracks())); - - for(int itrack=0; itrackAddTrack((AliESDtrack*)esdTrackList[itrack]); // Reset Track and Candidate Number AliTRDtrackerDebug::SetCandidateNumber(0); AliTRDtrackerDebug::SetTrackNumber(0); + + // delete ESD tracks in the array + fTracksESD->Delete(); return nTracks; } @@ -2981,7 +3013,8 @@ AliTRDtrackV1* AliTRDtrackerV1::MakeTrack(AliTRDseedV1 * const seeds, Double_t * return ptrTrack; } - if(TMath::Abs(track.GetY())>1000) + // prevent the error message in AliTracker::MeanMaterialBudget: "start point out of geometry" + if(TMath::Abs(track.GetX()) + TMath::Abs(track.GetY()) + TMath::Abs(track.GetZ()) > 10000) return NULL; track.ResetCovariance(1);