* provided "as is" without express or implied warranty. *
**************************************************************************/
-/*
-$Log$
-Revision 1.29 2003/07/22 15:56:14 hristov
-Implementing ESD functionality in the NewIO (Yu.Belikov)
+/* $Id$ */
-Revision 1.27.2.2 2003/07/14 09:19:33 hristov
-TOF included in the combined PID (Yu.Belikov)
-
-Revision 1.27.2.1 2003/07/11 10:53:01 hristov
-Inward refit for TPC and TRD in the ESD schema (T.Kuhr)
-
-Revision 1.27 2003/05/27 17:46:13 hristov
-TRD PID included in the ESD schema (T.Kuhr)
-
-Revision 1.26 2003/04/10 10:36:54 hristov
-Code for unified TPC/TRD tracking (S.Radomski)
-
-Revision 1.25 2003/03/19 17:14:11 hristov
-Load/UnloadClusters added to the base class and the derived classes changed correspondingly. Possibility to give 2 input files for ITS and TPC tracks in PropagateBack. TRD tracker uses fEventN from the base class (T.Kuhr)
-
-Revision 1.24 2003/02/19 09:02:28 hristov
-Track time measurement (S.Radomski)
-
-Revision 1.23 2003/02/10 14:06:10 cblume
-Add tracking without tilted pads as option
-
-Revision 1.22 2003/01/30 15:19:58 cblume
-New set of parameters
-
-Revision 1.21 2003/01/27 16:34:49 cblume
-Update of tracking by Sergei and Chuncheng
-
-Revision 1.20 2002/11/07 15:52:09 cblume
-Update of tracking code for tilted pads
-
-Revision 1.19 2002/10/22 15:53:08 alibrary
-Introducing Riostream.h
-
-Revision 1.18 2002/10/14 14:57:44 hristov
-Merging the VirtualMC branch to the main development branch (HEAD)
-
-Revision 1.14.6.2 2002/07/24 10:09:31 alibrary
-Updating VirtualMC
-
-Revision 1.17 2002/06/13 12:09:58 hristov
-Minor corrections
-
-Revision 1.16 2002/06/12 09:54:36 cblume
-Update of tracking code provided by Sergei
-
-Revision 1.14 2001/11/14 10:50:46 cblume
-Changes in digits IO. Add merging of summable digits
-
-Revision 1.13 2001/05/30 12:17:47 hristov
-Loop variables declared once
-
-Revision 1.12 2001/05/28 17:07:58 hristov
-Last minute changes; ExB correction in AliTRDclusterizerV1; taking into account of material in G10 TEC frames and material between TEC planes (C.Blume,S.Sedykh)
-
-Revision 1.8 2000/12/20 13:00:44 cblume
-Modifications for the HP-compiler
-
-Revision 1.7 2000/12/08 16:07:02 cblume
-Update of the tracking by Sergei
-
-Revision 1.6 2000/11/30 17:38:08 cblume
-Changes to get in line with new STEER and EVGEN
-
-Revision 1.5 2000/11/14 14:40:27 cblume
-Correction for the Sun compiler (kTRUE and kFALSE)
-
-Revision 1.4 2000/11/10 14:57:52 cblume
-Changes in the geometry constants for the DEC compiler
-
-Revision 1.3 2000/10/15 23:40:01 cblume
-Remove AliTRDconst
-
-Revision 1.2 2000/10/06 16:49:46 cblume
-Made Getters const
-
-Revision 1.1.2.2 2000/10/04 16:34:58 cblume
-Replace include files by forward declarations
-
-Revision 1.1.2.1 2000/09/22 14:47:52 cblume
-Add the tracking code
-
-*/
+///////////////////////////////////////////////////////////////////////////////
+// //
+// The standard TRD tracker //
+// //
+///////////////////////////////////////////////////////////////////////////////
#include <Riostream.h>
-
#include <TFile.h>
#include <TBranch.h>
#include <TTree.h>
#include "AliTRDgeometry.h"
#include "AliTRDparameter.h"
#include "AliTRDgeometryDetail.h"
+#include "AliTRDgeometryHole.h"
#include "AliTRDcluster.h"
#include "AliTRDtrack.h"
#include "AliTRDPartID.h"
ClassImp(AliTRDtracker)
- const Float_t AliTRDtracker::fSeedDepth = 0.5;
- const Float_t AliTRDtracker::fSeedStep = 0.10;
- const Float_t AliTRDtracker::fSeedGap = 0.25;
+ const Float_t AliTRDtracker::fgkSeedDepth = 0.5;
+ const Float_t AliTRDtracker::fgkSeedStep = 0.10;
+ const Float_t AliTRDtracker::fgkSeedGap = 0.25;
- const Float_t AliTRDtracker::fMaxSeedDeltaZ12 = 40.;
- const Float_t AliTRDtracker::fMaxSeedDeltaZ = 25.;
- const Float_t AliTRDtracker::fMaxSeedC = 0.0052;
- const Float_t AliTRDtracker::fMaxSeedTan = 1.2;
- const Float_t AliTRDtracker::fMaxSeedVertexZ = 150.;
+ const Float_t AliTRDtracker::fgkMaxSeedDeltaZ12 = 40.;
+ const Float_t AliTRDtracker::fgkMaxSeedDeltaZ = 25.;
+ const Float_t AliTRDtracker::fgkMaxSeedC = 0.0052;
+ const Float_t AliTRDtracker::fgkMaxSeedTan = 1.2;
+ const Float_t AliTRDtracker::fgkMaxSeedVertexZ = 150.;
- const Double_t AliTRDtracker::fSeedErrorSY = 0.2;
- const Double_t AliTRDtracker::fSeedErrorSY3 = 2.5;
- const Double_t AliTRDtracker::fSeedErrorSZ = 0.1;
+ const Double_t AliTRDtracker::fgkSeedErrorSY = 0.2;
+ const Double_t AliTRDtracker::fgkSeedErrorSY3 = 2.5;
+ const Double_t AliTRDtracker::fgkSeedErrorSZ = 0.1;
- const Float_t AliTRDtracker::fMinClustersInSeed = 0.7;
+ const Float_t AliTRDtracker::fgkMinClustersInSeed = 0.7;
- const Float_t AliTRDtracker::fMinClustersInTrack = 0.5;
- const Float_t AliTRDtracker::fMinFractionOfFoundClusters = 0.8;
+ const Float_t AliTRDtracker::fgkMinClustersInTrack = 0.5;
+ const Float_t AliTRDtracker::fgkMinFractionOfFoundClusters = 0.8;
- const Float_t AliTRDtracker::fSkipDepth = 0.3;
- const Float_t AliTRDtracker::fLabelFraction = 0.8;
- const Float_t AliTRDtracker::fWideRoad = 20.;
+ const Float_t AliTRDtracker::fgkSkipDepth = 0.3;
+ const Float_t AliTRDtracker::fgkLabelFraction = 0.8;
+ const Float_t AliTRDtracker::fgkWideRoad = 20.;
- const Double_t AliTRDtracker::fMaxChi2 = 12.;
+ const Double_t AliTRDtracker::fgkMaxChi2 = 12.;
-const Int_t AliTRDtracker::kFirstPlane = 5;
-const Int_t AliTRDtracker::kLastPlane = 17;
+const Int_t AliTRDtracker::fgkFirstPlane = 5;
+const Int_t AliTRDtracker::fgkLastPlane = 17;
+//____________________________________________________________________
+AliTRDtracker::AliTRDtracker():AliTracker(),
+ fGeom(0),
+ fPar(0),
+ fNclusters(0),
+ fClusters(0),
+ fNseeds(0),
+ fSeeds(0),
+ fNtracks(0),
+ fTracks(0),
+ fSY2corr(0),
+ fSZ2corr(0),
+ fTimeBinsPerPlane(0),
+ fMaxGap(0),
+ fVocal(kFALSE),
+ fAddTRDseeds(kFALSE),
+ fNoTilt(kFALSE)
+{
+ for(Int_t i=0;i<kTrackingSectors;i++) fTrSec[i]=0;
+ for(Int_t j=0;j<5;j++)
+ for(Int_t k=0;k<18;k++) fHoles[j][k]=kFALSE;
+}
//____________________________________________________________________
AliTRDtracker::AliTRDtracker(const TFile *geomfile):AliTracker()
{
}
else {
printf("AliTRDtracker::AliTRDtracker(): can't find TRD geometry!\n");
- printf("The DETAIL TRD geometry will be used\n");
- fGeom = new AliTRDgeometryDetail();
+ //printf("The DETAIL TRD geometry will be used\n");
+ //fGeom = new AliTRDgeometryDetail();
+ fGeom = new AliTRDgeometryHole();
+ fGeom->SetPHOShole();
+ fGeom->SetRICHhole();
}
if (!fPar) {
fNtracks = 0;
fTracks = new TObjArray(1000);
- for(Int_t geom_s = 0; geom_s < kTRACKING_SECTORS; geom_s++) {
- Int_t tr_s = CookSectorIndex(geom_s);
- fTrSec[tr_s] = new AliTRDtrackingSector(fGeom, geom_s, fPar);
+ for(Int_t geomS = 0; geomS < kTrackingSectors; geomS++) {
+ Int_t trS = CookSectorIndex(geomS);
+ fTrSec[trS] = new AliTRDtrackingSector(fGeom, geomS, fPar);
+ for (Int_t icham=0;icham<AliTRDgeometry::kNcham; icham++){
+ fHoles[icham][trS]=fGeom->IsHole(0,icham,geomS);
+ }
}
- Float_t tilt_angle = TMath::Abs(fPar->GetTiltingAngle());
- if(tilt_angle < 0.1) {
+ Float_t tiltAngle = TMath::Abs(fPar->GetTiltingAngle());
+ if(tiltAngle < 0.1) {
fNoTilt = kTRUE;
}
fSY2corr = 0.2;
fSZ2corr = 120.;
- if(fNoTilt && (tilt_angle > 0.1)) fSY2corr = fSY2corr + tilt_angle * 0.05;
+ if(fNoTilt && (tiltAngle > 0.1)) fSY2corr = fSY2corr + tiltAngle * 0.05;
// calculate max gap on track
tbAmp = TMath::Min(tbAmp,maxAmp);
fTimeBinsPerPlane = tbAmp + tbDrift;
- fMaxGap = (Int_t) (fTimeBinsPerPlane * fGeom->Nplan() * fSkipDepth);
+ fMaxGap = (Int_t) (fTimeBinsPerPlane * fGeom->Nplan() * fgkSkipDepth);
fVocal = kFALSE;
//___________________________________________________________________
AliTRDtracker::~AliTRDtracker()
{
- delete fClusters;
- delete fTracks;
- delete fSeeds;
+ //
+ // Destructor of AliTRDtracker
+ //
+
+ if (fClusters) {
+ fClusters->Delete();
+ delete fClusters;
+ }
+ if (fTracks) {
+ fTracks->Delete();
+ delete fTracks;
+ }
+ if (fSeeds) {
+ fSeeds->Delete();
+ delete fSeeds;
+ }
delete fGeom;
delete fPar;
- for(Int_t geom_s = 0; geom_s < kTRACKING_SECTORS; geom_s++) {
- delete fTrSec[geom_s];
+ for(Int_t geomS = 0; geomS < kTrackingSectors; geomS++) {
+ delete fTrSec[geomS];
}
}
fBarrelFile->cd();
fBarrelTree = new TTree(buff, "Barrel TPC tracks");
- Int_t nRefs = kLastPlane - kFirstPlane + 1;
+ Int_t nRefs = fgkLastPlane - fgkFirstPlane + 1;
if (!fBarrelArray) fBarrelArray = new TClonesArray("AliBarrelTrack", nRefs);
for(Int_t i=0; i<nRefs; i++) new((*fBarrelArray)[i]) AliBarrelTrack();
nWrong = ps->GetNWrong();
chi2 = ps->GetChi2();
- if (refPlane != kLastPlane) {
+ if (refPlane != fgkLastPlane) {
fBarrelTrack->SetNClusters(newClusters, newChi2);
fBarrelTrack->SetNWrongClusters(newWrong);
} else {
return (z1 - z2)/sqrt((x1-x2)*(x1-x2)+(y1-y2)*(y1-y2));
}
+
+AliTRDcluster * AliTRDtracker::GetCluster(AliTRDtrack * track, Int_t plane, Int_t timebin){
+ //
+ //try to find cluster in the backup list
+ //
+ AliTRDcluster * cl =0;
+ UInt_t *indexes = track->GetBackupIndexes();
+ for (UInt_t i=0;i<kMaxTimeBinIndex;i++){
+ if (indexes[i]==0) break;
+ AliTRDcluster * cli = (AliTRDcluster*)fClusters->UncheckedAt(indexes[i]);
+ if (!cli) break;
+ if (cli->GetLocalTimeBin()!=timebin) continue;
+ Int_t iplane = fGeom->GetPlane(cli->GetDetector());
+ if (iplane==plane) {
+ cl = cli;
+ break;
+ }
+ }
+ return cl;
+}
+
+
+Int_t AliTRDtracker::GetLastPlane(AliTRDtrack * track){
+ //
+ //return last updated plane
+ Int_t lastplane=0;
+ UInt_t *indexes = track->GetBackupIndexes();
+ for (UInt_t i=0;i<kMaxTimeBinIndex;i++){
+ AliTRDcluster * cli = (AliTRDcluster*)fClusters->UncheckedAt(indexes[i]);
+ if (!cli) break;
+ Int_t iplane = fGeom->GetPlane(cli->GetDetector());
+ if (iplane>lastplane) {
+ lastplane = iplane;
+ }
+ }
+ return lastplane;
+}
//___________________________________________________________________
Int_t AliTRDtracker::Clusters2Tracks(const TFile *inp, TFile *out)
{
}
sprintf(tname,"seedTRDtoTPC_%d",GetEventNumber());
- TTree tpc_tree(tname,"Tree with seeds from TRD at outer TPC pad row");
+ TTree tpcTree(tname,"Tree with seeds from TRD at outer TPC pad row");
AliTPCtrack *iotrack=0;
- tpc_tree.Branch("tracks","AliTPCtrack",&iotrack,32000,0);
+ tpcTree.Branch("tracks","AliTPCtrack",&iotrack,32000,0);
sprintf(tname,"TreeT%d_TRD",GetEventNumber());
- TTree trd_tree(tname,"TRD tracks at inner TRD time bin");
- AliTRDtrack *iotrack_trd=0;
- trd_tree.Branch("tracks","AliTRDtrack",&iotrack_trd,32000,0);
+ TTree trdTree(tname,"TRD tracks at inner TRD time bin");
+ AliTRDtrack *iotrackTRD=0;
+ trdTree.Branch("tracks","AliTRDtrack",&iotrackTRD,32000,0);
Int_t timeBins = fTrSec[0]->GetNumberOfTimeBins();
- Float_t foundMin = fMinClustersInTrack * timeBins;
+ Float_t foundMin = fgkMinClustersInTrack * timeBins;
if (inp) {
TFile *in=(TFile*)inp;
FollowProlongation(t, innerTB);
if (t.GetNumberOfClusters() >= foundMin) {
UseClusters(&t);
- CookLabel(pt, 1-fLabelFraction);
+ CookLabel(pt, 1-fgkLabelFraction);
// t.CookdEdx();
}
- iotrack_trd = pt;
- trd_tree.Fill();
+ iotrackTRD = pt;
+ trdTree.Fill();
found++;
// cout<<found<<'\r';
if(PropagateToTPC(t)) {
AliTPCtrack *tpc = new AliTPCtrack(*pt,pt->GetAlpha());
iotrack = tpc;
- tpc_tree.Fill();
+ tpcTree.Fill();
delete tpc;
}
delete fSeeds->RemoveAt(i);
// Find tracks for the seeds in the TRD
Int_t timeBins = fTrSec[0]->GetNumberOfTimeBins();
- Int_t nSteps = (Int_t) (fSeedDepth / fSeedStep);
- Int_t gap = (Int_t) (timeBins * fSeedGap);
- Int_t step = (Int_t) (timeBins * fSeedStep);
+ Int_t nSteps = (Int_t) (fgkSeedDepth / fgkSeedStep);
+ Int_t gap = (Int_t) (timeBins * fgkSeedGap);
+ Int_t step = (Int_t) (timeBins * fgkSeedStep);
// make a first turn with tight cut on initial curvature
for(Int_t turn = 1; turn <= 2; turn++) {
if(turn == 2) {
- nSteps = (Int_t) (fSeedDepth / (3*fSeedStep));
- step = (Int_t) (timeBins * (3*fSeedStep));
+ nSteps = (Int_t) (fgkSeedDepth / (3*fgkSeedStep));
+ step = (Int_t) (timeBins * (3*fgkSeedStep));
}
for(Int_t i=0; i<nSteps; i++) {
Int_t outer=timeBins-1-i*step;
FollowProlongation(t,innerTB);
if (t.GetNumberOfClusters() >= foundMin) {
UseClusters(&t);
- CookLabel(pt, 1-fLabelFraction);
+ CookLabel(pt, 1-fgkLabelFraction);
t.CookdEdx();
found++;
// cout<<found<<'\r';
- iotrack_trd = pt;
- trd_tree.Fill();
+ iotrackTRD = pt;
+ trdTree.Fill();
if(PropagateToTPC(t)) {
AliTPCtrack *tpc = new AliTPCtrack(*pt,pt->GetAlpha());
iotrack = tpc;
- tpc_tree.Fill();
+ tpcTree.Fill();
delete tpc;
}
}
}
}
}
- tpc_tree.Write();
- trd_tree.Write();
+ tpcTree.Write();
+ trdTree.Write();
cout<<"Total number of found tracks: "<<found<<endl;
//
Int_t timeBins = fTrSec[0]->GetNumberOfTimeBins();
- Float_t foundMin = fMinClustersInTrack * timeBins;
+ Float_t foundMin = fgkMinClustersInTrack * timeBins;
Int_t nseed = 0;
Int_t found = 0;
Int_t innerTB = fTrSec[0]->GetInnerTimeBin();
nseed++;
AliTRDtrack* seed2 = new AliTRDtrack(*seed);
- seed2->ResetCovariance();
+ //seed2->ResetCovariance();
AliTRDtrack *pt = new AliTRDtrack(*seed2,seed2->GetAlpha());
AliTRDtrack &t=*pt;
FollowProlongation(t, innerTB);
if (t.GetNumberOfClusters() >= foundMin) {
UseClusters(&t);
- CookLabel(pt, 1-fLabelFraction);
+ CookLabel(pt, 1-fgkLabelFraction);
// t.CookdEdx();
}
found++;
// Find tracks for the seeds in the TRD
Int_t timeBins = fTrSec[0]->GetNumberOfTimeBins();
- Int_t nSteps = (Int_t) (fSeedDepth / fSeedStep);
- Int_t gap = (Int_t) (timeBins * fSeedGap);
- Int_t step = (Int_t) (timeBins * fSeedStep);
+ Int_t nSteps = (Int_t) (fgkSeedDepth / fgkSeedStep);
+ Int_t gap = (Int_t) (timeBins * fgkSeedGap);
+ Int_t step = (Int_t) (timeBins * fgkSeedStep);
// make a first turn with tight cut on initial curvature
for(Int_t turn = 1; turn <= 2; turn++) {
if(turn == 2) {
- nSteps = (Int_t) (fSeedDepth / (3*fSeedStep));
- step = (Int_t) (timeBins * (3*fSeedStep));
+ nSteps = (Int_t) (fgkSeedDepth / (3*fgkSeedStep));
+ step = (Int_t) (timeBins * (3*fgkSeedStep));
}
for(Int_t i=0; i<nSteps; i++) {
Int_t outer=timeBins-1-i*step;
FollowProlongation(t,innerTB);
if (t.GetNumberOfClusters() >= foundMin) {
UseClusters(&t);
- CookLabel(pt, 1-fLabelFraction);
+ CookLabel(pt, 1-fgkLabelFraction);
t.CookdEdx();
found++;
// cout<<found<<'\r';
sprintf(tname,"TRDb_%d",GetEventNumber());
TTree trdTree(tname,"Back propagated TRD tracks at outer TRD time bin");
- AliTRDtrack *otrack_trd=0;
- trdTree.Branch("tracks","AliTRDtrack",&otrack_trd,32000,0);
+ AliTRDtrack *otrackTRD=0;
+ trdTree.Branch("tracks","AliTRDtrack",&otrackTRD,32000,0);
if (IsStoringBarrel()) SetBarrelTree("back");
out->cd();
Int_t found=0;
Int_t nseed=fSeeds->GetEntriesFast();
- // Float_t foundMin = fMinClustersInTrack * fTimeBinsPerPlane * fGeom->Nplan();
+ // Float_t foundMin = fgkMinClustersInTrack * fTimeBinsPerPlane * fGeom->Nplan();
Float_t foundMin = 40;
- Int_t outermost_tb = fTrSec[0]->GetOuterTimeBin();
+ Int_t outermostTB = fTrSec[0]->GetOuterTimeBin();
for (Int_t i=0; i<nseed; i++) {
Int_t expectedClr = FollowBackProlongation(s);
if (IsStoringBarrel()) {
- StoreBarrelTrack(ps, kLastPlane, kTrackBack);
+ StoreBarrelTrack(ps, fgkLastPlane, kTrackBack);
fBarrelTree->Fill();
}
Int_t foundClr = s.GetNumberOfClusters();
- Int_t last_tb = fTrSec[0]->GetLayerNumber(s.GetX());
+ Int_t lastTB = fTrSec[0]->GetLayerNumber(s.GetX());
// printf("seed %d: found %d out of %d expected clusters, Min is %f\n",
// i, foundClr, expectedClr, foundMin);
if (foundClr >= foundMin) {
if(foundClr >= 2) {
s.CookdEdx();
- CookLabel(ps, 1-fLabelFraction);
+ CookLabel(ps, 1-fgkLabelFraction);
UseClusters(ps);
}
// Propagate to outer reference plane [SR, GSI, 18.02.2003]
ps->PropagateTo(364.8);
- otrack_trd=ps;
+ otrackTRD=ps;
trdTree.Fill();
found++;
// cout<<found<<'\r';
}
- if(((expectedClr < 10) && (last_tb == outermost_tb)) ||
+ if(((expectedClr < 10) && (lastTB == outermostTB)) ||
((expectedClr >= 10) &&
(((Float_t) foundClr) / ((Float_t) expectedClr) >=
- fMinFractionOfFoundClusters) && (last_tb == outermost_tb))) {
+ fgkMinFractionOfFoundClusters) && (lastTB == outermostTB))) {
- Double_t x_tof = 375.5;
+ Double_t xTOF = 375.5;
- if(PropagateToOuterPlane(s,x_tof)) {
+ if(PropagateToOuterPlane(s,xTOF)) {
AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
otrack = pt;
tofTree1.Fill();
delete pt;
- x_tof = 381.5;
+ xTOF = 381.5;
- if(PropagateToOuterPlane(s,x_tof)) {
+ if(PropagateToOuterPlane(s,xTOF)) {
AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
otrack = pt;
tofTree2.Fill();
delete pt;
- Double_t x_phos = 460.;
+ Double_t xPHOS = 460.;
- if(PropagateToOuterPlane(s,x_phos)) {
+ if(PropagateToOuterPlane(s,xPHOS)) {
AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
otrack = pt;
phosTree.Fill();
delete pt;
- Double_t x_rich = 490+1.267;
+ Double_t xRICH = 490+1.267;
- if(PropagateToOuterPlane(s,x_rich)) {
+ if(PropagateToOuterPlane(s,xRICH)) {
AliTPCtrack *pt = new AliTPCtrack(*ps,ps->GetAlpha());
otrack = pt;
richTree.Fill();
track->SetSeedLabel(lbl);
fNseeds++;
- /*Int_t expectedClr = */FollowBackProlongation(*track);
-
+ Int_t expectedClr = FollowBackProlongation(*track);
+ if (track->GetNumberOfClusters()<expectedClr/3){
+ AliTRDtrack *track1 = new AliTRDtrack(*seed);
+ track1->SetSeedLabel(lbl);
+ FollowBackProlongation(*track1);
+ AliTRDtrack *track2= new AliTRDtrack(*seed);
+ track->SetSeedLabel(lbl);
+ FollowBackProlongation(*track2);
+ delete track1;
+ delete track2;
+ }
+
Int_t foundClr = track->GetNumberOfClusters();
if (foundClr >= foundMin) {
if(foundClr >= 2) {
track->CookdEdx();
-// CookLabel(track, 1-fLabelFraction);
+// CookLabel(track, 1-fgkLabelFraction);
UseClusters(track);
}
//found++;
}
- if (track->PropagateTo(376.)) { //Propagation to the TOF (I.Belikov)
- seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
- found++;
+ //Propagation to the TOF (I.Belikov)
+
+ if (track->GetStop()==kFALSE){
+ Double_t xTOF = 375.5;
+ PropagateToOuterPlane(*track,xTOF);
+
+ Double_t xtof=378.;
+ Double_t c2=track->GetC()*xtof - track->GetEta();
+ if (TMath::Abs(c2)>=0.9999999){
+ delete track;
+ continue;
+ }
+
+ Double_t ymax=xtof*TMath::Tan(0.5*AliTRDgeometry::GetAlpha());
+ Double_t y=track->GetYat(xtof);
+ if (y > ymax) {
+ if (!track->Rotate(AliTRDgeometry::GetAlpha())) {
+ delete track;
+ return 1;
+ }
+ } else if (y <-ymax) {
+ if (!track->Rotate(-AliTRDgeometry::GetAlpha())) {
+ delete track;
+ return 1;
+ }
+ }
+
+ if (track->PropagateTo(xtof)) {
+ seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
+ if (track->GetNumberOfClusters()>foundMin) found++;
+ }
+ }else{
+ if (track->GetNumberOfClusters()>15&&track->GetNumberOfClusters()>0.5*expectedClr){
+ seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
+ seed->UpdateTrackParams(track, AliESDtrack::kTRDStop);
+ found++;
+ }
}
+ delete track;
+
+ //End of propagation to the TOF
+ //if (foundClr>foundMin)
+ // seed->UpdateTrackParams(track, AliESDtrack::kTRDout);
+
+
}
cerr<<"Number of seeds: "<<fNseeds<<endl;
cerr<<"Number of back propagated TRD tracks: "<<found<<endl;
+ fSeeds->Clear(); fNseeds=0;
+
+ return 0;
+
+}
+
+//_____________________________________________________________________________
+Int_t AliTRDtracker::RefitInward(AliESD* event)
+{
+ //
+ // Refits tracks within the TRD. The ESD event is expected to contain seeds
+ // at the outer part of the TRD.
+ // The tracks are propagated to the innermost time bin
+ // of the TRD and the ESD event is updated
+ // Origin: Thomas KUHR (Thomas.Kuhr@cern.ch)
+ //
+
+ Int_t timeBins = fTrSec[0]->GetNumberOfTimeBins();
+ Float_t foundMin = fgkMinClustersInTrack * timeBins;
+ Int_t nseed = 0;
+ Int_t found = 0;
+ Int_t innerTB = fTrSec[0]->GetInnerTimeBin();
+
+ Int_t n = event->GetNumberOfTracks();
+ for (Int_t i=0; i<n; i++) {
+ AliESDtrack* seed=event->GetTrack(i);
+ ULong_t status=seed->GetStatus();
+ if ( (status & AliESDtrack::kTRDout ) == 0 ) continue;
+ if ( (status & AliESDtrack::kTRDin) != 0 ) continue;
+ nseed++;
+
+ AliTRDtrack* seed2 = new AliTRDtrack(*seed);
+ seed2->ResetCovariance(5.);
+ AliTRDtrack *pt = new AliTRDtrack(*seed2,seed2->GetAlpha());
+ UInt_t * indexes2 = seed2->GetIndexes();
+ UInt_t * indexes3 = pt->GetBackupIndexes();
+ for (Int_t i=0;i<200;i++) {
+ if (indexes2[i]==0) break;
+ indexes3[i] = indexes2[i];
+ }
+ //AliTRDtrack *pt = seed2;
+ AliTRDtrack &t=*pt;
+ FollowProlongation(t, innerTB);
+
+ if (t.GetNumberOfClusters()<seed->GetTRDclusters(indexes3)*0.5){
+ // debug - why we dont go back?
+ AliTRDtrack *pt2 = new AliTRDtrack(*seed2,seed2->GetAlpha());
+ UInt_t * indexes2 = seed2->GetIndexes();
+ UInt_t * indexes3 = pt2->GetBackupIndexes();
+ for (Int_t i=0;i<200;i++) {
+ if (indexes2[i]==0) break;
+ indexes3[i] = indexes2[i];
+ }
+ FollowProlongation(*pt2, innerTB);
+ delete pt2;
+ }
+
+ if (t.GetNumberOfClusters() >= foundMin) {
+ // UseClusters(&t);
+ //CookLabel(pt, 1-fgkLabelFraction);
+ // t.CookdEdx();
+ }
+ found++;
+// cout<<found<<'\r';
+
+ if(PropagateToTPC(t)) {
+ seed->UpdateTrackParams(pt, AliESDtrack::kTRDrefit);
+ }
+ delete seed2;
+ delete pt;
+ }
+
+ cout<<"Number of loaded seeds: "<<nseed<<endl;
+ cout<<"Number of found tracks from loaded seeds: "<<found<<endl;
+
return 0;
}
Float_t wYrt, wYclosest, wYcorrect, wYwindow;
Float_t wZrt, wZclosest, wZcorrect, wZwindow;
Float_t wPx, wPy, wPz, wC;
- Double_t Px, Py, Pz;
+ Double_t px, py, pz;
Float_t wSigmaC2, wSigmaTgl2, wSigmaY2, wSigmaZ2;
+ Int_t lastplane = GetLastPlane(&t);
Int_t trackIndex = t.GetLabel();
Int_t ns=Int_t(2*TMath::Pi()/AliTRDgeometry::GetAlpha()+0.5);
- Int_t try_again=fMaxGap;
+ Int_t tryAgain=fMaxGap;
Double_t alpha=t.GetAlpha();
alpha = TVector2::Phi_0_2pi(alpha);
Int_t s=Int_t(alpha/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;
- Double_t rad_length, rho, x, dx, y, ymax, z;
+ Double_t radLength, rho, x, dx, y, ymax, z;
Int_t expectedNumberOfClusters = 0;
Bool_t lookForCluster;
y = t.GetY(); z = t.GetZ();
// first propagate to the inner surface of the current time bin
- fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()-dx/2; y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
y = t.GetY();
ymax = x*TMath::Tan(0.5*alpha);
if (y > ymax) {
s = (s+1) % ns;
if (!t.Rotate(alpha)) break;
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
} else if (y <-ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) break;
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
}
y = t.GetY(); z = t.GetZ();
// now propagate to the middle plane of the next time bin
- fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr-1)->GetX(); y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
y = t.GetY();
ymax = x*TMath::Tan(0.5*alpha);
if (y > ymax) {
s = (s+1) % ns;
if (!t.Rotate(alpha)) break;
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
} else if (y <-ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) break;
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
}
wIndex = (Float_t) t.GetLabel();
wTB = nr;
- AliTRDpropagationLayer& time_bin=*(fTrSec[s]->GetLayer(nr-1));
+ AliTRDpropagationLayer& timeBin=*(fTrSec[s]->GetLayer(nr-1));
Double_t sy2=ExpectedSigmaY2(x,t.GetTgl(),t.GetPt());
Double_t sz2=ExpectedSigmaZ2(x,t.GetTgl());
wYrt = (Float_t) y;
wZrt = (Float_t) z;
wYwindow = (Float_t) road;
- t.GetPxPyPz(Px,Py,Pz);
- wPx = (Float_t) Px;
- wPy = (Float_t) Py;
- wPz = (Float_t) Pz;
+ t.GetPxPyPz(px,py,pz);
+ wPx = (Float_t) px;
+ wPy = (Float_t) py;
+ wPz = (Float_t) pz;
wC = (Float_t) t.GetC();
wSigmaC2 = (Float_t) t.GetSigmaC2();
wSigmaTgl2 = (Float_t) t.GetSigmaTgl2();
wSigmaZ2 = (Float_t) t.GetSigmaZ2();
wChi2 = -1;
- if (road>fWideRoad) {
- if (t.GetNumberOfClusters()>4)
- cerr<<t.GetNumberOfClusters()
- <<"FindProlongation warning: Too broad road !\n";
- return 0;
- }
AliTRDcluster *cl=0;
UInt_t index=0;
- Double_t max_chi2=fMaxChi2;
+ Double_t maxChi2=fgkMaxChi2;
wYclosest = 12345678;
wYcorrect = 12345678;
wZwindow = TMath::Sqrt(2.25 * 12 * sz2);
// Find the closest correct cluster for debugging purposes
- if (time_bin) {
+ if (timeBin) {
Float_t minDY = 1000000;
- for (Int_t i=0; i<time_bin; i++) {
- AliTRDcluster* c=(AliTRDcluster*)(time_bin[i]);
+ for (Int_t i=0; i<timeBin; i++) {
+ AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
if((c->GetLabel(0) != trackIndex) &&
(c->GetLabel(1) != trackIndex) &&
(c->GetLabel(2) != trackIndex)) continue;
// Now go for the real cluster search
- if (time_bin) {
-
- for (Int_t i=time_bin.Find(y-road); i<time_bin; i++) {
- AliTRDcluster* c=(AliTRDcluster*)(time_bin[i]);
- if (c->GetY() > y+road) break;
- if (c->IsUsed() > 0) continue;
- if((c->GetZ()-z)*(c->GetZ()-z) > 3 * sz2) continue;
-
- Double_t h01 = GetTiltFactor(c);
- Double_t chi2=t.GetPredictedChi2(c,h01);
-
- if (chi2 > max_chi2) continue;
- max_chi2=chi2;
- cl=c;
- index=time_bin.GetIndex(i);
- }
+ if (timeBin) {
+ //
+ //find cluster in history
+ cl =0;
+
+ AliTRDcluster * cl0 = timeBin[0];
+ if (!cl0) {
+ continue;
+ }
+ Int_t plane = fGeom->GetPlane(cl0->GetDetector());
+ if (plane>lastplane) continue;
+ Int_t timebin = cl0->GetLocalTimeBin();
+ AliTRDcluster * cl2= GetCluster(&t,plane, timebin);
+ if (cl2) {
+ cl =cl2;
+ Double_t h01 = GetTiltFactor(cl);
+ maxChi2=t.GetPredictedChi2(cl,h01);
+ }
+ if ((!cl) && road>fgkWideRoad) {
+ //if (t.GetNumberOfClusters()>4)
+ // cerr<<t.GetNumberOfClusters()
+ // <<"FindProlongation warning: Too broad road !\n";
+ continue;
+ }
+
+
+ if(!cl){
+
+ for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
+ AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
+ if (c->GetY() > y+road) break;
+ if (c->IsUsed() > 0) continue;
+ if((c->GetZ()-z)*(c->GetZ()-z) > 3 * sz2) continue;
+
+ Double_t h01 = GetTiltFactor(c);
+ Double_t chi2=t.GetPredictedChi2(c,h01);
+
+ if (chi2 > maxChi2) continue;
+ maxChi2=chi2;
+ cl=c;
+ index=timeBin.GetIndex(i);
+ }
+ }
if(!cl) {
- for (Int_t i=time_bin.Find(y-road); i<time_bin; i++) {
- AliTRDcluster* c=(AliTRDcluster*)(time_bin[i]);
+ for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
+ AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
if (c->GetY() > y+road) break;
if (c->IsUsed() > 0) continue;
Double_t h01 = GetTiltFactor(c);
Double_t chi2=t.GetPredictedChi2(c, h01);
- if (chi2 > max_chi2) continue;
- max_chi2=chi2;
+ if (chi2 > maxChi2) continue;
+ maxChi2=chi2;
cl=c;
- index=time_bin.GetIndex(i);
+ index=timeBin.GetIndex(i);
}
}
-
-
if (cl) {
wYclosest = cl->GetY();
wZclosest = cl->GetZ();
Double_t h01 = GetTiltFactor(cl);
t.SetSampledEdx(cl->GetQ()/dx,t.GetNumberOfClusters());
- if(!t.Update(cl,max_chi2,index,h01)) {
- if(!try_again--) return 0;
+ //printf("Track position\t%f\t%f\t%f\n",t.GetX(),t.GetY(),t.GetZ());
+ //printf("Cluster position\t%d\t%f\t%f\n",cl->GetLocalTimeBin(),cl->GetY(),cl->GetZ());
+ Int_t det = cl->GetDetector();
+ Int_t plane = fGeom->GetPlane(det);
+
+ if(!t.UpdateMI(cl,maxChi2,index,h01,plane)) {
+ //if(!t.Update(cl,maxChi2,index,h01)) {
+ //if(!tryAgain--) return 0;
}
- else try_again=fMaxGap;
+ else tryAgain=fMaxGap;
}
else {
- if (try_again==0) break;
- try_again--;
+ //if (tryAgain==0) break;
+ tryAgain--;
}
/*
Float_t wYrt, wYclosest, wYcorrect, wYwindow;
Float_t wZrt, wZclosest, wZcorrect, wZwindow;
Float_t wPx, wPy, wPz, wC;
- Double_t Px, Py, Pz;
+ Double_t px, py, pz;
Float_t wSigmaC2, wSigmaTgl2, wSigmaY2, wSigmaZ2;
Int_t trackIndex = t.GetLabel();
- Int_t try_again=fMaxGap;
+ Int_t tryAgain=fMaxGap;
Double_t alpha=t.GetAlpha();
TVector2::Phi_0_2pi(alpha);
Int_t s;
Int_t outerTB = fTrSec[0]->GetOuterTimeBin();
- Double_t rad_length, rho, x, dx, y, ymax = 0, z;
+ Double_t radLength, rho, x, dx, y, ymax = 0, z;
Bool_t lookForCluster;
Int_t expectedNumberOfClusters = 0;
alpha=AliTRDgeometry::GetAlpha(); // note: change in meaning
- Int_t nRefPlane = kFirstPlane;
+ Int_t nRefPlane = fgkFirstPlane;
Bool_t isNewLayer = kFALSE;
Double_t chi2;
Double_t minDY;
-
- for (Int_t nr=fTrSec[0]->GetLayerNumber(t.GetX()); nr<outerTB+1; nr++) {
+ Int_t zone =-10;
+ Int_t nr;
+ for (nr=fTrSec[0]->GetLayerNumber(t.GetX()); nr<outerTB+1; nr++) {
y = t.GetY();
z = t.GetZ();
// first propagate to the outer surface of the current time bin
s = t.GetSector();
- fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()+dx/2;
y = t.GetY();
z = t.GetZ();
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
+ // if (!AdjustSector(&t)) break;
+ //
+ // MI -fix untill correct material desription will be implemented
+ //
+ Float_t angle = t.GetAlpha(); // MI - if rotation - we go through the material -
if (!AdjustSector(&t)) break;
+ if (TMath::Abs(angle - t.GetAlpha())>0.000001) break; //better to stop track
+ Int_t currentzone = fTrSec[s]->GetLayer(nr)->GetZone(z);
+ if (currentzone==-10) break; // we are in the frame
+ if (currentzone>-10){ // layer knows where we are
+ if (zone==-10) zone = currentzone;
+ if (zone!=currentzone) break;
+ }
+ //
+ //
s = t.GetSector();
- if (!t.PropagateTo(x,rad_length,rho)) break;
+ if (!t.PropagateTo(x,radLength,rho)) break;
y = t.GetY();
z = t.GetZ();
z = t.GetZ();
// now propagate to the middle plane of the next time bin
- fTrSec[s]->GetLayer(nr+1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr+1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr+1)->GetX();
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
if (!AdjustSector(&t)) break;
s = t.GetSector();
- if(!t.PropagateTo(x,rad_length,rho)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
y = t.GetY();
z = t.GetZ();
wIndex = (Float_t) t.GetLabel();
wTB = fTrSec[s]->GetLayer(nr+1)->GetTimeBinIndex();
- AliTRDpropagationLayer& time_bin=*(fTrSec[s]->GetLayer(nr+1));
+ AliTRDpropagationLayer& timeBin=*(fTrSec[s]->GetLayer(nr+1));
Double_t sy2=ExpectedSigmaY2(t.GetX(),t.GetTgl(),t.GetPt());
Double_t sz2=ExpectedSigmaZ2(t.GetX(),t.GetTgl());
if((t.GetSigmaY2() + sy2) < 0) break;
wYrt = (Float_t) y;
wZrt = (Float_t) z;
wYwindow = (Float_t) road;
- t.GetPxPyPz(Px,Py,Pz);
- wPx = (Float_t) Px;
- wPy = (Float_t) Py;
- wPz = (Float_t) Pz;
+ t.GetPxPyPz(px,py,pz);
+ wPx = (Float_t) px;
+ wPy = (Float_t) py;
+ wPz = (Float_t) pz;
wC = (Float_t) t.GetC();
wSigmaC2 = (Float_t) t.GetSigmaC2();
wSigmaTgl2 = (Float_t) t.GetSigmaTgl2();
wSigmaZ2 = (Float_t) t.GetSigmaZ2();
wChi2 = -1;
- if (road>fWideRoad) {
+ if (road>fgkWideRoad) {
if (t.GetNumberOfClusters()>4)
cerr<<t.GetNumberOfClusters()
<<"FindProlongation warning: Too broad road !\n";
AliTRDcluster *cl=0;
UInt_t index=0;
- Double_t max_chi2=fMaxChi2;
+ Double_t maxChi2=fgkMaxChi2;
if (isNewLayer) {
road = 3 * road;
//sz2 = 3 * sz2;
- max_chi2 = 10 * fMaxChi2;
+ maxChi2 = 10 * fgkMaxChi2;
}
- if (nRefPlane == kFirstPlane) max_chi2 = 20 * fMaxChi2;
- if (nRefPlane == kFirstPlane+2) max_chi2 = 15 * fMaxChi2;
- if (t.GetNRotate() > 0) max_chi2 = 3 * max_chi2;
+ if (nRefPlane == fgkFirstPlane) maxChi2 = 20 * fgkMaxChi2;
+ if (nRefPlane == fgkFirstPlane+2) maxChi2 = 15 * fgkMaxChi2;
+ if (t.GetNRotate() > 0) maxChi2 = 3 * maxChi2;
wYclosest = 12345678;
wZwindow = TMath::Sqrt(2.25 * 12 * sz2);
// Find the closest correct cluster for debugging purposes
- if (time_bin) {
+ if (timeBin) {
minDY = 1000000;
- for (Int_t i=0; i<time_bin; i++) {
- AliTRDcluster* c=(AliTRDcluster*)(time_bin[i]);
+ for (Int_t i=0; i<timeBin; i++) {
+ AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
if((c->GetLabel(0) != trackIndex) &&
(c->GetLabel(1) != trackIndex) &&
(c->GetLabel(2) != trackIndex)) continue;
// Now go for the real cluster search
- if (time_bin) {
+ if (timeBin) {
- for (Int_t i=time_bin.Find(y-road); i<time_bin; i++) {
- AliTRDcluster* c=(AliTRDcluster*)(time_bin[i]);
+ for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
+ AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
if (c->GetY() > y+road) break;
if (c->IsUsed() > 0) continue;
if((c->GetZ()-z)*(c->GetZ()-z) > 3 * sz2) continue;
Double_t h01 = GetTiltFactor(c);
chi2=t.GetPredictedChi2(c,h01);
- if (chi2 > max_chi2) continue;
- max_chi2=chi2;
+ if (chi2 > maxChi2) continue;
+ maxChi2=chi2;
cl=c;
- index=time_bin.GetIndex(i);
+ index=timeBin.GetIndex(i);
//check is correct
if((c->GetLabel(0) != trackIndex) &&
if(!cl) {
- for (Int_t i=time_bin.Find(y-road); i<time_bin; i++) {
- AliTRDcluster* c=(AliTRDcluster*)(time_bin[i]);
+ for (Int_t i=timeBin.Find(y-road); i<timeBin; i++) {
+ AliTRDcluster* c=(AliTRDcluster*)(timeBin[i]);
if (c->GetY() > y+road) break;
if (c->IsUsed() > 0) continue;
Double_t h01 = GetTiltFactor(c);
chi2=t.GetPredictedChi2(c,h01);
- if (chi2 > max_chi2) continue;
- max_chi2=chi2;
+ if (chi2 > maxChi2) continue;
+ maxChi2=chi2;
cl=c;
- index=time_bin.GetIndex(i);
+ index=timeBin.GetIndex(i);
}
}
t.SetSampledEdx(cl->GetQ()/dx,t.GetNumberOfClusters());
Double_t h01 = GetTiltFactor(cl);
- if(!t.Update(cl,max_chi2,index,h01)) {
- if(!try_again--) return 0;
+ Int_t det = cl->GetDetector();
+ Int_t plane = fGeom->GetPlane(det);
+
+ if(!t.UpdateMI(cl,maxChi2,index,h01,plane)) {
+ //if(!t.Update(cl,maxChi2,index,h01)) {
+ if(!tryAgain--) return 0;
}
- else try_again=fMaxGap;
+ else tryAgain=fMaxGap;
}
else {
- if (try_again==0) break;
- try_again--;
+ if (tryAgain==0) break;
+ tryAgain--;
//if (minDY < 1000000 && isNewLayer)
//cout << "\t" << nRefPlane << "\t" << "\t" << t.GetNRotate() << "\t" <<
- // road << "\t" << minDY << "\t" << chi2 << "\t" << wChi2 << "\t" << max_chi2 << endl;
+ // road << "\t" << minDY << "\t" << chi2 << "\t" << wChi2 << "\t" << maxChi2 << endl;
}
}
}
}
+ if (nr<outerTB)
+ t.SetStop(kTRUE);
+ else
+ t.SetStop(kFALSE);
return expectedNumberOfClusters;
}
+//---------------------------------------------------------------------------
+Int_t AliTRDtracker::Refit(AliTRDtrack& t, Int_t rf)
+{
+ // Starting from current position on track=t this function tries
+ // to extrapolate the track up to timeBin=0 and to reuse already
+ // assigned clusters. Returns the number of clusters
+ // expected to be found in sensitive layers
+ // get indices of assigned clusters for each layer
+ // Origin: Thomas KUHR (Thomas.Kuhr@cern.ch)
+
+ Int_t iCluster[90];
+ for (Int_t i = 0; i < 90; i++) iCluster[i] = 0;
+ for (Int_t i = 0; i < t.GetNumberOfClusters(); i++) {
+ Int_t index = t.GetClusterIndex(i);
+ AliTRDcluster *cl=(AliTRDcluster*) GetCluster(index);
+ if (!cl) continue;
+ Int_t detector=cl->GetDetector();
+ Int_t localTimeBin=cl->GetLocalTimeBin();
+ Int_t sector=fGeom->GetSector(detector);
+ Int_t plane=fGeom->GetPlane(detector);
+
+ Int_t trackingSector = CookSectorIndex(sector);
+
+ Int_t gtb = fTrSec[trackingSector]->CookTimeBinIndex(plane,localTimeBin);
+ if(gtb < 0) continue;
+ Int_t layer = fTrSec[trackingSector]->GetLayerNumber(gtb);
+ iCluster[layer] = index;
+ }
+ t.ResetClusters();
+
+ Int_t ns=Int_t(2*TMath::Pi()/AliTRDgeometry::GetAlpha()+0.5);
+
+ Double_t alpha=t.GetAlpha();
+ alpha = TVector2::Phi_0_2pi(alpha);
+
+ Int_t s=Int_t(alpha/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;
+ Double_t radLength, rho, x, dx, y, ymax, z;
+
+ Int_t expectedNumberOfClusters = 0;
+ Bool_t lookForCluster;
+
+ alpha=AliTRDgeometry::GetAlpha(); // note: change in meaning
+
+
+ for (Int_t nr=fTrSec[0]->GetLayerNumber(t.GetX()); nr>rf; nr--) {
+
+ y = t.GetY(); z = t.GetZ();
+
+ // first propagate to the inner surface of the current time bin
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
+ x = fTrSec[s]->GetLayer(nr)->GetX()-dx/2; y = t.GetY(); z = t.GetZ();
+ if(!t.PropagateTo(x,radLength,rho)) break;
+ y = t.GetY();
+ ymax = x*TMath::Tan(0.5*alpha);
+ if (y > ymax) {
+ s = (s+1) % ns;
+ if (!t.Rotate(alpha)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
+ } else if (y <-ymax) {
+ s = (s-1+ns) % ns;
+ if (!t.Rotate(-alpha)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
+ }
+
+ y = t.GetY(); z = t.GetZ();
+
+ // now propagate to the middle plane of the next time bin
+ fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
+ x = fTrSec[s]->GetLayer(nr-1)->GetX(); y = t.GetY(); z = t.GetZ();
+ if(!t.PropagateTo(x,radLength,rho)) break;
+ y = t.GetY();
+ ymax = x*TMath::Tan(0.5*alpha);
+ if (y > ymax) {
+ s = (s+1) % ns;
+ if (!t.Rotate(alpha)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
+ } else if (y <-ymax) {
+ s = (s-1+ns) % ns;
+ if (!t.Rotate(-alpha)) break;
+ if(!t.PropagateTo(x,radLength,rho)) break;
+ }
+
+ if(lookForCluster) expectedNumberOfClusters++;
+
+ // use assigned cluster
+ if (!iCluster[nr-1]) continue;
+ AliTRDcluster *cl=(AliTRDcluster*)GetCluster(iCluster[nr-1]);
+ Double_t h01 = GetTiltFactor(cl);
+ Double_t chi2=t.GetPredictedChi2(cl, h01);
+ t.SetSampledEdx(cl->GetQ()/dx,t.GetNumberOfClusters());
+ t.Update(cl,chi2,iCluster[nr-1],h01);
+ }
+
+ return expectedNumberOfClusters;
+}
+
//___________________________________________________________________
Int_t AliTRDtracker::PropagateToOuterPlane(AliTRDtrack& t, Double_t xToGo)
Int_t s=Int_t(alpha/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;
Bool_t lookForCluster;
- Double_t rad_length, rho, x, dx, y, ymax, z;
+ Double_t radLength, rho, x, dx, y, ymax, z;
x = t.GetX();
y = t.GetY(); z = t.GetZ();
// first propagate to the outer surface of the current time bin
- fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()+dx/2; y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
y = t.GetY();
ymax = x*TMath::Tan(0.5*alpha);
if (y > ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) return 0;
}
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
y = t.GetY(); z = t.GetZ();
// now propagate to the middle plane of the next time bin
- fTrSec[s]->GetLayer(nr+1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr+1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr+1)->GetX(); y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
y = t.GetY();
ymax = x*TMath::Tan(0.5*alpha);
if (y > ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) return 0;
}
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
}
return 1;
}
Int_t s=Int_t(alpha/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;
Bool_t lookForCluster;
- Double_t rad_length, rho, x, dx, y, /*ymax,*/ z;
+ Double_t radLength, rho, x, dx, y, /*ymax,*/ z;
x = t.GetX();
z = t.GetZ();
// first propagate to the outer surface of the current time bin
- fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()-dx/2;
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
AdjustSector(&t);
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
y = t.GetY();
z = t.GetZ();
// now propagate to the middle plane of the next time bin
- fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
+ fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,radLength,lookForCluster);
x = fTrSec[s]->GetLayer(nr-1)->GetX();
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
AdjustSector(&t);
- if(!t.PropagateTo(x,rad_length,rho)) return 0;
+ if(!t.PropagateTo(x,radLength,rho)) return 0;
}
return 1;
}
while (ncl--) {
// printf("\r %d left ",ncl);
AliTRDcluster *c=(AliTRDcluster*)fClusters->UncheckedAt(ncl);
- Int_t detector=c->GetDetector(), local_time_bin=c->GetLocalTimeBin();
+ Int_t detector=c->GetDetector();
+ Int_t localTimeBin=c->GetLocalTimeBin();
Int_t sector=fGeom->GetSector(detector);
Int_t plane=fGeom->GetPlane(detector);
- Int_t tracking_sector = CookSectorIndex(sector);
+ Int_t trackingSector = CookSectorIndex(sector);
- Int_t gtb = fTrSec[tracking_sector]->CookTimeBinIndex(plane,local_time_bin);
+ Int_t gtb = fTrSec[trackingSector]->CookTimeBinIndex(plane,localTimeBin);
if(gtb < 0) continue;
- Int_t layer = fTrSec[tracking_sector]->GetLayerNumber(gtb);
+ Int_t layer = fTrSec[trackingSector]->GetLayerNumber(gtb);
index=ncl;
- fTrSec[tracking_sector]->GetLayer(layer)->InsertCluster(c,index);
+ fTrSec[trackingSector]->GetLayer(layer)->InsertCluster(c,index);
}
printf("\r\n");
cout<<"\n LoadSectors: sorting "<<ncl<<" clusters"<<endl;
UInt_t index;
+ for (Int_t ichamber=0;ichamber<5;ichamber++)
+ for (Int_t isector=0;isector<18;isector++){
+ fHoles[ichamber][isector]=kTRUE;
+ }
+
+
while (ncl--) {
// printf("\r %d left ",ncl);
AliTRDcluster *c=(AliTRDcluster*)fClusters->UncheckedAt(ncl);
- Int_t detector=c->GetDetector(), local_time_bin=c->GetLocalTimeBin();
+ Int_t detector=c->GetDetector();
+ Int_t localTimeBin=c->GetLocalTimeBin();
Int_t sector=fGeom->GetSector(detector);
Int_t plane=fGeom->GetPlane(detector);
+
+ Int_t trackingSector = CookSectorIndex(sector);
+ if (c->GetLabel(0)>0){
+ Int_t chamber = fGeom->GetChamber(detector);
+ fHoles[chamber][trackingSector]=kFALSE;
+ }
- Int_t tracking_sector = CookSectorIndex(sector);
-
- Int_t gtb = fTrSec[tracking_sector]->CookTimeBinIndex(plane,local_time_bin);
+ Int_t gtb = fTrSec[trackingSector]->CookTimeBinIndex(plane,localTimeBin);
if(gtb < 0) continue;
- Int_t layer = fTrSec[tracking_sector]->GetLayerNumber(gtb);
+ Int_t layer = fTrSec[trackingSector]->GetLayerNumber(gtb);
index=ncl;
- fTrSec[tracking_sector]->GetLayer(layer)->InsertCluster(c,index);
+ fTrSec[trackingSector]->GetLayer(layer)->InsertCluster(c,index);
}
printf("\r\n");
-
+ //
+ //
+ /*
+ for (Int_t isector=0;isector<18;isector++){
+ for (Int_t ichamber=0;ichamber<5;ichamber++)
+ if (fHoles[ichamber][isector]!=fGeom->IsHole(0,ichamber,17-isector))
+ printf("Problem \t%d\t%d\t%d\t%d\n",isector,ichamber,fHoles[ichamber][isector],
+ fGeom->IsHole(0,ichamber,17-isector));
+ }
+ */
return 0;
}
}
Double_t x[5], c[15];
- Int_t max_sec=AliTRDgeometry::kNsect;
+ Int_t maxSec=AliTRDgeometry::kNsect;
Double_t alpha=AliTRDgeometry::GetAlpha();
Double_t shift=AliTRDgeometry::GetAlpha()/2.;
Double_t x1 =fTrSec[0]->GetX(i1);
Double_t xx2=fTrSec[0]->GetX(i2);
- for (Int_t ns=0; ns<max_sec; ns++) {
+ for (Int_t ns=0; ns<maxSec; ns++) {
- Int_t nl2 = *(fTrSec[(ns-2+max_sec)%max_sec]->GetLayer(i2));
- Int_t nl=(*fTrSec[(ns-1+max_sec)%max_sec]->GetLayer(i2));
+ Int_t nl2 = *(fTrSec[(ns-2+maxSec)%maxSec]->GetLayer(i2));
+ Int_t nl=(*fTrSec[(ns-1+maxSec)%maxSec]->GetLayer(i2));
Int_t nm=(*fTrSec[ns]->GetLayer(i2));
- Int_t nu=(*fTrSec[(ns+1)%max_sec]->GetLayer(i2));
- Int_t nu2=(*fTrSec[(ns+2)%max_sec]->GetLayer(i2));
+ Int_t nu=(*fTrSec[(ns+1)%maxSec]->GetLayer(i2));
+ Int_t nu2=(*fTrSec[(ns+2)%maxSec]->GetLayer(i2));
AliTRDpropagationLayer& r1=*(fTrSec[ns]->GetLayer(i1));
if (js<nl2) {
if(turn != 2) continue;
- AliTRDpropagationLayer& r2=*(fTrSec[(ns-2+max_sec)%max_sec]->GetLayer(i2));
+ AliTRDpropagationLayer& r2=*(fTrSec[(ns-2+maxSec)%maxSec]->GetLayer(i2));
cl=r2[js];
y2=cl->GetY(); z2=cl->GetZ();
}
else if (js<nl2+nl) {
if(turn != 1) continue;
- AliTRDpropagationLayer& r2=*(fTrSec[(ns-1+max_sec)%max_sec]->GetLayer(i2));
+ AliTRDpropagationLayer& r2=*(fTrSec[(ns-1+maxSec)%maxSec]->GetLayer(i2));
cl=r2[js-nl2];
y2=cl->GetY(); z2=cl->GetZ();
}
else if (js<nl2+nl+nm+nu) {
if(turn != 1) continue;
- AliTRDpropagationLayer& r2=*(fTrSec[(ns+1)%max_sec]->GetLayer(i2));
+ AliTRDpropagationLayer& r2=*(fTrSec[(ns+1)%maxSec]->GetLayer(i2));
cl=r2[js-nl2-nl-nm];
y2=cl->GetY(); z2=cl->GetZ();
}
else {
if(turn != 2) continue;
- AliTRDpropagationLayer& r2=*(fTrSec[(ns+2)%max_sec]->GetLayer(i2));
+ AliTRDpropagationLayer& r2=*(fTrSec[(ns+2)%maxSec]->GetLayer(i2));
cl=r2[js-nl2-nl-nm-nu];
y2=cl->GetY(); z2=cl->GetZ();
y2=xx2*sn2+y2*cs2;
}
- if(TMath::Abs(z1-z2) > fMaxSeedDeltaZ12) continue;
+ if(TMath::Abs(z1-z2) > fgkMaxSeedDeltaZ12) continue;
Double_t zz=z1 - z1/x1*(x1-x2);
- if (TMath::Abs(zz-z2)>fMaxSeedDeltaZ) continue;
+ if (TMath::Abs(zz-z2)>fgkMaxSeedDeltaZ) continue;
Double_t d=(x2-x1)*(0.-y2)-(0.-x2)*(y2-y1);
if (d==0.) {cerr<<"TRD MakeSeeds: Straight seed !\n"; continue;}
x[1]=z1;
x[4]=f1trd(x1,y1,x2,y2,x3,y3);
- if (TMath::Abs(x[4]) > fMaxSeedC) continue;
+ if (TMath::Abs(x[4]) > fgkMaxSeedC) continue;
x[2]=f2trd(x1,y1,x2,y2,x3,y3);
x[3]=f3trd(x1,y1,x2,y2,z1,z2);
- if (TMath::Abs(x[3]) > fMaxSeedTan) continue;
+ if (TMath::Abs(x[3]) > fgkMaxSeedTan) continue;
Double_t a=asin(x[2]);
Double_t zv=z1 - x[3]/x[4]*(a+asin(x[4]*x1-x[2]));
- if (TMath::Abs(zv)>fMaxSeedVertexZ) continue;
+ if (TMath::Abs(zv)>fgkMaxSeedVertexZ) continue;
Double_t sy1=r1[is]->GetSigmaY2(), sz1=r1[is]->GetSigmaZ2();
Double_t sy2=cl->GetSigmaY2(), sz2=cl->GetSigmaZ2();
- Double_t sy3=fSeedErrorSY3, sy=fSeedErrorSY, sz=fSeedErrorSZ;
+ Double_t sy3=fgkSeedErrorSY3, sy=fgkSeedErrorSY, sz=fgkSeedErrorSZ;
// Tilt changes
Double_t h01 = GetTiltFactor(r1[is]);
- Double_t xu_factor = 100.;
+ Double_t xuFactor = 100.;
if(fNoTilt) {
h01 = 0;
- xu_factor = 1;
+ xuFactor = 1;
}
sy1=sy1+sz1*h01*h01;
c[0]=sy1;
// c[1]=0.; c[2]=sz1;
- c[1]=syz; c[2]=sz1*xu_factor;
+ c[1]=syz; c[2]=sz1*xuFactor;
c[3]=f20*sy1; c[4]=0.; c[5]=f20*sy1*f20+f22*sy2*f22+f23*sy3*f23;
c[6]=f30*sy1; c[7]=f31*sz1; c[8]=f30*sy1*f20+f32*sy2*f22;
c[9]=f30*sy1*f30+f31*sz1*f31+f32*sy2*f32+f34*sz2*f34;
if ((rc < 1) ||
(track->GetNumberOfClusters() <
- (outer-inner)*fMinClustersInSeed)) delete track;
+ (outer-inner)*fgkMinClustersInSeed)) delete track;
else {
fSeeds->AddLast(track); fNseeds++;
// cerr<<"\r found seed "<<fNseeds;
// from the file. The names of the cluster tree and branches
// should match the ones used in AliTRDclusterizer::WriteClusters()
//
- TObjArray *ClusterArray = new TObjArray(400);
+ TObjArray *clusterArray = new TObjArray(400);
TBranch *branch=ClusterTree->GetBranch("TRDcluster");
if (!branch) {
Error("ReadClusters","Can't get the branch !");
return 1;
}
- branch->SetAddress(&ClusterArray);
+ branch->SetAddress(&clusterArray);
Int_t nEntries = (Int_t) ClusterTree->GetEntries();
printf("found %d entries in %s.\n",nEntries,ClusterTree->GetName());
nbytes += ClusterTree->GetEvent(iEntry);
// Get the number of points in the detector
- Int_t nCluster = ClusterArray->GetEntriesFast();
+ Int_t nCluster = clusterArray->GetEntriesFast();
// printf("\r Read %d clusters from entry %d", nCluster, iEntry);
// Loop through all TRD digits
for (Int_t iCluster = 0; iCluster < nCluster; iCluster++) {
- c = (AliTRDcluster*)ClusterArray->UncheckedAt(iCluster);
+ c = (AliTRDcluster*)clusterArray->UncheckedAt(iCluster);
AliTRDcluster *co = new AliTRDcluster(*c);
co->SetSigmaY2(c->GetSigmaY2() * fSY2corr);
Int_t ltb = co->GetLocalTimeBin();
if(ltb == 19) co->SetSigmaZ2(c->GetSigmaZ2());
else if(fNoTilt) co->SetSigmaZ2(c->GetSigmaZ2() * fSZ2corr);
array->AddLast(co);
- delete ClusterArray->RemoveAt(iCluster);
+ delete clusterArray->RemoveAt(iCluster);
}
}
- delete ClusterArray;
+ delete clusterArray;
return 0;
}
Char_t treeName[12];
sprintf(treeName,"TreeR%d_TRD",GetEventNumber());
- TTree *ClusterTree = (TTree*) gDirectory->Get(treeName);
+ TTree *clusterTree = (TTree*) gDirectory->Get(treeName);
- if (!ClusterTree) {
+ if (!clusterTree) {
cerr<<"AliTRDtracker::ReadClusters(): ";
cerr<<"can't get a tree with clusters !\n";
return;
}
- TObjArray *ClusterArray = new TObjArray(400);
+ TObjArray *clusterArray = new TObjArray(400);
- ClusterTree->GetBranch("TRDcluster")->SetAddress(&ClusterArray);
+ clusterTree->GetBranch("TRDcluster")->SetAddress(&clusterArray);
- Int_t nEntries = (Int_t) ClusterTree->GetEntries();
- cout<<"found "<<nEntries<<" in ClusterTree"<<endl;
+ Int_t nEntries = (Int_t) clusterTree->GetEntries();
+ cout<<"found "<<nEntries<<" in clusterTree"<<endl;
// Loop through all entries in the tree
Int_t nbytes;
for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {
// Import the tree
- nbytes += ClusterTree->GetEvent(iEntry);
+ nbytes += clusterTree->GetEvent(iEntry);
// Get the number of points in the detector
- Int_t nCluster = ClusterArray->GetEntriesFast();
+ Int_t nCluster = clusterArray->GetEntriesFast();
printf("\n Read %d clusters from entry %d", nCluster, iEntry);
// Loop through all TRD digits
for (Int_t iCluster = 0; iCluster < nCluster; iCluster++) {
- c = (AliTRDcluster*)ClusterArray->UncheckedAt(iCluster);
+ c = (AliTRDcluster*)clusterArray->UncheckedAt(iCluster);
AliTRDcluster *co = new AliTRDcluster(*c);
co->SetSigmaY2(c->GetSigmaY2() * fSY2corr);
Int_t ltb = co->GetLocalTimeBin();
if(ltb == 19) co->SetSigmaZ2(c->GetSigmaZ2());
else if(fNoTilt) co->SetSigmaZ2(c->GetSigmaZ2() * fSZ2corr);
array->AddLast(co);
- delete ClusterArray->RemoveAt(iCluster);
+ delete clusterArray->RemoveAt(iCluster);
}
}
file->Close();
- delete ClusterArray;
+ delete clusterArray;
savedir->cd();
}
Char_t treeName[12];
sprintf(treeName,"TreeR%d_TRD",GetEventNumber());
- TTree *ClusterTree = (TTree*) gDirectory->Get(treeName);
+ TTree *clusterTree = (TTree*) gDirectory->Get(treeName);
- TObjArray *ClusterArray = new TObjArray(400);
+ TObjArray *clusterArray = new TObjArray(400);
- ClusterTree->GetBranch("TRDcluster")->SetAddress(&ClusterArray);
+ clusterTree->GetBranch("TRDcluster")->SetAddress(&clusterArray);
- Int_t nEntries = (Int_t) ClusterTree->GetEntries();
- printf("found %d entries in %s.\n",nEntries,ClusterTree->GetName());
+ Int_t nEntries = (Int_t) clusterTree->GetEntries();
+ printf("found %d entries in %s.\n",nEntries,clusterTree->GetName());
// Loop through all entries in the tree
Int_t nbytes;
for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {
// Import the tree
- nbytes += ClusterTree->GetEvent(iEntry);
+ nbytes += clusterTree->GetEvent(iEntry);
// Get the number of points in the detector
- Int_t nCluster = ClusterArray->GetEntriesFast();
+ Int_t nCluster = clusterArray->GetEntriesFast();
// printf("\r Read %d clusters from entry %d", nCluster, iEntry);
// Loop through all TRD digits
for (Int_t iCluster = 0; iCluster < nCluster; iCluster++) {
- c = (AliTRDcluster*)ClusterArray->UncheckedAt(iCluster);
+ c = (AliTRDcluster*)clusterArray->UncheckedAt(iCluster);
AliTRDcluster *co = new AliTRDcluster(*c);
co->SetSigmaY2(c->GetSigmaY2() * fSY2corr);
Int_t ltb = co->GetLocalTimeBin();
if(ltb == 19) co->SetSigmaZ2(c->GetSigmaZ2());
else if(fNoTilt) co->SetSigmaZ2(c->GetSigmaZ2() * fSZ2corr);
array->AddLast(co);
- delete ClusterArray->RemoveAt(iCluster);
+ delete clusterArray->RemoveAt(iCluster);
}
}
- delete ClusterArray;
+ delete clusterArray;
savedir->cd();
}
//__________________________________________________________________
-void AliTRDtracker::CookLabel(AliKalmanTrack* pt, Float_t wrong) const {
+void AliTRDtracker::CookLabel(AliKalmanTrack* pt, Float_t wrong) const
+{
+ //
+ // This cooks a label. Mmmmh, smells good...
+ //
Int_t label=123456789, index, i, j;
Int_t ncl=pt->GetNumberOfClusters();
- const Int_t range = fTrSec[0]->GetOuterTimeBin()+1;
+ const Int_t kRange = fTrSec[0]->GetOuterTimeBin()+1;
- Bool_t label_added;
+ Bool_t labelAdded;
- // Int_t s[range][2];
- Int_t **s = new Int_t* [range];
- for (i=0; i<range; i++) {
+ // Int_t s[kRange][2];
+ Int_t **s = new Int_t* [kRange];
+ for (i=0; i<kRange; i++) {
s[i] = new Int_t[2];
}
- for (i=0; i<range; i++) {
+ for (i=0; i<kRange; i++) {
s[i][0]=-1;
s[i][1]=0;
}
AliTRDcluster *c=(AliTRDcluster*)fClusters->UncheckedAt(index);
for (Int_t k=0; k<3; k++) {
label=c->GetLabel(k);
- label_added=kFALSE; j=0;
+ labelAdded=kFALSE; j=0;
if (label >= 0) {
- while ( (!label_added) && ( j < range ) ) {
+ while ( (!labelAdded) && ( j < kRange ) ) {
if (s[j][0]==label || s[j][1]==0) {
s[j][0]=label;
s[j][1]=s[j][1]+1;
- label_added=kTRUE;
+ labelAdded=kTRUE;
}
j++;
}
Int_t max=0;
label = -123456789;
- for (i=0; i<range; i++) {
+ for (i=0; i<kRange; i++) {
if (s[i][1]>max) {
max=s[i][1]; label=s[i][0];
}
}
- for (i=0; i<range; i++) {
+ for (i=0; i<kRange; i++) {
delete []s[i];
}
//__________________________________________________________________
-void AliTRDtracker::UseClusters(const AliKalmanTrack* t, Int_t from) const {
+void AliTRDtracker::UseClusters(const AliKalmanTrack* t, Int_t from) const
+{
+ //
+ // Use clusters, but don't abuse them!
+ //
+
Int_t ncl=t->GetNumberOfClusters();
for (Int_t i=from; i<ncl; i++) {
Int_t index = t->GetClusterIndex(i);
//_____________________________________________________________________
-Double_t AliTRDtracker::ExpectedSigmaY2(Double_t , Double_t , Double_t )
+Double_t AliTRDtracker::ExpectedSigmaY2(Double_t , Double_t , Double_t ) const
{
// Parametrised "expected" error of the cluster reconstruction in Y
}
//_____________________________________________________________________
-Double_t AliTRDtracker::ExpectedSigmaZ2(Double_t , Double_t )
+Double_t AliTRDtracker::ExpectedSigmaZ2(Double_t , Double_t ) const
{
// Parametrised "expected" error of the cluster reconstruction in Z
return s;
}
-
//_____________________________________________________________________
-Double_t AliTRDtracker::GetX(Int_t sector, Int_t plane, Int_t local_tb) const
+Double_t AliTRDtracker::GetX(Int_t sector, Int_t plane, Int_t localTB) const
{
//
- // Returns radial position which corresponds to time bin <local_tb>
+ // Returns radial position which corresponds to time bin <localTB>
// in tracking sector <sector> and plane <plane>
//
- Int_t index = fTrSec[sector]->CookTimeBinIndex(plane, local_tb);
+ Int_t index = fTrSec[sector]->CookTimeBinIndex(plane, localTB);
Int_t pl = fTrSec[sector]->GetLayerNumber(index);
return fTrSec[sector]->GetLayer(pl)->GetX();
//_______________________________________________________
AliTRDtracker::AliTRDpropagationLayer::AliTRDpropagationLayer(Double_t x,
- Double_t dx, Double_t rho, Double_t rad_length, Int_t tb_index)
+ Double_t dx, Double_t rho, Double_t radLength, Int_t tbIndex)
{
//
// AliTRDpropagationLayer constructor
//
- fN = 0; fX = x; fdX = dx; fRho = rho; fX0 = rad_length;
- fClusters = NULL; fIndex = NULL; fTimeBinIndex = tb_index;
+ fN = 0; fX = x; fdX = dx; fRho = rho; fX0 = radLength;
+ fClusters = NULL; fIndex = NULL; fTimeBinIndex = tbIndex;
- for(Int_t i=0; i < (Int_t) kZONES; i++) {
+ for(Int_t i=0; i < (Int_t) kZones; i++) {
fZc[i]=0; fZmax[i] = 0;
}
fYmax = 0;
if(fTimeBinIndex >= 0) {
- fClusters = new AliTRDcluster*[kMAX_CLUSTER_PER_TIME_BIN];
- fIndex = new UInt_t[kMAX_CLUSTER_PER_TIME_BIN];
+ fClusters = new AliTRDcluster*[kMaxClusterPerTimeBin];
+ fIndex = new UInt_t[kMaxClusterPerTimeBin];
}
+ for (Int_t i=0;i<5;i++) fIsHole[i] = kFALSE;
fHole = kFALSE;
fHoleZc = 0;
fHoleZmax = 0;
//_______________________________________________________
void AliTRDtracker::AliTRDpropagationLayer::SetHole(
Double_t Zmax, Double_t Ymax, Double_t rho,
- Double_t rad_length, Double_t Yc, Double_t Zc)
+ Double_t radLength, Double_t Yc, Double_t Zc)
{
//
// Sets hole in the layer
//
-
fHole = kTRUE;
fHoleZc = Zc;
fHoleZmax = Zmax;
fHoleYc = Yc;
fHoleYmax = Ymax;
fHoleRho = rho;
- fHoleX0 = rad_length;
+ fHoleX0 = radLength;
}
fGeomSector = gs;
fTzeroShift = 0.13;
fN = 0;
-
- for(UInt_t i=0; i < kMAX_TIME_BIN_INDEX; i++) fTimeBinIndex[i] = -1;
+ //
+ // get holes description from geometry
+ Bool_t holes[AliTRDgeometry::kNcham];
+ //printf("sector\t%d\t",gs);
+ for (Int_t icham=0; icham<AliTRDgeometry::kNcham;icham++){
+ holes[icham] = fGeom->IsHole(0,icham,gs);
+ //printf("%d",holes[icham]);
+ }
+ //printf("\n");
+
+ for(UInt_t i=0; i < kMaxTimeBinIndex; i++) fTimeBinIndex[i] = -1;
AliTRDpropagationLayer* ppl;
- Double_t x, xin, xout, dx, rho, rad_length;
+ Double_t x, xin, xout, dx, rho, radLength;
Int_t steps;
// set time bins in the gas of the TPC
xin = 246.055; xout = 254.055; steps = 20; dx = (xout-xin)/steps;
- rho = 0.9e-3; rad_length = 28.94;
+ rho = 0.9e-3; radLength = 28.94;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
// set time bins in the outer field cage vessel
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; rad_length = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; radLength = 44.77; // Tedlar
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 0.02; xin = xout; xout = xin + dx; rho = 1.45; rad_length = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 0.02; xin = xout; xout = xin + dx; rho = 1.45; radLength = 44.86; // prepreg
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 2.; xin = xout; xout = xin + dx; rho = 1.45*0.02; rad_length = 41.28; // Nomex
+ dx = 2.; xin = xout; xout = xin + dx; rho = 1.45*0.02; radLength = 41.28; // Nomex
steps = 5; dx = (xout - xin)/steps;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
- dx = 0.02; xin = xout; xout = xin + dx; rho = 1.45; rad_length = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 0.02; xin = xout; xout = xin + dx; rho = 1.45; radLength = 44.86; // prepreg
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; rad_length = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; radLength = 44.77; // Tedlar
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
xin = xout; xout = 275.0;
steps = 50; dx = (xout - xin)/steps;
- rho = 1.977e-3; rad_length = 36.2;
+ rho = 1.977e-3; radLength = 36.2;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
// set time bins in the outer containment vessel
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 2.7; rad_length = 24.01; // Al
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 50e-4; xin = xout; xout = xin + dx; rho = 2.7; radLength = 24.01; // Al
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; rad_length = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; radLength = 44.77; // Tedlar
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 0.06; xin = xout; xout = xin + dx; rho = 1.45; rad_length = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 0.06; xin = xout; xout = xin + dx; rho = 1.45; radLength = 44.86; // prepreg
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 3.; xin = xout; xout = xin + dx; rho = 1.45*0.02; rad_length = 41.28; // Nomex
+ dx = 3.; xin = xout; xout = xin + dx; rho = 1.45*0.02; radLength = 41.28; // Nomex
steps = 10; dx = (xout - xin)/steps;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
- dx = 0.06; xin = xout; xout = xin + dx; rho = 1.45; rad_length = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 0.06; xin = xout; xout = xin + dx; rho = 1.45; radLength = 44.86; // prepreg
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; rad_length = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; radLength = 44.77; // Tedlar
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 2.7; rad_length = 24.01; // Al
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
+ dx = 50e-4; xin = xout; xout = xin + dx; rho = 2.7; radLength = 24.01; // Al
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
InsertLayer(ppl);
Double_t xtrd = (Double_t) fGeom->Rmin();
// add layers between TPC and TRD (Air temporarily)
xin = xout; xout = xtrd;
steps = 50; dx = (xout - xin)/steps;
- rho = 1.2e-3; rad_length = 36.66;
+ rho = 1.2e-3; radLength = 36.66;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
- Double_t alpha=AliTRDgeometry::GetAlpha();
+ // Double_t alpha=AliTRDgeometry::GetAlpha();
// add layers for each of the planes
Double_t dxTEC = dxRad + dxDrift + dxAmp + dxRo;
Double_t dxPlane = dxTEC + dxSpace;
- Int_t tb, tb_index;
- const Int_t nChambers = AliTRDgeometry::Ncham();
- Double_t Ymax = 0, holeYmax = 0;
- Double_t * Zc = new Double_t[nChambers];
- Double_t * Zmax = new Double_t[nChambers];
- Double_t holeZmax = 1000.; // the whole sector is missing
+ Int_t tb, tbIndex;
+ const Int_t kNchambers = AliTRDgeometry::Ncham();
+ Double_t ymax = 0;
+ //, holeYmax = 0;
+ Double_t ymaxsensitive=0;
+ Double_t *zc = new Double_t[kNchambers];
+ Double_t *zmax = new Double_t[kNchambers];
+ Double_t *zmaxsensitive = new Double_t[kNchambers];
+ // Double_t holeZmax = 1000.; // the whole sector is missing
for(Int_t plane = 0; plane < AliTRDgeometry::Nplan(); plane++) {
-
+ //
// Radiator
xin = xtrd + plane * dxPlane; xout = xin + dxRad;
- steps = 12; dx = (xout - xin)/steps; rho = 0.074; rad_length = 40.6;
+ steps = 12; dx = (xout - xin)/steps; rho = 0.074; radLength = 40.6;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
- Ymax = fGeom->GetChamberWidth(plane)/2;
- for(Int_t ch = 0; ch < nChambers; ch++) {
- Zmax[ch] = fGeom->GetChamberLength(plane,ch)/2;
+ ymax = fGeom->GetChamberWidth(plane)/2.;
+ ymaxsensitive = (fPar->GetColPadSize(plane)*fPar->GetColMax(plane)-4)/2.;
+
+ for(Int_t ch = 0; ch < kNchambers; ch++) {
+ zmax[ch] = fGeom->GetChamberLength(plane,ch)/2;
Float_t pad = fPar->GetRowPadSize(plane,ch,0);
Float_t row0 = fPar->GetRow0(plane,ch,0);
Int_t nPads = fPar->GetRowMax(plane,ch,0);
- Zc[ch] = (pad * nPads)/2 + row0 - pad/2;
+ zmaxsensitive[ch] = Float_t(nPads)*pad/2.;
+ // zc[ch] = (pad * nPads)/2 + row0 - pad/2;
+ zc[ch] = (pad * nPads)/2 + row0;
+ //zc[ch] = row0+zmax[ch]-AliTRDgeometry::RpadW();
+
}
dx = fPar->GetTimeBinSize();
- rho = 0.00295 * 0.85; rad_length = 11.0;
+ rho = 0.00295 * 0.85; radLength = 11.0;
Double_t x0 = (Double_t) fPar->GetTime0(plane);
Double_t xbottom = x0 - dxDrift;
Double_t xtop = x0 + dxAmp;
-
+ //
// Amplification region
-
steps = (Int_t) (dxAmp/dx);
for(tb = 0; tb < steps; tb++) {
x = x0 + tb * dx + dx/2;
- tb_index = CookTimeBinIndex(plane, -tb-1);
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,tb_index);
- ppl->SetYmax(Ymax);
- for(Int_t ch = 0; ch < nChambers; ch++) {
- ppl->SetZmax(ch, Zc[ch], Zmax[ch]);
- }
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ tbIndex = CookTimeBinIndex(plane, -tb-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,tbIndex);
+ ppl->SetYmax(ymax,ymaxsensitive);
+ ppl->SetZ(zc, zmax, zmaxsensitive);
+ ppl->SetHoles(holes);
InsertLayer(ppl);
}
- tb_index = CookTimeBinIndex(plane, -steps);
+ tbIndex = CookTimeBinIndex(plane, -steps);
x = (x + dx/2 + xtop)/2;
dx = 2*(xtop-x);
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,tb_index);
- ppl->SetYmax(Ymax);
- for(Int_t ch = 0; ch < nChambers; ch++) {
- ppl->SetZmax(ch, Zc[ch], Zmax[ch]);
- }
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,tbIndex);
+ ppl->SetYmax(ymax,ymaxsensitive);
+ ppl->SetZ(zc, zmax,zmaxsensitive);
+ ppl->SetHoles(holes);
InsertLayer(ppl);
// Drift region
for(tb = 0; tb < steps; tb++) {
x = x0 - tb * dx - dx/2;
- tb_index = CookTimeBinIndex(plane, tb);
+ tbIndex = CookTimeBinIndex(plane, tb);
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,tb_index);
- ppl->SetYmax(Ymax);
- for(Int_t ch = 0; ch < nChambers; ch++) {
- ppl->SetZmax(ch, Zc[ch], Zmax[ch]);
- }
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,tbIndex);
+ ppl->SetYmax(ymax,ymaxsensitive);
+ ppl->SetZ(zc, zmax, zmaxsensitive);
+ ppl->SetHoles(holes);
InsertLayer(ppl);
}
- tb_index = CookTimeBinIndex(plane, steps);
+ tbIndex = CookTimeBinIndex(plane, steps);
x = (x - dx/2 + xbottom)/2;
dx = 2*(x-xbottom);
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,tb_index);
- ppl->SetYmax(Ymax);
- for(Int_t ch = 0; ch < nChambers; ch++) {
- ppl->SetZmax(ch, Zc[ch], Zmax[ch]);
- }
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,tbIndex);
+ ppl->SetYmax(ymax,ymaxsensitive);
+ ppl->SetZ(zc, zmax, zmaxsensitive);
+ ppl->SetHoles(holes);
InsertLayer(ppl);
// Pad Plane
- xin = xtop; dx = 0.025; xout = xin + dx; rho = 1.7; rad_length = 33.0;
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,rad_length,-1);
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = (xin+dx/2)*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = (xin+dx/2)*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ xin = xtop; dx = 0.025; xout = xin + dx; rho = 1.7; radLength = 33.0;
+ ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,radLength,-1);
+ ppl->SetYmax(ymax,ymaxsensitive);
+ ppl->SetZ(zc, zmax,zmax);
+ ppl->SetHoles(holes);
InsertLayer(ppl);
// Rohacell
xin = xout; xout = xtrd + (plane + 1) * dxPlane - dxSpace;
- steps = 5; dx = (xout - xin)/steps; rho = 0.074; rad_length = 40.6;
+ steps = 5; dx = (xout - xin)/steps; rho = 0.074; radLength = 40.6;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
+ ppl->SetYmax(ymax,ymaxsensitive);
+ ppl->SetZ(zc, zmax,zmax);
+ ppl->SetHoles(holes);
InsertLayer(ppl);
}
// Space between the chambers, air
xin = xout; xout = xtrd + (plane + 1) * dxPlane;
- steps = 5; dx = (xout - xin)/steps; rho = 1.29e-3; rad_length = 36.66;
+ steps = 5; dx = (xout - xin)/steps; rho = 1.29e-3; radLength = 36.66;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
- if((fGeom->GetPHOShole()) && (fGeomSector >= 2) && (fGeomSector <= 6)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
- if((fGeom->GetRICHhole()) && (fGeomSector >= 12) && (fGeomSector <= 14)) {
- holeYmax = x*TMath::Tan(0.5*alpha);
- ppl->SetHole(holeYmax, holeZmax);
- }
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
}
// Space between the TRD and RICH
Double_t xRICH = 500.;
xin = xout; xout = xRICH;
- steps = 200; dx = (xout - xin)/steps; rho = 1.29e-3; rad_length = 36.66;
+ steps = 200; dx = (xout - xin)/steps; rho = 1.29e-3; radLength = 36.66;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,radLength,-1);
InsertLayer(ppl);
}
MapTimeBinLayers();
- delete [] Zc;
- delete [] Zmax;
+ delete [] zc;
+ delete [] zmax;
}
//______________________________________________________
-Int_t AliTRDtracker::AliTRDtrackingSector::CookTimeBinIndex(Int_t plane, Int_t local_tb) const
+Int_t AliTRDtracker::AliTRDtrackingSector::CookTimeBinIndex(Int_t plane, Int_t localTB) const
{
//
// depending on the digitization parameters calculates "global"
- // time bin index for timebin <local
_tb> in plane <plane>
+ // time bin index for timebin <local
TB> in plane <plane>
//
Double_t dxAmp = (Double_t) fGeom->CamHght(); // Amplification region
Int_t tbDrift = fPar->GetTimeMax();
Int_t maxDrift = (Int_t) ((dxDrift+0.000001)/dx);
- Int_t tb_per_plane = TMath::Min(tbAmp,maxAmp) + TMath::Min(tbDrift,maxDrift);
+ Int_t tbPerPlane = TMath::Min(tbAmp,maxAmp) + TMath::Min(tbDrift,maxDrift);
- Int_t gtb = (plane+1) * tb_per_plane - local_tb - 1 - TMath::Min(tbAmp,maxAmp);
+ Int_t gtb = (plane+1) * tbPerPlane - localTB - 1 - TMath::Min(tbAmp,maxAmp);
- if((local_tb < 0) &&
- (TMath::Abs(local_tb) > TMath::Min(tbAmp,maxAmp))) return -1;
- if(local_tb >= TMath::Min(tbDrift,maxDrift)) return -1;
+ if((localTB < 0) &&
+ (TMath::Abs(localTB) > TMath::Min(tbAmp,maxAmp))) return -1;
+ if(localTB >= TMath::Min(tbDrift,maxDrift)) return -1;
return gtb;
// printf("gtb %d -> pl %d -> x %f \n", index, i, fLayers[i]->GetX());
if(index < 0) continue;
- if(index >= (Int_t) kMAX_TIME_BIN_INDEX) {
+ if(index >= (Int_t) kMaxTimeBinIndex) {
printf("*** AliTRDtracker::MapTimeBinLayers: \n");
printf(" index %d exceeds allowed maximum of %d!\n",
- index, kMAX_TIME_BIN_INDEX-1);
+ index, kMaxTimeBinIndex-1);
continue;
}
fTimeBinIndex[index] = i;
//
Int_t tb, layer;
- for(tb = kMAX_TIME_BIN_INDEX-1; tb >=0; tb--) {
+ for(tb = kMaxTimeBinIndex-1; tb >=0; tb--) {
layer = GetLayerNumber(tb);
if(layer>=0) break;
}
// Insert layer <pl> in fLayers array.
// Layers are sorted according to X coordinate.
- if ( fN == ((Int_t) kMAX_LAYERS_PER_SECTOR)) {
+ if ( fN == ((Int_t) kMaxLayersPerSector)) {
printf("AliTRDtrackingSector::InsertLayer(): Too many layers !\n");
return;
}
}
//______________________________________________________
+void AliTRDtracker::AliTRDpropagationLayer::SetZ(Double_t* center, Double_t *w, Double_t *wsensitive )
+{
+ //
+ // set centers and the width of sectors
+ for (Int_t icham=0;icham< AliTRDgeometry::kNcham;icham++){
+ fZc[icham] = center[icham];
+ fZmax[icham] = w[icham];
+ fZmaxSensitive[icham] = wsensitive[icham];
+ // printf("chamber\t%d\tzc\t%f\tzmax\t%f\tzsens\t%f\n",icham,fZc[icham],fZmax[icham],fZmaxSensitive[icham]);
+ }
+}
+//______________________________________________________
+
+void AliTRDtracker::AliTRDpropagationLayer::SetHoles(Bool_t *holes)
+{
+ //
+ // set centers and the width of sectors
+ fHole = kFALSE;
+ for (Int_t icham=0;icham< AliTRDgeometry::kNcham;icham++){
+ fIsHole[icham] = holes[icham];
+ if (holes[icham]) fHole = kTRUE;
+ }
+}
+
+
void AliTRDtracker::AliTRDpropagationLayer::GetPropagationParameters(
- Double_t y, Double_t z, Double_t &dx, Double_t &rho, Double_t &rad_length,
+ Double_t y, Double_t z, Double_t &dx, Double_t &rho, Double_t &radLength,
Bool_t &lookForCluster) const
{
//
- // Returns radial step <dx>, density <rho>, rad. length <rad_length>,
+ // Returns radial step <dx>, density <rho>, rad. length <radLength>,
// and sensitivity <lookForCluster> in point <y,z>
//
dx = fdX;
rho = fRho;
- rad_length = fX0;
+ radLength = fX0;
lookForCluster = kFALSE;
-
- // check dead regions
+ //
+ // check dead regions in sensitive volume
if(fTimeBinIndex >= 0) {
- for(Int_t ch = 0; ch < (Int_t) kZONES; ch++) {
- if(TMath::Abs(z - fZc[ch]) < fZmax[ch])
- lookForCluster = kTRUE;
- // else { rho = 1.7; rad_length = 33.0; } // G10
- }
- if(TMath::Abs(y) > fYmax) lookForCluster = kFALSE;
- if(!lookForCluster) {
- // rho = 1.7; rad_length = 33.0; // G10
+ //
+ Int_t zone=-1;
+ for(Int_t ch = 0; ch < (Int_t) kZones; ch++) {
+ if (TMath::Abs(z - fZc[ch]) < fZmaxSensitive[ch]){
+ zone = ch;
+ lookForCluster = !(fIsHole[zone]);
+ if(TMath::Abs(y) > fYmaxSensitive){
+ lookForCluster = kFALSE;
+ }
+ if (fIsHole[zone]) {
+ //if hole
+ rho = 1.29e-3;
+ radLength = 36.66;
+ }
+ }
}
+ return;
}
-
+ //
+ //
// check hole
- if(fHole && (TMath::Abs(y - fHoleYc) < fHoleYmax) &&
- (TMath::Abs(z - fHoleZc) < fHoleZmax)) {
- lookForCluster = kFALSE;
- rho = fHoleRho;
- rad_length = fHoleX0;
- }
-
+ if (fHole==kFALSE) return;
+ //
+ for(Int_t ch = 0; ch < (Int_t) kZones; ch++) {
+ if (TMath::Abs(z - fZc[ch]) < fZmax[ch]){
+ if (fIsHole[ch]) {
+ //if hole
+ rho = 1.29e-3;
+ radLength = 36.66;
+ }
+ }
+ }
return;
}
+Int_t AliTRDtracker::AliTRDpropagationLayer::GetZone( Double_t z) const
+{
+ //
+ //
+ if (fTimeBinIndex < 0) return -20; //unknown
+ Int_t zone=-10; // dead zone
+ for(Int_t ch = 0; ch < (Int_t) kZones; ch++) {
+ if(TMath::Abs(z - fZc[ch]) < fZmax[ch])
+ zone = ch;
+ }
+ return zone;
+}
+
+
//______________________________________________________
void AliTRDtracker::AliTRDpropagationLayer::InsertCluster(AliTRDcluster* c,
return;
}
- if (fN== (Int_t) kMAX_CLUSTER_PER_TIME_BIN) {
+ if (fN== (Int_t) kMaxClusterPerTimeBin) {
printf("AliTRDpropagationLayer::InsertCluster(): Too many clusters !\n");
return;
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff