#include <TObjArray.h>
#include <TTree.h>
-#include "AliESD.h"
+#include "AliESDEvent.h"
#include "AliESDVertex.h"
#include "AliESDtrack.h"
#include "AliITSVertexer.h"
#include "AliITSclusterTable.h"
#include "AliITSRecPoint.h"
-#include "AliITSgeom.h"
+#include "AliITSgeomTGeo.h"
#include "AliITStrackSA.h"
#include "AliITStrackerSA.h"
#include "AliRun.h"
ClassImp(AliITStrackerSA)
//____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA():AliITStrackerMI(){
+AliITStrackerSA::AliITStrackerSA():AliITStrackerMI(),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(0),
+fVertexer(0),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0){
// Default constructor
Init();
}
//____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(AliITSgeom *geom):AliITStrackerMI(geom)
+AliITStrackerSA::AliITStrackerSA(const Char_t *geom):AliITStrackerMI(0),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(0),
+fVertexer(0),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0)
{
// Standard constructor (Vertex is known and passed to this obj.)
+ if (geom) {
+ AliWarning("\"geom\" is actually a dummy argument !");
+ }
+
Init();
fVert = 0;
- fGeom = geom;
}
//____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(AliITSgeom *geom, AliESDVertex *vert):AliITStrackerMI(geom)
+AliITStrackerSA::AliITStrackerSA(const Char_t *geom, AliESDVertex *vert):AliITStrackerMI(0),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(vert),
+fVertexer(0),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0)
{
// Standard constructor (Vertex is known and passed to this obj.)
+ if (geom) {
+ AliWarning("\"geom\" is actually a dummy argument !");
+ }
Init();
- fVert = vert;
- fGeom = geom;
}
//____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(AliITSgeom *geom, AliITSVertexer *vertexer):AliITStrackerMI(geom)
+AliITStrackerSA::AliITStrackerSA(const Char_t *geom, AliITSVertexer *vertexer):AliITStrackerMI(0),
+fPhiEstimate(0),
+fITSStandAlone(0),
+fLambdac(0),
+fPhic(0),
+fCoef1(0),
+fCoef2(0),
+fCoef3(0),
+fNloop(0),
+fPhiWin(0),
+fLambdaWin(0),
+fVert(),
+fVertexer(vertexer),
+fListOfTracks(0),
+fITSclusters(0),
+fSixPoints(0),
+fOuterStartLayer(0),
+fCluLayer(0),
+fCluCoord(0)
{
// Standard constructor (Vertex is unknown - vertexer is passed to this obj)
+ if (geom) {
+ AliWarning("\"geom\" is actually a dummy argument !");
+ }
Init();
fVertexer = vertexer;
- fGeom = geom;
}
//____________________________________________________________________________
-AliITStrackerSA::AliITStrackerSA(const AliITStrackerSA& tracker):AliITStrackerMI(){
+AliITStrackerSA::AliITStrackerSA(const AliITStrackerSA& tracker):AliITStrackerMI(),
+fPhiEstimate(tracker.fPhiEstimate),
+fITSStandAlone(tracker.fITSStandAlone),
+fLambdac(tracker.fLambdac),
+fPhic(tracker.fPhic),
+fCoef1(tracker.fCoef1),
+fCoef2(tracker.fCoef2),
+fCoef3(tracker.fCoef3),
+fNloop(tracker.fNloop),
+fPhiWin(tracker.fPhiWin),
+fLambdaWin(tracker.fLambdaWin),
+fVert(tracker.fVert),
+fVertexer(tracker.fVertexer),
+fListOfTracks(tracker.fListOfTracks),
+fITSclusters(tracker.fITSclusters),
+fSixPoints(tracker.fSixPoints),
+fOuterStartLayer(tracker.fOuterStartLayer),
+fCluLayer(tracker.fCluLayer),
+fCluCoord(tracker.fCluCoord) {
// Copy constructor
- fPhiEstimate = tracker.fPhiEstimate;
for(Int_t i=0;i<2;i++){
fPoint1[i]=tracker.fPoint1[i];
fPoint2[i]=tracker.fPoint2[i];
fPoint3[i]=tracker.fPoint3[i];
fPointc[i]=tracker.fPointc[i];
}
- fLambdac = tracker.fLambdac;
- fPhic = tracker.fPhic;
- fCoef1 = tracker.fCoef1;
- fCoef2 = tracker.fCoef2;
- fCoef3 = tracker.fCoef3;
- fNloop = tracker.fNloop;
- fPhiWin = tracker.fPhiWin;
- fLambdaWin = tracker.fLambdaWin;
if(tracker.fVertexer && tracker.fVert){
fVert = new AliESDVertex(*tracker.fVert);
}
else {
fVert = tracker.fVert;
}
- fVertexer = tracker.fVertexer;
- fGeom = tracker.fGeom;
- fListOfTracks = tracker.fListOfTracks;
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
fCluLayer[i] = tracker.fCluLayer[i];
fCluCoord[i] = tracker.fCluCoord[i];
}
}
//______________________________________________________________________
-AliITStrackerSA& AliITStrackerSA::operator=(const AliITStrackerSA& /*source*/){
- // Assignment operator. This is a function which is not allowed to be
- // done.
- Error("operator=","Assignment operator not allowed\n");
- return *this;
+AliITStrackerSA& AliITStrackerSA::operator=(const AliITStrackerSA& source){
+ // Assignment operator.
+ this->~AliITStrackerSA();
+ new(this) AliITStrackerSA(source);
+ return *this;
+
}
//____________________________________________________________________________
if(fPhiWin)delete []fPhiWin;
if(fLambdaWin)delete []fLambdaWin;
fListOfTracks->Delete();
+ delete fListOfTracks;
if(fCluLayer){
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
if(fCluLayer[i]){
fCluLayer[i]->Delete();
delete fCluLayer[i];
delete [] fCluLayer;
}
if(fCluCoord){
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
if(fCluCoord[i]){
fCluCoord[i]->Delete();
delete fCluCoord[i];
delete [] fCluCoord;
}
- fGeom = 0;
+}
+
+//____________________________________________________________________________
+Int_t AliITStrackerSA::Clusters2Tracks(AliESDEvent *event){
+// This method is used to find and fit the tracks. By default the corresponding
+// method in the parent class is invoked. In this way a combined tracking
+// TPC+ITS is performed. If the flag fITSStandAlone is true, the tracking
+// is done in the ITS only. In the standard reconstruction chain this option
+// can be set via AliReconstruction::SetOption("ITS","onlyITS")
+ Int_t rc=0;
+ if(!fITSStandAlone){
+ rc=AliITStrackerMI::Clusters2Tracks(event);
+ }
+ else {
+ AliDebug(1,"Stand Alone flag set: doing tracking in ITS alone\n");
+ }
+ if(!rc) rc=FindTracks(event);
+ return rc;
}
//____________________________________________________________________________
fPointc[1]=0;
fVert = 0;
fVertexer = 0;
- fGeom = 0;
SetWindowSizes();
fITSclusters = 0;
SetSixPoints();
+ SetOuterStartLayer(0);
+ SetSAFlag(kFALSE);
fListOfTracks=new TObjArray(0,0);
fCluLayer = 0;
fCluCoord = 0;
//______________________________________________________________________
-Int_t AliITStrackerSA::FindTracks(AliESD* event){
+Int_t AliITStrackerSA::FindTracks(AliESDEvent* event){
// Track finder using the ESD object
while (nentr--) {
AliESDtrack *track=event->GetTrack(nentr);
if (track->GetStatus()&AliESDtrack::kITSin==AliESDtrack::kITSin){
- UInt_t idx[6];
+ Int_t idx[12];
Int_t ncl = track->GetITSclusters(idx);
for(Int_t k=0;k<ncl;k++){
AliITSRecPoint* cll = (AliITSRecPoint*)GetCluster(idx[k]);
}
}
+ //Get primary vertex
Double_t primaryVertex[3];
event->GetVertex()->GetXYZ(primaryVertex);
//Creates TClonesArray with clusters for each layer. The clusters already used
Int_t nclusters[6]={0,0,0,0,0,0};
Int_t dmar[6]={0,0,0,0,0,0};
- fCluLayer = new TClonesArray*[fGeom->GetNlayers()];
- fCluCoord = new TClonesArray*[fGeom->GetNlayers()];
-
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ if (fCluLayer == 0) {
+ fCluLayer = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
+ fCluCoord = new TClonesArray*[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
+ fCluLayer[i]=0;
+ fCluCoord[i]=0;
+ }
+ }
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
AliITSlayer &layer=fgLayers[i];
for(Int_t cli=0;cli<layer.GetNumberOfClusters();cli++){
AliITSRecPoint* cls = (AliITSRecPoint*)layer.GetCluster(cli);
nclusters[i]++;
}
dmar[i]=0;
+ delete fCluLayer[i];
fCluLayer[i] = new TClonesArray("AliITSRecPoint",nclusters[i]);
+ delete fCluCoord[i];
fCluCoord[i] = new TClonesArray("AliITSclusterTable",nclusters[i]);
}
- Int_t * firstmod = new Int_t[fGeom->GetNlayers()];
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
- firstmod[i]=fGeom->GetModuleIndex(i+1,1,1);
+ Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ firstmod[i]=AliITSgeomTGeo::GetModuleIndex(i+1,1,1);
}
- for(Int_t ilay=0;ilay<fGeom->GetNlayers();ilay++){
+ for(Int_t ilay=0;ilay<AliITSgeomTGeo::GetNLayers();ilay++){
TClonesArray &clulay = *fCluLayer[ilay];
TClonesArray &clucoo = *fCluCoord[ilay];
AliITSlayer &layer=fgLayers[ilay];
Double_t phi=0;Double_t lambda=0;
Float_t x=0;Float_t y=0;Float_t z=0;
Float_t sx=0;Float_t sy=0;Float_t sz=0;
- Int_t module = cls->GetDetectorIndex()+firstmod[ilay];
- GetCoorAngles(cls,module,phi,lambda,x,y,z,primaryVertex);
- GetCoorErrors(cls,module,sx,sy,sz);
+ GetCoorAngles(cls,phi,lambda,x,y,z,primaryVertex);
+ GetCoorErrors(cls,sx,sy,sz);
new (clulay[dmar[ilay]]) AliITSRecPoint(*cls);
new (clucoo[dmar[ilay]]) AliITSclusterTable(x,y,z,sx,sy,sz,phi,lambda,cli);
dmar[ilay]++;
}
- //Get primary vertex
Int_t ntrack=0;
//loop on the different windows
fPoint2[0]=arr->GetX();
fPoint2[1]=arr->GetY();
- Int_t * nn = new Int_t[fGeom->GetNlayers()];//counter for clusters on each layer
- for(Int_t i=0;i<fGeom->GetNlayers();i++){ nn[i]=0;}
+ Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()];//counter for clusters on each layer
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){ nn[i]=0;}
nn[0] = SearchClusters(0,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
nn[1] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],trs,primaryVertex[2],pflag);
Int_t numberofpoints;
if(fSixPoints) numberofpoints=6; //check of the candidate track
else numberofpoints=5; //if track is good (with the required number
- for(Int_t nnp=0;nnp<fGeom->GetNlayers();nnp++){ //of points) it is written on file
+ for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers();nnp++){ //of points) it is written on file
if(nn[nnp]!=0) layOK+=1;
}
if(layOK>=numberofpoints){
outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
event->AddTrack(&outtrack);
ntrack++;
-
}
}
//if 5/6 points are required, second loop starting
- //from second layer, to find tracks with point of
- //layer 1 missing
-
- if(!fSixPoints){
+ //from second layer (SPD2), to find tracks with point of
+ //layer 1 missing
+ if(!fSixPoints) {
+ //printf("looking from SPD2\n");
// counter for clusters on each layer
- Int_t * nn = new Int_t[fGeom->GetNlayers()-1];
+ Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-1];
for(Int_t nloop=0;nloop<fNloop;nloop++){
Int_t ncl2=fCluLayer[1]->GetEntries();
while(ncl2--){ //loop starting from layer 2
fPoint2[0]=arr->GetX();
fPoint2[1]=arr->GetY();
- for(Int_t kk=0;kk<fGeom->GetNlayers()-1;kk++)nn[kk] = 0;
+ for(Int_t kk=0;kk<AliITSgeomTGeo::GetNLayers()-1;kk++)nn[kk] = 0;
nn[0] = SearchClusters(1,fPhiWin[nloop],fLambdaWin[nloop],
trs,primaryVertex[2],pflag);
nn[1] = SearchClusters(2,fPhiWin[nloop],fLambdaWin[nloop],
trs,primaryVertex[2],pflag);
Int_t fl=0;
- for(Int_t nnp=0;nnp<fGeom->GetNlayers()-1;nnp++){
+ for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-1;nnp++){
if(nn[nnp]!=0) fl+=1;
}
if(fl>=5){ // 5/6
ntrack++;
}
-
-
+
delete trs;
}//end loop on clusters of layer2
}
delete [] nn;
- } //end opt="5/6"
+ } //end opt="5/6"
+
+
+
+ // search for tracks starting from SPD2, SDD1, SDD2, SSD2
+ // for cosmics (A. Dainese 31.07.07)
+ if(fOuterStartLayer>0) {
+ for(Int_t innLay=1; innLay<=fOuterStartLayer; innLay++) {
+ printf("Searching from layer %d outward\n",innLay);
+ // counter for clusters on each layer
+ Int_t * nn = new Int_t[AliITSgeomTGeo::GetNLayers()-innLay];
+ for(Int_t nloop=0;nloop<fNloop;nloop++){
+ Int_t nclInnLay=fCluLayer[innLay]->GetEntries();
+ while(nclInnLay--){ //loop starting from layer innLay
+ ResetForFinding();
+ Int_t pflag=0;
+ AliITSRecPoint* cl = (AliITSRecPoint*)fCluLayer[innLay]->At(nclInnLay);
+
+ if(!cl) continue;
+ AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(innLay,nclInnLay);
+ fPhic = arr->GetPhi();
+ fLambdac = arr->GetLambda();
+ fPhiEstimate = fPhic;
+
+ AliITStrackSA* trs = new AliITStrackSA();
+ fPoint1[0]=primaryVertex[0];
+ fPoint1[1]=primaryVertex[1];
+ fPoint2[0]=arr->GetX();
+ fPoint2[1]=arr->GetY();
+
+ Int_t kk;
+ for(kk=0;kk<AliITSgeomTGeo::GetNLayers()-innLay;kk++) nn[kk] = 0;
+
+ kk=0;
+ nn[kk] = SearchClusters(innLay,fPhiWin[nloop],fLambdaWin[nloop],
+ trs,primaryVertex[2],pflag);
+ for(Int_t nextLay=innLay+1; nextLay<AliITSgeomTGeo::GetNLayers(); nextLay++) {
+ kk++;
+ nn[kk] = SearchClusters(nextLay,fPhiWin[nloop],fLambdaWin[nloop],
+ trs,primaryVertex[2],pflag);
+ if(nn[kk]!=0){
+ pflag=1;
+ if(kk==1) {
+ fPoint3[0]=fPointc[0];
+ fPoint3[1]=fPointc[1];
+ } else {
+ UpdatePoints();
+ }
+ }
+ }
+
+ Int_t fl=0;
+ for(Int_t nnp=0;nnp<AliITSgeomTGeo::GetNLayers()-innLay;nnp++){
+ if(nn[nnp]!=0) fl+=1;
+ }
+ if(fl>=AliITSgeomTGeo::GetNLayers()-innLay){
+ AliITStrackV2* tr2 = FitShortTrack(trs,primaryVertex,innLay);
+ if(tr2==0){
+ continue;
+ }
+
+ AliESDtrack outtrack;
+ outtrack.UpdateTrackParams(tr2,AliESDtrack::kITSin);
+ event->AddTrack(&outtrack);
+ ntrack++;
+
+ }
+
+ delete trs;
+ }//end loop on clusters of innLay
+ } //end loop on window sizes
+
+ delete [] nn;
+ } //end loop on innLay
+ } //end if(fOuterStartLayer>0)
+
delete [] firstmod;
Info("FindTracks","Number of found tracks: %d",event->GetNumberOfTracks());
//fit of the found track
- Int_t * firstmod = new Int_t[fGeom->GetNlayers()];
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
- firstmod[i]=fGeom->GetModuleIndex(i+1,1,1);
+ Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ firstmod[i]=AliITSgeomTGeo::GetModuleIndex(i+1,1,1);
}
Int_t nclusters = tr->GetNumberOfClustersSA();
- TObjArray** listlayer = new TObjArray*[fGeom->GetNlayers()];
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
listlayer[i] = new TObjArray(0,0);
}
TArrayI mark5(20);
- Int_t * nnn = new Int_t[fGeom->GetNlayers()];
- Int_t * kkk = new Int_t[fGeom->GetNlayers()];
- for(Int_t i=0;i<fGeom->GetNlayers();i++) {nnn[i]=0;kkk[i]=0;}
+ Int_t * nnn = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ Int_t * kkk = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {nnn[i]=0;kkk[i]=0;}
for(Int_t ncl=0;ncl<nclusters;ncl++){
Int_t index = tr->GetClusterIndexSA(ncl);
}
delete [] nnn;
- for(Int_t nlay=0;nlay<fGeom->GetNlayers();nlay++){
+ for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
for(Int_t ncl=0;ncl<tr->GetNumberOfMarked(nlay);ncl++){
Int_t mark = tr->GetClusterMark(nlay,ncl);
if(nlay==0) { mark0[kkk[0]]=mark;kkk[0]++;}
delete [] kkk;
- Int_t * end = new Int_t[fGeom->GetNlayers()];
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ Int_t * end = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
if(listlayer[i]->GetEntries()==0) end[i]=1;
else end[i]=listlayer[i]->GetEntries();
}
Int_t nlist=0;
if(end[0]==0) end[0]=1; //for tracks with cluster on layer 0 missing
- for(Int_t l1=0;l1<end[0];l1++){//loop on layer 1
+ for(Int_t l1=0;l1<end[0];l1++){ //loop on layer 1
AliITSRecPoint* cl0 = (AliITSRecPoint*)listlayer[0]->At(l1);
Double_t x1,y1,z1,sx1,sy1,sz1;
Double_t x2,y2,z2,sx2,sy2,sz2;
Int_t lay1=0;
Int_t lay2=1;
Int_t module1=-1;
- for(Int_t l2=0;l2<end[1];l2++){//loop on layer 2
+ for(Int_t l2=0;l2<end[1];l2++){ //loop on layer 2
AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1]->At(l2);
index2=clind1[l2];
mrk2 = mark1[l2];
AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2]->At(l3);
if(cl0==0 && cl1!=0) {
- p2 = cl2;index1=clind2[l3];mrk1=mark2[l3];lay1=2;
p1=cl1;
+ p2=cl2;
+ index1=clind1[l2];mrk1=mark1[l2];
+ index2=clind2[l3];mrk2=mark2[l3];
+ lay1=1;
+ lay2=2;
module1 = p1->GetDetectorIndex()+firstmod[1];
}
if(cl0!=0 && cl1==0){
p1=cl0;
- p2=cl2;index2=clind2[l3];mrk2=mark2[l3];lay2=2;
+ p2=cl2;index2=clind2[l3];mrk2=mark2[l3];
+ lay1=0;
+ lay2=2;
module1 = p1->GetDetectorIndex()+firstmod[0];
}
if(cl0!=0 && cl1!=0){
p1=cl0;
p2=cl1;
+ lay1=0;
+ lay2=1;
module1 = p1->GetDetectorIndex()+firstmod[0];
}
Int_t cln1=mrk1;
Int_t cln2=mrk2;
- AliITSclusterTable* arr = (AliITSclusterTable*)GetClusterCoord(lay1,cln1);
- AliITSclusterTable* arr1= (AliITSclusterTable*)GetClusterCoord(lay2,cln2);
- x1 = arr->GetX();
- x2 = arr1->GetX();
- y1 = arr->GetY();
- y2 = arr1->GetY();
- z1 = arr->GetZ();
- z2 = arr1->GetZ();
- sx1 = arr->GetSx();
- sx2 = arr1->GetSx();
- sy1 = arr->GetSy();
- sy2 = arr1->GetSy();
- sz1 = arr->GetSz();
- sz2 = arr1->GetSz();
+ AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(lay1,cln1);
+ AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(lay2,cln2);
+ x1 = arr1->GetX();
+ x2 = arr2->GetX();
+ y1 = arr1->GetY();
+ y2 = arr2->GetY();
+ z1 = arr1->GetZ();
+ z2 = arr2->GetZ();
+ sx1 = arr1->GetSx();
+ sx2 = arr2->GetSx();
+ sy1 = arr1->GetSy();
+ sy2 = arr2->GetSy();
+ sz1 = arr1->GetSz();
+ sz2 = arr2->GetSz();
Int_t layer,ladder,detector;
- fGeom->GetModuleId(module1,layer,ladder,detector);
+ AliITSgeomTGeo::GetModuleId(module1,layer,ladder,detector);
Float_t yclu1 = p1->GetY();
Float_t zclu1 = p1->GetZ();
- Double_t cv=Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2);
-
+ Double_t cv=Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2);
Double_t tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1));
Double_t phi2 = TMath::ATan2((y2-y1),(x2-x1));
AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4]->At(l5);
for(Int_t l6=0;l6<end[5];l6++){ //loop on layer 6
AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5]->At(l6);
- AliITStrackSA* trac = new AliITStrackSA(fGeom,layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
+ AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
if(cl5!=0) {
trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0);
AliITStrackMI* ot = new AliITStrackSA(*trac);
- ot->ResetCovariance();
+ ot->ResetCovariance(10.);
ot->ResetClusters();
- if(RefitAt(49.,ot,trac)){ //fit from layer 1 to layer 6
+ if(RefitAt(krInsideITSscreen,ot,trac)){ //fit from layer 1 to layer 6
AliITStrackMI *otrack2 = new AliITStrackMI(*ot);
- otrack2->ResetCovariance();
+ otrack2->ResetCovariance(10.);
otrack2->ResetClusters();
//fit from layer 6 to layer 1
- if(RefitAt(3.7,otrack2,ot)) {
+ if(RefitAt(krInsideSPD1,otrack2,ot)) {
fListOfTracks->AddLast(otrack2);
new (tri[nlist]) AliITStrackSA(*trac);
nlist++;
delete trac;
}//end loop layer 6
}//end loop layer 5
- }//end loop layer 4
-
+ }//end loop layer 4
}//end loop layer 3
}//end loop layer 2
}//end loop layer 1
Int_t dim=fListOfTracks->GetEntries();
if(dim==0){
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
delete listlayer[i];
}
delete [] listlayer;
AliITStrackSA* trsa = (AliITStrackSA*)listSA->At(lowchi2);
if(otrack==0) {
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
delete listlayer[i];
}
delete [] listlayer;
delete [] firstmod;
return 0;
}
- Int_t * indexc = new Int_t[fGeom->GetNlayers()];
- for(Int_t i=0;i<fGeom->GetNlayers();i++) indexc[i]=0;
+ Int_t * indexc = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) indexc[i]=0;
for(Int_t nind=0;nind<otrack->GetNumberOfClusters();nind++){
indexc[nind] = otrack->GetClusterIndex(nind);
}
AliITSRecPoint* cl3 = (AliITSRecPoint*)GetCluster(indexc[3]);
AliITSRecPoint* cl4 = (AliITSRecPoint*)GetCluster(indexc[4]);
Int_t labl[3]={-1,-1,-1};
- if(otrack->GetNumberOfClusters()==fGeom->GetNlayers()){
+ if(otrack->GetNumberOfClusters()==AliITSgeomTGeo::GetNLayers()){
AliITSRecPoint* cl5 = (AliITSRecPoint*)GetCluster(indexc[5]);
labl[0]=cl5->GetLabel(0);
labl[1]=cl5->GetLabel(1);
labl[2]=cl5->GetLabel(2);
}
delete [] indexc;
- if(otrack->GetNumberOfClusters()==(fGeom->GetNlayers()-1)){
+ if(otrack->GetNumberOfClusters()==(AliITSgeomTGeo::GetNLayers()-1)){
labl[0]=-1;
labl[1]=-1;
labl[2]=-1;
otrack->SetLabel(label);
//remove clusters of found track
- for(Int_t nlay=0;nlay<fGeom->GetNlayers();nlay++){
+ for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
for(Int_t cln=0;cln<trsa->GetNumberOfMarked(nlay);cln++){
Int_t index = trsa->GetClusterMark(nlay,cln);
fCluLayer[nlay]->RemoveAt(index);
listSA->Delete();
delete listSA;
- for(Int_t i=0;i<fGeom->GetNlayers();i++){
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ delete listlayer[i];
+ }
+ delete [] listlayer;
+ delete [] firstmod;
+ return otrack;
+
+}
+
+//________________________________________________________________________
+
+AliITStrackV2* AliITStrackerSA::FitShortTrack(AliITStrackSA* tr,Double_t *primaryVertex,Int_t innLay){
+ //fit of the found track (short tracks, <6 points, for cosmics). A.Dainese 31.07.07
+
+
+ Int_t * firstmod = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ firstmod[i]=AliITSgeomTGeo::GetModuleIndex(i+1,1,1);
+ }
+
+ Int_t nclusters = tr->GetNumberOfClustersSA();
+ TObjArray** listlayer = new TObjArray*[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ listlayer[i] = new TObjArray(0,0);
+ }
+
+ TArrayI clind0(20);
+ TArrayI clind1(20);
+ TArrayI clind2(20);
+ TArrayI clind3(20);
+ TArrayI clind4(20);
+ TArrayI clind5(20);
+
+ TArrayI mark0(20);
+ TArrayI mark1(20);
+ TArrayI mark2(20);
+ TArrayI mark3(20);
+ TArrayI mark4(20);
+ TArrayI mark5(20);
+
+
+ Int_t * nnn = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ Int_t * kkk = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {nnn[i]=0;kkk[i]=0;}
+
+ for(Int_t ncl=0;ncl<nclusters;ncl++){
+ Int_t index = tr->GetClusterIndexSA(ncl);
+ AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(index);
+ if(cl->TestBit(kSAflag)==kTRUE) cl->ResetBit(kSAflag);
+ Int_t lay = (index & 0xf0000000) >> 28;
+ if(lay==0) { listlayer[0]->AddLast(cl); clind0[nnn[0]]=index;nnn[0]++;}
+ if(lay==1) { listlayer[1]->AddLast(cl); clind1[nnn[1]]=index;nnn[1]++;}
+ if(lay==2) { listlayer[2]->AddLast(cl); clind2[nnn[2]]=index;nnn[2]++;}
+ if(lay==3) { listlayer[3]->AddLast(cl); clind3[nnn[3]]=index;nnn[3]++;}
+ if(lay==4) { listlayer[4]->AddLast(cl); clind4[nnn[4]]=index;nnn[4]++;}
+ if(lay==5) { listlayer[5]->AddLast(cl); clind5[nnn[5]]=index;nnn[5]++;}
+ }
+ delete [] nnn;
+
+ for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
+ for(Int_t ncl=0;ncl<tr->GetNumberOfMarked(nlay);ncl++){
+ Int_t mark = tr->GetClusterMark(nlay,ncl);
+ if(nlay==0) { mark0[kkk[0]]=mark;kkk[0]++;}
+ if(nlay==1) { mark1[kkk[1]]=mark;kkk[1]++;}
+ if(nlay==2) { mark2[kkk[2]]=mark;kkk[2]++;}
+ if(nlay==3) { mark3[kkk[3]]=mark;kkk[3]++;}
+ if(nlay==4) { mark4[kkk[4]]=mark;kkk[4]++;}
+ if(nlay==5) { mark5[kkk[5]]=mark;kkk[5]++;}
+
+ }
+ }
+
+ delete [] kkk;
+
+
+ Int_t * end = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ if(listlayer[i]->GetEntries()==0) end[i]=1;
+ else end[i]=listlayer[i]->GetEntries();
+ }
+
+ TClonesArray* listSA = new TClonesArray("AliITStrackSA");
+ TClonesArray &tri = *listSA;
+ Int_t nlist=0;
+
+ // if(end[0]==0) end[0]=1; //for tracks with cluster on layer 0 missing
+ for(Int_t l1=0;l1<end[0];l1++){ //loop on layer 1
+ AliITSRecPoint* cl0 = (AliITSRecPoint*)listlayer[0]->At(l1);
+ for(Int_t l2=0;l2<end[1];l2++){ //loop on layer 2
+ AliITSRecPoint* cl1 = (AliITSRecPoint*)listlayer[1]->At(l2);
+ for(Int_t l3=0;l3<end[2];l3++){ //loop on layer 3
+ AliITSRecPoint* cl2 = (AliITSRecPoint*)listlayer[2]->At(l3);
+ for(Int_t l4=0;l4<end[3];l4++){ //loop on layer 4
+ AliITSRecPoint* cl3 = (AliITSRecPoint*)listlayer[3]->At(l4);
+ for(Int_t l5=0;l5<end[4];l5++){ //loop on layer 5
+ AliITSRecPoint* cl4 = (AliITSRecPoint*)listlayer[4]->At(l5);
+ for(Int_t l6=0;l6<end[5];l6++){ //loop on layer 6
+ AliITSRecPoint* cl5 = (AliITSRecPoint*)listlayer[5]->At(l6);
+
+
+ Double_t x1,y1,z1,sx1,sy1,sz1;
+ Double_t x2,y2,z2,sx2,sy2,sz2;
+ AliITSRecPoint* p1=0;
+ AliITSRecPoint* p2=0;
+ Int_t index1=0,index2=0;
+ Int_t mrk1=0,mrk2=0;
+ if(innLay==1) {
+ p1=cl1;
+ p2=cl2;
+ index1=clind1[l2];mrk1=mark1[l2];
+ index2=clind2[l3];mrk2=mark2[l3];
+ } else if(innLay==2) {
+ p1=cl2;
+ p2=cl3;
+ index1=clind2[l3];mrk1=mark2[l3];
+ index2=clind3[l4];mrk2=mark3[l4];
+ } else if(innLay==3) {
+ p1=cl3;
+ p2=cl4;
+ index1=clind3[l4];mrk1=mark3[l4];
+ index2=clind4[l5];mrk2=mark4[l5];
+ } else if(innLay==4) {
+ p1=cl4;
+ p2=cl5;
+ index1=clind4[l5];mrk1=mark4[l5];
+ index2=clind5[l6];mrk2=mark5[l6];
+ }
+ Int_t lay1=innLay;
+ Int_t lay2=innLay+1;
+ Int_t module1 = p1->GetDetectorIndex()+firstmod[innLay];
+
+ Int_t cln1=mrk1;
+ Int_t cln2=mrk2;
+ AliITSclusterTable* arr1 = (AliITSclusterTable*)GetClusterCoord(lay1,cln1);
+ AliITSclusterTable* arr2 = (AliITSclusterTable*)GetClusterCoord(lay2,cln2);
+ x1 = arr1->GetX();
+ x2 = arr2->GetX();
+ y1 = arr1->GetY();
+ y2 = arr2->GetY();
+ z1 = arr1->GetZ();
+ z2 = arr2->GetZ();
+ sx1 = arr1->GetSx();
+ sx2 = arr2->GetSx();
+ sy1 = arr1->GetSy();
+ sy2 = arr2->GetSy();
+ sz1 = arr1->GetSz();
+ sz2 = arr2->GetSz();
+
+ Int_t layer,ladder,detector;
+ AliITSgeomTGeo::GetModuleId(module1,layer,ladder,detector);
+ Float_t yclu1 = p1->GetY();
+ Float_t zclu1 = p1->GetZ();
+ Double_t cv=Curvature(primaryVertex[0],primaryVertex[1],x1,y1,x2,y2);
+ Double_t tgl2 = (z2-z1)/TMath::Sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1));
+ Double_t phi2 = TMath::ATan2((y2-y1),(x2-x1));
+ //printf("phi2: %f tgl2: %f\n",phi2,tgl2);
+ AliITStrackSA* trac = new AliITStrackSA(layer,ladder,detector,yclu1,zclu1,phi2,tgl2,cv,1);
+
+ //Float_t clxyz[3];
+ if(cl5!=0) {
+ trac->AddClusterV2(5,(clind5[l6] & 0x0fffffff)>>0);
+ trac->AddClusterMark(5,mark5[l6]);
+ //cl5->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+ }
+ if(cl4!=0){
+ trac->AddClusterV2(4,(clind4[l5] & 0x0fffffff)>>0);
+ trac->AddClusterMark(4,mark4[l5]);
+ //cl4->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+ }
+ if(cl3!=0){
+ trac->AddClusterV2(3,(clind3[l4] & 0x0fffffff)>>0);
+ trac->AddClusterMark(3,mark3[l4]);
+ //cl3->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+ }
+ if(cl2!=0){
+ trac->AddClusterV2(2,(clind2[l3] & 0x0fffffff)>>0);
+ trac->AddClusterMark(2,mark2[l3]);
+ //cl2->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+ }
+ if(cl1!=0){
+ trac->AddClusterV2(1,(clind1[l2] & 0x0fffffff)>>0);
+ trac->AddClusterMark(1,mark1[l2]);
+ //cl1->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+ }
+ if(cl0!=0){
+ trac->AddClusterV2(0,(clind0[l1] & 0x0fffffff)>>0);
+ trac->AddClusterMark(0,mark0[l1]);
+ //cl0->GetGlobalXYZ(clxyz);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+ }
+
+
+ //fit with Kalman filter using AliITStrackerMI::RefitAt()
+ AliITStrackMI* ot = new AliITStrackSA(*trac);
+
+ ot->ResetCovariance(10.);
+ ot->ResetClusters();
+
+ //printf("%d \n",trac->GetNumberOfClusters());for(Int_t ijk=0;ijk<trac->GetNumberOfClusters();ijk++) printf(" %d",trac->GetClusterIndex(ijk)); printf("\n");
+ if(RefitAt(krInsideITSscreen,ot,trac)){ //fit from layer 1 to layer 6
+ AliITStrackMI *otrack2 = new AliITStrackMI(*ot);
+ otrack2->ResetCovariance(10.);
+ otrack2->ResetClusters();
+ //fit from layer 6 to layer 1
+ if(RefitAt(krInsideSPD1,otrack2,ot)) {
+ fListOfTracks->AddLast(otrack2);
+ new (tri[nlist]) AliITStrackSA(*trac);
+ nlist++;
+ } else {
+ delete otrack2;
+ }
+
+ }
+
+ delete ot;
+ delete trac;
+ }//end loop layer 6
+ }//end loop layer 5
+ }//end loop layer 4
+ }//end loop layer 3
+ }//end loop layer 2
+ }//end loop layer 1
+
+ delete [] end;
+
+
+
+ Int_t dim=fListOfTracks->GetEntries();
+ if(dim==0){
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ delete listlayer[i];
+ }
+ delete [] listlayer;
+ listSA->Delete();
+ delete listSA;
+ delete [] firstmod;
+ return 0;
+ }
+
+ Int_t lowchi2 = FindTrackLowChiSquare(fListOfTracks,dim);
+ AliITStrackV2* otrack =(AliITStrackV2*)fListOfTracks->At(lowchi2);
+ AliITStrackSA* trsa = (AliITStrackSA*)listSA->At(lowchi2);
+
+ if(otrack==0) {
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
+ delete listlayer[i];
+ }
+ delete [] listlayer;
+ listSA->Delete();
+ delete listSA;
+ delete [] firstmod;
+ return 0;
+ }
+ Int_t * indexc = new Int_t[AliITSgeomTGeo::GetNLayers()];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) indexc[i]=0;
+ for(Int_t nind=0;nind<otrack->GetNumberOfClusters();nind++){
+ indexc[nind] = otrack->GetClusterIndex(nind);
+ }
+ Int_t labl[6][3];
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++) {
+ if(i<otrack->GetNumberOfClusters()) {
+ AliITSRecPoint* cl = (AliITSRecPoint*)GetCluster(indexc[i]);
+ labl[i][0]=cl->GetLabel(0);
+ labl[i][1]=cl->GetLabel(1);
+ labl[i][2]=cl->GetLabel(2);
+ } else {
+ labl[i][0]=-1;
+ labl[i][1]=-1;
+ labl[i][2]=-1;
+ }
+ }
+ delete [] indexc;
+ Int_t numberofpoints=AliITSgeomTGeo::GetNLayers()-innLay;
+ CookLabel(otrack,0.); //MI change - to see fake ratio
+
+ Int_t label=FindLabel(labl[0][0],labl[1][0],labl[2][0],labl[3][0],labl[4][0],labl[5][0]);
+ Int_t lflag=0;
+ for(Int_t i=0;i<numberofpoints;i++)
+ if(labl[i][0]==label || labl[i][1]==label || labl[i][2]==label) lflag++;
+
+ if(lflag<numberofpoints) label = -label;
+ otrack->SetLabel(label);
+
+ //remove clusters of found track
+ for(Int_t nlay=0;nlay<AliITSgeomTGeo::GetNLayers();nlay++){
+ for(Int_t cln=0;cln<trsa->GetNumberOfMarked(nlay);cln++){
+ Int_t index = trsa->GetClusterMark(nlay,cln);
+ fCluLayer[nlay]->RemoveAt(index);
+ RemoveClusterCoord(nlay,index);
+ fCluLayer[nlay]->Compress();
+ }
+ }
+ listSA->Delete();
+ delete listSA;
+
+ for(Int_t i=0;i<AliITSgeomTGeo::GetNLayers();i++){
delete listlayer[i];
}
delete [] listlayer;
FindEquation(fPoint1[0],fPoint1[1],fPoint2[0],fPoint2[1],fPoint3[0],fPoint3[1],fCoef1,fCoef2,fCoef3);
if (FindIntersection(fCoef1,fCoef2,fCoef3,-r*r,cx1,cy1,cx2,cy2)==0)
return 0;
- Double_t fi1=TMath::ATan2(cy1,cx1);
- Double_t fi2=TMath::ATan2(cy2,cx2);
+ Double_t fi1=TMath::ATan2(cy1-fPoint1[1],cx1-fPoint1[0]);
+ Double_t fi2=TMath::ATan2(cy2-fPoint1[1],cx2-fPoint1[0]);
fPhiEstimate=ChoosePoint(fi1,fi2,fPhic);
}
//_________________________________________________________________
Int_t AliITStrackerSA::FindTrackLowChiSquare(TObjArray* tracklist, Int_t dim) const {
- // returns track with lowes chi square
+ // returns track with lowers chi square
if(dim==1){
//AliITStrackV2* trk = (AliITStrackV2*)tracklist->At(0);
//return trk;
return 0;
}
- //if(dim==0) return 0;
+ if(dim==0) return 0;
Double_t * chi2 = new Double_t[dim];
Int_t * index = new Int_t[dim];
for(Int_t i=0;i<dim;i++){
}
w++;
}
-
+ Int_t tmp = index[dim-1];
delete [] chi2;
delete [] index;
- return index[dim-1];
+ return tmp;
}
//__________________________________________________________
Int_t ff=0;
Int_t ll=0;
Int_t k=0;Int_t w=0;Int_t num=6;
- if(lb[5]==-1) num=5;
+ for(Int_t i=5;i>=0;i--) if(lb[i]==-1) num=i;
while(k<num){
aa[i]=0;
}
}
- k++;
+ k++;
}
while(w<num){
-
+
for(Int_t j=0;j<6;j++){
if(aa[w]<aa[j]){
ff=aa[w];
lb[j]=ll;
}
}
- w++;
+ w++;
}
- if(num==6) return lb[5];
- else return lb[4];
+
+ if(num<1) return -1;
+ return lb[num-1];
}
//_____________________________________________________________________________
}
//_______________________________________________________________________
-void AliITStrackerSA::GetCoorAngles(AliITSRecPoint* cl,Int_t module,Double_t &phi,Double_t &lambda, Float_t &x, Float_t &y,Float_t &z,Double_t* vertex){
+void AliITStrackerSA::GetCoorAngles(AliITSRecPoint* cl,Double_t &phi,Double_t &lambda, Float_t &x, Float_t &y,Float_t &z,Double_t* vertex){
//Returns values of phi (azimuthal) and lambda angles for a given cluster
-
+/*
Double_t rot[9]; fGeom->GetRotMatrix(module,rot);
Int_t lay,lad,det; fGeom->GetModuleId(module,lay,lad,det);
Float_t tx,ty,tz; fGeom->GetTrans(lay,lad,det,tx,ty,tz);
Float_t cp=TMath::Cos(phi1), sp=TMath::Sin(phi1);
Float_t r=tx*cp+ty*sp;
- x= r*cp - cl->GetY()*sp;
+ xyz= r*cp - cl->GetY()*sp;
y= r*sp + cl->GetY()*cp;
z=cl->GetZ();
-
- phi=TMath::ATan2(y,x);
+*/
+ Float_t xyz[3];
+ cl->GetGlobalXYZ(xyz);
+ x=xyz[0];
+ y=xyz[1];
+ z=xyz[2];
+
+ phi=TMath::ATan2(y-vertex[1],x-vertex[0]);
lambda=TMath::ATan2(z-vertex[2],TMath::Sqrt((x-vertex[0])*(x-vertex[0])+(y-vertex[1])*(y-vertex[1])));
}
//________________________________________________________________________
-void AliITStrackerSA::GetCoorErrors(AliITSRecPoint* cl, Int_t module,Float_t &sx,Float_t &sy, Float_t &sz){
-
- //returns x,y,z of cluster in global coordinates
+void AliITStrackerSA::GetCoorErrors(AliITSRecPoint* cl,Float_t &sx,Float_t &sy, Float_t &sz){
+ //returns sigmax, y, z of cluster in global coordinates
+/*
Double_t rot[9]; fGeom->GetRotMatrix(module,rot);
- Int_t lay,lad,det; fGeom->GetModuleId(module,lay,lad,det);
+ Int_t lay,lad,det;
+ AliITSgeomTGeo::GetModuleId(module,lay,lad,det);
Double_t alpha=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
Double_t phi=TMath::Pi()/2+alpha;
if (lay==1) phi+=TMath::Pi();
Float_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
-
+*/
+ Float_t covm[6];
+ cl->GetGlobalCov(covm);
+ sx=TMath::Sqrt(covm[0]);
+ sy=TMath::Sqrt(covm[3]);
+ sz=TMath::Sqrt(covm[5]);
+/*
sx = TMath::Sqrt(sp*sp*cl->GetSigmaY2());
sy = TMath::Sqrt(cp*cp*cl->GetSigmaY2());
sz = TMath::Sqrt(cl->GetSigmaZ2());
-
+*/
}
+
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff