X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFtrackerV1.cxx;h=97a7eba6d2712925be03e7c19ab014ce09d87fd0;hb=ebc98c6ffbcb769021ed4eadffae30f23e128678;hp=6acfc41088b8b7dc778b0eb29fdf1fca48e37fe1;hpb=4682c56e32cf939ad0815430785dec9507f31d50;p=u%2Fmrichter%2FAliRoot.git diff --git a/TOF/AliTOFtrackerV1.cxx b/TOF/AliTOFtrackerV1.cxx index 6acfc41088b..97a7eba6d27 100644 --- a/TOF/AliTOFtrackerV1.cxx +++ b/TOF/AliTOFtrackerV1.cxx @@ -52,7 +52,7 @@ #include "AliTOFtrackerV1.h" #include "AliTOFtrack.h" -extern TROOT *gROOT; +//extern TROOT *gROOT; ClassImp(AliTOFtrackerV1) @@ -80,7 +80,9 @@ AliTOFtrackerV1::AliTOFtrackerV1(): fHRecSigYVsPWin(0x0), fHRecSigZVsPWin(0x0) { - //AliTOFtrackerV1 main Ctor + //AliTOFtrackerV1 main Ctor + + for (Int_t ii=0; iiDelete(); + } //_____________________________________________________________________________ void AliTOFtrackerV1::GetPidSettings(AliESDpid *esdPID) { @@ -134,6 +141,11 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) { // Gets seeds from ESD event and Match with TOF Clusters // + if (fN==0) { + AliInfo("No TOF recPoints to be matched with reconstructed tracks"); + return 0; + } + // initialize RecoParam for current event AliDebug(1,"Initializing params for TOF"); @@ -159,12 +171,19 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) { fNseeds = ntrk; //Load ESD tracks into a local Array of ESD Seeds - for (Int_t i=0; iAddLast(event->GetTrack(i)); + event->GetTrack(i)->SetESDEvent(event); + } //Prepare ESD tracks candidates for TOF Matching CollectESD(); + if (fNseeds==0 || fNseedsTOF==0) { + AliInfo("No seeds to try TOF match"); + return 0; + } + //Matching Step MatchTracks(); @@ -223,10 +242,10 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) { AliTOFtrack *track = new AliTOFtrack(*seed); t->UpdateTrackParams(track,AliESDtrack::kTOFout); // to be checked - AdC delete track; - Double_t time[10]; t->GetIntegratedTimes(time); + Double_t time[AliPID::kSPECIESC]; t->GetIntegratedTimes(time); */ - Double_t time[10]; seed->GetIntegratedTimes(time); + Double_t time[AliPID::kSPECIESC]; seed->GetIntegratedTimes(time,AliPID::kSPECIESC); t->SetIntegratedTimes(time); Double_t length = seed->GetIntegratedLength(); @@ -240,17 +259,17 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) { Double_t p2B = (Double_t)t->GetTgl(); Double_t p3B = (Double_t)t->GetSigned1Pt(); const Double_t *covB = (Double_t*)t->GetCovariance(); - AliDebug(2,"Track params -now(before)-:"); - AliDebug(2,Form(" X: %f(%f), Y: %f(%f), Z: %f(%f) --- alpha: %f(%f)", + AliDebug(3,"Track params -now(before)-:"); + AliDebug(3,Form(" X: %f(%f), Y: %f(%f), Z: %f(%f) --- alpha: %f(%f)", xB,xA, yB,yA, zB,zA, alphaB,alphaA)); - AliDebug(2,Form(" p1: %f(%f), p2: %f(%f), p3: %f(%f)", + AliDebug(3,Form(" p1: %f(%f), p2: %f(%f), p3: %f(%f)", p1B,p1A, p2B,p2A, p3B,p3A)); - AliDebug(2,Form(" cov1: %f(%f), cov2: %f(%f), cov3: %f(%f)" + AliDebug(3,Form(" cov1: %f(%f), cov2: %f(%f), cov3: %f(%f)" " cov4: %f(%f), cov5: %f(%f), cov6: %f(%f)" " cov7: %f(%f), cov8: %f(%f), cov9: %f(%f)" " cov10: %f(%f), cov11: %f(%f), cov12: %f(%f)" @@ -271,7 +290,7 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) { covB[13],covA[13], covB[14],covA[14] )); - AliDebug(3,Form(" %6d %f %f %f %f %f %6d %3d %f %f %f %f %f %f", + AliDebug(2,Form(" TOF params: %6d %f %f %f %f %f %6d %3d %f", i, t->GetTOFsignalRaw(), t->GetTOFsignal(), @@ -280,10 +299,9 @@ Int_t AliTOFtrackerV1::PropagateBack(AliESDEvent * const event) { t->GetTOFsignalDx(), t->GetTOFCalChannel(), t->GetTOFcluster(), - t->GetIntegratedLength(), - time[0], time[1], time[2], time[3], time[4] - ) - ); + t->GetIntegratedLength())); + AliDebug(2,Form(" %f %f %f %f %f %f %f %f %f", + time[0], time[1], time[2], time[3], time[4], time[5], time[6], time[7], time[8])); } } } @@ -298,6 +316,7 @@ void AliTOFtrackerV1::CollectESD() { //prepare the set of ESD tracks to be matched to clusters in TOF Int_t seedsTOF1=0; + Int_t seedsTOF3=0; Int_t seedsTOF2=0; TClonesArray &aTOFTrack = *fTracks; @@ -309,26 +328,57 @@ void AliTOFtrackerV1::CollectESD() { AliTOFtrack *track = new AliTOFtrack(*t); // New Float_t x = (Float_t)track->GetX(); //New - // TRD 'good' tracks, already propagated at 371 cm - if ( ( (t->GetStatus()&AliESDtrack::kTRDout)!=0 ) && - ( x >= AliTOFGeometry::Rmin() ) ) { - if ( track->PropagateToInnerTOF() ) { + // TRD 'good' tracks + if ( ( (t->GetStatus()&AliESDtrack::kTRDout)!=0 ) ) { - AliDebug(1,Form(" TRD propagated track till rho = %fcm." - " And then the track has been propagated till rho = %fcm.", - x, (Float_t)track->GetX())); + AliDebug(1,Form(" Before propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength())); + + // TRD 'good' tracks, already propagated at 371 cm + if ( x >= AliTOFGeometry::Rmin() ) { + + if ( track->PropagateToInnerTOF() ) { + + AliDebug(1,Form(" TRD propagated track till rho = %fcm." + " And then the track has been propagated till rho = %fcm.", + x, (Float_t)track->GetX())); + + track->SetSeedIndex(i); + t->UpdateTrackParams(track,AliESDtrack::kTOFin); + new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track); + fNseedsTOF++; + seedsTOF1++; + + AliDebug(1,Form(" After propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength())); + } + delete track; - track->SetSeedIndex(i); - t->UpdateTrackParams(track,AliESDtrack::kTOFin); - new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track); - fNseedsTOF++; - seedsTOF1++; } - delete track; + else { // TRD 'good' tracks, propagated rho<371cm + + if ( track->PropagateToInnerTOF() ) { + + AliDebug(1,Form(" TRD propagated track till rho = %fcm." + " And then the track has been propagated till rho = %fcm.", + x, (Float_t)track->GetX())); + + track->SetSeedIndex(i); + t->UpdateTrackParams(track,AliESDtrack::kTOFin); + new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track); + fNseedsTOF++; + seedsTOF3++; + + AliDebug(1,Form(" After propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength())); + } + delete track; + + } + } - // Propagate the rest of TPCbp - else { + else { // Propagate the rest of TPCbp + + AliDebug(1,Form(" Before propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength())); + if ( track->PropagateToInnerTOF() ) { AliDebug(1,Form(" TRD propagated track till rho = %fcm." @@ -345,7 +395,7 @@ void AliTOFtrackerV1::CollectESD() { } } - AliInfo(Form("Number of TOF seeds = %d (Type 1 = %d, Type 2 = %d)",fNseedsTOF,seedsTOF1,seedsTOF2)); + AliInfo(Form("Number of TOF seeds = %d (kTRDout371 = %d, kTRDoutLess371 = %d, !kTRDout = %d)",fNseedsTOF,seedsTOF1,seedsTOF3,seedsTOF2)); // Sort according uncertainties on track position fTracks->Sort(); @@ -362,7 +412,7 @@ void AliTOFtrackerV1::MatchTracks( ){ Float_t dY=AliTOFGeometry::XPad(); Float_t dZ=AliTOFGeometry::ZPad(); - const Float_t kTimeOffset = 32.; // time offset for tracking algorithm [ps] + const Float_t kTimeOffset = 0.; // time offset for tracking algorithm [ps] const Int_t kncmax = 100; Float_t sensRadius = fkRecoParam->GetSensRadius(); @@ -371,14 +421,14 @@ void AliTOFtrackerV1::MatchTracks( ){ Float_t dzMax=fkRecoParam->GetWindowSizeMaxZ(); Double_t maxChi2=fkRecoParam->GetMaxChi2(); Bool_t timeWalkCorr = fkRecoParam->GetTimeWalkCorr(); - AliDebug(1,"++++++++++++++TOF Reconstruction Parameters:++++++++++++ \n"); + AliDebug(1,"++++++++++++++TOF Reconstruction Parameters:++++++++++++"); AliDebug(1,Form("TOF sens radius: %f",sensRadius)); AliDebug(1,Form("TOF Window scale factor: %f",scaleFact)); AliDebug(1,Form("TOF Window max dy: %f",dyMax)); AliDebug(1,Form("TOF Window max dz: %f",dzMax)); AliDebug(1,Form("TOF Max Chi2: %f",maxChi2)); AliDebug(1,Form("Time Walk Correction? : %d",timeWalkCorr)); - + AliDebug(1,"++++++++++++++++++++++++++++++++++++++++++++++++++++++++"); //The matching loop for (Int_t iseed=0; iseedPropagateTo(xTOF))) { + delete trackTOFin; + continue; + } + + // ...and then, if necessary, rotate the track Double_t ymax = xTOF*TMath::Tan(0.5*AliTOFGeometry::GetAlpha()); - Bool_t skip = kFALSE; - Double_t ysect = trackTOFin->GetYat(xTOF,skip); - if (skip) break; + Double_t ysect = trackTOFin->GetY(); if (ysect > ymax) { - if (!trackTOFin->Rotate(AliTOFGeometry::GetAlpha())) { - break; + if (!(trackTOFin->Rotate(AliTOFGeometry::GetAlpha()))) { + delete trackTOFin; + continue; } } else if (ysect <-ymax) { - if (!trackTOFin->Rotate(-AliTOFGeometry::GetAlpha())) { - break; + if (!(trackTOFin->Rotate(-AliTOFGeometry::GetAlpha()))) { + delete trackTOFin; + continue; } } - if(!trackTOFin->PropagateTo(xTOF)) { - break; - } AliTOFcluster *bestCluster=0; @@ -475,14 +529,16 @@ void AliTOFtrackerV1::MatchTracks( ){ } if (!bestCluster) { // no matching , go to the next track + AliDebug(1,Form("No track points for the track number %d",iseed)); fnunmatch++; delete trackTOFin; continue; } fnmatch++; + AliDebug(1,Form(" Matched TOF cluster %d for the track number %d",idclus,iseed)); - AliDebug(2, Form("%7i %7i %10i %10i %10i %10i %7i", + AliDebug(3, Form("%7i %7i %10i %10i %10i %10i %7i", iseed, fnmatch-1, TMath::Abs(trackTOFin->GetLabel()), @@ -502,14 +558,31 @@ void AliTOFtrackerV1::MatchTracks( ){ fngoodmatch++; AliDebug(2,Form(" track label good %5d",trackTOFin->GetLabel())); - } - else{ + } else { fnbadmatch++; AliDebug(2,Form(" track label bad %5d",trackTOFin->GetLabel())); } //Propagate the track to the best matched cluster - trackTOFin->PropagateTo(bestCluster); + if (!(trackTOFin->PropagateTo(bestCluster))) { + delete trackTOFin; + continue; + } + + // If necessary, rotate the track + Double_t yATxMax = trackTOFin->GetX()*TMath::Tan(0.5*AliTOFGeometry::GetAlpha()); + Double_t yATx = trackTOFin->GetY(); + if (yATx > yATxMax) { + if (!(trackTOFin->Rotate(AliTOFGeometry::GetAlpha()))) { + delete trackTOFin; + continue; + } + } else if (yATx <-yATxMax) { + if (!(trackTOFin->Rotate(-AliTOFGeometry::GetAlpha()))) { + delete trackTOFin; + continue; + } + } // Fill the track residual histograms. FillResiduals(trackTOFin,bestCluster,kFALSE); @@ -519,7 +592,7 @@ void AliTOFtrackerV1::MatchTracks( ){ Double_t dzTW=trackTOFin->GetZ()-bestCluster->GetZ(); // in cm - in the ALICE RF - dzTW/=TMath::Cos(tiltangle); // from ALICE/tracking RF to pad RF (1) dzTW=-dzTW; // from ALICE/tracking RF to pad RF (2) - if (tiltangle!=0.) AliDebug(2,Form(" rho_track = %f --- rho_cluster = %f ",trackTOFin->GetX(),bestCluster->GetX())); + if (tiltangle!=0.) AliDebug(3,Form(" rho_track = %f --- rho_cluster = %f ",trackTOFin->GetX(),bestCluster->GetX())); //update the ESD track and delete the TOFtrack t->UpdateTrackParams(trackTOFin,AliESDtrack::kTOFout); @@ -560,21 +633,21 @@ void AliTOFtrackerV1::MatchTracks( ){ tlab[0]=bestCluster->GetLabel(0); tlab[1]=bestCluster->GetLabel(1); tlab[2]=bestCluster->GetLabel(2); - AliDebug(2,Form(" tdc time of the matched track %6d = ",bestCluster->GetTDC())); + AliDebug(3,Form(" tdc time of the matched track %6d = ",bestCluster->GetTDC())); Double_t tof=AliTOFGeometry::TdcBinWidth()*bestCluster->GetTDC()+kTimeOffset; // in ps - AliDebug(2,Form(" tof time of the matched track: %f = ",tof)); + AliDebug(3,Form(" tof time of the matched track: %f = ",tof)); Double_t tofcorr=tof; if(timeWalkCorr)tofcorr=CorrectTimeWalk(dzTW,tof); - AliDebug(2,Form(" tof time of the matched track, after TW corr: %f = ",tofcorr)); + AliDebug(3,Form(" tof time of the matched track, after TW corr: %f = ",tofcorr)); //Set TOF time signal and pointer to the matched cluster t->SetTOFsignal(tofcorr); t->SetTOFcluster(idclus); // pointing to the recPoints tree t->SetTOFLabel(tlab); - AliDebug(2,Form(" Setting TOF raw time: %f z distance: %f corrected time: %f",rawTime,dzTW,tofcorr)); + AliDebug(3,Form(" Setting TOF raw time: %f z distance: %f corrected time: %f",rawTime,dzTW,tofcorr)); Double_t mom=t->GetP(); - AliDebug(2,Form(" Momentum for track %d -> %f", iseed,mom)); + AliDebug(3,Form(" Momentum for track %d -> %f", iseed,mom)); // Fill Reco-QA histos for Reconstruction fHRecNClus->Fill(nc); fHRecChi2->Fill(bestChi2); @@ -594,6 +667,7 @@ void AliTOFtrackerV1::MatchTracks( ){ // no longer there - all info is in the ESDs now delete trackTOFin; + } } @@ -819,16 +893,17 @@ void AliTOFtrackerV1::SaveCheckHists() { //write histos for Digits/Reco QA and Calibration TDirectory *dir = gDirectory; - TFile *logFile = 0; + //TFile *logFile = 0; TFile *logFileTOF = 0; TSeqCollection *list = gROOT->GetListOfFiles(); int n = list->GetEntries(); + /* for(int i=0; iAt(i); if (strstr(logFile->GetName(), "AliESDs.root")) break; } - + */ Bool_t isThere=kFALSE; for(int i=0; iAt(i); @@ -842,7 +917,8 @@ void AliTOFtrackerV1::SaveCheckHists() { AliError(Form("File TOFQA.root not found!! not wring histograms....")); return; } - logFile->cd(); + //logFile->cd(); + logFileTOF->cd(); fHDigClusMap->Write(fHDigClusMap->GetName(), TObject::kOverwrite); fHDigNClus->Write(fHDigNClus->GetName(), TObject::kOverwrite); fHDigClusTime->Write(fHDigClusTime->GetName(), TObject::kOverwrite); @@ -854,7 +930,8 @@ void AliTOFtrackerV1::SaveCheckHists() { fHRecSigZVsP->Write(fHRecSigZVsP->GetName(), TObject::kOverwrite); fHRecSigYVsPWin->Write(fHRecSigYVsPWin->GetName(), TObject::kOverwrite); fHRecSigZVsPWin->Write(fHRecSigZVsPWin->GetName(), TObject::kOverwrite); - logFile->Flush(); + //logFile->Flush(); + logFileTOF->Flush(); dir->cd();