#include <TSeqCollection.h>
#include <TClonesArray.h>
+#include <TObjArray.h>
#include <TGeoManager.h>
#include <TTree.h>
#include <TFile.h>
#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"
extern TGeoManager *gGeoManager;
extern TROOT *gROOT;
+
ClassImp(AliTOFtracker)
//_____________________________________________________________________________
AliTOFtracker::AliTOFtracker():
- fRecoParam(0x0),
+ fkRecoParam(0x0),
fGeom(0x0),
- fPid(0x0),
fN(0),
fNseeds(0),
fNseedsTOF(0),
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),
fExpTimePi(-1.),
fExpTimeKa(-1.),
fExpTimePr(-1.)
- {
+{
//AliTOFtracker main Ctor
-
- // Gettimg the geometry
- fGeom= new AliTOFGeometry();
- InitCheckHists();
+ for (Int_t ii=0; ii<kMaxCluster; ii++) fClusters[ii]=0x0;
+
+ // Getting the geometry
+ fGeom = new AliTOFGeometry();
+
+ InitCheckHists();
}
//_____________________________________________________________________________
SaveCheckHists();
if(!(AliCDBManager::Instance()->GetCacheFlag())){
- delete fRecoParam;
+ delete fkRecoParam;
}
delete fGeom;
- delete fPid;
delete fHDigClusMap;
delete fHDigNClus;
delete fHDigClusTime;
delete fSeeds;
fSeeds=0x0;
}
+ if (fTOFtrackPoints){
+ fTOFtrackPoints->Delete();
+ delete fTOFtrackPoints;
+ fTOFtrackPoints=0x0;
+ }
+
+ for (Int_t ii=0; ii<kMaxCluster; ii++)
+ if (fClusters[ii]) fClusters[ii]->Delete();
}
//_____________________________________________________________________________
-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
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; i<fNseeds; i++) {
- AliESDtrack *t=event->GetTrack(i);
- new(aESDTrack[i]) AliESDtrack(*t);
- }
+ for (Int_t i=0; i<fNseeds; i++)
+ fSeeds->AddLast(event->GetTrack(i));
//Prepare ESD tracks candidates for TOF Matching
CollectESD();
//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; i<ntrk; i++) {
AliESDtrack *t=event->GetTrack(i);
- AliESDtrack *seed =(AliESDtrack*)fSeeds->UncheckedAt(i);
+ AliESDtrack *seed =(AliESDtrack*)fSeeds->At(i);
if ( (seed->GetStatus()&AliESDtrack::kTOFin)!=0 ) {
t->SetStatus(AliESDtrack::kTOFin);
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);
- Float_t info[10]={0.,0.,0.,0.,0.,0.,0.,0.,0.,0.};
- seed->GetTOFInfo(info);
+ 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(2,Form(" distance=%f; residual in the pad reference frame: dX=%f, dZ=%f", info[0],info[1],info[2]));
-
- AliTOFtrack *track = new AliTOFtrack(*seed);
- t->UpdateTrackParams(track,AliESDtrack::kTOFout); // to be checked - AdC
- delete track;
- Double_t time[10]; t->GetIntegratedTimes(time);
- AliDebug(2,Form(" %6d %f %f %f %f %f %6d %3d %f %f %f %f %f %f",
+ 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(),
}
}
- //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(2,Form("Use Time Zero?: %d",usetimeZero));
- AliDebug(2,Form("Time Zero from T0? : %d",timeZeroFromT0));
- AliDebug(2,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->Delete();
fTracks->Clear();
return 0;
//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;
for (Int_t i=0; i<fNseeds; i++) {
- AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(i);
+ AliESDtrack *t =(AliESDtrack*)fSeeds->At(i);
if ((t->GetStatus()&AliESDtrack::kTPCout)==0)continue;
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;
+
+ }
+ //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(" TPC propagated track till rho = %fcm."
new(aTOFTrack[fNseedsTOF]) AliTOFtrack(*track);
fNseedsTOF++;
seedsTOF2++;
+
+ AliDebug(1,Form(" After propagation till inner TOF radius, ESDtrackLength=%f, TOFtrackLength=%f",t->GetIntegratedLength(),track->GetIntegratedLength()));
}
delete track;
}
}
- AliInfo(Form("Number of TOF seeds %d",fNseedsTOF));
- AliInfo(Form("Number of TOF seeds Type 1 %d",seedsTOF1));
- AliInfo(Form("Number of TOF seeds Type 2 %d",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();
}
+
//_________________________________________________________________________
void AliTOFtracker::MatchTracks( Bool_t mLastStep){
-
// Parameters used/regulating the reconstruction
- static Float_t corrLen=0.75;
- static Float_t detDepth=15.3;
+ //static Float_t corrLen=0.;//0.75;
+ static Float_t detDepth=18.;
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]
+ const Float_t kTimeOffset = 0.; // 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();
+ if (dCut==3. && fNseedsTOF<=10) {
+ dCut=10.;
+ AliInfo(Form("Matching window=%f, since low multiplicity event (fNseedsTOF=%d)",
+ dCut, fNseedsTOF));
+ }
+ 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));
// Get the number of propagation steps
Int_t nSteps=(Int_t)(detDepth/stepSize);
+ AliDebug(1,Form(" Number of steps to be done %d",nSteps));
//PH Arrays (moved outside of the loop)
Float_t * trackPos[4];
Int_t * clind = new Int_t[fN];
// Some init
- const Int_t kNfoundMax = 10000; // related to nSteps value
- Int_t index[kNfoundMax];
- Float_t dist[kNfoundMax];
- Float_t distZ[kNfoundMax];
- Float_t distY[kNfoundMax]; // delta(rhoXphi) // AdC
- Float_t cxpos[kNfoundMax];
- Float_t crecL[kNfoundMax];
const Int_t kNclusterMax = 1000; // related to fN value
- TGeoHMatrix global[kNclusterMax];
-
+ TGeoHMatrix global[kNclusterMax];
+
//The matching loop
for (Int_t iseed=0; iseed<fNseedsTOF; iseed++) {
- for (Int_t ii=0; ii<kNfoundMax; ii++) {
- index[ii] = -1;
- dist[ii] = 9999.;
- distZ[ii] = 9999.;
- distY[ii] = 9999.;
- cxpos[ii] = 9999.;
- crecL[ii] = 0.;
- }
+ fTOFtrackPoints->Delete();
+
for (Int_t ii=0; ii<kNclusterMax; ii++)
global[ii] = 0x0;
-
AliTOFtrack *track =(AliTOFtrack*)fTracks->UncheckedAt(iseed);
- AliESDtrack *t =(AliESDtrack*)fSeeds->UncheckedAt(track->GetSeedIndex());
+ AliESDtrack *t =(AliESDtrack*)fSeeds->At(track->GetSeedIndex());
//if ( t->GetTOFsignal()>0. ) continue;
if ( (t->GetStatus()&AliESDtrack::kTOFout)!=0 ) continue;
- AliTOFtrack *trackTOFin =new AliTOFtrack(*track);
+ AliTOFtrack *trackTOFin = new AliTOFtrack(*track);
// Determine a window around the track
Double_t x,par[5];
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<fN; k++) {
if (nc>=kNclusterMax) {
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
if (trackTOFin->AliExternalTrackParam::GetPredictedChi2(p,cov2) > maxChi2)continue;
clind[nc] = k;
- Char_t path[100];
+ Char_t path[200];
Int_t ind[5];
ind[0]=c->GetDetInd(0);
ind[1]=c->GetDetInd(1);
AliDebug(1,Form(" Number of matchable TOF clusters for the track number %d: %d",iseed,nc));
+ if (nc == 0 ) {
+ fnunmatch++;
+ delete trackTOFin;
+ continue;
+ }
+
//start fine propagation
Int_t nStepsDone = 0;
for( Int_t istep=0; istep<nSteps; istep++){
- Float_t xs=AliTOFGeometry::RinTOF()+istep*0.1;
- Double_t ymax=xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
+ // First of all, propagate the track...
+ Float_t xs = AliTOFGeometry::RinTOF()+istep*stepSize;
+ if(!trackTOFin->PropagateTo(xs)) {
+ break;
+ }
- Bool_t skip=kFALSE;
- Double_t ysect=trackTOFin->GetYat(xs,skip);
- if (skip) break;
+ // ...and then, if necessary, rotate the track
+ Double_t ymax = xs*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
+ Double_t ysect = trackTOFin->GetY();
if (ysect > ymax) {
if (!trackTOFin->Rotate(AliTOFGeometry::GetAlpha())) {
break;
}
}
- if(!trackTOFin->PropagateTo(xs)) {
- break;
- }
-
nStepsDone++;
+ AliDebug(2,Form(" current step %d (%d) - nStepsDone=%d",istep,nSteps,nStepsDone));
// store the running point (Globalrf) - fine propagation
Double_t r[3];
trackTOFin->GetXYZ(r);
- trackPos[0][istep]= (Float_t) r[0];
- trackPos[1][istep]= (Float_t) r[1];
- trackPos[2][istep]= (Float_t) r[2];
- trackPos[3][istep]= trackTOFin->GetIntegratedLength();
+ trackPos[0][nStepsDone-1]= (Float_t) r[0];
+ trackPos[1][nStepsDone-1]= (Float_t) r[1];
+ trackPos[2][nStepsDone-1]= (Float_t) r[2];
+ trackPos[3][nStepsDone-1]= trackTOFin->GetIntegratedLength();
}
+#if 0
+ /*****************/
+ /**** OLD CODE ***/
+ /*****************/
+
Int_t nfound = 0;
Bool_t accept = kFALSE;
Bool_t isInside = kFALSE;
for (Int_t istep=0; istep<nStepsDone; istep++) {
- if (nfound>=kNfoundMax) {
- AliWarning("No more track positions can be stored! Please, increase the corresponding vectors size.");
- break;
- }
-
Float_t ctrackPos[3];
ctrackPos[0] = trackPos[0][istep];
ctrackPos[1] = trackPos[1][istep];
Float_t dist3d[3];
accept = kFALSE;
for (Int_t i=0; i<nc; i++) {
- isInside = fGeom->IsInsideThePad(global[i],ctrackPos,dist3d);
+ isInside = fGeom->IsInsideThePad((TGeoHMatrix*)(&global[i]),ctrackPos,dist3d);
if ( mLastStep ) {
Float_t yLoc = dist3d[1];
}
if (accept) {
- dist[nfound] = TMath::Sqrt(dist3d[0]*dist3d[0] +
- dist3d[1]*dist3d[1] +
- dist3d[2]*dist3d[2]);
- AliDebug(2,Form(" dist3dLoc[0] = %f, dist3dLoc[1] = %f, dist3dLoc[2] = %f ",
- dist3d[0],dist3d[1],dist3d[2]));
- distZ[nfound] = dist3d[2]; // Z distance in the RF of the
- // hit pad closest to the
- // reconstructed track
- distY[nfound] = dist3d[0]; // X distance in the RF of the
- // hit pad closest to the
- // reconstructed track
- // It corresponds to Y coordinate
- // in tracking RF
-
-
- AliDebug(2,Form(" dist3dLoc[0] = %f --- distY[%d] = %f",
- dist3d[0],nfound,distY[nfound]));
- AliDebug(2,Form(" dist3dLoc[2] = %f --- distZ[%d] = %f",
- dist3d[2],nfound,distZ[nfound]));
-
-
- crecL[nfound] = trackPos[3][istep];
- index[nfound] = clind[i]; // store cluster id
- cxpos[nfound] = AliTOFGeometry::RinTOF()+istep*0.1; //store prop.radius
+ fTOFtrackPoints->AddLast(new AliTOFtrackPoint(clind[i],
+ TMath::Sqrt(dist3d[0]*dist3d[0] + dist3d[1]*dist3d[1] + dist3d[2]*dist3d[2]),
+ dist3d[2],dist3d[0],dist3d[1],
+ AliTOFGeometry::RinTOF()+istep*stepSize,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
if(accept &&!mLastStep)break;
} //end for on the steps
- AliDebug(1,Form(" Number of track points for the track number %d: %d",iseed,nfound));
+ /*****************/
+ /**** OLD CODE ***/
+ /*****************/
+#endif
+
+ AliDebug(1,Form(" Number of steps done for the track number %d: %d",iseed,nStepsDone));
+
+ if ( nStepsDone == 0 ) {
+ fnunmatch++;
+ delete trackTOFin;
+ continue;
+ }
+
+ /*****************/
+ /**** NEW CODE ***/
+ /*****************/
+
+ Int_t nfound = 0;
+ Bool_t accept = kFALSE;
+ Bool_t isInside = kFALSE;
+ for (Int_t istep=0; istep<nStepsDone; istep++) {
+
+ Bool_t gotInsideCluster = kFALSE;
+ Int_t trackInsideCluster = -1;
+
+ Float_t ctrackPos[3];
+ ctrackPos[0] = trackPos[0][istep];
+ ctrackPos[1] = trackPos[1][istep];
+ ctrackPos[2] = trackPos[2][istep];
+
+ //now see whether the track matches any of the TOF clusters
+
+ Float_t dist3d[3]={0.,0.,0.};
+ accept = kFALSE;
+ for (Int_t i=0; i<nc; i++) {
+
+ // ***** NEW *****
+ /* check whether track was inside another cluster
+ * and in case inhibit this cluster.
+ * this will allow to only go on and add track points for
+ * that cluster where the track got inside first */
+ if (gotInsideCluster && trackInsideCluster != i) {
+ AliDebug(2,Form(" A - istep=%d ~ %d %d ~ nfound=%d",istep,trackInsideCluster,i,nfound));
+ continue;
+ }
+ AliDebug(2,Form(" B - istep=%d ~ %d %d ~ nfound=%d",istep,trackInsideCluster,i,nfound));
+
+ /* check whether track is inside this cluster */
+ for (Int_t hh=0; hh<3; hh++) dist3d[hh]=0.;
+ isInside = fGeom->IsInsideThePad((TGeoHMatrix*)(&global[i]),ctrackPos,dist3d);
+ // ***** NEW *****
+ /* if track is inside this cluster set flags which will then
+ * inhibit to add track points for the other clusters */
+ if (isInside) {
+ gotInsideCluster = kTRUE;
+ trackInsideCluster = i;
+ }
+
+ if ( mLastStep ) {
+ Float_t yLoc = dist3d[1];
+ Float_t rLoc = TMath::Sqrt(dist3d[0]*dist3d[0]+dist3d[2]*dist3d[2]);
+ accept = (TMath::Abs(yLoc)<padDepth*0.5 && rLoc<dCut);
+ AliDebug(2," I am in the case mLastStep==kTRUE ");
+ }
+
+ //***** NEW *****
+ /* add point everytime that:
+ * - the track is inside the cluster
+ * - the track got inside the cluster, even when it eventually exited the cluster
+ * - the tracks is within dCut from the cluster
+ */
+ if (accept || isInside || gotInsideCluster) {
+
+ fTOFtrackPoints->AddLast(new AliTOFtrackPoint(clind[i],
+ TMath::Sqrt(dist3d[0]*dist3d[0] + dist3d[1]*dist3d[1] + dist3d[2]*dist3d[2]),
+ dist3d[2],dist3d[0],dist3d[1],
+ AliTOFGeometry::RinTOF()+istep*stepSize,trackPos[3][istep]));
+
+ AliDebug(2,Form(" dist3dLoc[0] = %f, dist3dLoc[1] = %f, dist3dLoc[2] = %f ",dist3d[0],dist3d[1],dist3d[2]));
+ nfound++;
+
+ AliDebug(2,Form(" C - istep=%d ~ %d %d ~ nfound=%d",istep,trackInsideCluster,i,nfound));
+
+ // ***** NEW *****
+ /* do not break loop in any case
+ * if the track got inside a cluster all other clusters
+ * are inhibited */
+ // if(accept &&!mLastStep)break;
+
+ }//end if accept
+
+ } //end for on the clusters
+
+ // ***** NEW *****
+ /* do not break loop in any case
+ * if the track got inside a cluster all other clusters
+ * are inhibited but we want to go on adding track points */
+ // 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 ) {
fnunmatch++;
continue;
}
- fnmatch++;
-
// now choose the cluster to be matched with the track.
Int_t idclus=-1;
Float_t mindist=1000.;
Float_t mindistZ=0.;
Float_t mindistY=0.;
- for (Int_t iclus= 0; iclus<nfound;iclus++){
- if (dist[iclus]< mindist){
- mindist = dist[iclus];
- mindistZ = distZ[iclus]; // Z distance in the RF of the hit
- // pad closest to the reconstructed
- // track
- mindistY = distY[iclus]; // Y distance in the RF of the hit
- // pad closest to the reconstructed
- // track
- xpos = cxpos[iclus];
- idclus =index[iclus];
- recL=crecL[iclus]+corrLen*0.5;
+ Float_t mindistX=stepSize;
+ for (Int_t iclus= 0; iclus<nfound;iclus++) {
+ AliTOFtrackPoint *matchableTOFcluster = (AliTOFtrackPoint*)fTOFtrackPoints->At(iclus);
+ //if ( matchableTOFcluster->Distance()<mindist ) {
+ if ( TMath::Abs(matchableTOFcluster->DistanceX())<TMath::Abs(mindistX) &&
+ TMath::Abs(matchableTOFcluster->DistanceX())<=stepSize ) {
+ mindist = matchableTOFcluster->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
+ mindistX = matchableTOFcluster->DistanceX(); // X 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;
+
+ AliDebug(1,Form(" %d(%d) --- %f (%f, %f, %f), step=%f -- idclus=%d --- seed=%d, trackId=%d, trackLab=%d", iclus,nfound,
+ mindist,mindistX,mindistY,mindistZ,stepSize,idclus,iseed,track->GetSeedIndex(),track->GetLabel()));
+
}
+ } // loop on found TOF track points
+
+ if (TMath::Abs(mindistX)>stepSize && idclus!=-1) {
+ AliInfo(Form("--------Not matched --- but idclus=%d, trackId=%d, trackLab=%d",
+ idclus,track->GetSeedIndex(),track->GetLabel()));
+ idclus=-1;
}
+ if (idclus==-1) {
+ AliDebug(1,Form("Reconstructed track %d doesn't match any TOF cluster", iseed));
+ fnunmatch++;
+ delete trackTOFin;
+ continue;
+ }
+
+ AliDebug(1,"--------Matched");
+
+ fnmatch++;
AliTOFcluster *c=fClusters[idclus];
- /*
- Float_t tiltangle = AliTOFGeometry::GetAngles(c->GetDetInd(1),c->GetDetInd(2))*TMath::DegToRad();
- Float_t localCheck=-mindistZ;
- localCheck/=TMath::Cos(tiltangle); // Z (tracking/ALICE RF) component of
- // the distance between the
- // reconstructed track and the
- // TOF closest cluster
- */
+
AliDebug(2, Form("%7d %7d %10d %10d %10d %10d %7d",
iseed,
fnmatch-1,
c->Use();
// 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()))
||
t->SetTOFsignalRaw(rawTime);
t->SetTOFsignalDz(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.};
AliTOFtrack *trackTOFout = new AliTOFtrack(*t);
trackTOFout->PropagateTo(xpos);
+ // If necessary, rotate the track
+ Double_t yATxposMax=xpos*TMath::Tan(0.5*AliTOFGeometry::GetAlpha());
+ Double_t yATxpos=trackTOFout->GetY();
+ if (yATxpos > yATxposMax) {
+ trackTOFout->Rotate(AliTOFGeometry::GetAlpha());
+ } else if (yATxpos < -yATxposMax) {
+ trackTOFout->Rotate(-AliTOFGeometry::GetAlpha());
+ }
+
// Fill the track residual histograms.
FillResiduals(trackTOFout,c,kFALSE);
// 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);
}
delete trackTOFout;
}
+
for (Int_t ii=0; ii<4; ii++) delete [] trackPos[ii];
delete [] clind;
for (Int_t i=0; i<nc; i++) {
AliTOFcluster *c=(AliTOFcluster*)clusters->UncheckedAt(i);
- fClusters[i]=new AliTOFcluster(*c); fN++;
+//PH fClusters[i]=new AliTOFcluster(*c); fN++;
+ fClusters[i]=c; fN++;
// Fill Digits QA histos
//This function unloads TOF clusters
//--------------------------------------------------------------------
for (Int_t i=0; i<fN; i++) {
- delete fClusters[i];
+//PH delete fClusters[i];
fClusters[i] = 0x0;
}
fN=0;
dir->cd();
}
//_________________________________________________________________________
-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.;
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
{
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff