/*
$Log$
+Revision 1.14 2002/11/07 15:52:09 cblume
+Update of tracking code for tilted pads
+
Revision 1.13 2002/10/22 15:53:08 alibrary
Introducing Riostream.h
#include "AliTRDtrack.h"
#include "../TPC/AliTPCtrack.h"
+
ClassImp(AliTRDtrack)
fX=xref;
- fY=xx[0]; fZ=xx[1]; fC=xx[2]; fE=xx[3]; fT=xx[4];
+ fY=xx[0]; fZ=xx[1]; fE=xx[2]; fT=xx[3]; fC=xx[4];
fCyy=cc[0];
fCzy=cc[1]; fCzz=cc[2];
- fCcy=cc[3]; fCcz=cc[4]; fCcc=cc[5];
- fCey=cc[6]; fCez=cc[7]; fCec=cc[8]; fCee=cc[9];
- fCty=cc[10]; fCtz=cc[11]; fCtc=cc[12]; fCte=cc[13]; fCtt=cc[14];
+ fCey=cc[3]; fCez=cc[4]; fCee=cc[5];
+ fCty=cc[6]; fCtz=cc[7]; fCte=cc[8]; fCtt=cc[9];
+ fCcy=cc[10]; fCcz=cc[11]; fCce=cc[12]; fCct=cc[13]; fCcc=cc[14];
fIndex[0]=index;
SetNumberOfClusters(1);
fdEdx=0.;
+ fLhElectron = 0.0;
+
Double_t q = TMath::Abs(c->GetQ());
Double_t s = fX*fC - fE, t=fT;
if(s*s < 1) q *= TMath::Sqrt((1-s*s)/(1+t*t));
SetChi2(t.GetChi2());
fdEdx=t.fdEdx;
+ fLhElectron = 0.0;
+
fAlpha=t.fAlpha;
fX=t.fX;
fCyy=t.fCyy;
fCzy=t.fCzy; fCzz=t.fCzz;
- fCcy=t.fCcy; fCcz=t.fCcz; fCcc=t.fCcc;
- fCey=t.fCey; fCez=t.fCez; fCec=t.fCec; fCee=t.fCee;
- fCty=t.fCty; fCtz=t.fCtz; fCtc=t.fCtc; fCte=t.fCte; fCtt=t.fCtt;
+ fCey=t.fCey; fCez=t.fCez; fCee=t.fCee;
+ fCty=t.fCty; fCtz=t.fCtz; fCte=t.fCte; fCtt=t.fCtt;
+ fCcy=t.fCcy; fCcz=t.fCcz; fCce=t.fCce; fCct=t.fCct; fCcc=t.fCcc;
Int_t n=t.GetNumberOfClusters();
SetNumberOfClusters(n);
}
//_____________________________________________________________________________
-AliTRDtrack::AliTRDtrack(const AliKalmanTrack& t, Double_t alpha) {
+AliTRDtrack::AliTRDtrack(const AliKalmanTrack& t, Double_t alpha)
+ :AliKalmanTrack(t) {
//
// Constructor from AliTPCtrack or AliITStrack .
//
fdEdx=0;
+ fLhElectron = 0.0;
+
fAlpha = alpha;
if (fAlpha < -TMath::Pi()) fAlpha += 2*TMath::Pi();
else if (fAlpha >= TMath::Pi()) fAlpha -= 2*TMath::Pi();
x = GetConvConst();
- fY=p[0]; fZ=p[1]; fC=p[4]/x;
- fE=fX*fC-p[2]; fT=p[3];
+ fY=p[0];
+ fZ=p[1];
+ fT=p[3];
+ fC=p[4]/x;
+ fE=fX*fC-p[2];
//Conversion of the covariance matrix
Double_t c[15]; t.GetExternalCovariance(c);
Double_t c32=fX*c[13] - c[8];
Double_t c20=fX*c[10] - c[3], c21=fX*c[11] - c[4], c42=fX*c[14] - c[12];
- fCyy=c[0 ];
- fCzy=c[1 ]; fCzz=c[2 ];
- fCcy=c[10]; fCcz=c[11]; fCcc=c[14];
- fCey=c20; fCez=c21; fCec=c42; fCee=c22;
- fCty=c[6 ]; fCtz=c[7 ]; fCtc=c[13]; fCte=c32; fCtt=c[9 ];
+ fCyy=c[0];
+ fCzy=c[1]; fCzz=c[2];
+ fCey=c20; fCez=c21; fCee=c22;
+ fCty=c[6]; fCtz=c[7]; fCte=c32; fCtt=c[9];
+ fCcy=c[10]; fCcz=c[11]; fCce=c42; fCct=c[13]; fCcc=c[14];
}
//
Double_t a=GetConvConst();
- Double_t c22=fX*fX*fCcc-2*fX*fCec+fCee;
- Double_t c32=fX*fCtc-fCte;
- Double_t c20=fX*fCcy-fCey, c21=fX*fCcz-fCez, c42=fX*fCcc-fCec;
+ Double_t c22=fX*fX*fCcc-2*fX*fCce+fCee;
+ Double_t c32=fX*fCct-fCte;
+ Double_t c20=fX*fCcy-fCey, c21=fX*fCcz-fCez, c42=fX*fCcc-fCce;
cc[0 ]=fCyy;
cc[1 ]=fCzy; cc[2 ]=fCzz;
cc[3 ]=c20; cc[4 ]=c21; cc[5 ]=c22;
cc[6 ]=fCty; cc[7 ]=fCtz; cc[8 ]=c32; cc[9 ]=fCtt;
- cc[10]=fCcy*a; cc[11]=fCcz*a; cc[12]=c42*a; cc[13]=fCtc*a; cc[14]=fCcc*a*a;
+ cc[10]=fCcy*a; cc[11]=fCcz*a; cc[12]=c42*a; cc[13]=fCct*a; cc[14]=fCcc*a*a;
}
void AliTRDtrack::GetCovariance(Double_t cc[15]) const {
cc[0]=fCyy;
cc[1]=fCzy; cc[2]=fCzz;
- cc[3]=fCcy; cc[4]=fCcz; cc[5]=fCcc;
- cc[6]=fCey; cc[7]=fCez; cc[8]=fCec; cc[9]=fCee;
- cc[10]=fCty; cc[11]=fCtz; cc[12]=fCtc; cc[13]=fCte; cc[14]=fCtt;
+ cc[3]=fCey; cc[4]=fCez; cc[5]=fCee;
+ cc[6]=fCcy; cc[7]=fCcz; cc[8]=fCce; cc[9]=fCcc;
+ cc[10]=fCty; cc[11]=fCtz; cc[12]=fCte; cc[13]=fCct; cc[14]=fCtt;
}
//_____________________________________________________________________________
//_____________________________________________________________________________
-Int_t AliTRDtrack::PropagateTo(Double_t xk,Double_t x0,Double_t rho,Double_t pm)
+Int_t AliTRDtrack::PropagateTo(Double_t xk,Double_t x0,Double_t rho)
{
// Propagates a track of particle with mass=pm to a reference plane
// defined by x=xk through media of density=rho and radiationLength=x0
//f = F - 1
Double_t rr=r1+r2, cc=c1+c2, xx=x1+x2;
- Double_t f02= dx*(rr*xx + cc*(c1*x1/r1+c2*x2/r2))/(rr*rr);
- Double_t f03=-dx*(2*rr + cc*(c1/r1 + c2/r2))/(rr*rr);
+ Double_t f02=-dx*(2*rr + cc*(c1/r1 + c2/r2))/(rr*rr);
+ Double_t f04= dx*(rr*xx + cc*(c1*x1/r1+c2*x2/r2))/(rr*rr);
Double_t cr=c1*r2+c2*r1;
- Double_t f12= dx*fT*(cr*xx-cc*(r1*x2-c2*c1*x1/r1+r2*x1-c1*c2*x2/r2))/(cr*cr);
- Double_t f13=-dx*fT*(2*cr + cc*(c2*c1/r1-r1 + c1*c2/r2-r2))/(cr*cr);
- Double_t f14= dx*cc/cr;
+ Double_t f12=-dx*fT*(2*cr + cc*(c2*c1/r1-r1 + c1*c2/r2-r2))/(cr*cr);
+ Double_t f13= dx*cc/cr;
+ Double_t f14= dx*fT*(cr*xx-cc*(r1*x2-c2*c1*x1/r1+r2*x1-c1*c2*x2/r2))/(cr*cr);
//b = C*ft
- Double_t b00=f02*fCcy + f03*fCey, b01=f12*fCcy + f13*fCey + f14*fCty;
- Double_t b10=f02*fCcz + f03*fCez, b11=f12*fCcz + f13*fCez + f14*fCtz;
- Double_t b20=f02*fCcc + f03*fCec, b21=f12*fCcc + f13*fCec + f14*fCtc;
- Double_t b30=f02*fCec + f03*fCee, b31=f12*fCec + f13*fCee + f14*fCte;
- Double_t b40=f02*fCtc + f03*fCte, b41=f12*fCtc + f13*fCte + f14*fCtt;
+ Double_t b00=f02*fCey + f04*fCcy, b01=f12*fCey + f14*fCcy + f13*fCty;
+ Double_t b10=f02*fCez + f04*fCcz, b11=f12*fCez + f14*fCcz + f13*fCtz;
+ Double_t b20=f02*fCee + f04*fCce, b21=f12*fCee + f14*fCce + f13*fCte;
+ Double_t b30=f02*fCte + f04*fCct, b31=f12*fCte + f14*fCct + f13*fCtt;
+ Double_t b40=f02*fCce + f04*fCcc, b41=f12*fCce + f14*fCcc + f13*fCct;
//a = f*b = f*C*ft
- Double_t a00=f02*b20+f03*b30,a01=f02*b21+f03*b31,a11=f12*b21+f13*b31+f14*b41;
+ Double_t a00=f02*b20+f04*b40,a01=f02*b21+f04*b41,a11=f12*b21+f14*b41+f13*b31;
//F*C*Ft = C + (a + b + bt)
fCyy += a00 + 2*b00;
fCzy += a01 + b01 + b10;
- fCcy += b20;
- fCey += b30;
- fCty += b40;
+ fCey += b20;
+ fCty += b30;
+ fCcy += b40;
fCzz += a11 + 2*b11;
- fCcz += b21;
- fCez += b31;
- fCtz += b41;
+ fCez += b21;
+ fCtz += b31;
+ fCcz += b41;
fX=x2;
Double_t d=sqrt((x1-fX)*(x1-fX)+(y1-fY)*(y1-fY)+(z1-fZ)*(z1-fZ));
Double_t p2=GetPt()*GetPt()*(1.+fT*fT);
p2 = TMath::Min(p2,1e+08); // to avoid division by (1-1) for stiff tracks
- Double_t beta2=p2/(p2 + pm*pm);
+ Double_t beta2=p2/(p2 + GetMass()*GetMass());
Double_t ey=fC*fX - fE, ez=fT;
Double_t xz=fC*ez, zz1=ez*ez+1, xy=fE+ey;
Double_t theta2=14.1*14.1/(beta2*p2*1e6)*d/x0*rho;
- fCcc += xz*xz*theta2;
- fCec += xz*ez*xy*theta2;
- fCtc += xz*zz1*theta2;
+
fCee += (2*ey*ez*ez*fE+1-ey*ey+ez*ez+fE*fE*ez*ez)*theta2;
fCte += ez*zz1*xy*theta2;
fCtt += zz1*zz1*theta2;
+ fCce += xz*ez*xy*theta2;
+ fCct += xz*zz1*theta2;
+ fCcc += xz*xz*theta2;
//Energy losses************************
//PH SetLength(GetLength()+d);
cc = fC;
- fC*=(1.- sqrt(p2+pm*pm)/p2*dE);
+ fC*=(1.- sqrt(p2+GetMass()*GetMass())/p2*dE);
fE+=fX*(fC-cc);
return 1;
// Double_t k00=fCyy*r00+fCzy*r01, k01=fCyy*r01+fCzy*r11;
// Double_t k10=fCzy*r00+fCzz*r01, k11=fCzy*r01+fCzz*r11;
-// Double_t k20=fCcy*r00+fCcz*r01, k21=fCcy*r01+fCcz*r11;
-// Double_t k30=fCey*r00+fCez*r01, k31=fCey*r01+fCez*r11;
-// Double_t k40=fCty*r00+fCtz*r01, k41=fCty*r01+fCtz*r11;
+// Double_t k20=fCey*r00+fCez*r01, k21=fCey*r01+fCez*r11;
+// Double_t k30=fCty*r00+fCtz*r01, k31=fCty*r01+fCtz*r11;
+// Double_t k40=fCcy*r00+fCcz*r01, k41=fCcy*r01+fCcz*r11;
Double_t k00=fCyy*r00+fCzy*(r01+h01*r00),k01=fCyy*r01+fCzy*(r11+h01*r01);
Double_t k10=fCzy*r00+fCzz*(r01+h01*r00),k11=fCzy*r01+fCzz*(r11+h01*r01);
- Double_t k20=fCcy*r00+fCcz*(r01+h01*r00),k21=fCcy*r01+fCcz*(r11+h01*r01);
- Double_t k30=fCey*r00+fCez*(r01+h01*r00),k31=fCey*r01+fCez*(r11+h01*r01);
- Double_t k40=fCty*r00+fCtz*(r01+h01*r00),k41=fCty*r01+fCtz*(r11+h01*r01);
+ Double_t k20=fCey*r00+fCez*(r01+h01*r00),k21=fCey*r01+fCez*(r11+h01*r01);
+ Double_t k30=fCty*r00+fCtz*(r01+h01*r00),k31=fCty*r01+fCtz*(r11+h01*r01);
+ Double_t k40=fCcy*r00+fCcz*(r01+h01*r00),k41=fCcy*r01+fCcz*(r11+h01*r01);
Double_t dy=c->GetY() - fY, dz=c->GetZ() - fZ;
dy=dy+h01*dz;
- Double_t cur=fC + k20*dy + k21*dz, eta=fE + k30*dy + k31*dz;
+ Double_t cur=fC + k40*dy + k41*dz, eta=fE + k20*dy + k21*dz;
if (TMath::Abs(cur*fX-eta) >= 0.99999) {
- // if (fN>4) cerr<<fN<<" AliTRDtrack warning: Filtering failed !\n";
+ Int_t n=GetNumberOfClusters();
+ if (n>4) cerr<<n<<" AliTRDtrack warning: Filtering failed !\n";
return 0;
}
fY += k00*dy + k01*dz;
fZ += k10*dy + k11*dz;
- fC = cur;
fE = eta;
- fT += k40*dy + k41*dz;
+ fT += k30*dy + k31*dz;
+ fC = cur;
k01+=h01*k00;
k31+=h01*k30;
k41+=h01*k40;
- Double_t c01=fCzy, c02=fCcy, c03=fCey, c04=fCty;
- Double_t c12=fCcz, c13=fCez, c14=fCtz;
+ Double_t c01=fCzy, c02=fCey, c03=fCty, c04=fCcy;
+ Double_t c12=fCez, c13=fCtz, c14=fCcz;
fCyy-=k00*fCyy+k01*fCzy; fCzy-=k00*c01+k01*fCzz;
- fCcy-=k00*c02+k01*c12; fCey-=k00*c03+k01*c13;
- fCty-=k00*c04+k01*c14;
+ fCey-=k00*c02+k01*c12; fCty-=k00*c03+k01*c13;
+ fCcy-=k00*c04+k01*c14;
fCzz-=k10*c01+k11*fCzz;
- fCcz-=k10*c02+k11*c12; fCez-=k10*c03+k11*c13;
- fCtz-=k10*c04+k11*c14;
+ fCez-=k10*c02+k11*c12; fCtz-=k10*c03+k11*c13;
+ fCcz-=k10*c04+k11*c14;
- fCcc-=k20*c02+k21*c12; fCec-=k20*c03+k21*c13;
- fCtc-=k20*c04+k21*c14;
+ fCee-=k20*c02+k21*c12; fCte-=k20*c03+k21*c13;
+ fCce-=k20*c04+k21*c14;
- fCee-=k30*c03+k31*c13;
- fCte-=k30*c04+k31*c14;
+ fCtt-=k30*c03+k31*c13;
+ fCct-=k40*c03+k41*c13;
- fCtt-=k40*c04+k41*c14;
+ fCcc-=k40*c04+k41*c14;
Int_t n=GetNumberOfClusters();
fIndex[n]=index;
// Rotates track parameters in R*phi plane
fAlpha += alpha;
+ if (fAlpha<-TMath::Pi()) fAlpha += 2*TMath::Pi();
+ if (fAlpha>=TMath::Pi()) fAlpha -= 2*TMath::Pi();
Double_t x1=fX, y1=fY;
Double_t ca=cos(alpha), sa=sin(alpha);
}
//f = F - 1
- Double_t f00=ca-1, f32=(y1 - r1*x1/sqrt(1.- r1*r1))*sa,
- f30=fC*sa, f33=(ca + sa*r1/sqrt(1.- r1*r1))-1;
+ Double_t f00=ca-1, f24=(y1 - r1*x1/sqrt(1.- r1*r1))*sa,
+ f20=fC*sa, f22=(ca + sa*r1/sqrt(1.- r1*r1))-1;
//b = C*ft
- Double_t b00=fCyy*f00, b03=fCyy*f30+fCcy*f32+fCey*f33;
- Double_t b10=fCzy*f00, b13=fCzy*f30+fCcz*f32+fCez*f33;
- Double_t b20=fCcy*f00, b23=fCcy*f30+fCcc*f32+fCec*f33;
- Double_t b30=fCey*f00, b33=fCey*f30+fCec*f32+fCee*f33;
- Double_t b40=fCty*f00, b43=fCty*f30+fCtc*f32+fCte*f33;
+ Double_t b00=fCyy*f00, b02=fCyy*f20+fCcy*f24+fCey*f22;
+ Double_t b10=fCzy*f00, b12=fCzy*f20+fCcz*f24+fCez*f22;
+ Double_t b20=fCey*f00, b22=fCey*f20+fCce*f24+fCee*f22;
+ Double_t b30=fCty*f00, b32=fCty*f20+fCct*f24+fCte*f22;
+ Double_t b40=fCcy*f00, b42=fCcy*f20+fCcc*f24+fCce*f22;
//a = f*b = f*C*ft
- Double_t a00=f00*b00, a03=f00*b03, a33=f30*b03+f32*b23+f33*b33;
+ Double_t a00=f00*b00, a02=f00*b02, a22=f20*b02+f24*b42+f22*b22;
// *** Double_t dy2=fCyy;
//F*C*Ft = C + (a + b + bt)
fCyy += a00 + 2*b00;
fCzy += b10;
- fCcy += b20;
- fCey += a03+b30+b03;
- fCty += b40;
- fCez += b13;
- fCec += b23;
- fCee += a33 + 2*b33;
- fCte += b43;
+ fCey += a02+b20+b02;
+ fCty += b30;
+ fCcy += b40;
+ fCez += b12;
+ fCte += b32;
+ fCee += a22 + 2*b22;
+ fCce += b42;
// *** fCyy+=dy2*sa*sa*r1*r1/(1.- r1*r1);
// *** fCzz+=d2y*sa*sa*fT*fT/(1.- r1*r1);
fCyy*=10.;
fCzy=0.; fCzz*=10.;
- fCcy=0.; fCcz=0.; fCcc*=10.;
- fCey=0.; fCez=0.; fCec=0.; fCee*=10.;
- fCty=0.; fCtz=0.; fCtc=0.; fCte=0.; fCtt*=10.;
+ fCey=0.; fCez=0.; fCee*=10.;
+ fCty=0.; fCtz=0.; fCte=0.; fCtt*=10.;
+ fCcy=0.; fCcz=0.; fCce=0.; fCct=0.; fCcc*=10.;
}
/*
$Log$
+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
const Float_t AliTRDtracker::fLabelFraction = 0.8;
const Float_t AliTRDtracker::fWideRoad = 20.;
- const Double_t AliTRDtracker::fMaxChi2 = 24.;
+ const Double_t AliTRDtracker::fMaxChi2 = 12.;
//____________________________________________________________________
}
fSY2corr = 0.025;
- fSZ2corr = 12.;
+ fSZ2corr = 1.;
// calculate max gap on track
Double_t dx = (Double_t) fPar->GetTimeBinSize();
Int_t tbAmp = fPar->GetTimeBefore();
Int_t maxAmp = (Int_t) ((dxAmp+0.000001)/dx);
+ if(kTRUE) maxAmp = 0; // intentional until we change the parameter class
Int_t tbDrift = fPar->GetTimeMax();
Int_t maxDrift = (Int_t) ((dxDrift+0.000001)/dx);
Int_t s=Int_t(alpha/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;
- Double_t x0, rho, x, dx, y, ymax, z;
+ Double_t rad_length, 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,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()-dx/2; y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,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,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,rho)) break;
} else if (y <-ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) break;
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,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,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr-1)->GetX(); y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,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,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,rho)) break;
} else if (y <-ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) break;
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,rho)) break;
}
if (c->GetY() > y+road) break;
if (c->IsUsed() > 0) continue;
- if((c->GetZ()-z)*(c->GetZ()-z) > 2.25 * 12 * sz2) continue;
+ if((c->GetZ()-z)*(c->GetZ()-z) > 12 * sz2) continue;
Double_t h01 = GetTiltFactor(c);
Double_t chi2=t.GetPredictedChi2(c, h01);
Int_t outerTB = fTrSec[0]->GetOuterTimeBin();
- Double_t x0, rho, x, dx, y, ymax, z;
+ Double_t rad_length, rho, x, dx, y, ymax, z;
Bool_t lookForCluster;
// first propagate to the outer surface of the current time bin
- fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()+dx/2; y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,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,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,rho)) break;
} else if (y <-ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) break;
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,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,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr+1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr+1)->GetX(); y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,rho)) break;
y = t.GetY();
if (y > ymax) {
s = (s+1) % ns;
if (!t.Rotate(alpha)) break;
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,rho)) break;
} else if (y <-ymax) {
s = (s-1+ns) % ns;
if (!t.Rotate(-alpha)) break;
- if(!t.PropagateTo(x,x0,rho,0.139)) break;
+ if(!t.PropagateTo(x,rad_length,rho)) break;
}
// printf("label %d, pl %d, lookForCluster %d \n",
Int_t s=Int_t(alpha/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;
Bool_t lookForCluster;
- Double_t x0, rho, x, dx, y, ymax, z;
+ Double_t rad_length, 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,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()+dx/2; y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,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,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,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,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr+1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr+1)->GetX(); y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,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,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,rho)) return 0;
}
return 1;
}
Int_t s=Int_t(alpha/AliTRDgeometry::GetAlpha())%AliTRDgeometry::kNsect;
Bool_t lookForCluster;
- Double_t x0, rho, x, dx, y, ymax, z;
+ Double_t rad_length, 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,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr)->GetX()-dx/2; y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,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,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,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,x0,lookForCluster);
+ fTrSec[s]->GetLayer(nr-1)->GetPropagationParameters(y,z,dx,rho,rad_length,lookForCluster);
x = fTrSec[s]->GetLayer(nr-1)->GetX(); y = t.GetY(); z = t.GetZ();
- if(!t.PropagateTo(x,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,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,x0,rho,0.139)) return 0;
+ if(!t.PropagateTo(x,rad_length,rho)) return 0;
}
return 1;
}
Int_t tracking_sector = CookSectorIndex(sector);
Int_t gtb = fTrSec[tracking_sector]->CookTimeBinIndex(plane,local_time_bin);
+ if(gtb < 0) continue;
Int_t layer = fTrSec[tracking_sector]->GetLayerNumber(gtb);
index=ncl;
x[0]=y1;
x[1]=z1;
- x[2]=f1trd(x1,y1,x2,y2,x3,y3);
+ x[4]=f1trd(x1,y1,x2,y2,x3,y3);
- if (TMath::Abs(x[2]) > fMaxSeedC) continue;
+ if (TMath::Abs(x[4]) > fMaxSeedC) continue;
- x[3]=f2trd(x1,y1,x2,y2,x3,y3);
+ x[2]=f2trd(x1,y1,x2,y2,x3,y3);
- if (TMath::Abs(x[2]*x1-x[3]) >= 0.99999) continue;
+ if (TMath::Abs(x[4]*x1-x[2]) >= 0.99999) continue;
- x[4]=f3trd(x1,y1,x2,y2,z1,z2);
+ x[3]=f3trd(x1,y1,x2,y2,z1,z2);
- if (TMath::Abs(x[4]) > fMaxSeedTan) continue;
+ if (TMath::Abs(x[3]) > fMaxSeedTan) continue;
- Double_t a=asin(x[3]);
- Double_t zv=z1 - x[4]/x[2]*(a+asin(x[2]*x1-x[3]));
+ 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;
// Tilt changes
Double_t h01 = GetTiltFactor(r1[is]);
sy1=sy1+sz1*h01*h01;
- Double_t syz=sz1*h01;
+ Double_t syz=sz1*(-h01);
// end of tilt changes
- Double_t f20=(f1trd(x1,y1+sy,x2,y2,x3,y3)-x[2])/sy;
- Double_t f22=(f1trd(x1,y1,x2,y2+sy,x3,y3)-x[2])/sy;
- Double_t f24=(f1trd(x1,y1,x2,y2,x3,y3+sy)-x[2])/sy;
- Double_t f30=(f2trd(x1,y1+sy,x2,y2,x3,y3)-x[3])/sy;
- Double_t f32=(f2trd(x1,y1,x2,y2+sy,x3,y3)-x[3])/sy;
- Double_t f34=(f2trd(x1,y1,x2,y2,x3,y3+sy)-x[3])/sy;
- Double_t f40=(f3trd(x1,y1+sy,x2,y2,z1,z2)-x[4])/sy;
- Double_t f41=(f3trd(x1,y1,x2,y2,z1+sz,z2)-x[4])/sz;
- Double_t f42=(f3trd(x1,y1,x2,y2+sy,z1,z2)-x[4])/sy;
- Double_t f43=(f3trd(x1,y1,x2,y2,z1,z2+sz)-x[4])/sz;
+ Double_t f40=(f1trd(x1,y1+sy,x2,y2,x3,y3)-x[4])/sy;
+ Double_t f42=(f1trd(x1,y1,x2,y2+sy,x3,y3)-x[4])/sy;
+ Double_t f43=(f1trd(x1,y1,x2,y2,x3,y3+sy)-x[4])/sy;
+ Double_t f20=(f2trd(x1,y1+sy,x2,y2,x3,y3)-x[2])/sy;
+ Double_t f22=(f2trd(x1,y1,x2,y2+sy,x3,y3)-x[2])/sy;
+ Double_t f23=(f2trd(x1,y1,x2,y2,x3,y3+sy)-x[2])/sy;
+ Double_t f30=(f3trd(x1,y1+sy,x2,y2,z1,z2)-x[3])/sy;
+ Double_t f31=(f3trd(x1,y1,x2,y2,z1+sz,z2)-x[3])/sz;
+ Double_t f32=(f3trd(x1,y1,x2,y2+sy,z1,z2)-x[3])/sy;
+ Double_t f34=(f3trd(x1,y1,x2,y2,z1,z2+sz)-x[3])/sz;
+
- c[0]=sy1;
- // c[1]=0.; c[2]=sz1;
+ c[0]=sy1;
+ // c[1]=0.; c[2]=sz1;
c[1]=syz; c[2]=sz1*100;
- c[3]=f20*sy1; c[4]=0.; c[5]=f20*sy1*f20+f22*sy2*f22+f24*sy3*f24;
- c[6]=f30*sy1; c[7]=0.; c[8]=f30*sy1*f20+f32*sy2*f22+f34*sy3*f24;
- c[9]=f30*sy1*f30+f32*sy2*f32+f34*sy3*f34;
- c[10]=f40*sy1; c[11]=f41*sz1; c[12]=f40*sy1*f20+f42*sy2*f22;
- c[13]=f40*sy1*f30+f42*sy2*f32;
- c[14]=f40*sy1*f40+f41*sz1*f41+f42*sy2*f42+f43*sz2*f43;
+ 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;
+ c[10]=f40*sy1; c[11]=0.; c[12]=f40*sy1*f20+f42*sy2*f22+f43*sy3*f23;
+ c[13]=f30*sy1*f40+f32*sy2*f42;
+ c[14]=f40*sy1*f40+f42*sy2*f42+f43*sy3*f43;
+
UInt_t index=r1.GetIndex(is);
// Get the number of points in the detector
Int_t nCluster = ClusterArray->GetEntriesFast();
- printf("\r Read %d clusters from entry %d", nCluster, iEntry);
+ printf("\n Read %d clusters from entry %d", nCluster, iEntry);
// Loop through all TRD digits
for (Int_t iCluster = 0; iCluster < nCluster; iCluster++) {
//_______________________________________________________
AliTRDtracker::AliTRDpropagationLayer::AliTRDpropagationLayer(Double_t x,
- Double_t dx, Double_t rho, Double_t x0, Int_t tb_index)
+ Double_t dx, Double_t rho, Double_t rad_length, Int_t tb_index)
{
//
// AliTRDpropagationLayer constructor
//
- fN = 0; fX = x; fdX = dx; fRho = rho; fX0 = x0;
+ fN = 0; fX = x; fdX = dx; fRho = rho; fX0 = rad_length;
fClusters = NULL; fIndex = NULL; fTimeBinIndex = tb_index;
//_______________________________________________________
void AliTRDtracker::AliTRDpropagationLayer::SetHole(
Double_t Zmax, Double_t Ymax, Double_t rho,
- Double_t x0, Double_t Yc, Double_t Zc)
+ Double_t rad_length, Double_t Yc, Double_t Zc)
{
//
// Sets hole in the layer
fHoleYc = Yc;
fHoleYmax = Ymax;
fHoleRho = rho;
- fHoleX0 = x0;
+ fHoleX0 = rad_length;
}
AliTRDpropagationLayer* ppl;
- Double_t x, xin, xout, dx, rho, x0;
+ Double_t x, xin, xout, dx, rho, rad_length;
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; x0 = 28.94;
+ rho = 0.9e-3; rad_length = 28.94;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
InsertLayer(ppl);
}
// set time bins in the outer field cage vessel
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; x0 = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 0.02; xin = xout; xout = xin + dx; rho = 1.45; x0 = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 2.; xin = xout; xout = xin + dx; rho = 1.45*0.02; x0 = 41.28; // Nomex
+ dx = 2.; xin = xout; xout = xin + dx; rho = 1.45*0.02; rad_length = 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,x0,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
InsertLayer(ppl);
}
- dx = 0.02; xin = xout; xout = xin + dx; rho = 1.45; x0 = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; x0 = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
xin = xout; xout = 275.0;
steps = 50; dx = (xout - xin)/steps;
- rho = 1.977e-3; x0 = 36.2;
+ rho = 1.977e-3; rad_length = 36.2;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
InsertLayer(ppl);
}
// set time bins in the outer containment vessel
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 2.7; x0 = 24.01; // Al
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; x0 = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 0.06; xin = xout; xout = xin + dx; rho = 1.45; x0 = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 3.; xin = xout; xout = xin + dx; rho = 1.45*0.02; x0 = 41.28; // Nomex
+ dx = 3.; xin = xout; xout = xin + dx; rho = 1.45*0.02; rad_length = 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,x0,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
InsertLayer(ppl);
}
- dx = 0.06; xin = xout; xout = xin + dx; rho = 1.45; x0 = 44.86; // prepreg
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 1.71; x0 = 44.77; // Tedlar
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
InsertLayer(ppl);
- dx = 50e-4; xin = xout; xout = xin + dx; rho = 2.7; x0 = 24.01; // Al
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
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; x0 = 36.66;
+ rho = 1.2e-3; rad_length = 36.66;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
InsertLayer(ppl);
}
Double_t dxTEC = dxRad + dxDrift + dxAmp + dxRo;
Double_t dxPlane = dxTEC + dxSpace;
- Int_t tbBefore = (Int_t) (dxAmp/fPar->GetTimeBinSize());
- if(tbBefore > fPar->GetTimeBefore()) tbBefore = fPar->GetTimeBefore();
-
Int_t tb, tb_index;
const Int_t nChambers = AliTRDgeometry::Ncham();
Double_t Ymax = 0, holeYmax = 0;
Double_t * Zmax = new Double_t[nChambers];
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; x0 = 40.6;
+ steps = 12; dx = (xout - xin)/steps; rho = 0.074; rad_length = 40.6;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,-1);
+ 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);
}
dx = fPar->GetTimeBinSize();
- rho = 0.00295 * 0.85; x0 = 11.0;
+ rho = 0.00295 * 0.85; rad_length = 11.0;
Double_t x0 = (Double_t) fPar->GetTime0(plane);
Double_t xbottom = x0 - dxDrift;
for(tb = 0; tb < steps; tb++) {
x = x0 + tb * dx + dx/2;
tb_index = CookTimeBinIndex(plane, -tb-1);
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,tb_index);
+ 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]);
tb_index = CookTimeBinIndex(plane, -steps);
x = (x + dx/2 + xtop)/2;
dx = 2*(xtop-x);
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,tb_index);
+ 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]);
x = x0 - tb * dx - dx/2;
tb_index = CookTimeBinIndex(plane, tb);
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,tb_index);
+ 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]);
tb_index = CookTimeBinIndex(plane, steps);
x = (x - dx/2 + xbottom)/2;
dx = 2*(x-xbottom);
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,tb_index);
+ 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]);
InsertLayer(ppl);
// Pad Plane
- xin = xtop; dx = 0.025; xout = xin + dx; rho = 1.7; x0 = 33.0;
- ppl = new AliTRDpropagationLayer(xin+dx/2,dx,rho,x0,-1);
+ 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);
// Rohacell
xin = xout; xout = xtrd + (plane + 1) * dxPlane - dxSpace;
- steps = 5; dx = (xout - xin)/steps; rho = 0.074; x0 = 40.6;
+ steps = 5; dx = (xout - xin)/steps; rho = 0.074; rad_length = 40.6;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,-1);
+ 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);
// Space between the chambers, air
xin = xout; xout = xtrd + (plane + 1) * dxPlane;
- steps = 5; dx = (xout - xin)/steps; rho = 1.29e-3; x0 = 36.66;
+ steps = 5; dx = (xout - xin)/steps; rho = 1.29e-3; rad_length = 36.66;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,-1);
+ 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);
// Space between the TRD and RICH
Double_t xRICH = 500.;
xin = xout; xout = xRICH;
- steps = 200; dx = (xout - xin)/steps; rho = 1.29e-3; x0 = 36.66;
+ steps = 200; dx = (xout - xin)/steps; rho = 1.29e-3; rad_length = 36.66;
for(Int_t i=0; i<steps; i++) {
x = xin + i*dx + dx/2;
- ppl = new AliTRDpropagationLayer(x,dx,rho,x0,-1);
+ ppl = new AliTRDpropagationLayer(x,dx,rho,rad_length,-1);
InsertLayer(ppl);
}
Int_t tbAmp = fPar->GetTimeBefore();
Int_t maxAmp = (Int_t) ((dxAmp+0.000001)/dx);
+ if(kTRUE) maxAmp = 0; // intentional until we change parameter class
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 gtb = (plane+1) * tb_per_plane - local_tb - 1;
+ Int_t gtb = (plane+1) * tb_per_plane - local_tb - 1 - TMath::Min(tbAmp,maxAmp);
if((local_tb < 0) &&
(TMath::Abs(local_tb) > TMath::Min(tbAmp,maxAmp))) return -1;
//______________________________________________________
void AliTRDtracker::AliTRDpropagationLayer::GetPropagationParameters(
- Double_t y, Double_t z, Double_t &dx, Double_t &rho, Double_t &x0,
+ Double_t y, Double_t z, Double_t &dx, Double_t &rho, Double_t &rad_length,
Bool_t &lookForCluster) const
{
//
- // Returns radial step <dx>, density <rho>, rad. length <x0>,
+ // Returns radial step <dx>, density <rho>, rad. length <rad_length>,
// and sensitivity <lookForCluster> in point <y,z>
//
dx = fdX;
rho = fRho;
- x0 = fX0;
+ rad_length = fX0;
lookForCluster = kFALSE;
// check dead regions
}
if(TMath::Abs(y) > fYmax) lookForCluster = kFALSE;
if(!lookForCluster) {
- // rho = 1.7; x0 = 33.0; // G10
+ // rho = 1.7; rad_length = 33.0; // G10
}
}
(TMath::Abs(z - fHoleZc) < fHoleZmax)) {
lookForCluster = kFALSE;
rho = fHoleRho;
- x0 = fHoleX0;
+ rad_length = fHoleX0;
}
return;
Double_t h01 = sin(TMath::Pi() / 180.0 * fPar->GetTiltingAngle());
Int_t det = c->GetDetector();
Int_t plane = fGeom->GetPlane(det);
- if((plane == 0) || (plane == 2) || (plane == 4)) h01=-h01;
+
+ if((plane == 1) || (plane == 3) || (plane == 5)) h01=-h01;
return h01;
}