X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFtracker.cxx;h=7cfb305f9ab0b17c99a19333bd8a757ef413736c;hb=4c6e817d90f39bcba228af3704172eaec76bca83;hp=5458b4971634fe646c95468e6554728d3b634b94;hpb=a825d82998e3435389e0cab0adc5200c9d644518;p=u%2Fmrichter%2FAliRoot.git diff --git a/TOF/AliTOFtracker.cxx b/TOF/AliTOFtracker.cxx index 5458b497163..7cfb305f9ab 100644 --- a/TOF/AliTOFtracker.cxx +++ b/TOF/AliTOFtracker.cxx @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -39,11 +40,12 @@ #include "AliGeomManager.h" #include "AliESDtrack.h" #include "AliESDEvent.h" +#include "AliESDpid.h" #include "AliLog.h" #include "AliTrackPointArray.h" #include "AliCDBManager.h" -#include "AliTOFpidESD.h" +//#include "AliTOFpidESD.h" #include "AliTOFRecoParam.h" #include "AliTOFReconstructor.h" #include "AliTOFcluster.h" @@ -54,13 +56,13 @@ extern TGeoManager *gGeoManager; extern TROOT *gROOT; + ClassImp(AliTOFtracker) //_____________________________________________________________________________ AliTOFtracker::AliTOFtracker(): - fRecoParam(0x0), + fkRecoParam(0x0), fGeom(0x0), - fPid(0x0), fN(0), fNseeds(0), fNseedsTOF(0), @@ -69,7 +71,8 @@ AliTOFtracker::AliTOFtracker(): fnunmatch(0), fnmatch(0), fTracks(new TClonesArray("AliTOFtrack")), - fSeeds(new TClonesArray("AliESDtrack")), + fSeeds(new TObjArray(100)), + fTOFtrackPoints(new TObjArray(10)), fHDigClusMap(0x0), fHDigNClus(0x0), fHDigClusTime(0x0), @@ -95,75 +98,6 @@ AliTOFtracker::AliTOFtracker(): InitCheckHists(); -} -//_____________________________________________________________________________ -AliTOFtracker::AliTOFtracker(const AliTOFtracker &t): - AliTracker(), - fRecoParam(0x0), - fGeom(0x0), - fPid(0x0), - fN(0), - fNseeds(0), - fNseedsTOF(0), - fngoodmatch(0), - fnbadmatch(0), - fnunmatch(0), - fnmatch(0), - fTracks(new TClonesArray("AliTOFtrack")), - fSeeds(new TClonesArray("AliESDtrack")), - fHDigClusMap(0x0), - fHDigNClus(0x0), - fHDigClusTime(0x0), - fHDigClusToT(0x0), - fHRecNClus(0x0), - fHRecDist(0x0), - fHRecSigYVsP(0x0), - fHRecSigZVsP(0x0), - fHRecSigYVsPWin(0x0), - fHRecSigZVsPWin(0x0), - fCalTree(0x0), - fIch(-1), - fToT(-1.), - fTime(-1.), - fExpTimePi(-1.), - fExpTimeKa(-1.), - fExpTimePr(-1.) - { - //AliTOFtracker copy Ctor - - fNseeds=t.fNseeds; - fNseeds=t.fNseeds; - fNseedsTOF=t.fNseedsTOF; - fngoodmatch=t.fngoodmatch; - fnbadmatch=t.fnbadmatch; - fnunmatch=t.fnunmatch; - fnmatch=t.fnmatch; - fRecoParam=t.fRecoParam; - fPid=t.fPid; - fSeeds=t.fSeeds; - fTracks=t.fTracks; - fN=t.fN; -} - -//_____________________________________________________________________________ -AliTOFtracker& AliTOFtracker::operator=(const AliTOFtracker &t) -{ - //AliTOFtracker assignment operator - - this->fNseeds=t.fNseeds; - this->fNseedsTOF=t.fNseedsTOF; - this->fngoodmatch=t.fngoodmatch; - this->fnbadmatch=t.fnbadmatch; - this->fnunmatch=t.fnunmatch; - this->fnmatch=t.fnmatch; - this->fRecoParam = t.fRecoParam; - this->fGeom=t.fGeom; - this->fPid = t.fPid; - this->fSeeds=t.fSeeds; - this->fTracks=t.fTracks; - this->fN=t.fN; - return *this; - } //_____________________________________________________________________________ AliTOFtracker::~AliTOFtracker() { @@ -174,10 +108,9 @@ AliTOFtracker::~AliTOFtracker() { SaveCheckHists(); if(!(AliCDBManager::Instance()->GetCacheFlag())){ - delete fRecoParam; + delete fkRecoParam; } delete fGeom; - delete fPid; delete fHDigClusMap; delete fHDigNClus; delete fHDigClusTime; @@ -199,31 +132,40 @@ AliTOFtracker::~AliTOFtracker() { delete fSeeds; fSeeds=0x0; } + if (fTOFtrackPoints){ + fTOFtrackPoints->Delete(); + delete fTOFtrackPoints; + fTOFtrackPoints=0x0; + } } //_____________________________________________________________________________ -Int_t AliTOFtracker::PropagateBack(AliESDEvent* event) { +void AliTOFtracker::GetPidSettings(AliESDpid *esdPID) { + // + // Sets TOF resolution from RecoParams + // + if (fkRecoParam) + esdPID->GetTOFResponse().SetTimeResolution(fkRecoParam->GetTimeResolution()); + else + AliWarning("fkRecoParam not yet set; cannot set PID settings"); +} +//_____________________________________________________________________________ +Int_t AliTOFtracker::PropagateBack(AliESDEvent * const event) { // // Gets seeds from ESD event and Match with TOF Clusters // // initialize RecoParam for current event + AliDebug(1,"Initializing params for TOF"); - AliInfo("Initializing params for TOF... "); - - fRecoParam = AliTOFReconstructor::GetRecoParam(); // instantiate reco param from STEER... + fkRecoParam = AliTOFReconstructor::GetRecoParam(); // instantiate reco param from STEER... - if (fRecoParam == 0x0) { + if (fkRecoParam == 0x0) { AliFatal("No Reco Param found for TOF!!!"); } - //fRecoParam->Dump(); - //if(fRecoParam->GetApplyPbPbCuts())fRecoParam=fRecoParam->GetPbPbparam(); - //fRecoParam->PrintParameters(); - - Double_t parPID[2]; - parPID[0]=fRecoParam->GetTimeResolution(); - parPID[1]=fRecoParam->GetTimeNSigma(); - fPid=new AliTOFpidESD(parPID); + //fkRecoParam->Dump(); + //if(fkRecoParam->GetApplyPbPbCuts())fkRecoParam=fkRecoParam->GetPbPbparam(); + //fkRecoParam->PrintParameters(); //Initialise some counters @@ -236,15 +178,11 @@ Int_t AliTOFtracker::PropagateBack(AliESDEvent* event) { Int_t ntrk=event->GetNumberOfTracks(); fNseeds = ntrk; - TClonesArray &aESDTrack = *fSeeds; //Load ESD tracks into a local Array of ESD Seeds - - for (Int_t i=0; iGetTrack(i); - new(aESDTrack[i]) AliESDtrack(*t); - } + for (Int_t i=0; iAddLast(event->GetTrack(i)); //Prepare ESD tracks candidates for TOF Matching CollectESD(); @@ -255,56 +193,131 @@ Int_t AliTOFtracker::PropagateBack(AliESDEvent* event) { //Second Step with Looser Matching Criterion MatchTracks(kTRUE); - AliInfo(Form("Number of matched tracks: %d",fnmatch)); - AliInfo(Form("Number of good matched tracks: %d",fngoodmatch)); - AliInfo(Form("Number of bad matched tracks: %d",fnbadmatch)); + AliInfo(Form("Number of matched tracks = %d (good = %d, bad = %d)",fnmatch,fngoodmatch,fnbadmatch)); //Update the matched ESD tracks for (Int_t i=0; iGetTrack(i); - AliESDtrack *seed =(AliESDtrack*)fSeeds->UncheckedAt(i); - if(seed->GetTOFsignal()>0){ - t->SetTOFsignal(seed->GetTOFsignal()); - t->SetTOFcluster(seed->GetTOFcluster()); - t->SetTOFsignalToT(seed->GetTOFsignalToT()); - t->SetTOFsignalRaw(seed->GetTOFsignalRaw()); - t->SetTOFsignalDz(seed->GetTOFsignalDz()); - t->SetTOFCalChannel(seed->GetTOFCalChannel()); - Int_t tlab[3]; seed->GetTOFLabel(tlab); - t->SetTOFLabel(tlab); - AliTOFtrack *track = new AliTOFtrack(*seed); - t->UpdateTrackParams(track,AliESDtrack::kTOFout); - delete track; + AliESDtrack *seed =(AliESDtrack*)fSeeds->At(i); + + if ( (seed->GetStatus()&AliESDtrack::kTOFin)!=0 ) { + t->SetStatus(AliESDtrack::kTOFin); + //if(seed->GetTOFsignal()>0){ + if ( (seed->GetStatus()&AliESDtrack::kTOFout)!=0 ) { + t->SetStatus(AliESDtrack::kTOFout); + t->SetTOFsignal(seed->GetTOFsignal()); + t->SetTOFcluster(seed->GetTOFcluster()); + t->SetTOFsignalToT(seed->GetTOFsignalToT()); + t->SetTOFsignalRaw(seed->GetTOFsignalRaw()); + t->SetTOFsignalDz(seed->GetTOFsignalDz()); + t->SetTOFsignalDx(seed->GetTOFsignalDx()); + t->SetTOFDeltaBC(seed->GetTOFDeltaBC()); + t->SetTOFL0L1(seed->GetTOFL0L1()); + t->SetTOFCalChannel(seed->GetTOFCalChannel()); + Int_t tlab[3]; seed->GetTOFLabel(tlab); + t->SetTOFLabel(tlab); + + Double_t alphaA = (Double_t)t->GetAlpha(); + Double_t xA = (Double_t)t->GetX(); + Double_t yA = (Double_t)t->GetY(); + Double_t zA = (Double_t)t->GetZ(); + Double_t p1A = (Double_t)t->GetSnp(); + Double_t p2A = (Double_t)t->GetTgl(); + Double_t p3A = (Double_t)t->GetSigned1Pt(); + const Double_t *covA = (Double_t*)t->GetCovariance(); + + // Make attention, please: + // AliESDtrack::fTOFInfo array does not be stored in the AliESDs.root file + // it is there only for a check during the reconstruction step. + Float_t info[10]; seed->GetTOFInfo(info); + t->SetTOFInfo(info); + AliDebug(3,Form(" distance=%f; residual in the pad reference frame: dX=%f, dZ=%f", info[0],info[1],info[2])); + + // Check done: + // by calling the AliESDtrack::UpdateTrackParams, + // the current track parameters are changed + // and it could cause refit problems. + // We need to update only the following track parameters: + // the track length and expected times. + // Removed AliESDtrack::UpdateTrackParams call + // Called AliESDtrack::SetIntegratedTimes(...) and + // AliESDtrack::SetIntegratedLength() routines. + /* + 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[10]; seed->GetIntegratedTimes(time); + t->SetIntegratedTimes(time); + + Double_t length = seed->GetIntegratedLength(); + t->SetIntegratedLength(length); + + Double_t alphaB = (Double_t)t->GetAlpha(); + Double_t xB = (Double_t)t->GetX(); + Double_t yB = (Double_t)t->GetY(); + Double_t zB = (Double_t)t->GetZ(); + Double_t p1B = (Double_t)t->GetSnp(); + 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)", + xB,xA, + yB,yA, + zB,zA, + alphaB,alphaA)); + AliDebug(2,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)" + " 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)" + " cov13: %f(%f), cov14: %f(%f), cov15: %f(%f)", + covB[0],covA[0], + covB[1],covA[1], + covB[2],covA[2], + covB[3],covA[3], + covB[4],covA[4], + covB[5],covA[5], + covB[6],covA[6], + covB[7],covA[7], + covB[8],covA[8], + covB[9],covA[9], + covB[10],covA[10], + covB[11],covA[11], + covB[12],covA[12], + covB[13],covA[13], + covB[14],covA[14] + )); + AliDebug(3,Form(" TOF params: %6d %f %f %f %f %f %6d %3d %f %f %f %f %f %f", + i, + t->GetTOFsignalRaw(), + t->GetTOFsignal(), + t->GetTOFsignalToT(), + t->GetTOFsignalDz(), + t->GetTOFsignalDx(), + t->GetTOFCalChannel(), + t->GetTOFcluster(), + t->GetIntegratedLength(), + time[0], time[1], time[2], time[3], time[4] + ) + ); + } } } - //Handle Time Zero information - - Double_t timeZero=0.; - Double_t timeZeroMax=99999.; - Bool_t usetimeZero = fRecoParam->UseTimeZero(); - Bool_t timeZeroFromT0 = fRecoParam->GetTimeZerofromT0(); - Bool_t timeZeroFromTOF = fRecoParam->GetTimeZerofromTOF(); - - AliDebug(1,Form("Use Time Zero?: %d",usetimeZero)); - AliDebug(1,Form("Time Zero from T0? : %d",timeZeroFromT0)); - AliDebug(1,Form("Time Zero From TOF? : %d",timeZeroFromTOF)); - - if(usetimeZero){ - if(timeZeroFromT0){ - timeZero=GetTimeZerofromT0(event); - } - if(timeZeroFromTOF && (timeZero>timeZeroMax || !timeZeroFromT0)){ - timeZero=GetTimeZerofromTOF(event); - } - } - AliDebug(2,Form("time Zero used in PID: %f",timeZero)); //Make TOF PID - fPid->MakePID(event,timeZero); + // Now done in AliESDpid + // fPid->MakePID(event,timeZero); fSeeds->Clear(); - fTracks->Clear(); + fTracks->Delete(); return 0; } @@ -318,29 +331,40 @@ void AliTOFtracker::CollectESD() { TClonesArray &aTOFTrack = *fTracks; for (Int_t i=0; iUncheckedAt(i); + AliESDtrack *t =(AliESDtrack*)fSeeds->At(i); if ((t->GetStatus()&AliESDtrack::kTPCout)==0)continue; - // TRD 'good' tracks, already propagated at 372 cm - AliTOFtrack *track = new AliTOFtrack(*t); // New - Double_t x = track->GetX(); //New - if (((t->GetStatus()&AliESDtrack::kTRDout)!=0 ) && - ( x >= AliTOFGeometry::RinTOF()) ){ - track->SetSeedIndex(i); - t->UpdateTrackParams(track,AliESDtrack::kTOFout); - new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track); - fNseedsTOF++; - seedsTOF1++; + 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() ) { + + 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++; + } delete track; } // Propagate the rest of TPCbp - else { - if(track->PropagateToInnerTOF()){ + if ( track->PropagateToInnerTOF() ) { + + AliDebug(1,Form(" TPC 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::kTOFout); + t->UpdateTrackParams(track,AliESDtrack::kTOFin); new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track); fNseedsTOF++; seedsTOF2++; @@ -349,9 +373,7 @@ void AliTOFtracker::CollectESD() { } } - AliInfo(Form("Number of TOF seeds %i",fNseedsTOF)); - AliInfo(Form("Number of TOF seeds Type 1 %i",seedsTOF1)); - AliInfo(Form("Number of TOF seeds Type 2 %i",seedsTOF2)); + AliInfo(Form("Number of TOF seeds = %d (Type 1 = %d, Type 2 = %d)",fNseedsTOF,seedsTOF1,seedsTOF2)); // Sort according uncertainties on track position fTracks->Sort(); @@ -367,17 +389,20 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ static Float_t detDepth=15.3; static Float_t padDepth=0.5; + const Float_t kSpeedOfLight= 2.99792458e-2; // speed of light [cm/ps] + const Float_t kTimeOffset = 32.; // time offset for tracking algorithm [ps] + Float_t dY=AliTOFGeometry::XPad(); Float_t dZ=AliTOFGeometry::ZPad(); - Float_t sensRadius = fRecoParam->GetSensRadius(); - Float_t stepSize = fRecoParam->GetStepSize(); - Float_t scaleFact = fRecoParam->GetWindowScaleFact(); - Float_t dyMax=fRecoParam->GetWindowSizeMaxY(); - Float_t dzMax=fRecoParam->GetWindowSizeMaxZ(); - Float_t dCut=fRecoParam->GetDistanceCut(); - Double_t maxChi2=fRecoParam->GetMaxChi2TRD(); - Bool_t timeWalkCorr = fRecoParam->GetTimeWalkCorr(); + Float_t sensRadius = fkRecoParam->GetSensRadius(); + Float_t stepSize = fkRecoParam->GetStepSize(); + Float_t scaleFact = fkRecoParam->GetWindowScaleFact(); + Float_t dyMax=fkRecoParam->GetWindowSizeMaxY(); + Float_t dzMax=fkRecoParam->GetWindowSizeMaxZ(); + Float_t dCut=fkRecoParam->GetDistanceCut(); + Double_t maxChi2=fkRecoParam->GetMaxChi2TRD(); + Bool_t timeWalkCorr = fkRecoParam->GetTimeWalkCorr(); if(!mLastStep){ AliDebug(1,"++++++++++++++TOF Reconstruction Parameters:++++++++++++ \n"); AliDebug(1,Form("TOF sens radius: %f",sensRadius)); @@ -389,48 +414,52 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ AliDebug(1,Form("TOF Max Chi2: %f",maxChi2)); AliDebug(1,Form("Time Walk Correction? : %d",timeWalkCorr)); } - //Match ESD tracks to clusters in TOF + //Match ESD tracks to clusters in TOF // Get the number of propagation steps - Int_t nSteps=(Int_t)(detDepth/stepSize); //PH Arrays (moved outside of the loop) - Float_t * trackPos[4]; for (Int_t ii=0; ii<4; ii++) trackPos[ii] = new Float_t[nSteps]; Int_t * clind = new Int_t[fN]; + // Some init + const Int_t kNclusterMax = 1000; // related to fN value + TGeoHMatrix global[kNclusterMax]; + + //The matching loop for (Int_t iseed=0; iseedClear(); + + for (Int_t ii=0; iiUncheckedAt(iseed); - AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(track->GetSeedIndex()); - if(t->GetTOFsignal()>0. ) continue; - AliTOFtrack *trackTOFin =new AliTOFtrack(*track); - - // Some init - - Int_t index[10000]; - Float_t dist[10000]; - Float_t distZ[10000]; - Float_t cxpos[10000]; - Float_t crecL[10000]; - TGeoHMatrix global[1000]; - - // Determine a window around the track + AliESDtrack *t =(AliESDtrack*)fSeeds->At(track->GetSeedIndex()); + //if ( t->GetTOFsignal()>0. ) continue; + if ( (t->GetStatus()&AliESDtrack::kTOFout)!=0 ) continue; + AliTOFtrack *trackTOFin = new AliTOFtrack(*track); + // Determine a window around the track Double_t x,par[5]; trackTOFin->GetExternalParameters(x,par); Double_t cov[15]; trackTOFin->GetExternalCovariance(cov); + if (cov[0]<0. || cov[2]<0.) { + AliWarning(Form("Very strange track (%d)! At least one of its covariance matrix diagonal elements is negative!",iseed)); + //delete trackTOFin; + //continue; + } + Double_t dphi= scaleFact* - ((5*TMath::Sqrt(cov[0]) + 0.5*dY + 2.5*TMath::Abs(par[2]))/sensRadius); + ((5*TMath::Sqrt(TMath::Abs(cov[0])) + 0.5*dY + 2.5*TMath::Abs(par[2]))/sensRadius); Double_t dz= scaleFact* - (5*TMath::Sqrt(cov[2]) + 0.5*dZ + 2.5*TMath::Abs(par[3])); + (5*TMath::Sqrt(TMath::Abs(cov[2])) + 0.5*dZ + 2.5*TMath::Abs(par[3])); Double_t phi=TMath::ATan2(par[0],x) + trackTOFin->GetAlpha(); if (phi<-TMath::Pi())phi+=2*TMath::Pi(); @@ -438,24 +467,25 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ Double_t z=par[1]; //upper limit on window's size. - - if(dz> dzMax) dz=dzMax; - if(dphi*sensRadius> dyMax) dphi=dyMax/sensRadius; + if (dz> dzMax) dz=dzMax; + if (dphi*sensRadius> dyMax) dphi=dyMax/sensRadius; - Int_t nc=0; - // find the clusters in the window of the track - + Int_t nc=0; for (Int_t k=FindClusterIndex(z-dz); k=kNclusterMax) { + AliWarning("No more matchable clusters can be stored! Please, increase the corresponding vectors size."); + break; + } + AliTOFcluster *c=fClusters[k]; if (c->GetZ() > z+dz) break; if (c->IsUsed()) continue; - if (!c->GetStatus()) { - AliDebug(1,"Cluster in channel declared bad!"); - continue; // skip bad channels as declared in OCDB + AliDebug(1,"Cluster in channel declared bad!"); + continue; // skip bad channels as declared in OCDB } Double_t dph=TMath::Abs(c->GetPhi()-phi); @@ -481,6 +511,8 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ nc++; } + AliDebug(1,Form(" Number of matchable TOF clusters for the track number %d: %d",iseed,nc)); + //start fine propagation Int_t nStepsDone = 0; @@ -497,7 +529,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ break; } } else if (ysect <-ymax) { - if (!trackTOFin->Rotate(AliTOFGeometry::GetAlpha())) { + if (!trackTOFin->Rotate(-AliTOFGeometry::GetAlpha())) { break; } } @@ -521,43 +553,47 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ Int_t nfound = 0; Bool_t accept = kFALSE; - Bool_t isInside =kFALSE; + Bool_t isInside = kFALSE; for (Int_t istep=0; istepIsInsideThePad(global[i],ctrackPos,dist3d); - - if( mLastStep){ - Float_t xLoc=dist3d[0]; - Float_t rLoc=TMath::Sqrt(dist3d[1]*dist3d[1]+dist3d[2]*dist3d[2]); - accept = (TMath::Abs(xLoc)IsInsideThePad(global[i],ctrackPos,dist3d); + + if ( mLastStep ) { + Float_t yLoc = dist3d[1]; + Float_t rLoc = TMath::Sqrt(dist3d[0]*dist3d[0]+dist3d[2]*dist3d[2]); + accept = (TMath::Abs(yLoc)AddLast(new AliTOFtrackPoint(clind[i], + TMath::Sqrt(dist3d[0]*dist3d[0] + dist3d[1]*dist3d[1] + dist3d[2]*dist3d[2]), + dist3d[2], dist3d[0], + AliTOFGeometry::RinTOF()+istep*0.1,trackPos[3][istep])); + + AliDebug(2,Form(" dist3dLoc[0] = %f, dist3dLoc[1] = %f, dist3dLoc[2] = %f ",dist3d[0],dist3d[1],dist3d[2])); nfound++; if(accept &&!mLastStep)break; }//end if accept + } //end for on the clusters if(accept &&!mLastStep)break; } //end for on the steps + AliDebug(1,Form(" Number of track points for the track number %d: %d",iseed,nfound)); if (nfound == 0 ) { @@ -575,20 +611,31 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ Float_t xpos=0.; Float_t mindist=1000.; Float_t mindistZ=0.; + Float_t mindistY=0.; for (Int_t iclus= 0; iclusAt(iclus); + if (matchableTOFcluster->Distance()Distance(); + mindistZ = matchableTOFcluster->DistanceZ(); // Z distance in the + // RF of the hit pad + // closest to the + // reconstructed + // track + mindistY = matchableTOFcluster->DistanceY(); // Y distance in the + // RF of the hit pad + // closest to the + // reconstructed + // track + xpos = matchableTOFcluster->PropRadius(); + idclus = matchableTOFcluster->Index(); + recL = matchableTOFcluster->Length() + corrLen*0.5; } - } + } // loop on found TOF track points AliTOFcluster *c=fClusters[idclus]; - AliDebug(2, Form("%7i %7i %10i %10i %10i %10i %7i", + AliDebug(2, Form("%7d %7d %10d %10d %10d %10d %7d", iseed, fnmatch-1, TMath::Abs(trackTOFin->GetLabel()), @@ -599,14 +646,14 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ // Track length correction for matching Step 2 - if(mLastStep){ - Float_t rc=TMath::Sqrt(c->GetR()*c->GetR() + c->GetZ()*c->GetZ()); - Float_t rt=TMath::Sqrt(trackPos[0][70]*trackPos[0][70] - +trackPos[1][70]*trackPos[1][70] - +trackPos[2][70]*trackPos[2][70]); - Float_t dlt=rc-rt; + if (mLastStep) { + Float_t rc = TMath::Sqrt(c->GetR()*c->GetR() + c->GetZ()*c->GetZ()); + Float_t rt = TMath::Sqrt(trackPos[0][70]*trackPos[0][70] + +trackPos[1][70]*trackPos[1][70] + +trackPos[2][70]*trackPos[2][70]); + Float_t dlt=rc-rt; recL=trackPos[3][70]+dlt; - } + } if ( (c->GetLabel(0)==TMath::Abs(trackTOFin->GetLabel())) @@ -617,13 +664,13 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ ) { fngoodmatch++; - AliDebug(2,Form(" track label good %5i",trackTOFin->GetLabel())); + AliDebug(2,Form(" track label good %5d",trackTOFin->GetLabel())); } - else{ + else { fnbadmatch++; - AliDebug(2,Form(" track label bad %5i",trackTOFin->GetLabel())); + AliDebug(2,Form(" track label bad %5d",trackTOFin->GetLabel())); } @@ -632,10 +679,19 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ // Store quantities to be used in the TOF Calibration Float_t tToT=AliTOFGeometry::ToTBinWidth()*c->GetToT()*1E-3; // in ns t->SetTOFsignalToT(tToT); - Float_t rawTime=AliTOFGeometry::TdcBinWidth()*c->GetTDCRAW()+32; // RAW time,in ps + Float_t rawTime=AliTOFGeometry::TdcBinWidth()*c->GetTDCRAW()+kTimeOffset; // RAW time,in ps t->SetTOFsignalRaw(rawTime); t->SetTOFsignalDz(mindistZ); - AliDebug(2,Form(" Setting TOF raw time: %f, z distance: %f time: %f = ",rawTime,mindistZ)); + t->SetTOFsignalDx(mindistY); + t->SetTOFDeltaBC(c->GetDeltaBC()); + t->SetTOFL0L1(c->GetL0L1Latency()); + + Float_t info[10] = {mindist,mindistY,mindistZ, + 0.,0.,0.,0.,0.,0.,0.}; + t->SetTOFInfo(info); + AliDebug(2,Form(" distance=%f; residual in the pad reference frame: dX=%f, dZ=%f", info[0],info[1],info[2])); + + Int_t ind[5]; ind[0]=c->GetDetInd(0); ind[1]=c->GetDetInd(1); @@ -650,8 +706,8 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ tlab[0]=c->GetLabel(0); tlab[1]=c->GetLabel(1); tlab[2]=c->GetLabel(2); - AliDebug(2,Form(" tdc time of the matched track %i = ",c->GetTDC())); - Double_t tof=AliTOFGeometry::TdcBinWidth()*c->GetTDC()+32; // in ps + AliDebug(2,Form(" tdc time of the matched track %6d = ",c->GetTDC())); + Double_t tof=AliTOFGeometry::TdcBinWidth()*c->GetTDC()+kTimeOffset; // in ps AliDebug(2,Form(" tof time of the matched track: %f = ",tof)); Double_t tofcorr=tof; if(timeWalkCorr)tofcorr=CorrectTimeWalk(mindistZ,tof); @@ -660,17 +716,24 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ t->SetTOFsignal(tofcorr); t->SetTOFcluster(idclus); // pointing to the recPoints tree + AliDebug(2,Form(" Setting TOF raw time: %f, z distance: %f corrected time: %f ",rawTime,mindistZ,tofcorr)); + //Tracking info - Double_t time[AliPID::kSPECIES]; t->GetIntegratedTimes(time); + Double_t time[AliPID::kSPECIES]; t->GetIntegratedTimes(time); // in ps Double_t mom=t->GetP(); - for(Int_t j=0;j %f", iseed,mom)); + for (Int_t j=0;jPropagateTo(xpos); - t->UpdateTrackParams(trackTOFout,AliESDtrack::kTOFout); + + // Fill the track residual histograms. + FillResiduals(trackTOFout,c,kFALSE); + + t->UpdateTrackParams(trackTOFout,AliESDtrack::kTOFout); t->SetIntegratedLength(recL); t->SetIntegratedTimes(time); t->SetTOFLabel(tlab); @@ -679,14 +742,20 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ // Fill Reco-QA histos for Reconstruction fHRecNClus->Fill(nc); fHRecDist->Fill(mindist); - fHRecSigYVsP->Fill(mom,TMath::Sqrt(cov[0])); - fHRecSigZVsP->Fill(mom,TMath::Sqrt(cov[2])); + if (cov[0]>=0.) + fHRecSigYVsP->Fill(mom,TMath::Sqrt(cov[0])); + else + fHRecSigYVsP->Fill(mom,-TMath::Sqrt(-cov[0])); + if (cov[2]>=0.) + fHRecSigZVsP->Fill(mom,TMath::Sqrt(cov[2])); + else + fHRecSigZVsP->Fill(mom,-TMath::Sqrt(-cov[2])); fHRecSigYVsPWin->Fill(mom,dphi*sensRadius); fHRecSigZVsPWin->Fill(mom,dz); // Fill Tree for on-the-fly offline Calibration - if ( !((t->GetStatus() & AliESDtrack::kTIME)==0 )){ + if ( !((t->GetStatus() & AliESDtrack::kTIME)==0 ) ) { fIch=calindex; fToT=tToT; fTime=rawTime; @@ -697,6 +766,7 @@ void AliTOFtracker::MatchTracks( Bool_t mLastStep){ } delete trackTOFout; } + for (Int_t ii=0; ii<4; ii++) delete [] trackPos[ii]; delete [] clind; @@ -732,7 +802,8 @@ Int_t AliTOFtracker::LoadClusters(TTree *cTree) { for (Int_t i=0; iUncheckedAt(i); - fClusters[i]=new AliTOFcluster(*c); fN++; +//PH fClusters[i]=new AliTOFcluster(*c); fN++; + fClusters[i]=c; fN++; // Fill Digits QA histos @@ -783,7 +854,7 @@ void AliTOFtracker::UnloadClusters() { //This function unloads TOF clusters //-------------------------------------------------------------------- for (Int_t i=0; icd(); } //_________________________________________________________________________ -Float_t AliTOFtracker::CorrectTimeWalk( Float_t dist, Float_t tof) { +Float_t AliTOFtracker::CorrectTimeWalk( Float_t dist, Float_t tof) const { //dummy, for the moment Float_t tofcorr=0.; @@ -976,22 +1047,6 @@ Float_t AliTOFtracker::CorrectTimeWalk( Float_t dist, Float_t tof) { return tofcorr; } //_________________________________________________________________________ -Float_t AliTOFtracker::GetTimeZerofromT0(AliESDEvent *event) const { - - //Returns TimeZero as measured by T0 detector - - return event->GetT0(); -} -//_________________________________________________________________________ -Float_t AliTOFtracker::GetTimeZerofromTOF(AliESDEvent * /*event*/) const { - - //dummy, for the moment. T0 algorithm using tracks on TOF - { - //place T0 algo here... - } - return 0.; -} -//_________________________________________________________________________ void AliTOFtracker::FillClusterArray(TObjArray* arr) const { @@ -1005,3 +1060,5 @@ void AliTOFtracker::FillClusterArray(TObjArray* arr) const for (Int_t i=0; iAdd(fClusters[i]); } +//_________________________________________________________________________ +