/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * Copyright(c) 2007-2009, ALICE Experiment at CERN, All rights reserved. *
* *
* Author: The ALICE Off-line Project. *
* Contributors are mentioned in the code where appropriate. *
* about the suitability of this software for any purpose. It is *
* provided "as is" without express or implied warranty. *
**************************************************************************/
+/* $Id$ */
//-------------------------------------------------------------------------
// Implementation of the ITS tracker class
-// It reads AliITSclusterV2 clusters and creates AliITStrackMI tracks
+// It reads AliITSRecPoint clusters and creates AliITStrackMI tracks
// and fills with them the ESD
// Origin: Marian Ivanov, CERN, Marian.Ivanov@cern.ch
-// dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
-//
+// dE/dx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch
+// Params moved to AliITSRecoParam by: Andrea Dainese, INFN
+// Material budget from TGeo by: Ludovic Gaudichet & Andrea Dainese, INFN
//-------------------------------------------------------------------------
-#include "AliITSrecoV2.h"
+
+#include <TMatrixD.h>
#include <TTree.h>
-#include "AliITSgeom.h"
-#include "AliESD.h"
-#include "AliITSclusterV2.h"
-#include "AliITStrackerMI.h"
-#include "TMatrixD.h"
-#include "TFile.h"
-#include "TTree.h"
+#include <TTreeStream.h>
+#include <TTree.h>
+#include <TDatabasePDG.h>
+#include <TString.h>
+
+
+#include "AliESDEvent.h"
+#include "AliESDtrack.h"
+#include "AliESDVertex.h"
+#include "AliV0.h"
#include "AliHelix.h"
-#include "AliESDV0MI.h"
-#include "AliLog.h"
-#include "TTreeStream.h"
+#include "AliITSRecPoint.h"
+#include "AliITSgeomTGeo.h"
+#include "AliITStrackerMI.h"
+#include "AliITSReconstructor.h"
+#include "AliTrackPointArray.h"
+#include "AliAlignObj.h"
ClassImp(AliITStrackerMI)
AliITStrackerMI::AliITSlayer AliITStrackerMI::fgLayers[kMaxLayer]; // ITS layers
-AliITStrackerMI::AliITStrackerMI(const AliITSgeom *geom) : AliTracker() {
+AliITStrackerMI::AliITStrackerMI():AliTracker(),
+fI(0),
+fBestTrack(),
+fTrackToFollow(),
+fTrackHypothesys(),
+fBestHypothesys(),
+fOriginal(),
+fCurrentEsdTrack(),
+fPass(0),
+fAfterV0(kFALSE),
+fLastLayerToTrackTo(0),
+fCoefficients(0),
+fEsd(0),
+fUseTGeo(kFALSE),
+fDebugStreamer(0){
+ //Default constructor
+ for(Int_t i=0;i<4;i++) fSPDdetzcentre[i]=0.;
+}
+//------------------------------------------------------------------------
+AliITStrackerMI::AliITStrackerMI(const Char_t *geom) : AliTracker(),
+fI(kMaxLayer),
+fBestTrack(),
+fTrackToFollow(),
+fTrackHypothesys(),
+fBestHypothesys(),
+fOriginal(),
+fCurrentEsdTrack(),
+fPass(0),
+fAfterV0(kFALSE),
+fLastLayerToTrackTo(kLastLayerToTrackTo),
+fCoefficients(0),
+fEsd(0),
+fUseTGeo(kFALSE),
+fDebugStreamer(0){
//--------------------------------------------------------------------
//This is the AliITStrackerMI constructor
//--------------------------------------------------------------------
- fCoeficients = 0;
+ if (geom) {
+ AliWarning("\"geom\" is actually a dummy argument !");
+ }
+
+ fCoefficients = 0;
fAfterV0 = kFALSE;
- AliITSgeom *g=(AliITSgeom*)geom;
- Float_t x,y,z;
- Int_t i;
- for (i=1; i<kMaxLayer+1; i++) {
- Int_t nlad=g->GetNladders(i);
- Int_t ndet=g->GetNdetectors(i);
-
- g->GetTrans(i,1,1,x,y,z);
- Double_t r=TMath::Sqrt(x*x + y*y);
+
+ for (Int_t i=1; i<kMaxLayer+1; i++) {
+ Int_t nlad=AliITSgeomTGeo::GetNLadders(i);
+ Int_t ndet=AliITSgeomTGeo::GetNDetectors(i);
+
+ Double_t xyz[3], &x=xyz[0], &y=xyz[1], &z=xyz[2];
+ AliITSgeomTGeo::GetOrigTranslation(i,1,1,xyz);
Double_t poff=TMath::ATan2(y,x);
Double_t zoff=z;
+ Double_t r=TMath::Sqrt(x*x + y*y);
- g->GetTrans(i,1,2,x,y,z);
+ AliITSgeomTGeo::GetOrigTranslation(i,1,2,xyz);
r += TMath::Sqrt(x*x + y*y);
- g->GetTrans(i,2,1,x,y,z);
+ AliITSgeomTGeo::GetOrigTranslation(i,2,1,xyz);
r += TMath::Sqrt(x*x + y*y);
- g->GetTrans(i,2,2,x,y,z);
+ AliITSgeomTGeo::GetOrigTranslation(i,2,2,xyz);
r += TMath::Sqrt(x*x + y*y);
r*=0.25;
for (Int_t j=1; j<nlad+1; j++) {
for (Int_t k=1; k<ndet+1; k++) { //Fill this layer with detectors
- Float_t x,y,zshift; g->GetTrans(i,j,k,x,y,zshift);
- Double_t rot[9]; g->GetRotMatrix(i,j,k,rot);
+ TGeoHMatrix m; AliITSgeomTGeo::GetOrigMatrix(i,j,k,m);
+ const TGeoHMatrix *tm=AliITSgeomTGeo::GetTracking2LocalMatrix(i,j,k);
+ m.Multiply(tm);
+ Double_t txyz[3]={0.}, xyz[3]={0.};
+ m.LocalToMaster(txyz,xyz);
+ Double_t r=TMath::Sqrt(xyz[0]*xyz[0] + xyz[1]*xyz[1]);
+ Double_t phi=TMath::ATan2(xyz[1],xyz[0]);
- Double_t phi=TMath::ATan2(rot[1],rot[0])+TMath::Pi();
- phi+=TMath::Pi()/2;
- if (i==1) phi+=TMath::Pi();
- Double_t cp=TMath::Cos(phi), sp=TMath::Sin(phi);
- Double_t r=x*cp+y*sp;
+ if (phi<0) phi+=TMath::TwoPi();
+ else if (phi>=TMath::TwoPi()) phi-=TMath::TwoPi();
AliITSdetector &det=fgLayers[i-1].GetDetector((j-1)*ndet + k-1);
new(&det) AliITSdetector(r,phi);
fPass=0;
fConstraint[0]=1; fConstraint[1]=0;
- Double_t xyz[]={kXV,kYV,kZV}, ers[]={kSigmaXV,kSigmaYV,kSigmaZV};
- SetVertex(xyz,ers);
+ Double_t xyzVtx[]={AliITSReconstructor::GetRecoParam()->GetXVdef(),
+ AliITSReconstructor::GetRecoParam()->GetYVdef(),
+ AliITSReconstructor::GetRecoParam()->GetZVdef()};
+ Double_t ersVtx[]={AliITSReconstructor::GetRecoParam()->GetSigmaXVdef(),
+ AliITSReconstructor::GetRecoParam()->GetSigmaYVdef(),
+ AliITSReconstructor::GetRecoParam()->GetSigmaZVdef()};
+ SetVertex(xyzVtx,ersVtx);
for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=kLayersNotToSkip[i];
fLastLayerToTrackTo=kLastLayerToTrackTo;
for (Int_t i=0;i<100000;i++){
fBestTrackIndex[i]=0;
}
+
+ // store positions of centre of SPD modules (in z)
+ Double_t tr[3];
+ AliITSgeomTGeo::GetTranslation(1,1,1,tr);
+ fSPDdetzcentre[0] = tr[2];
+ AliITSgeomTGeo::GetTranslation(1,1,2,tr);
+ fSPDdetzcentre[1] = tr[2];
+ AliITSgeomTGeo::GetTranslation(1,1,3,tr);
+ fSPDdetzcentre[2] = tr[2];
+ AliITSgeomTGeo::GetTranslation(1,1,4,tr);
+ fSPDdetzcentre[3] = tr[2];
+
+
+ fUseTGeo = AliITSReconstructor::GetRecoParam()->GetUseTGeoInTracker();
//
fDebugStreamer = new TTreeSRedirector("ITSdebug.root");
}
-
+//------------------------------------------------------------------------
+AliITStrackerMI::AliITStrackerMI(const AliITStrackerMI &tracker):AliTracker(tracker),
+fI(tracker.fI),
+fBestTrack(tracker.fBestTrack),
+fTrackToFollow(tracker.fTrackToFollow),
+fTrackHypothesys(tracker.fTrackHypothesys),
+fBestHypothesys(tracker.fBestHypothesys),
+fOriginal(tracker.fOriginal),
+fCurrentEsdTrack(tracker.fCurrentEsdTrack),
+fPass(tracker.fPass),
+fAfterV0(tracker.fAfterV0),
+fLastLayerToTrackTo(tracker.fLastLayerToTrackTo),
+fCoefficients(tracker.fCoefficients),
+fEsd(tracker.fEsd),
+fUseTGeo(tracker.fUseTGeo),
+fDebugStreamer(tracker.fDebugStreamer){
+ //Copy constructor
+}
+//------------------------------------------------------------------------
+AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){
+ //Assignment operator
+ this->~AliITStrackerMI();
+ new(this) AliITStrackerMI(tracker);
+ return *this;
+}
+//------------------------------------------------------------------------
AliITStrackerMI::~AliITStrackerMI()
{
//
//destructor
//
- if (fCoeficients) delete []fCoeficients;
+ if (fCoefficients) delete []fCoefficients;
if (fDebugStreamer) {
//fDebugStreamer->Close();
delete fDebugStreamer;
}
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::SetLayersNotToSkip(Int_t *l) {
//--------------------------------------------------------------------
//This function set masks of the layers which must be not skipped
//--------------------------------------------------------------------
for (Int_t i=0; i<kMaxLayer; i++) fLayersNotToSkip[i]=l[i];
}
-
+//------------------------------------------------------------------------
Int_t AliITStrackerMI::LoadClusters(TTree *cTree) {
//--------------------------------------------------------------------
//This function loads ITS clusters
//--------------------------------------------------------------------
- TBranch *branch=cTree->GetBranch("Clusters");
+ TBranch *branch=cTree->GetBranch("ITSRecPoints");
if (!branch) {
Error("LoadClusters"," can't get the branch !\n");
return 1;
}
- TClonesArray dummy("AliITSclusterV2",10000), *clusters=&dummy;
+ TClonesArray dummy("AliITSRecPoint",10000), *clusters=&dummy;
branch->SetAddress(&clusters);
Int_t j=0;
if (!cTree->GetEvent(j)) continue;
Int_t ncl=clusters->GetEntriesFast();
SignDeltas(clusters,GetZ());
+
while (ncl--) {
- AliITSclusterV2 *c=(AliITSclusterV2*)clusters->UncheckedAt(ncl);
- detector = c->GetDetectorIndex();
- fgLayers[i].InsertCluster(new AliITSclusterV2(*c));
+ AliITSRecPoint *c=(AliITSRecPoint*)clusters->UncheckedAt(ncl);
+ detector=c->GetDetectorIndex();
+
+ if (!c->Misalign()) AliWarning("Can't misalign this cluster !");
+
+ fgLayers[i].InsertCluster(new AliITSRecPoint(*c));
}
clusters->Delete();
- //add dead zone virtual "cluster"
- if (i<2){
- for (Float_t ydead = 0; ydead < 1.31 ; ydead+=(i+1.)*0.018){
- Int_t lab[4] = {0,0,0,detector};
- Int_t info[3] = {0,0,0};
- Float_t hit[5]={0,0,0.004/12.,0.001/12.,0};
- if (i==0) hit[0] =ydead-0.4;
- if (i==1) hit[0]=ydead-3.75;
- hit[1] =-0.04;
- if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
- hit[1]=-7.05;
- if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
- hit[1]=-7.15;
- if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
- hit[1] =0.06;
- if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
- hit[1]=7.05;
- if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
- hit[1]=7.25;
- if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<2.)
- fgLayers[i].InsertCluster(new AliITSclusterV2(lab, hit, info));
+ // add dead zone "virtual" cluster in SPD, if there is a cluster within
+ // zwindow cm from the dead zone
+ if (i<2 && AliITSReconstructor::GetRecoParam()->GetAddVirtualClustersInDeadZone()) {
+ for (Float_t xdead = 0; xdead < kSPDdetxlength; xdead += (i+1.)*AliITSReconstructor::GetRecoParam()->GetXPassDeadZoneHits()) {
+ Int_t lab[4] = {0,0,0,detector};
+ Int_t info[3] = {0,0,i};
+ Float_t q = 0.;
+ Float_t hit[5] = {xdead,
+ 0.,
+ AliITSReconstructor::GetRecoParam()->GetSigmaXDeadZoneHit2(),
+ AliITSReconstructor::GetRecoParam()->GetSigmaZDeadZoneHit2(),
+ q};
+ Bool_t local = kTRUE;
+ Double_t zwindow = AliITSReconstructor::GetRecoParam()->GetZWindowDeadZone();
+ hit[1] = fSPDdetzcentre[0]+0.5*kSPDdetzlength;
+ if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow)
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
+ hit[1] = fSPDdetzcentre[1]-0.5*kSPDdetzlength;
+ if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow)
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
+ hit[1] = fSPDdetzcentre[1]+0.5*kSPDdetzlength;
+ if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow)
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
+ hit[1] = fSPDdetzcentre[2]-0.5*kSPDdetzlength;
+ if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow)
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
+ hit[1] = fSPDdetzcentre[2]+0.5*kSPDdetzlength;
+ if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow)
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
+ hit[1] = fSPDdetzcentre[3]-0.5*kSPDdetzlength;
+ if (TMath::Abs(fgLayers[i].GetDetector(detector).GetZmax()-hit[1])<zwindow)
+ fgLayers[i].InsertCluster(new AliITSRecPoint(lab,hit,info,local));
}
}
return 0;
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::UnloadClusters() {
//--------------------------------------------------------------------
//This function unloads ITS clusters
//--------------------------------------------------------------------
for (Int_t i=0; i<kMaxLayer; i++) fgLayers[i].ResetClusters();
}
-
-static Int_t CorrectForDeadZoneMaterial(AliITStrackMI *t) {
+//------------------------------------------------------------------------
+static Int_t CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) {
//--------------------------------------------------------------------
// Correction for the material between the TPC and the ITS
- // (should it belong to the TPC code ?)
//--------------------------------------------------------------------
- Double_t riw=80., diw=0.0053, x0iw=30; // TPC inner wall ?
- Double_t rcd=61., dcd=0.0053, x0cd=30; // TPC "central drum" ?
- Double_t yr=12.8, dr=0.03; // rods ?
- Double_t zm=0.2, dm=0.40; // membrane
- //Double_t rr=52., dr=0.19, x0r=24., yyr=7.77; //rails
- Double_t rs=50., ds=0.001; // something belonging to the ITS (screen ?)
-
- if (t->GetX() > riw) {
- if (!t->PropagateTo(riw,diw,x0iw)) return 1;
- if (TMath::Abs(t->GetY())>yr) t->CorrectForMaterial(dr);
- if (TMath::Abs(t->GetZ())<zm) t->CorrectForMaterial(dm);
- if (!t->PropagateTo(rcd,dcd,x0cd)) return 1;
- //Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
- //if (TMath::Abs(y)<yyr) t->PropagateTo(rr,dr,x0r);
- if (!t->PropagateTo(rs,ds)) return 1;
- } else if (t->GetX() < rs) {
- if (!t->PropagateTo(rs,-ds)) return 1;
- //Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
- //if (TMath::Abs(y)<yyr) t->PropagateTo(rr,-dr,x0r);
- if (!t->PropagateTo(rcd,-dcd,x0cd)) return 1;
- if (!t->PropagateTo(riw+0.001,-diw,x0iw)) return 1;
+ if (t->GetX() > kriw) { // inward direction
+ if (!t->PropagateToTGeo(kriw,1)) return 1;// TPC inner wall
+ if (!t->PropagateToTGeo(krcd,1)) return 1;// TPC central drum
+ if (!t->PropagateToTGeo(krs,1)) return 1;// ITS screen
+ /* without TGeo:
+ if (!t->PropagateTo(kriw,kdiw,kX0iw)) return 1;// TPC inner wall
+ if (TMath::Abs(t->GetY())>kyr) t->CorrectForMaterial(kdr);//rods
+ if (TMath::Abs(t->GetZ())<kzm) t->CorrectForMaterial(kdm);//membrane
+ if (!t->PropagateTo(krcd,kdcd,kX0cd)) return 1;// TPC central drum
+ //Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
+ //if (TMath::Abs(y)<yyr) t->PropagateTo(rr,dr,x0r);
+ if (!t->PropagateTo(krs,kds,kX0Air)) return 1;// ITS screen */
+ } else if (t->GetX() < krs) { // outward direction
+ if (!t->PropagateToTGeo(krs,1)) return 1;// ITS screen
+ if (!t->PropagateToTGeo(krcd,1)) return 1;// TPC central drum
+ if (!t->PropagateToTGeo(kriw+0.001,1)) return 1;// TPC inner wall
+ /* without TGeo
+ if (!t->PropagateTo(krs,-kds,kX0Air)) return 1;
+ //Double_t x,y,z; t->GetGlobalXYZat(rr,x,y,z);
+ //if (TMath::Abs(y)<yyr) t->PropagateTo(rr,-dr,x0r);
+ if (!t->PropagateTo(krcd,-kdcd,kX0cd)) return 1;// TPC central drum
+ if (!t->PropagateTo(kriw+0.001,-kdiw,kX0iw)) return 1; */
} else {
- ::Error("CorrectForDeadZoneMaterial","track is already in the dead zone !");
+ Error("CorrectForTPCtoITSDeadZoneMaterial","Track is already in the dead zone !");
return 1;
}
return 0;
}
-
-Int_t AliITStrackerMI::Clusters2Tracks(AliESD *event) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) {
//--------------------------------------------------------------------
// This functions reconstructs ITS tracks
// The clusters must be already loaded !
TObjArray itsTracks(15000);
fOriginal.Clear();
fEsd = event; // store pointer to the esd
+
+ // temporary (for cosmics)
+ if(event->GetVertex()) {
+ TString title = event->GetVertex()->GetTitle();
+ if(title.Contains("cosmics")) {
+ Double_t xyz[3]={GetX(),GetY(),GetZ()};
+ Double_t exyz[3]={0.1,0.1,0.1};
+ SetVertex(xyz,exyz);
+ }
+ }
+ // temporary
+
{/* Read ESD tracks */
+ Double_t pimass = TDatabasePDG::Instance()->GetParticle(211)->Mass();
Int_t nentr=event->GetNumberOfTracks();
Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr);
while (nentr--) {
delete t;
continue;
}
- t->fD[0] = t->GetD(GetX(),GetY());
- t->fD[1] = t->GetZat(GetX())-GetZ();
- Double_t vdist = TMath::Sqrt(t->fD[0]*t->fD[0]+t->fD[1]*t->fD[1]);
- if (t->GetMass()<0.13) t->SetMass(0.13957); // MI look to the esd - mass hypothesys !!!!!!!!!!!
+ t->GetDZ(GetX(),GetY(),GetZ(),t->GetDP()); //I.B.
+ Double_t vdist = TMath::Sqrt(t->GetD(0)*t->GetD(0)+t->GetD(1)*t->GetD(1));
+ // look at the ESD mass hypothesys !
+ if (t->GetMass()<0.9*pimass) t->SetMass(pimass);
// write expected q
- t->fExpQ = TMath::Max(0.8*t->fESDtrack->GetTPCsignal(),30.);
+ t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
- if (esd->GetV0Index(0)>0 && t->fD[0]<30){
+ if (esd->GetV0Index(0)>0 && t->GetD(0)<AliITSReconstructor::GetRecoParam()->GetMaxDforV0dghtrForProlongation()){
//track - can be V0 according to TPC
- }
- else{
- if (TMath::Abs(t->fD[0])>10) {
+ } else {
+ if (TMath::Abs(t->GetD(0))>AliITSReconstructor::GetRecoParam()->GetMaxDForProlongation()) {
delete t;
continue;
}
- if (TMath::Abs(vdist)>20) {
+ if (TMath::Abs(vdist)>AliITSReconstructor::GetRecoParam()->GetMaxDZForProlongation()) {
delete t;
continue;
}
- if (TMath::Abs(1/t->Get1Pt())<0.120) {
+ if (t->Pt()<AliITSReconstructor::GetRecoParam()->GetMinPtForProlongation()) {
delete t;
continue;
}
- if (CorrectForDeadZoneMaterial(t)!=0) {
+ if (CorrectForTPCtoITSDeadZoneMaterial(t)!=0) {
//Warning("Clusters2Tracks",
// "failed to correct for the material in the dead zone !\n");
delete t;
continue;
}
}
- t->fReconstructed = kFALSE;
+ t->SetReconstructed(kFALSE);
itsTracks.AddLast(t);
fOriginal.AddLast(t);
}
Int_t nentr=itsTracks.GetEntriesFast();
fTrackHypothesys.Expand(nentr);
fBestHypothesys.Expand(nentr);
- MakeCoeficients(nentr);
+ MakeCoefficients(nentr);
Int_t ntrk=0;
+ // THE TWO TRACKING PASSES
for (fPass=0; fPass<2; fPass++) {
Int_t &constraint=fConstraint[fPass]; if (constraint<0) continue;
for (Int_t i=0; i<nentr; i++) {
-// cerr<<fPass<<" "<<i<<'\r';
+ //cerr<<fPass<<" "<<i<<'\r';
fCurrentEsdTrack = i;
AliITStrackMI *t=(AliITStrackMI*)itsTracks.UncheckedAt(i);
if (t==0) continue; //this track has been already tracked
- if (t->fReconstructed&&(t->fNUsed<1.5)) continue; //this track was already "succesfully" reconstructed
- if ( (TMath::Abs(t->GetD(GetX(),GetY())) >3.) && fConstraint[fPass]) continue;
- if ( (TMath::Abs(t->GetZat(GetX())-GetZ())>3.) && fConstraint[fPass]) continue;
+ if (t->GetReconstructed()&&(t->GetNUsed()<1.5)) continue; //this track was already "succesfully" reconstructed
+ Float_t dz[2]; t->GetDZ(GetX(),GetY(),GetZ(),dz); //I.B.
+ if (fConstraint[fPass]) {
+ if (TMath::Abs(dz[0])>AliITSReconstructor::GetRecoParam()->GetMaxDZToUseConstraint() ||
+ TMath::Abs(dz[1])>AliITSReconstructor::GetRecoParam()->GetMaxDZToUseConstraint()) continue;
+ }
Int_t tpcLabel=t->GetLabel(); //save the TPC track label
fI = 6;
besttrack->SetLabel(tpcLabel);
// besttrack->CookdEdx();
CookdEdx(besttrack);
- besttrack->fFakeRatio=1.;
+ besttrack->SetFakeRatio(1.);
CookLabel(besttrack,0.); //For comparison only
UpdateESDtrack(besttrack,AliESDtrack::kITSin);
- /*
- if ( besttrack->GetNumberOfClusters()<6 && fConstraint[fPass]) {
- continue;
- }
- if (besttrack->fChi2MIP[0]+besttrack->fNUsed>3.5) continue;
- if ( (TMath::Abs(besttrack->fD[0]*besttrack->fD[0]+besttrack->fD[1]*besttrack->fD[1])>0.1) && fConstraint[fPass]) continue;
- //delete itsTracks.RemoveAt(i);
- */
if (fConstraint[fPass]&&(!besttrack->IsGoldPrimary())) continue; //to be tracked also without vertex constrain
-
- t->fReconstructed = kTRUE;
+ t->SetReconstructed(kTRUE);
ntrk++;
}
GetBestHypothesysMIP(itsTracks);
- }
+ } // end loop on the two tracking passes
//GetBestHypothesysMIP(itsTracks);
- UpdateTPCV0(event);
- FindV02(event);
+ if(event->GetNumberOfV0s()>0) UpdateTPCV0(event);
+ if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) FindV02(event);
fAfterV0 = kTRUE;
//GetBestHypothesysMIP(itsTracks);
//
fTrackHypothesys.Delete();
fBestHypothesys.Delete();
fOriginal.Clear();
- delete []fCoeficients;
- fCoeficients=0;
+ delete [] fCoefficients;
+ fCoefficients=0;
Info("Clusters2Tracks","Number of prolonged tracks: %d\n",ntrk);
return 0;
}
-
-
-Int_t AliITStrackerMI::PropagateBack(AliESD *event) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) {
//--------------------------------------------------------------------
// This functions propagates reconstructed ITS tracks back
// The clusters must be loaded !
delete t;
continue;
}
- t->fExpQ = TMath::Max(0.8*t->fESDtrack->GetTPCsignal(),30.);
+ t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
ResetTrackToFollow(*t);
- // propagete to vertex [SR, GSI 17.02.2003]
+ // propagate to vertex [SR, GSI 17.02.2003]
// Start Time measurement [SR, GSI 17.02.2003], corrected by I.Belikov
- if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) {
- if (fTrackToFollow.PropagateToVertex()) {
- fTrackToFollow.StartTimeIntegral();
+ if(fUseTGeo) {
+ if (fTrackToFollow.PropagateToTGeo(krInsidePipe,1)) {
+ if (fTrackToFollow.PropagateToVertex(event->GetVertex())) {
+ fTrackToFollow.StartTimeIntegral();
+ }
+ fTrackToFollow.PropagateToTGeo(krOutsidePipe,1);
+ }
+ } else {
+ if (fTrackToFollow.PropagateTo(krInsidePipe,kdPipe,kX0Be)) {
+ if (fTrackToFollow.PropagateToVertex(event->GetVertex())) {
+ fTrackToFollow.StartTimeIntegral();
+ }
+ fTrackToFollow.PropagateTo(krOutsidePipe,-kdPipe,kX0Be);
}
- fTrackToFollow.PropagateTo(3.,-0.0028,65.19);
}
- fTrackToFollow.ResetCovariance(); fTrackToFollow.ResetClusters();
- if (RefitAt(49.,&fTrackToFollow,t)) {
- if (CorrectForDeadZoneMaterial(&fTrackToFollow)!=0) {
+ fTrackToFollow.ResetCovariance(10.); fTrackToFollow.ResetClusters();
+ if (RefitAt(krInsideITSscreen,&fTrackToFollow,t)) {
+ if (CorrectForTPCtoITSDeadZoneMaterial(&fTrackToFollow)!=0) {
//Warning("PropagateBack",
// "failed to correct for the material in the dead zone !\n");
delete t;
return 0;
}
-
-Int_t AliITStrackerMI::RefitInward(AliESD *event) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) {
//--------------------------------------------------------------------
// This functions refits ITS tracks using the
// "inward propagated" TPC tracks
// The clusters must be loaded !
//--------------------------------------------------------------------
+ if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) RefitV02(event);
Int_t nentr=event->GetNumberOfTracks();
Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
delete t;
continue;
}
- t->fExpQ = TMath::Max(0.8*t->fESDtrack->GetTPCsignal(),30.);
- if (CorrectForDeadZoneMaterial(t)!=0) {
+ t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.));
+ if (CorrectForTPCtoITSDeadZoneMaterial(t)!=0) {
//Warning("RefitInward",
// "failed to correct for the material in the dead zone !\n");
delete t;
fTrackToFollow.ResetClusters();
if ((esd->GetStatus()&AliESDtrack::kTPCin)==0)
- fTrackToFollow.ResetCovariance();
+ fTrackToFollow.ResetCovariance(10.);
//Refitting...
- if (RefitAt(3.7, &fTrackToFollow, t)) {
+ if (RefitAt(krInsideSPD1, &fTrackToFollow, t,kTRUE)) {
fTrackToFollow.SetLabel(t->GetLabel());
// fTrackToFollow.CookdEdx();
CookdEdx(&fTrackToFollow);
CookLabel(&fTrackToFollow,0.0); //For comparison only
- if (fTrackToFollow.PropagateTo(3.,0.0028,65.19)) {//The beam pipe
- Double_t a=fTrackToFollow.GetAlpha();
- Double_t cs=TMath::Cos(a),sn=TMath::Sin(a);
- Double_t xv= GetX()*cs + GetY()*sn;
- Double_t yv=-GetX()*sn + GetY()*cs;
-
- Double_t c=fTrackToFollow.GetC(), snp=fTrackToFollow.GetSnp();
- Double_t x=fTrackToFollow.GetX(), y=fTrackToFollow.GetY();
- Double_t tgfv=-(c*(x-xv)-snp)/(c*(y-yv) + TMath::Sqrt(1.-snp*snp));
- Double_t fv=TMath::ATan(tgfv);
-
- cs=TMath::Cos(fv); sn=TMath::Sin(fv);
- x = xv*cs + yv*sn;
- yv=-xv*sn + yv*cs; xv=x;
-
- if (fTrackToFollow.Propagate(fv+a,xv)) {
- fTrackToFollow.UpdateESDtrack(AliESDtrack::kITSrefit);
- //UseClusters(&fTrackToFollow);
- {
- AliITSclusterV2 c; c.SetY(yv); c.SetZ(GetZ());
- c.SetSigmaY2(GetSigmaY()*GetSigmaY());
- c.SetSigmaZ2(GetSigmaZ()*GetSigmaZ());
- Double_t chi2=fTrackToFollow.GetPredictedChi2(&c);
- //Double_t chi2=GetPredictedChi2MI(&fTrackToFollow,&c,fI);
- if (chi2<kMaxChi2)
- if (fTrackToFollow.Update(&c,-chi2,0))
- //if (UpdateMI(&fTrackToFollow,&c,-chi2,0))
- fTrackToFollow.SetConstrainedESDtrack(chi2);
- }
- ntrk++;
- }
+ //The beam pipe
+ Bool_t okToPipe;
+ if(fUseTGeo) {
+ okToPipe = fTrackToFollow.PropagateToTGeo(krInsidePipe,1);
+ } else {
+ okToPipe = fTrackToFollow.PropagateTo(krInsidePipe,kdPipe,kX0Be);
+ }
+ if(okToPipe) {
+ AliESDtrack *esdTrack =fTrackToFollow.GetESDtrack();
+ esdTrack->UpdateTrackParams(&fTrackToFollow,AliESDtrack::kITSrefit);
+ Float_t r[3]={0.,0.,0.};
+ Double_t maxD=3.;
+ esdTrack->RelateToVertex(event->GetVertex(),GetBz(r),maxD);
+ ntrk++;
}
+
}
delete t;
}
return 0;
}
-
+//------------------------------------------------------------------------
AliCluster *AliITStrackerMI::GetCluster(Int_t index) const {
//--------------------------------------------------------------------
// Return pointer to a given cluster
Int_t c=(index & 0x0fffffff) >> 00;
return fgLayers[l].GetCluster(c);
}
+//------------------------------------------------------------------------
+Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const {
+ //--------------------------------------------------------------------
+ // Get track space point with index i
+ //--------------------------------------------------------------------
+ Int_t l=(index & 0xf0000000) >> 28;
+ Int_t c=(index & 0x0fffffff) >> 00;
+ AliITSRecPoint *cl = fgLayers[l].GetCluster(c);
+ Int_t idet = cl->GetDetectorIndex();
+
+ Float_t xyz[3];
+ Float_t cov[6];
+ cl->GetGlobalXYZ(xyz);
+ cl->GetGlobalCov(cov);
+ p.SetXYZ(xyz, cov);
+
+ AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+ switch (l) {
+ case 0:
+ iLayer = AliGeomManager::kSPD1;
+ break;
+ case 1:
+ iLayer = AliGeomManager::kSPD2;
+ break;
+ case 2:
+ iLayer = AliGeomManager::kSDD1;
+ break;
+ case 3:
+ iLayer = AliGeomManager::kSDD2;
+ break;
+ case 4:
+ iLayer = AliGeomManager::kSSD1;
+ break;
+ case 5:
+ iLayer = AliGeomManager::kSSD2;
+ break;
+ default:
+ AliWarning(Form("Wrong layer index in ITS (%d) !",l));
+ break;
+ };
+ UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
+ p.SetVolumeID((UShort_t)volid);
+ return kTRUE;
+}
+//------------------------------------------------------------------------
+Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index,
+ AliTrackPoint& p, const AliESDtrack *t) {
+ //--------------------------------------------------------------------
+ // Get track space point with index i
+ // (assign error estimated during the tracking)
+ //--------------------------------------------------------------------
+ Int_t l=(index & 0xf0000000) >> 28;
+ Int_t c=(index & 0x0fffffff) >> 00;
+ const AliITSRecPoint *cl = fgLayers[l].GetCluster(c);
+ Int_t idet = cl->GetDetectorIndex();
+ const AliITSdetector &det=fgLayers[l].GetDetector(idet);
+
+ // tgphi and tglambda of the track in tracking frame with alpha=det.GetPhi
+ Float_t detxy[2];
+ detxy[0] = det.GetR()*TMath::Cos(det.GetPhi());
+ detxy[1] = det.GetR()*TMath::Sin(det.GetPhi());
+ Double_t alpha = t->GetAlpha();
+ Double_t xdetintrackframe = detxy[0]*TMath::Cos(alpha)+detxy[1]*TMath::Sin(alpha);
+ Float_t phi = TMath::ASin(t->GetSnpAt(xdetintrackframe,AliTracker::GetBz()));
+ phi += alpha-det.GetPhi();
+ Float_t tgphi = TMath::Tan(phi);
+
+ Float_t tgl = t->GetTgl(); // tgl about const along track
+ Float_t expQ = TMath::Max(0.8*t->GetTPCsignal(),30.);
+
+ Float_t errlocalx,errlocalz;
+ GetError(l,cl,tgl,tgphi,expQ,errlocalx,errlocalz);
+
+
+ Float_t xyz[3];
+ Float_t cov[6];
+ cl->GetGlobalXYZ(xyz);
+ // cl->GetGlobalCov(cov);
+ Float_t pos[3] = {0.,0.,0.};
+ AliCluster tmpcl((UShort_t)cl->GetVolumeId(),pos[0],pos[1],pos[2],errlocalx*errlocalx,errlocalz*errlocalz,0);
+ tmpcl.GetGlobalCov(cov);
+
+ p.SetXYZ(xyz, cov);
+
+ AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
+ switch (l) {
+ case 0:
+ iLayer = AliGeomManager::kSPD1;
+ break;
+ case 1:
+ iLayer = AliGeomManager::kSPD2;
+ break;
+ case 2:
+ iLayer = AliGeomManager::kSDD1;
+ break;
+ case 3:
+ iLayer = AliGeomManager::kSDD2;
+ break;
+ case 4:
+ iLayer = AliGeomManager::kSSD1;
+ break;
+ case 5:
+ iLayer = AliGeomManager::kSSD2;
+ break;
+ default:
+ AliWarning(Form("Wrong layer index in ITS (%d) !",l));
+ break;
+ };
+ UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet);
+ p.SetVolumeID((UShort_t)volid);
+ return kTRUE;
+}
+//------------------------------------------------------------------------
void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdindex, Bool_t constrain)
{
//--------------------------------------------------------------------
// Follow prolongation tree
//--------------------------------------------------------------------
//
- AliESDtrack * esd = otrack->fESDtrack;
- if (esd->GetV0Index(0)>0){
- //
+ Double_t xyzVtx[]={GetX(),GetY(),GetZ()};
+ Double_t ersVtx[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
+
+ AliESDtrack * esd = otrack->GetESDtrack();
+ if (esd->GetV0Index(0)>0) {
// TEMPORARY SOLLUTION: map V0 indexes to point to proper track
- // mapping of esd track is different as its track in Containers
+ // mapping of ESD track is different as ITS track in Containers
// Need something more stable
- // Indexes are set back againg to the ESD track indexes in UpdateTPCV0
+ // Indexes are set back again to the ESD track indexes in UpdateTPCV0
for (Int_t i=0;i<3;i++){
Int_t index = esd->GetV0Index(i);
if (index==0) break;
- AliESDV0MI * vertex = fEsd->GetV0MI(index);
+ AliESDv0 * vertex = fEsd->GetV0(index);
if (vertex->GetStatus()<0) continue; // rejected V0
//
if (esd->GetSign()>0) {
- vertex->SetIndex(0,esdindex);
- }
- else{
- vertex->SetIndex(1,esdindex);
+ vertex->SetIndex(0,esdindex);
+ } else {
+ vertex->SetIndex(1,esdindex);
}
}
}
Int_t nindexes[7][100];
Float_t normalizedchi2[100];
for (Int_t ilayer=0;ilayer<6;ilayer++) ntracks[ilayer]=0;
- otrack->fNSkipped=0;
+ otrack->SetNSkipped(0);
new (&(tracks[6][0])) AliITStrackMI(*otrack);
ntracks[6]=1;
for (Int_t i=0;i<7;i++) nindexes[i][0]=0;
for (Int_t itrack =0;itrack<ntracks[ilayer+1];itrack++){
//set current track
if (ntracks[ilayer]>=100) break;
- if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNSkipped>0) nskipped++;
- if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNUsed>2.) nused++;
+ if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNSkipped()>0) nskipped++;
+ if (tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNUsed()>2.) nused++;
if (ntracks[ilayer]>15+ilayer){
- if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNSkipped>0 && nskipped>4+ilayer) continue;
- if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].fNUsed>2. && nused>3) continue;
+ if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNSkipped()>0 && nskipped>4+ilayer) continue;
+ if (itrack>1&&tracks[ilayer+1][nindexes[ilayer+1][itrack]].GetNUsed()>2. && nused>3) continue;
}
new(¤ttrack1) AliITStrackMI(tracks[ilayer+1][nindexes[ilayer+1][itrack]]);
+
+ // material between SSD and SDD, SDD and SPD
if (ilayer==3 || ilayer==1) {
- Double_t rs=0.5*(fgLayers[ilayer+1].GetR() + r);
- Double_t d=0.0034, x0=38.6;
- if (ilayer==1) {rs=9.; d=0.0097; x0=42;}
- if (!currenttrack1.PropagateTo(rs,d,x0)) {
- continue;
+ Double_t rshield,dshield,x0shield;
+ if (ilayer==3) { // SDDouter
+ rshield=0.5*(fgLayers[ilayer+1].GetR() + r);
+ dshield=kdshieldSDD;
+ x0shield=kX0shieldSDD;
+ } else { // SPDouter
+ rshield=krshieldSPD;
+ dshield=kdshieldSPD;
+ x0shield=kX0shieldSPD;
+ }
+ if (fUseTGeo) {
+ if (!currenttrack1.PropagateToTGeo(rshield,1)) continue;
+ } else {
+ if (!currenttrack1.PropagateTo(rshield,dshield,x0shield)) continue;
}
}
- //
- //find intersection with layer
- Double_t x,y,z;
- if (!currenttrack1.GetGlobalXYZat(r,x,y,z)) {
- continue;
- }
- Double_t phi=TMath::ATan2(y,x);
+
+ Double_t phi,z;
+ if (!currenttrack1.GetPhiZat(r,phi,z)) continue;
+
Int_t idet=layer.FindDetectorIndex(phi,z);
- if (idet<0) {
- continue;
- }
+ if (idet<0) continue;
+
+ Double_t trackGlobXYZ1[3],trackGlobXYZ2[3];
+ currenttrack1.GetXYZ(trackGlobXYZ1);
+
//propagate to the intersection
const AliITSdetector &det=layer.GetDetector(idet);
- phi=det.GetPhi();
new(¤ttrack2) AliITStrackMI(currenttrack1);
- if (!currenttrack1.Propagate(phi,det.GetR())) {
- continue;
- }
- currenttrack2.Propagate(phi,det.GetR()); //
+ if (!currenttrack1.Propagate(det.GetPhi(),det.GetR())) continue;
+ currenttrack2.Propagate(det.GetPhi(),det.GetR());
currenttrack1.SetDetectorIndex(idet);
currenttrack2.SetDetectorIndex(idet);
+ // Get the budget to the primary vertex and between the two layers
+ // for the current track being prolonged (before searching for clusters
+ // on this layer)
+ fI = ilayer;
+ Double_t budgetToPrimVertex = 0.;
+ if (fUseTGeo) {
+ if (!currenttrack2.MeanBudgetToPrimVertex(xyzVtx,2,budgetToPrimVertex))
+ budgetToPrimVertex = GetEffectiveThickness(0,0);
+ } else {
+ budgetToPrimVertex = GetEffectiveThickness(0,0);
+ }
+ Double_t mparam[7];
+ currenttrack2.GetXYZ(trackGlobXYZ2);
+ if(fUseTGeo) {
+ AliTracker::MeanMaterialBudget(trackGlobXYZ1,trackGlobXYZ2,mparam);
+ }
+
+
+ //***************
+ // DEFINITION OF SEARCH ROAD FOR CLUSTERS SELECTION
//
- //
- Double_t dz=7.5*TMath::Sqrt(currenttrack1.GetSigmaZ2() + 16.*kSigmaZ2[ilayer]);
- Double_t dy=7.5*TMath::Sqrt(currenttrack1.GetSigmaY2() + 16.*kSigmaY2[ilayer]);
- //
- Bool_t isBoundary=kFALSE;
- if (currenttrack1.GetY()-dy< det.GetYmin()+0.2) isBoundary = kTRUE;
- if (currenttrack1.GetY()+dy> det.GetYmax()-0.2) isBoundary = kTRUE;
- if (currenttrack1.GetZ()-dz< det.GetZmin()+0.2) isBoundary = kTRUE;
- if (currenttrack1.GetZ()+dz> det.GetZmax()-0.2) isBoundary = kTRUE;
+ Double_t dz=AliITSReconstructor::GetRecoParam()->GetNSigmaRoadZ()*
+ TMath::Sqrt(currenttrack1.GetSigmaZ2() +
+ AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+ AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+ AliITSReconstructor::GetRecoParam()->GetSigmaZ2(ilayer));
+ Double_t dy=AliITSReconstructor::GetRecoParam()->GetNSigmaRoadY()*
+ TMath::Sqrt(currenttrack1.GetSigmaY2() +
+ AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+ AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+ AliITSReconstructor::GetRecoParam()->GetSigmaY2(ilayer));
- if (isBoundary){ // track at boundary between detectors
- Float_t maxtgl = TMath::Abs(currenttrack1.GetTgl());
- if (maxtgl>1) maxtgl=1;
- dz = TMath::Sqrt(dz*dz+0.25*maxtgl*maxtgl);
- //
- Float_t maxsnp = TMath::Abs(currenttrack1.GetSnp());
- if (maxsnp>0.95) continue;
- //if (maxsnp>0.5) maxsnp=0.5;
- dy=TMath::Sqrt(dy*dy+0.25*maxsnp*maxsnp);
- }
+ // track at boundary between detectors, enlarge road
+ if ( (currenttrack1.GetY()-dy < det.GetYmin()+kBoundaryWidth) ||
+ (currenttrack1.GetY()+dy > det.GetYmax()-kBoundaryWidth) ||
+ (currenttrack1.GetZ()-dz < det.GetZmin()+kBoundaryWidth) ||
+ (currenttrack1.GetZ()+dz > det.GetZmax()-kBoundaryWidth) ) {
+ Float_t tgl = TMath::Abs(currenttrack1.GetTgl());
+ if (tgl > 1.) tgl=1.;
+ dz = TMath::Sqrt(dz*dz+kDeltaXNeighbDets*kDeltaXNeighbDets*tgl*tgl);
+ Float_t snp = TMath::Abs(currenttrack1.GetSnp());
+ if (snp > AliITSReconstructor::GetRecoParam()->GetMaxSnp()) continue;
+ dy = TMath::Sqrt(dy*dy+kDeltaXNeighbDets*kDeltaXNeighbDets*snp*snp);
+ } // boundary
- Double_t zmin=currenttrack1.GetZ() - dz;
- Double_t zmax=currenttrack1.GetZ() + dz;
- Double_t ymin=currenttrack1.GetY() + r*phi - dy;
- Double_t ymax=currenttrack1.GetY() + r*phi + dy;
+ // road in global (rphi,z)
+ Double_t zmin = currenttrack1.GetZ() - dz;
+ Double_t zmax = currenttrack1.GetZ() + dz;
+ Double_t ymin = currenttrack1.GetY() + r*det.GetPhi() - dy;
+ Double_t ymax = currenttrack1.GetY() + r*det.GetPhi() + dy;
+ // select clusters in road
layer.SelectClusters(zmin,zmax,ymin,ymax);
+ //********************
+
+ // Define criteria for track-cluster association
+ Double_t msz = currenttrack1.GetSigmaZ2() +
+ AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+ AliITSReconstructor::GetRecoParam()->GetNSigmaZLayerForRoadZ()*
+ AliITSReconstructor::GetRecoParam()->GetSigmaZ2(ilayer);
+ Double_t msy = currenttrack1.GetSigmaY2() +
+ AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+ AliITSReconstructor::GetRecoParam()->GetNSigmaYLayerForRoadY()*
+ AliITSReconstructor::GetRecoParam()->GetSigmaY2(ilayer);
+ if (constrain) {
+ msz *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadZC();
+ msy *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadYC();
+ } else {
+ msz *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadZNonC();
+ msy *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadYNonC();
+ }
+ msz = 1./msz; // 1/RoadZ^2
+ msy = 1./msy; // 1/RoadY^2
//
- // loop over all possible prolongations
//
- Double_t msz=1./((currenttrack1.GetSigmaZ2() + 16.*kSigmaZ2[ilayer]));
- Double_t msy=1./((currenttrack1.GetSigmaY2() + 16.*kSigmaY2[ilayer]));
- if (constrain){
- msy/=60; msz/=60.;
- }
- else{
- msy/=50; msz/=50.;
- }
+ // LOOP OVER ALL POSSIBLE TRACK PROLONGATIONS ON THIS LAYER
//
- const AliITSclusterV2 *c=0; Int_t ci=-1;
- Double_t chi2=12345.;
+ const AliITSRecPoint *cl=0;
+ Int_t clidx=-1;
+ Double_t chi2trkcl=AliITSReconstructor::GetRecoParam()->GetMaxChi2(); // init with big value
Int_t deadzone=0;
currenttrack = ¤ttrack1;
- while ((c=layer.GetNextCluster(ci))!=0) {
+ // loop over selected clusters
+ while ((cl=layer.GetNextCluster(clidx))!=0) {
if (ntracks[ilayer]>95) break; //space for skipped clusters
- Bool_t change =kFALSE;
- if (c->GetQ()==0 && (deadzone==1)) continue;
- Int_t idet=c->GetDetectorIndex();
- if (currenttrack->GetDetectorIndex()!=idet) {
+ Bool_t changedet =kFALSE;
+ if (cl->GetQ()==0 && (deadzone==1)) continue;
+ Int_t idet=cl->GetDetectorIndex();
+
+ if (currenttrack->GetDetectorIndex()==idet) { // track already on the cluster's detector
+ // a first cut on track-cluster distance
+ if ( (currenttrack->GetZ()-cl->GetZ())*(currenttrack->GetZ()-cl->GetZ())*msz +
+ (currenttrack->GetY()-cl->GetY())*(currenttrack->GetY()-cl->GetY())*msy > 1. )
+ continue; // cluster not associated to track
+ } else { // have to move track to cluster's detector
const AliITSdetector &det=layer.GetDetector(idet);
+ // a first cut on track-cluster distance
Double_t y,z;
if (!currenttrack2.GetProlongationFast(det.GetPhi(),det.GetR(),y,z)) continue;
- Float_t pz = (z - c->GetZ()) , py=(y - c->GetY());
- if (pz*pz*msz+py*py*msy>1.) continue;
+ if ( (z-cl->GetZ())*(z-cl->GetZ())*msz +
+ (y-cl->GetY())*(y-cl->GetY())*msy > 1. )
+ continue; // cluster not associated to track
//
new (&backuptrack) AliITStrackMI(currenttrack2);
- change = kTRUE;
+ changedet = kTRUE;
currenttrack =¤ttrack2;
if (!currenttrack->Propagate(det.GetPhi(),det.GetR())) {
new (currenttrack) AliITStrackMI(backuptrack);
- change = kFALSE;
+ changedet = kFALSE;
continue;
}
currenttrack->SetDetectorIndex(idet);
- }
- else{
- Float_t pz = (currenttrack->GetZ() - c->GetZ()) , py=(currenttrack->GetY() - c->GetY());
- if (pz*pz*msz+py*py*msy>1.) continue;
+ // Get again the budget to the primary vertex and between the two
+ // layers for the current track being prolonged, if had to change detector
+ if (fUseTGeo) {
+ if (!currenttrack->MeanBudgetToPrimVertex(xyzVtx,2,budgetToPrimVertex))
+ budgetToPrimVertex = GetEffectiveThickness(0,0);
+ currenttrack->GetXYZ(trackGlobXYZ2);
+ AliTracker::MeanMaterialBudget(trackGlobXYZ1,trackGlobXYZ2,mparam);
+ } else {
+ budgetToPrimVertex = GetEffectiveThickness(0,0);
+ }
}
- chi2=GetPredictedChi2MI(currenttrack,c,ilayer);
- if (chi2<kMaxChi2s[ilayer]){
- if (c->GetQ()==0) deadzone=1; // take dead zone only once
+ // calculate track-clusters chi2
+ chi2trkcl = GetPredictedChi2MI(currenttrack,cl,ilayer);
+ // chi2 cut
+ if (chi2trkcl < AliITSReconstructor::GetRecoParam()->GetMaxChi2s(ilayer)) {
+ if (cl->GetQ()==0) deadzone=1; // take dead zone only once
if (ntracks[ilayer]>=100) continue;
AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack);
- updatetrack->fClIndex[ilayer]=0;
- if (change){
- new (¤ttrack2) AliITStrackMI(backuptrack);
+ updatetrack->SetClIndex(ilayer,0);
+ if (changedet) new (¤ttrack2) AliITStrackMI(backuptrack);
+
+ if (cl->GetQ()!=0) {
+ if (!UpdateMI(updatetrack,cl,chi2trkcl,(ilayer<<28)+clidx)) continue;
+ updatetrack->SetSampledEdx(cl->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b.
+ } else { // cluster in dead zone
+ updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1);
+ updatetrack->SetDeadZoneProbability(GetDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2())));
}
- if (c->GetQ()!=0){
- if (!UpdateMI(updatetrack,c,chi2,(ilayer<<28)+ci)) continue;
- updatetrack->SetSampledEdx(c->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b.
+ if (cl->IsUsed()) updatetrack->IncrementNUsed();
+
+ // apply correction for material of the current layer
+ if(fUseTGeo) {
+ Double_t d,lengthTimesMeanDensity;
+ d=mparam[1];
+ lengthTimesMeanDensity=mparam[0]*mparam[4];
+ updatetrack->CorrectForMeanMaterial(d,lengthTimesMeanDensity);
+ } else {
+ Double_t d,x0;
+ d=layer.GetThickness(updatetrack->GetY(),updatetrack->GetZ(),x0);
+ updatetrack->CorrectForMaterial(d,x0);
}
- else {
- updatetrack->fNDeadZone++;
- updatetrack->fDeadZoneProbability=GetDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()));
- }
- if (c->IsUsed()){
- updatetrack->fNUsed++;
- }
- Double_t x0;
- Double_t d=layer.GetThickness(updatetrack->GetY(),updatetrack->GetZ(),x0);
- updatetrack->CorrectForMaterial(d,x0);
- if (constrain) {
- updatetrack->fConstrain = constrain;
- fI = ilayer;
- Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
- Double_t xyz[]={GetX(),GetY(),GetZ()};
- Double_t ptfactor = 1;
- Double_t ers[]={GetSigmaX()*ptfactor,GetSigmaY()*ptfactor,GetSigmaZ()};
+ if (constrain) { // apply vertex constrain
+ updatetrack->SetConstrain(constrain);
Bool_t isPrim = kTRUE;
- if (ilayer<4){
- updatetrack->fD[0] = updatetrack->GetD(GetX(),GetY());
- updatetrack->fD[1] = updatetrack->GetZat(GetX())-GetZ();
- if ( TMath::Abs(updatetrack->fD[0]/(1.+ilayer))>0.4 || TMath::Abs(updatetrack->fD[1]/(1.+ilayer))>0.4) isPrim=kFALSE;
+ if (ilayer<4) { // check that it's close to the vertex
+ updatetrack->GetDZ(GetX(),GetY(),GetZ(),updatetrack->GetDP()); //I.B.
+ if (TMath::Abs(updatetrack->GetD(0)/(1.+ilayer)) > // y
+ AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk() ||
+ TMath::Abs(updatetrack->GetD(1)/(1.+ilayer)) > // z
+ AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk()) isPrim=kFALSE;
}
- if (isPrim) updatetrack->Improve(d,xyz,ers);
+ if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
} //apply vertex constrain
ntracks[ilayer]++;
- } // create new hypothesy
+ } // create new hypothesis
} // loop over possible cluster prolongation
- // if (constrain&&itrack<2&¤ttrack1.fNSkipped==0 && deadzone==0){
- if (constrain&&itrack<2&¤ttrack1.fNSkipped==0 && deadzone==0&&ntracks[ilayer]<100){
+ if (constrain&&itrack<2&¤ttrack1.GetNSkipped()==0 && deadzone==0&&ntracks[ilayer]<100) {
AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
- vtrack->fClIndex[ilayer]=0;
- fI = ilayer;
- Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
- Double_t xyz[]={GetX(),GetY(),GetZ()};
- Double_t ers[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
- vtrack->Improve(d,xyz,ers);
- vtrack->fNSkipped++;
+ vtrack->SetClIndex(ilayer,0);
+ vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
+ vtrack->IncrementNSkipped();
ntracks[ilayer]++;
}
- if (constrain&&itrack<1&&TMath::Abs(currenttrack1.fP3)>1.1){ //big theta -- for low mult. runs
+ if (constrain&&itrack<1&&TMath::Abs(currenttrack1.GetTgl())>1.1) { //big theta - for low flux
AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
- vtrack->fClIndex[ilayer]=0;
- fI = ilayer;
- Double_t d=GetEffectiveThickness(0,0); //Think of this !!!!
- Double_t xyz[]={GetX(),GetY(),GetZ()};
- Double_t ers[]={GetSigmaX(),GetSigmaY(),GetSigmaZ()};
- vtrack->Improve(d,xyz,ers);
- vtrack->fNDeadZone++;
+ vtrack->SetClIndex(ilayer,0);
+ vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
+ vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1);
ntracks[ilayer]++;
}
- } //loop over track candidates
+ }
+
+ //loop over track candidates for the current layer
//
//
Int_t accepted=0;
- Int_t golds=0;
+ Int_t golden=0;
for (Int_t itrack=0;itrack<ntracks[ilayer];itrack++){
normalizedchi2[itrack] = NormalizedChi2(&tracks[ilayer][itrack],ilayer);
- if ( normalizedchi2[itrack]<3+0.5*ilayer) golds++;
- if (ilayer>4) accepted++;
- else{
- if ( constrain && normalizedchi2[itrack]<kMaxNormChi2C[ilayer]+1) accepted++;
- if (!constrain && normalizedchi2[itrack]<kMaxNormChi2NonC[ilayer]+1) accepted++;
+ if (normalizedchi2[itrack] <
+ AliITSReconstructor::GetRecoParam()->GetMaxNormChi2ForGolden(ilayer)) golden++;
+ if (ilayer>4) {
+ accepted++;
+ } else {
+ if (constrain) { // constrain
+ if (normalizedchi2[itrack]<AliITSReconstructor::GetRecoParam()->GetMaxNormChi2C(ilayer)+1)
+ accepted++;
+ } else { // !constrain
+ if (normalizedchi2[itrack]<AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonC(ilayer)+1)
+ accepted++;
+ }
}
}
- TMath::Sort(ntracks[ilayer],normalizedchi2,nindexes[ilayer],kFALSE);
+ // sort tracks by increasing normalized chi2
+ TMath::Sort(ntracks[ilayer],normalizedchi2,nindexes[ilayer],kFALSE);
ntracks[ilayer] = TMath::Min(accepted,7+2*ilayer);
- if (ntracks[ilayer]<golds+2+ilayer) ntracks[ilayer]=TMath::Min(golds+2+ilayer,accepted);
+ if (ntracks[ilayer]<golden+2+ilayer) ntracks[ilayer]=TMath::Min(golden+2+ilayer,accepted);
if (ntracks[ilayer]>90) ntracks[ilayer]=90;
- } //loop over layers
+ } // end loop over layers
+
//printf("%d\t%d\t%d\t%d\t%d\t%d\n",ntracks[0],ntracks[1],ntracks[2],ntracks[3],ntracks[4],ntracks[5]);
- Int_t max = constrain? 20: 5;
- for (Int_t i=0;i<TMath::Min(max,ntracks[0]);i++) {
+ //
+ // Now select tracks to be kept
+ //
+ Int_t max = constrain ? 20 : 5;
+
+ // tracks that reach layer 0 (SPD inner)
+ for (Int_t i=0; i<TMath::Min(max,ntracks[0]); i++) {
AliITStrackMI & track= tracks[0][nindexes[0][i]];
if (track.GetNumberOfClusters()<2) continue;
- if (!constrain&&track.fNormChi2[0]>7.)continue;
+ if (!constrain && track.GetNormChi2(0) >
+ AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue;
AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}
+
+ // tracks that reach layer 1 (SPD outer)
for (Int_t i=0;i<TMath::Min(2,ntracks[1]);i++) {
AliITStrackMI & track= tracks[1][nindexes[1][i]];
if (track.GetNumberOfClusters()<4) continue;
- if (!constrain&&track.fNormChi2[1]>7.)continue;
- if (constrain) track.fNSkipped+=1;
+ if (!constrain && track.GetNormChi2(1) >
+ AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue;
+ if (constrain) track.IncrementNSkipped();
if (!constrain) {
- track.fD[0] = track.GetD(GetX(),GetY());
- track.fNSkipped+=4./(4.+8.*TMath::Abs(track.fD[0]));
- if (track.fN+track.fNDeadZone+track.fNSkipped>6) {
- track.fNSkipped = 6-track.fN+track.fNDeadZone;
+ track.SetD(0,track.GetD(GetX(),GetY()));
+ track.SetNSkipped(track.GetNSkipped()+4./(4.+8.*TMath::Abs(track.GetD(0))));
+ if (track.GetNumberOfClusters()+track.GetNDeadZone()+track.GetNSkipped()>6) {
+ track.SetNSkipped(6-track.GetNumberOfClusters()+track.GetNDeadZone());
}
}
AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}
- //}
-
+
+ // tracks that reack layer 2 (SDD inner), only during non-constrained pass
if (!constrain){
for (Int_t i=0;i<TMath::Min(2,ntracks[2]);i++) {
AliITStrackMI & track= tracks[2][nindexes[2][i]];
if (track.GetNumberOfClusters()<3) continue;
- if (!constrain&&track.fNormChi2[2]>7.)continue;
- if (constrain) track.fNSkipped+=2;
+ if (!constrain && track.GetNormChi2(2) >
+ AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue;
+ if (constrain) track.SetNSkipped(track.GetNSkipped()+2);
if (!constrain){
- track.fD[0] = track.GetD(GetX(),GetY());
- track.fNSkipped+= 7./(7.+8.*TMath::Abs(track.fD[0]));
- if (track.fN+track.fNDeadZone+track.fNSkipped>6) {
- track.fNSkipped = 6-track.fN+track.fNDeadZone;
+ track.SetD(0,track.GetD(GetX(),GetY()));
+ track.SetNSkipped(track.GetNSkipped()+7./(7.+8.*TMath::Abs(track.GetD(0))));
+ if (track.GetNumberOfClusters()+track.GetNDeadZone()+track.GetNSkipped()>6) {
+ track.SetNSkipped(6-track.GetNumberOfClusters()+track.GetNDeadZone());
}
}
AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}
}
- if (!constrain){
+ if (!constrain) {
//
- // register best tracks - important for V0 finder
+ // register best track of each layer - important for V0 finder
//
for (Int_t ilayer=0;ilayer<5;ilayer++){
if (ntracks[ilayer]==0) continue;
//
// update TPC V0 information
//
- if (otrack->fESDtrack->GetV0Index(0)>0){
+ if (otrack->GetESDtrack()->GetV0Index(0)>0){
Float_t fprimvertex[3]={GetX(),GetY(),GetZ()};
for (Int_t i=0;i<3;i++){
- Int_t index = otrack->fESDtrack->GetV0Index(i);
+ Int_t index = otrack->GetESDtrack()->GetV0Index(i);
if (index==0) break;
- AliESDV0MI * vertex = fEsd->GetV0MI(index);
+ AliV0 *vertex = (AliV0*)fEsd->GetV0(index);
if (vertex->GetStatus()<0) continue; // rejected V0
//
- if (otrack->fP4>0) {
+ if (otrack->GetSign()>0) {
vertex->SetIndex(0,esdindex);
}
else{
vertex->SetIndex(1,esdindex);
}
//find nearest layer with track info
- Int_t nearestold = GetNearestLayer(vertex->GetXrp());
+ Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B.
+ Int_t nearestold = GetNearestLayer(xrp); //I.B.
Int_t nearest = nearestold;
for (Int_t ilayer =nearest;ilayer<8;ilayer++){
if (ntracks[nearest]==0){
//
AliITStrackMI & track= tracks[nearest][nindexes[nearest][0]];
if (nearestold<5&&nearest<5){
- Bool_t accept = track.fNormChi2[nearest]<10;
+ Bool_t accept = track.GetNormChi2(nearest)<10;
if (accept){
- if (track.fP4>0) {
- vertex->SetP(track);
+ if (track.GetSign()>0) {
+ vertex->SetParamP(track);
vertex->Update(fprimvertex);
- // vertex->SetIndex(0,track.fESDtrack->GetID());
+ //vertex->SetIndex(0,track.fESDtrack->GetID());
if (track.GetNumberOfClusters()>2) AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}else{
- vertex->SetM(track);
+ vertex->SetParamN(track);
vertex->Update(fprimvertex);
//vertex->SetIndex(1,track.fESDtrack->GetID());
if (track.GetNumberOfClusters()>2) AddTrackHypothesys(new AliITStrackMI(track), esdindex);
}
vertex->SetStatus(vertex->GetStatus()+1);
}else{
- // vertex->SetStatus(-2); // reject V0 - not enough clusters
+ //vertex->SetStatus(-2); // reject V0 - not enough clusters
}
}
- // if (nearestold>3){
-// Int_t indexlayer = (ntracks[0]>0)? 0:1;
-// if (ntracks[indexlayer]>0){
-// AliITStrackMI & track= tracks[indexlayer][nindexes[indexlayer][0]];
-// if (track.GetNumberOfClusters()>4&&track.fNormChi2[indexlayer]<4){
-// vertex->SetStatus(-1); // reject V0 - clusters before
-// }
-// }
-// }
}
- }
+ }
+
}
-
-
+//------------------------------------------------------------------------
AliITStrackerMI::AliITSlayer & AliITStrackerMI::GetLayer(Int_t layer) const
{
//--------------------------------------------------------------------
//
return fgLayers[layer];
}
-AliITStrackerMI::AliITSlayer::AliITSlayer() {
+//------------------------------------------------------------------------
+AliITStrackerMI::AliITSlayer::AliITSlayer():
+fR(0),
+fPhiOffset(0),
+fNladders(0),
+fZOffset(0),
+fNdetectors(0),
+fDetectors(0),
+fN(0),
+fDy5(0),
+fDy10(0),
+fDy20(0),
+fClustersCs(0),
+fClusterIndexCs(0),
+fYcs(0),
+fZcs(0),
+fNcs(0),
+fCurrentSlice(-1),
+fZmax(0),
+fYmin(0),
+fYmax(0),
+fI(0),
+fImax(0),
+fSkip(0),
+fAccepted(0),
+fRoad(0){
//--------------------------------------------------------------------
//default AliITSlayer constructor
//--------------------------------------------------------------------
- fN=0;
- fDetectors=0;
- fSkip = 0;
- fCurrentSlice=-1;
for (Int_t i=0; i<kMaxClusterPerLayer;i++) {
fClusterWeight[i]=0;
fClusterTracks[0][i]=-1;
fClusterTracks[3][i]=-1;
}
}
-
+//------------------------------------------------------------------------
AliITStrackerMI::AliITSlayer::
-AliITSlayer(Double_t r,Double_t p,Double_t z,Int_t nl,Int_t nd) {
+AliITSlayer(Double_t r,Double_t p,Double_t z,Int_t nl,Int_t nd):
+fR(r),
+fPhiOffset(p),
+fNladders(nl),
+fZOffset(z),
+fNdetectors(nd),
+fDetectors(0),
+fN(0),
+fDy5(0),
+fDy10(0),
+fDy20(0),
+fClustersCs(0),
+fClusterIndexCs(0),
+fYcs(0),
+fZcs(0),
+fNcs(0),
+fCurrentSlice(-1),
+fZmax(0),
+fYmin(0),
+fYmax(0),
+fI(0),
+fImax(0),
+fSkip(0),
+fAccepted(0),
+fRoad(0) {
//--------------------------------------------------------------------
//main AliITSlayer constructor
//--------------------------------------------------------------------
- fR=r; fPhiOffset=p; fZOffset=z;
- fNladders=nl; fNdetectors=nd;
fDetectors=new AliITSdetector[fNladders*fNdetectors];
-
- fN=0;
- fI=0;
- fSkip = 0;
- fRoad=2*fR*TMath::Sqrt(3.14/1.);//assuming that there's only one cluster
+ fRoad=2*fR*TMath::Sqrt(TMath::Pi()/1.);//assuming that there's only one cluster
}
-
+//------------------------------------------------------------------------
+AliITStrackerMI::AliITSlayer::AliITSlayer(const AliITSlayer& layer):
+fR(layer.fR),
+fPhiOffset(layer.fPhiOffset),
+fNladders(layer.fNladders),
+fZOffset(layer.fZOffset),
+fNdetectors(layer.fNdetectors),
+fDetectors(layer.fDetectors),
+fN(layer.fN),
+fDy5(layer.fDy5),
+fDy10(layer.fDy10),
+fDy20(layer.fDy20),
+fClustersCs(layer.fClustersCs),
+fClusterIndexCs(layer.fClusterIndexCs),
+fYcs(layer.fYcs),
+fZcs(layer.fZcs),
+fNcs(layer.fNcs),
+fCurrentSlice(layer.fCurrentSlice),
+fZmax(layer.fZmax),
+fYmin(layer.fYmin),
+fYmax(layer.fYmax),
+fI(layer.fI),
+fImax(layer.fImax),
+fSkip(layer.fSkip),
+fAccepted(layer.fAccepted),
+fRoad(layer.fRoad){
+ //Copy constructor
+}
+//------------------------------------------------------------------------
AliITStrackerMI::AliITSlayer::~AliITSlayer() {
//--------------------------------------------------------------------
// AliITSlayer destructor
fClusterTracks[3][i]=-1;
}
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::AliITSlayer::ResetClusters() {
//--------------------------------------------------------------------
// This function removes loaded clusters
fN=0;
fI=0;
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::AliITSlayer::ResetWeights() {
//--------------------------------------------------------------------
// This function reset weights of the clusters
fClusterTracks[3][i]=-1;
}
for (Int_t i=0; i<fN;i++) {
- AliITSclusterV2 * cl = (AliITSclusterV2*)GetCluster(i);
+ AliITSRecPoint * cl = (AliITSRecPoint*)GetCluster(i);
if (cl&&cl->IsUsed()) cl->Use();
}
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::AliITSlayer::ResetRoad() {
//--------------------------------------------------------------------
// This function calculates the road defined by the cluster density
for (Int_t i=0; i<fN; i++) {
if (TMath::Abs(fClusters[i]->GetZ())<fR) n++;
}
- //if (n>1) fRoad=2*fR*TMath::Sqrt(3.14/n);
- if (n>1) fRoad=2*fR*TMath::Sqrt(3.14/n);
+ if (n>1) fRoad=2*fR*TMath::Sqrt(TMath::Pi()/n);
}
-
-
-Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSclusterV2 *c) {
+//------------------------------------------------------------------------
+Int_t AliITStrackerMI::AliITSlayer::InsertCluster(AliITSRecPoint *cl) {
//--------------------------------------------------------------------
//This function adds a cluster to this layer
//--------------------------------------------------------------------
return 1;
}
fCurrentSlice=-1;
- fClusters[fN]=c;
+ fClusters[fN]=cl;
fN++;
- AliITSdetector &det=GetDetector(c->GetDetectorIndex());
- if (c->GetY()<det.GetYmin()) det.SetYmin(c->GetY());
- if (c->GetY()>det.GetYmax()) det.SetYmax(c->GetY());
- if (c->GetZ()<det.GetZmin()) det.SetZmin(c->GetZ());
- if (c->GetZ()>det.GetZmax()) det.SetZmax(c->GetZ());
+ AliITSdetector &det=GetDetector(cl->GetDetectorIndex());
+ if (cl->GetY()<det.GetYmin()) det.SetYmin(cl->GetY());
+ if (cl->GetY()>det.GetYmax()) det.SetYmax(cl->GetY());
+ if (cl->GetZ()<det.GetZmin()) det.SetZmin(cl->GetZ());
+ if (cl->GetZ()>det.GetZmax()) det.SetZmax(cl->GetZ());
return 0;
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::AliITSlayer::SortClusters()
{
//
//sort clusters
//
- AliITSclusterV2 **clusters = new AliITSclusterV2*[fN];
+ AliITSRecPoint **clusters = new AliITSRecPoint*[fN];
Float_t *z = new Float_t[fN];
Int_t * index = new Int_t[fN];
//
}
-
-
+//------------------------------------------------------------------------
Int_t AliITStrackerMI::AliITSlayer::FindClusterIndex(Float_t z) const {
//--------------------------------------------------------------------
// This function returns the index of the nearest cluster
}
return m;
}
-
-
+//------------------------------------------------------------------------
void AliITStrackerMI::AliITSlayer::
SelectClusters(Double_t zmin,Double_t zmax,Double_t ymin, Double_t ymax) {
//--------------------------------------------------------------------
fSkip = 0;
fAccepted =0;
}
-
-
-
-
+//------------------------------------------------------------------------
Int_t AliITStrackerMI::AliITSlayer::
FindDetectorIndex(Double_t phi, Double_t z) const {
//--------------------------------------------------------------------
//This function finds the detector crossed by the track
//--------------------------------------------------------------------
- Double_t dphi=-(phi-fPhiOffset);
+ Double_t dphi;
+ if (fZOffset<0) // old geometry
+ dphi = -(phi-fPhiOffset);
+ else // new geometry
+ dphi = phi-fPhiOffset;
+
if (dphi < 0) dphi += 2*TMath::Pi();
else if (dphi >= 2*TMath::Pi()) dphi -= 2*TMath::Pi();
Int_t np=Int_t(dphi*fNladders*0.5/TMath::Pi()+0.5);
return np*fNdetectors + nz;
}
-
-
-const AliITSclusterV2 *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){
+//------------------------------------------------------------------------
+const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci){
//--------------------------------------------------------------------
// This function returns clusters within the "window"
//--------------------------------------------------------------------
}
return 0;
}
-
-
-
+//------------------------------------------------------------------------
Double_t AliITStrackerMI::AliITSlayer::GetThickness(Double_t y,Double_t z,Double_t &x0)
const {
//--------------------------------------------------------------------
- //This function returns the layer thickness at this point (units X0)
+ // This function returns the layer thickness at this point (units X0)
//--------------------------------------------------------------------
Double_t d=0.0085;
- x0=21.82;
+ x0=kX0Air;
if (43<fR&&fR<45) { //SSD2
Double_t dd=0.0034;
d=dd;
Double_t dd=0.0063; x0=21.5;
d=dd;
if (TMath::Abs(y-3.08)>0.5) d+=dd;
- //if (TMath::Abs(y-3.08)>0.45) d+=dd;
- if (TMath::Abs(y-3.03)<0.10) {d+=0.014;}
+ if (TMath::Abs(y-3.03)<0.10) d+=0.014;
} else
if (3<fR&&fR<5) { //SPD1
Double_t dd=0.0063; x0=21.5;
d=dd;
if (TMath::Abs(y+0.21)>0.6) d+=dd;
- //if (TMath::Abs(y+0.21)>0.45) d+=dd;
- if (TMath::Abs(y+0.10)<0.10) {d+=0.014;}
+ if (TMath::Abs(y+0.10)<0.10) d+=0.014;
}
return d;
}
-
+//------------------------------------------------------------------------
Double_t AliITStrackerMI::GetEffectiveThickness(Double_t y,Double_t z) const
{
//--------------------------------------------------------------------
- //Returns the thickness between the current layer and the vertex (units X0)
+ // Returns the thickness between the current layer and the vertex (units X0)
//--------------------------------------------------------------------
- Double_t d=0.0028*3*3; //beam pipe
- Double_t x0=0;
+ // beam pipe
+ Double_t d=kdPipe*krPipe*krPipe;
+
+ // layers
+ Double_t x0=0;
Double_t xn=fgLayers[fI].GetR();
for (Int_t i=0; i<fI; i++) {
Double_t xi=fgLayers[i].GetR();
d+=fgLayers[i].GetThickness(y,z,x0)*xi*xi;
}
+ // shields
if (fI>1) {
- Double_t xi=9.;
- d+=0.0097*xi*xi;
+ d+=kdshieldSPD*krshieldSPD*krshieldSPD;
}
-
if (fI>3) {
Double_t xi=0.5*(fgLayers[3].GetR()+fgLayers[4].GetR());
- d+=0.0034*xi*xi;
+ d+=kdshieldSDD*xi*xi;
}
return d/(xn*xn);
}
-
+//------------------------------------------------------------------------
Int_t AliITStrackerMI::AliITSlayer::InRoad() const {
//--------------------------------------------------------------------
// This function returns number of clusters within the "window"
//--------------------------------------------------------------------
Int_t ncl=0;
for (Int_t i=fI; i<fN; i++) {
- const AliITSclusterV2 *c=fClusters[i];
+ const AliITSRecPoint *c=fClusters[i];
if (c->GetZ() > fZmax) break;
if (c->IsUsed()) continue;
const AliITSdetector &det=GetDetector(c->GetDetectorIndex());
}
return ncl;
}
-
-Bool_t
-AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const AliITStrackMI *c) {
+//------------------------------------------------------------------------
+Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,
+ const AliITStrackMI *c, Bool_t extra) {
//--------------------------------------------------------------------
// This function refits the track "t" at the position "x" using
// the clusters from "c"
+ // If "extra"==kTRUE,
+ // the clusters from overlapped modules get attached to "t"
//--------------------------------------------------------------------
Int_t index[kMaxLayer];
Int_t k;
index[nl]=idx;
}
+ // special for cosmics: check which the innermost layer crossed
+ // by the track
+ Int_t innermostlayer=5;
+ Double_t d = TMath::Abs(t->GetD(0.,0.));
+ for(innermostlayer=0; innermostlayer<kMaxLayer; innermostlayer++)
+ if(d<fgLayers[innermostlayer].GetR()) break;
+ //printf(" d %f innermost %d\n",d,innermostlayer);
+
Int_t from, to, step;
if (xx > t->GetX()) {
- from=0; to=kMaxLayer;
+ from=innermostlayer; to=kMaxLayer;
step=+1;
} else {
- from=kMaxLayer-1; to=-1;
+ from=kMaxLayer-1; to=innermostlayer-1;
step=-1;
}
+ // loop on the layers
for (Int_t i=from; i != to; i += step) {
AliITSlayer &layer=fgLayers[i];
Double_t r=layer.GetR();
- {
+ // material between SSD and SDD, SDD and SPD
Double_t hI=i-0.5*step;
if (TMath::Abs(hI-1.5)<0.01 || TMath::Abs(hI-3.5)<0.01) {
- Double_t rs=0.5*(fgLayers[i-step].GetR() + r);
- Double_t d=0.0034, x0=38.6;
- if (TMath::Abs(hI-1.5)<0.01) {rs=9.; d=0.0097; x0=42;}
- if (!t->PropagateTo(rs,-step*d,x0)) {
- return kFALSE;
- }
- }
+ Double_t rshield,dshield,x0shield;
+ if (TMath::Abs(hI-3.5)<0.01) { // SDDouter
+ rshield=0.5*(fgLayers[i-step].GetR() + r);
+ dshield=kdshieldSDD;
+ x0shield=kX0shieldSDD;
+ } else { // SPDouter
+ rshield=krshieldSPD;
+ dshield=kdshieldSPD;
+ x0shield=kX0shieldSPD;
+ }
+ if (fUseTGeo) {
+ if (!t->PropagateToTGeo(rshield,1)) return kFALSE;
+ } else {
+ if (!t->PropagateTo(rshield,-step*dshield,x0shield)) return kFALSE;
+ }
}
-
+
// remember old position [SR, GSI 18.02.2003]
Double_t oldX=0., oldY=0., oldZ=0.;
if (t->IsStartedTimeIntegral() && step==1) {
}
//
- Double_t x,y,z;
- if (!t->GetGlobalXYZat(r,x,y,z)) {
- return kFALSE;
- }
- Double_t phi=TMath::ATan2(y,x);
+ Double_t oldGlobXYZ[3];
+ t->GetXYZ(oldGlobXYZ);
+
+ Double_t phi,z;
+ if (!t->GetPhiZat(r,phi,z)) return kFALSE;
+
Int_t idet=layer.FindDetectorIndex(phi,z);
if (idet<0) {
return kFALSE;
}
+
const AliITSdetector &det=layer.GetDetector(idet);
phi=det.GetPhi();
if (!t->Propagate(phi,det.GetR())) {
}
t->SetDetectorIndex(idet);
- const AliITSclusterV2 *cl=0;
- Double_t maxchi2=1000.*kMaxChi2;
+ const AliITSRecPoint *cl=0;
+ Double_t maxchi2=1000.*AliITSReconstructor::GetRecoParam()->GetMaxChi2();
Int_t idx=index[i];
- if (idx>0) {
- const AliITSclusterV2 *c=(AliITSclusterV2 *)GetCluster(idx);
- if (idet != c->GetDetectorIndex()) {
- idet=c->GetDetectorIndex();
- const AliITSdetector &det=layer.GetDetector(idet);
- if (!t->Propagate(det.GetPhi(),det.GetR())) {
- return kFALSE;
- }
- t->SetDetectorIndex(idet);
- }
- //Double_t chi2=t->GetPredictedChi2(c);
- Int_t layer = (idx & 0xf0000000) >> 28;;
- Double_t chi2=GetPredictedChi2MI(t,c,layer);
- if (chi2<maxchi2) {
- cl=c;
- maxchi2=chi2;
- } else {
- return kFALSE;
+ if (idx>=0) {
+ const AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(idx);
+ if (c){
+ if (idet != c->GetDetectorIndex()) {
+ idet=c->GetDetectorIndex();
+ const AliITSdetector &det=layer.GetDetector(idet);
+ if (!t->Propagate(det.GetPhi(),det.GetR())) {
+ return kFALSE;
+ }
+ t->SetDetectorIndex(idet);
+ }
+ //Double_t chi2=t->GetPredictedChi2(c);
+ Int_t layer = (idx & 0xf0000000) >> 28;;
+ Double_t chi2=GetPredictedChi2MI(t,c,layer);
+ if (chi2<maxchi2) {
+ cl=c;
+ maxchi2=chi2;
+ } else {
+ return kFALSE;
+ }
}
}
- /*
- if (cl==0)
- if (t->GetNumberOfClusters()>2) {
- Double_t dz=4*TMath::Sqrt(t->GetSigmaZ2()+kSigmaZ2[i]);
- Double_t dy=4*TMath::Sqrt(t->GetSigmaY2()+kSigmaY2[i]);
+
+ if (cl) {
+ if (!UpdateMI(t,cl,maxchi2,idx)) return kFALSE;
+ t->SetSampledEdx(cl->GetQ(),t->GetNumberOfClusters()-1);
+ }
+
+ // Correct for material of the current layer
+ Double_t d,x0;
+ if(fUseTGeo) {
+ Double_t globXYZ[3];
+ t->GetXYZ(globXYZ);
+ Double_t mparam[7];
+ AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
+ if (mparam[1]<900000) {
+ d=mparam[1];
+ Double_t lengthTimesMeanDensity=mparam[0]*mparam[4];
+ t->CorrectForMeanMaterial(d,lengthTimesMeanDensity);
+ } else {
+ d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
+ t->CorrectForMaterial(-step*d,x0);
+ }
+ } else {
+ d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
+ t->CorrectForMaterial(-step*d,x0);
+ }
+
+
+ if (extra) { //search for extra clusters
+ AliITStrackV2 tmp(*t);
+ Double_t dz=4*TMath::Sqrt(tmp.GetSigmaZ2()+AliITSReconstructor::GetRecoParam()->GetSigmaZ2(i));
+ if (dz < 0.5*TMath::Abs(tmp.GetTgl())) dz=0.5*TMath::Abs(tmp.GetTgl());
+ Double_t dy=4*TMath::Sqrt(t->GetSigmaY2()+AliITSReconstructor::GetRecoParam()->GetSigmaY2(i));
+ if (dy < 0.5*TMath::Abs(tmp.GetSnp())) dy=0.5*TMath::Abs(tmp.GetSnp());
Double_t zmin=t->GetZ() - dz;
Double_t zmax=t->GetZ() + dz;
Double_t ymin=t->GetY() + phi*r - dy;
Double_t ymax=t->GetY() + phi*r + dy;
layer.SelectClusters(zmin,zmax,ymin,ymax);
- const AliITSclusterV2 *c=0; Int_t ci=-1;
+ const AliITSRecPoint *c=0; Int_t ci=-1,cci=-1;
+ Double_t maxchi2=1000.*AliITSReconstructor::GetRecoParam()->GetMaxChi2(), tolerance=0.1;
while ((c=layer.GetNextCluster(ci))!=0) {
- if (idet != c->GetDetectorIndex()) continue;
- Double_t chi2=t->GetPredictedChi2(c);
- if (chi2<maxchi2) { cl=c; maxchi2=chi2; idx=ci; }
+ if (idet == c->GetDetectorIndex()) continue;
+
+ const AliITSdetector &det=layer.GetDetector(c->GetDetectorIndex());
+
+ if (!tmp.Propagate(det.GetPhi(),det.GetR())) continue;
+
+ if (TMath::Abs(tmp.GetZ() - c->GetZ()) > tolerance) continue;
+ if (TMath::Abs(tmp.GetY() - c->GetY()) > tolerance) continue;
+
+ Double_t chi2=tmp.GetPredictedChi2(c);
+ if (chi2<maxchi2) { maxchi2=chi2; cci=ci; }
}
+ if (cci>=0) t->SetExtraCluster(i,(i<<28)+cci);
+ }
+
+ // track time update [SR, GSI 17.02.2003]
+ if (t->IsStartedTimeIntegral() && step==1) {
+ Double_t newX, newY, newZ;
+ t->GetGlobalXYZat(t->GetX(),newX,newY,newZ);
+ Double_t dL2 = (oldX-newX)*(oldX-newX) + (oldY-newY)*(oldY-newY) +
+ (oldZ-newZ)*(oldZ-newZ);
+ t->AddTimeStep(TMath::Sqrt(dL2));
+ }
+ //
+
+ } // end loop on the layers
+
+ if (!t->PropagateTo(xx,0.,0.)) return kFALSE;
+ return kTRUE;
+}
+//------------------------------------------------------------------------
+Bool_t
+AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *t,const Int_t *clindex) {
+ //--------------------------------------------------------------------
+ // This function refits the track "t" at the position "x" using
+ // the clusters from array
+ //--------------------------------------------------------------------
+ Int_t index[kMaxLayer];
+ Int_t k;
+ for (k=0; k<kMaxLayer; k++) index[k]=-1;
+ //
+ for (k=0; k<kMaxLayer; k++) {
+ index[k]=clindex[k];
+ }
+
+ // special for cosmics: check which the innermost layer crossed
+ // by the track
+ Int_t innermostlayer=5;
+ Double_t d = TMath::Abs(t->GetD(0.,0.));
+ for(innermostlayer=0; innermostlayer<kMaxLayer; innermostlayer++)
+ if(d<fgLayers[innermostlayer].GetR()) break;
+ //printf(" d %f innermost %d\n",d,innermostlayer);
+
+ Int_t from, to, step;
+ if (xx > t->GetX()) {
+ from=innermostlayer; to=kMaxLayer;
+ step=+1;
+ } else {
+ from=kMaxLayer-1; to=innermostlayer-1;
+ step=-1;
+ }
+
+ for (Int_t i=from; i != to; i += step) {
+ AliITSlayer &layer=fgLayers[i];
+ Double_t r=layer.GetR();
+ if (step<0 && xx>r) break;
+
+ // material between SSD and SDD, SDD and SPD
+ Double_t hI=i-0.5*step;
+ if (TMath::Abs(hI-1.5)<0.01 || TMath::Abs(hI-3.5)<0.01) {
+ Double_t rshield,dshield,x0shield;
+ if (TMath::Abs(hI-3.5)<0.01) { // SDDouter
+ rshield=0.5*(fgLayers[i-step].GetR() + r);
+ dshield=kdshieldSDD;
+ x0shield=kX0shieldSDD;
+ } else { // SPDouter
+ rshield=krshieldSPD;
+ dshield=kdshieldSPD;
+ x0shield=kX0shieldSPD;
+ }
+ if (fUseTGeo) {
+ if (!t->PropagateToTGeo(rshield,1)) return kFALSE;
+ } else {
+ if (!t->PropagateTo(rshield,-step*dshield,x0shield)) return kFALSE;
+ }
}
- */
+
+ // remember old position [SR, GSI 18.02.2003]
+ Double_t oldX=0., oldY=0., oldZ=0.;
+ if (t->IsStartedTimeIntegral() && step==1) {
+ t->GetGlobalXYZat(t->GetX(),oldX,oldY,oldZ);
+ }
+ //
+ Double_t oldGlobXYZ[3];
+ t->GetXYZ(oldGlobXYZ);
+
+ Double_t phi,z;
+ if (!t->GetPhiZat(r,phi,z)) return kFALSE;
+
+ Int_t idet=layer.FindDetectorIndex(phi,z);
+ if (idet<0) {
+ return kFALSE;
+ }
+ const AliITSdetector &det=layer.GetDetector(idet);
+ phi=det.GetPhi();
+ if (!t->Propagate(phi,det.GetR())) {
+ return kFALSE;
+ }
+ t->SetDetectorIndex(idet);
+
+ const AliITSRecPoint *cl=0;
+ Double_t maxchi2=1000.*AliITSReconstructor::GetRecoParam()->GetMaxChi2();
+
+ Int_t idx=index[i];
+ if (idx>=0) {
+ const AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(idx);
+ if (c){
+ if (idet != c->GetDetectorIndex()) {
+ idet=c->GetDetectorIndex();
+ const AliITSdetector &det=layer.GetDetector(idet);
+ if (!t->Propagate(det.GetPhi(),det.GetR())) {
+ return kFALSE;
+ }
+ t->SetDetectorIndex(idet);
+ }
+ //Double_t chi2=t->GetPredictedChi2(c);
+ Int_t layer = (idx & 0xf0000000) >> 28;;
+ Double_t chi2=GetPredictedChi2MI(t,c,layer);
+ if (chi2<maxchi2) {
+ cl=c;
+ maxchi2=chi2;
+ } else {
+ return kFALSE;
+ }
+ }
+ }
+
if (cl) {
- //if (!t->Update(cl,maxchi2,idx)) {
- if (!UpdateMI(t,cl,maxchi2,idx)) {
- return kFALSE;
- }
+ if (!UpdateMI(t,cl,maxchi2,idx)) return kFALSE;
t->SetSampledEdx(cl->GetQ(),t->GetNumberOfClusters()-1);
}
- {
- Double_t x0;
- Double_t d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
- t->CorrectForMaterial(-step*d,x0);
+ // Correct for material of the current layer
+ Double_t d,x0;
+ if(fUseTGeo) {
+ Double_t globXYZ[3];
+ t->GetXYZ(globXYZ);
+ Double_t mparam[7];
+ AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
+ if (mparam[1]<900000) {
+ d=mparam[1];
+ Double_t lengthTimesMeanDensity=mparam[0]*mparam[4];
+ t->CorrectForMeanMaterial(d,lengthTimesMeanDensity);
+ } else {
+ d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
+ t->CorrectForMaterial(-step*d,x0);
+ }
+ } else {
+ d=layer.GetThickness(t->GetY(),t->GetZ(),x0);
+ t->CorrectForMaterial(-step*d,x0);
}
// track time update [SR, GSI 17.02.2003]
if (!t->PropagateTo(xx,0.,0.)) return kFALSE;
return kTRUE;
}
-
-
+//------------------------------------------------------------------------
Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode)
{
//
Float_t *ny = GetNy(fCurrentEsdTrack), *nz = GetNz(fCurrentEsdTrack);
if (mode<100){
for (Int_t i = 0;i<6;i++){
- if (track->fClIndex[i]>0){
+ if (track->GetClIndex(i)>0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
else
- { cerry= track->fSigmaY[i]; cerrz = track->fSigmaZ[i];}
+ { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
cerry*=cerry;
cerrz*=cerrz;
- Float_t cchi2 = (track->fDy[i]*track->fDy[i]/cerry)+(track->fDz[i]*track->fDz[i]/cerrz);
+ Float_t cchi2 = (track->GetDy(i)*track->GetDy(i)/cerry)+(track->GetDz(i)*track->GetDz(i)/cerrz);
if (i>1){
- Float_t ratio = track->fNormQ[i]/track->fExpQ;
+ Float_t ratio = track->GetNormQ(i)/track->GetExpQ();
if (ratio<0.5) {
cchi2+=(0.5-ratio)*10.;
//track->fdEdxMismatch+=(0.5-ratio)*10.;
}
}
if (i<2 ||i>3){
- AliITSclusterV2 * cl = (AliITSclusterV2*)GetCluster( track->fClIndex[i]);
+ AliITSRecPoint * cl = (AliITSRecPoint*)GetCluster( track->GetClIndex(i));
Double_t delta = cl->GetNy()+cl->GetNz()-ny[i]-nz[i];
if (delta>1) chi2 +=0.5*TMath::Min(delta/2,2.);
if (i<2) chi2+=2*cl->GetDeltaProbability();
sum++;
}
}
- if (TMath::Abs(track->fdEdxMismatch-dedxmismatch)>0.0001){
- track->fdEdxMismatch = dedxmismatch;
+ if (TMath::Abs(track->GetdEdxMismatch()-dedxmismatch)>0.0001){
+ track->SetdEdxMismatch(dedxmismatch);
}
}
else{
for (Int_t i = 0;i<4;i++){
- if (track->fClIndex[i]>0){
+ if (track->GetClIndex(i)>0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
- else { cerry= track->fSigmaY[i]; cerrz = track->fSigmaZ[i];}
+ else { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
cerry*=cerry;
cerrz*=cerrz;
- chi2+= (track->fDy[i]*track->fDy[i]/cerry);
- chi2+= (track->fDz[i]*track->fDz[i]/cerrz);
+ chi2+= (track->GetDy(i)*track->GetDy(i)/cerry);
+ chi2+= (track->GetDz(i)*track->GetDz(i)/cerrz);
sum++;
}
}
for (Int_t i = 4;i<6;i++){
- if (track->fClIndex[i]>0){
+ if (track->GetClIndex(i)>0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
- else { cerry= track->fSigmaY[i]; cerrz = track->fSigmaZ[i];}
+ else { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
cerry*=cerry;
cerrz*=cerrz;
Float_t cerryb, cerrzb;
if (ny[i+6]>0) {cerryb = erry[i+6]; cerrzb=errz[i+6];}
- else { cerryb= track->fSigmaY[i+6]; cerrzb = track->fSigmaZ[i+6];}
+ else { cerryb= track->GetSigmaY(i+6); cerrzb = track->GetSigmaZ(i+6);}
cerryb*=cerryb;
cerrzb*=cerrzb;
- chi2+= TMath::Min((track->fDy[i+6]*track->fDy[i+6]/cerryb),track->fDy[i]*track->fDy[i]/cerry);
- chi2+= TMath::Min((track->fDz[i+6]*track->fDz[i+6]/cerrzb),track->fDz[i]*track->fDz[i]/cerrz);
+ chi2+= TMath::Min((track->GetDy(i+6)*track->GetDy(i+6)/cerryb),track->GetDy(i)*track->GetDy(i)/cerry);
+ chi2+= TMath::Min((track->GetDz(i+6)*track->GetDz(i+6)/cerrzb),track->GetDz(i)*track->GetDz(i)/cerrz);
sum++;
}
}
}
- if (track->fESDtrack->GetTPCsignal()>85){
- Float_t ratio = track->fdEdx/track->fESDtrack->GetTPCsignal();
+ if (track->GetESDtrack()->GetTPCsignal()>85){
+ Float_t ratio = track->GetdEdx()/track->GetESDtrack()->GetTPCsignal();
if (ratio<0.5) {
chi2+=(0.5-ratio)*5.;
}
}
}
//
- Double_t match = TMath::Sqrt(track->fChi22);
- if (track->fConstrain) match/=track->GetNumberOfClusters();
- if (!track->fConstrain) match/=track->GetNumberOfClusters()-2.;
+ Double_t match = TMath::Sqrt(track->GetChi22());
+ if (track->GetConstrain()) match/=track->GetNumberOfClusters();
+ if (!track->GetConstrain()) match/=track->GetNumberOfClusters()-2.;
if (match<0) match=0;
- Float_t deadzonefactor = (track->fNDeadZone>0) ? 3*(1.1-track->fDeadZoneProbability):0.;
- Double_t normchi2 = 2*track->fNSkipped+match+deadzonefactor+(1+(2*track->fNSkipped+deadzonefactor)/track->GetNumberOfClusters())*
- (chi2)/TMath::Max(double(sum-track->fNSkipped),
- 1./(1.+track->fNSkipped));
+ Float_t deadzonefactor = (track->GetNDeadZone()>0) ? 3*(1.1-track->GetDeadZoneProbability()):0.;
+ Double_t normchi2 = 2*track->GetNSkipped()+match+deadzonefactor+(1+(2*track->GetNSkipped()+deadzonefactor)/track->GetNumberOfClusters())*
+ (chi2)/TMath::Max(double(sum-track->GetNSkipped()),
+ 1./(1.+track->GetNSkipped()));
return normchi2;
}
-
-
+//------------------------------------------------------------------------
Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI * track2)
{
//
AliITStrackMI track3(*track2);
track3.Propagate(track1->GetAlpha(),track1->GetX());
TMatrixD vec(5,1);
- vec(0,0)=track1->fP0-track3.fP0;
- vec(1,0)=track1->fP1-track3.fP1;
- vec(2,0)=track1->fP2-track3.fP2;
- vec(3,0)=track1->fP3-track3.fP3;
- vec(4,0)=track1->fP4-track3.fP4;
+ vec(0,0)=track1->GetY() - track3.GetY();
+ vec(1,0)=track1->GetZ() - track3.GetZ();
+ vec(2,0)=track1->GetSnp() - track3.GetSnp();
+ vec(3,0)=track1->GetTgl() - track3.GetTgl();
+ vec(4,0)=track1->GetSigned1Pt() - track3.GetSigned1Pt();
//
TMatrixD cov(5,5);
- cov(0,0) = track1->fC00+track3.fC00;
- cov(1,1) = track1->fC11+track3.fC11;
- cov(2,2) = track1->fC22+track3.fC22;
- cov(3,3) = track1->fC33+track3.fC33;
- cov(4,4) = track1->fC44+track3.fC44;
+ cov(0,0) = track1->GetSigmaY2()+track3.GetSigmaY2();
+ cov(1,1) = track1->GetSigmaZ2()+track3.GetSigmaZ2();
+ cov(2,2) = track1->GetSigmaSnp2()+track3.GetSigmaSnp2();
+ cov(3,3) = track1->GetSigmaTgl2()+track3.GetSigmaTgl2();
+ cov(4,4) = track1->GetSigma1Pt2()+track3.GetSigma1Pt2();
- cov(0,1)=cov(1,0) = track1->fC10+track3.fC10;
- cov(0,2)=cov(2,0) = track1->fC20+track3.fC20;
- cov(0,3)=cov(3,0) = track1->fC30+track3.fC30;
- cov(0,4)=cov(4,0) = track1->fC40+track3.fC40;
+ cov(0,1)=cov(1,0) = track1->GetSigmaZY()+track3.GetSigmaZY();
+ cov(0,2)=cov(2,0) = track1->GetSigmaSnpY()+track3.GetSigmaSnpY();
+ cov(0,3)=cov(3,0) = track1->GetSigmaTglY()+track3.GetSigmaTglY();
+ cov(0,4)=cov(4,0) = track1->GetSigma1PtY()+track3.GetSigma1PtY();
//
- cov(1,2)=cov(2,1) = track1->fC21+track3.fC21;
- cov(1,3)=cov(3,1) = track1->fC31+track3.fC31;
- cov(1,4)=cov(4,1) = track1->fC41+track3.fC41;
+ cov(1,2)=cov(2,1) = track1->GetSigmaSnpZ()+track3.GetSigmaSnpZ();
+ cov(1,3)=cov(3,1) = track1->GetSigmaTglZ()+track3.GetSigmaTglZ();
+ cov(1,4)=cov(4,1) = track1->GetSigma1PtZ()+track3.GetSigma1PtZ();
//
- cov(2,3)=cov(3,2) = track1->fC32+track3.fC32;
- cov(2,4)=cov(4,2) = track1->fC42+track3.fC42;
+ cov(2,3)=cov(3,2) = track1->GetSigmaTglSnp()+track3.GetSigmaTglSnp();
+ cov(2,4)=cov(4,2) = track1->GetSigma1PtSnp()+track3.GetSigma1PtSnp();
//
- cov(3,4)=cov(4,3) = track1->fC43+track3.fC43;
+ cov(3,4)=cov(4,3) = track1->GetSigma1PtTgl()+track3.GetSigma1PtTgl();
cov.Invert();
TMatrixD vec2(cov,TMatrixD::kMult,vec);
TMatrixD chi2(vec2,TMatrixD::kTransposeMult,vec);
return chi2(0,0);
}
-
+//------------------------------------------------------------------------
Double_t AliITStrackerMI::GetDeadZoneProbability(Double_t zpos, Double_t zerr)
{
//
- // return probability that given point - characterized by z position and error is in dead zone
+ // return probability that given point (characterized by z position and error)
+ // is in SPD dead zone
//
- Double_t probability =0;
+ Double_t probability = 0.;
Double_t absz = TMath::Abs(zpos);
- Double_t nearestz = (absz<2)? 0.:7.1;
- if (TMath::Abs(absz-nearestz)>0.25+3*zerr) return 0;
- Double_t zmin=0, zmax=0;
- if (zpos<-6.){
- zmin = -7.25; zmax = -6.95;
- }
- if (zpos>6){
- zmin = 7.0; zmax =7.3;
- }
- if (absz<2){
- zmin = -0.75; zmax = 1.5;
+ Double_t nearestz = (absz<2.) ? 0.5*(fSPDdetzcentre[1]+fSPDdetzcentre[2]) :
+ 0.5*(fSPDdetzcentre[2]+fSPDdetzcentre[3]);
+ if (TMath::Abs(absz-nearestz)>0.25+3.*zerr) return probability;
+ Double_t zmin, zmax;
+ if (zpos<-6.) { // dead zone at z = -7
+ zmin = fSPDdetzcentre[0] + 0.5*kSPDdetzlength;
+ zmax = fSPDdetzcentre[1] - 0.5*kSPDdetzlength;
+ } else if (zpos>6.) { // dead zone at z = +7
+ zmin = fSPDdetzcentre[2] + 0.5*kSPDdetzlength;
+ zmax = fSPDdetzcentre[3] - 0.5*kSPDdetzlength;
+ } else if (absz<2.) { // dead zone at z = 0
+ zmin = fSPDdetzcentre[1] + 0.5*kSPDdetzlength;
+ zmax = fSPDdetzcentre[2] - 0.5*kSPDdetzlength;
+ } else {
+ zmin = 0.;
+ zmax = 0.;
}
- probability = (TMath::Erf((zpos-zmin)/zerr) - TMath::Erf((zpos-zmax)/zerr))*0.5;
+ // probability that the true z is in the range [zmin,zmax] (i.e. inside
+ // dead zone)
+ probability = 0.5*( TMath::Erf((zpos-zmin)/zerr/TMath::Sqrt(2.)) -
+ TMath::Erf((zpos-zmax)/zerr/TMath::Sqrt(2.)) );
return probability;
}
-
-
+//------------------------------------------------------------------------
Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackMI * track, Float_t fac)
{
//
Float_t *erry = GetErrY(fCurrentEsdTrack), *errz = GetErrZ(fCurrentEsdTrack);
Float_t ncl = 0;
for (Int_t i = 0;i<6;i++){
- if (TMath::Abs(track->fDy[i])>0){
- chi2[i]= (track->fDy[i]/erry[i])*(track->fDy[i]/erry[i]);
- chi2[i]+= (track->fDz[i]/errz[i])*(track->fDz[i]/errz[i]);
+ if (TMath::Abs(track->GetDy(i))>0){
+ chi2[i]= (track->GetDy(i)/erry[i])*(track->GetDy(i)/erry[i]);
+ chi2[i]+= (track->GetDz(i)/errz[i])*(track->GetDz(i)/errz[i]);
ncl++;
}
else{chi2[i]=10000;}
Double_t normchi2 = sumchi/sumweight;
return normchi2;
}
-
-
+//------------------------------------------------------------------------
Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackMI * forwardtrack, AliITStrackMI * backtrack)
{
//
Int_t npoints = 0;
Double_t res =0;
for (Int_t i=0;i<6;i++){
- if ( (backtrack->fSigmaY[i]<0.000000001) || (forwardtrack->fSigmaY[i]<0.000000001)) continue;
- Double_t sy1 = forwardtrack->fSigmaY[i];
- Double_t sz1 = forwardtrack->fSigmaZ[i];
- Double_t sy2 = backtrack->fSigmaY[i];
- Double_t sz2 = backtrack->fSigmaZ[i];
+ if ( (backtrack->GetSigmaY(i)<0.000000001) || (forwardtrack->GetSigmaY(i)<0.000000001)) continue;
+ Double_t sy1 = forwardtrack->GetSigmaY(i);
+ Double_t sz1 = forwardtrack->GetSigmaZ(i);
+ Double_t sy2 = backtrack->GetSigmaY(i);
+ Double_t sz2 = backtrack->GetSigmaZ(i);
if (i<2){ sy2=1000.;sz2=1000;}
//
- Double_t dy0 = (forwardtrack->fDy[i]/(sy1*sy1) +backtrack->fDy[i]/(sy2*sy2))/(1./(sy1*sy1)+1./(sy2*sy2));
- Double_t dz0 = (forwardtrack->fDz[i]/(sz1*sz1) +backtrack->fDz[i]/(sz2*sz2))/(1./(sz1*sz1)+1./(sz2*sz2));
+ Double_t dy0 = (forwardtrack->GetDy(i)/(sy1*sy1) +backtrack->GetDy(i)/(sy2*sy2))/(1./(sy1*sy1)+1./(sy2*sy2));
+ Double_t dz0 = (forwardtrack->GetDz(i)/(sz1*sz1) +backtrack->GetDz(i)/(sz2*sz2))/(1./(sz1*sz1)+1./(sz2*sz2));
//
Double_t nz0 = dz0*TMath::Sqrt((1./(sz1*sz1)+1./(sz2*sz2)));
Double_t ny0 = dy0*TMath::Sqrt((1./(sy1*sy1)+1./(sy2*sy2)));
npoints++;
}
if (npoints>1) return
- TMath::Max(TMath::Abs(0.3*forwardtrack->Get1Pt())-0.5,0.)+
+ TMath::Max(0.3*forwardtrack->OneOverPt()-0.5,0.)+
//2*forwardtrack->fNUsed+
- res/TMath::Max(double(npoints-forwardtrack->fNSkipped),
- 1./(1.+forwardtrack->fNSkipped));
+ res/TMath::Max(double(npoints-forwardtrack->GetNSkipped()),
+ 1./(1.+forwardtrack->GetNSkipped()));
return 1000;
}
-
-
-
-
-
+//------------------------------------------------------------------------
Float_t *AliITStrackerMI::GetWeight(Int_t index) {
//--------------------------------------------------------------------
// Return pointer to a given cluster
Int_t c=(index & 0x0fffffff) >> 00;
return fgLayers[l].GetWeight(c);
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::RegisterClusterTracks(AliITStrackMI* track,Int_t id)
{
//---------------------------------------------
// register track to the list
//
- if (track->fESDtrack->GetKinkIndex(0)!=0) return; //don't register kink tracks
+ if (track->GetESDtrack()->GetKinkIndex(0)!=0) return; //don't register kink tracks
//
//
for (Int_t icluster=0;icluster<track->GetNumberOfClusters();icluster++){
Int_t index = track->GetClusterIndex(icluster);
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
for (Int_t itrack=0;itrack<4;itrack++){
- if (fgLayers[l].fClusterTracks[itrack][c]<0){
- fgLayers[l].fClusterTracks[itrack][c]=id;
+ if (fgLayers[l].GetClusterTracks(itrack,c)<0){
+ fgLayers[l].SetClusterTracks(itrack,c,id);
break;
}
}
}
}
+//------------------------------------------------------------------------
void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackMI* track, Int_t id)
{
//---------------------------------------------
Int_t index = track->GetClusterIndex(icluster);
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
for (Int_t itrack=0;itrack<4;itrack++){
- if (fgLayers[l].fClusterTracks[itrack][c]==id){
- fgLayers[l].fClusterTracks[itrack][c]=-1;
+ if (fgLayers[l].GetClusterTracks(itrack,c)==id){
+ fgLayers[l].SetClusterTracks(itrack,c,-1);
}
}
}
}
-Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id, Int_t list[6], AliITSclusterV2 *clist[6])
+//------------------------------------------------------------------------
+Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id, Int_t list[6], AliITSRecPoint *clist[6])
{
//-------------------------------------------------------------
//get number of shared clusters
Int_t index = track->GetClusterIndex(icluster);
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
if (ny[l]==0){
printf("problem\n");
}
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(index);
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index);
Float_t weight=1;
//
Float_t deltan = 0;
if (l>3&&cl->GetNy()+cl->GetNz()>6) continue;
- if (l>2&&track->fNormQ[l]/track->fExpQ>3.5) continue;
+ if (l>2&&track->GetNormQ(l)/track->GetExpQ()>3.5) continue;
if (l<2 || l>3){
deltan = (cl->GetNy()+cl->GetNz()-ny[l]-nz[l]);
}
weight = 2./TMath::Max(3.+deltan,2.);
//
for (Int_t itrack=0;itrack<4;itrack++){
- if (fgLayers[l].fClusterTracks[itrack][c]>=0 && fgLayers[l].fClusterTracks[itrack][c]!=id){
+ if (fgLayers[l].GetClusterTracks(itrack,c)>=0 && fgLayers[l].GetClusterTracks(itrack,c)!=id){
list[l]=index;
- clist[l] = (AliITSclusterV2*)GetCluster(index);
+ clist[l] = (AliITSRecPoint*)GetCluster(index);
shared+=weight;
break;
}
}
}
- track->fNUsed=shared;
+ track->SetNUsed(shared);
return shared;
}
-
+//------------------------------------------------------------------------
Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackMI *track, Int_t trackID, Int_t &shared, Int_t clusterlist[6],Int_t overlist[6])
{
//
if (ny[l]==0){
printf("problem\n");
}
- if (c>fgLayers[l].fN) continue;
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
//if (l>3) continue;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(index);
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index);
//
Float_t deltan = 0;
if (l>3&&cl->GetNy()+cl->GetNz()>6) continue;
- if (l>2&&track->fNormQ[l]/track->fExpQ>3.5) continue;
+ if (l>2&&track->GetNormQ(l)/track->GetExpQ()>3.5) continue;
if (l<2 || l>3){
deltan = (cl->GetNy()+cl->GetNz()-ny[l]-nz[l]);
}
if (deltan>2.0) continue; // extended - highly probable shared cluster
//
for (Int_t itrack=3;itrack>=0;itrack--){
- if (fgLayers[l].fClusterTracks[itrack][c]<0) continue;
- if (fgLayers[l].fClusterTracks[itrack][c]!=trackID){
- tracks[trackindex] = fgLayers[l].fClusterTracks[itrack][c];
+ if (fgLayers[l].GetClusterTracks(itrack,c)<0) continue;
+ if (fgLayers[l].GetClusterTracks(itrack,c)!=trackID){
+ tracks[trackindex] = fgLayers[l].GetClusterTracks(itrack,c);
trackindex++;
}
}
Int_t index = clusterlist[icluster];
Int_t l=(index & 0xf0000000) >> 28;
Int_t c=(index & 0x0fffffff) >> 00;
- if (c>fgLayers[l].fN) continue;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(index);
+ if (c>fgLayers[l].GetNumberOfClusters()) continue;
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index);
if (l==0 || l==1){
if (cl->GetNy()>2) continue;
if (cl->GetNz()>2) continue;
}
//
for (Int_t itrack=3;itrack>=0;itrack--){
- if (fgLayers[l].fClusterTracks[itrack][c]<0) continue;
- if (fgLayers[l].fClusterTracks[itrack][c]==sharedtrack){
+ if (fgLayers[l].GetClusterTracks(itrack,c)<0) continue;
+ if (fgLayers[l].GetClusterTracks(itrack,c)==sharedtrack){
overlist[l]=index;
shared++;
}
}
return sharedtrack;
}
-
-
+//------------------------------------------------------------------------
AliITStrackMI * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, Float_t th0, Float_t th1){
//
// try to find track hypothesys without conflicts
//
AliITStrackMI * track10=(AliITStrackMI*) arr1->UncheckedAt(0);
AliITStrackMI * track20=(AliITStrackMI*) arr2->UncheckedAt(0);
- if (TMath::Abs(1./track10->Get1Pt())>0.5+TMath::Abs(1/track20->Get1Pt())) return track10;
+ if (track10->Pt()>0.5+track20->Pt()) return track10;
for (Int_t itrack=0;itrack<entries1;itrack++){
AliITStrackMI * track=(AliITStrackMI*) arr1->UncheckedAt(itrack);
Double_t w1,w2;
Int_t list1[6],list2[6];
- AliITSclusterV2 *clist1[6], *clist2[6] ;
+ AliITSRecPoint *clist1[6], *clist2[6] ;
RegisterClusterTracks(track10,trackID1);
RegisterClusterTracks(track20,trackID2);
Float_t conflict1 = GetNumberOfSharedClusters(track10,trackID1,list1,clist1);
nerry[i] = TMath::Max(erry1[i],erry2[i]);
nerrz[i] = TMath::Max(errz1[i],errz2[i]);
}
- if (TMath::Abs(track10->fDy[i])>0.000000000000001){
- chi21 += track10->fDy[i]*track10->fDy[i]/(nerry[i]*nerry[i]);
- chi21 += track10->fDz[i]*track10->fDz[i]/(nerrz[i]*nerrz[i]);
+ if (TMath::Abs(track10->GetDy(i))>0.000000000000001){
+ chi21 += track10->GetDy(i)*track10->GetDy(i)/(nerry[i]*nerry[i]);
+ chi21 += track10->GetDz(i)*track10->GetDz(i)/(nerrz[i]*nerrz[i]);
ncl1++;
}
- if (TMath::Abs(track20->fDy[i])>0.000000000000001){
- chi22 += track20->fDy[i]*track20->fDy[i]/(nerry[i]*nerry[i]);
- chi22 += track20->fDz[i]*track20->fDz[i]/(nerrz[i]*nerrz[i]);
+ if (TMath::Abs(track20->GetDy(i))>0.000000000000001){
+ chi22 += track20->GetDy(i)*track20->GetDy(i)/(nerry[i]*nerry[i]);
+ chi22 += track20->GetDz(i)*track20->GetDz(i)/(nerrz[i]*nerrz[i]);
ncl2++;
}
}
chi22/=ncl2;
//
//
- Float_t d1 = TMath::Sqrt(track10->fD[0]*track10->fD[0]+track10->fD[1]*track10->fD[1])+0.1;
- Float_t d2 = TMath::Sqrt(track20->fD[0]*track20->fD[0]+track20->fD[1]*track20->fD[1])+0.1;
+ Float_t d1 = TMath::Sqrt(track10->GetD(0)*track10->GetD(0)+track10->GetD(1)*track10->GetD(1))+0.1;
+ Float_t d2 = TMath::Sqrt(track20->GetD(0)*track20->GetD(0)+track20->GetD(1)*track20->GetD(1))+0.1;
Float_t s1 = TMath::Sqrt(track10->GetSigmaY2()*track10->GetSigmaZ2());
Float_t s2 = TMath::Sqrt(track20->GetSigmaY2()*track20->GetSigmaZ2());
//
w1 = (d2/(d1+d2)+ 2*s2/(s1+s2)+
+s2/(s1+s2)*0.5*(chi22+2.)/(chi21+chi22+4.)
- +1.*TMath::Abs(1./track10->Get1Pt())/(TMath::Abs(1./track10->Get1Pt())+TMath::Abs(1./track20->Get1Pt()))
+ +1.*track10->Pt()/(track10->Pt()+track20->Pt())
);
w2 = (d1/(d1+d2)+ 2*s1/(s1+s2)+
s1/(s1+s2)*0.5*(chi21+2.)/(chi21+chi22+4.)
- +1.*TMath::Abs(1./track20->Get1Pt())/(TMath::Abs(1./track10->Get1Pt())+TMath::Abs(1./track20->Get1Pt()))
+ +1.*track20->Pt()/(track10->Pt()+track20->Pt())
);
Double_t sumw = w1+w2;
Float_t nskipped=0;
RegisterClusterTracks(track2,trackID2);
Int_t list1[6],list2[6];
- AliITSclusterV2 *clist1[6], *clist2[6] ;
+ AliITSRecPoint *clist1[6], *clist2[6] ;
Float_t cconflict1 = GetNumberOfSharedClusters(track1,trackID1,list1,clist1);
Float_t cconflict2 = GetNumberOfSharedClusters(track2,trackID2,list2,clist2);
UnRegisterClusterTracks(track2,trackID2);
//
- if (track1->fConstrain) nskipped+=w1*track1->fNSkipped;
- if (track2->fConstrain) nskipped+=w2*track2->fNSkipped;
+ if (track1->GetConstrain()) nskipped+=w1*track1->GetNSkipped();
+ if (track2->GetConstrain()) nskipped+=w2*track2->GetNSkipped();
if (nskipped>0.5) continue;
//
//if ( w1*conflict1+w2*conflict2>maxconflicts0) continue;
}
//
Double_t chi21=0,chi22=0;
- if (TMath::Abs(track1->fDy[i])>0.) {
- chi21 = (track1->fDy[i]/track1->fSigmaY[i])*(track1->fDy[i]/track1->fSigmaY[i])+
- (track1->fDz[i]/track1->fSigmaZ[i])*(track1->fDz[i]/track1->fSigmaZ[i]);
+ if (TMath::Abs(track1->GetDy(i))>0.) {
+ chi21 = (track1->GetDy(i)/track1->GetSigmaY(i))*(track1->GetDy(i)/track1->GetSigmaY(i))+
+ (track1->GetDz(i)/track1->GetSigmaZ(i))*(track1->GetDz(i)/track1->GetSigmaZ(i));
//chi21 = (track1->fDy[i]*track1->fDy[i])/(nerry[i]*nerry[i])+
- // (track1->fDz[i]*track1->fDz[i])/(nerrz[i]*nerrz[i]);
+ // (track1->GetDz(i)*track1->GetDz(i))/(nerrz[i]*nerrz[i]);
}else{
- if (TMath::Abs(track1->fSigmaY[i]>0.)) c1=1;
+ if (TMath::Abs(track1->GetSigmaY(i)>0.)) c1=1;
}
//
- if (TMath::Abs(track2->fDy[i])>0.) {
- chi22 = (track2->fDy[i]/track2->fSigmaY[i])*(track2->fDy[i]/track2->fSigmaY[i])+
- (track2->fDz[i]/track2->fSigmaZ[i])*(track2->fDz[i]/track2->fSigmaZ[i]);
+ if (TMath::Abs(track2->GetDy(i))>0.) {
+ chi22 = (track2->GetDy(i)/track2->GetSigmaY(i))*(track2->GetDy(i)/track2->GetSigmaY(i))+
+ (track2->GetDz(i)/track2->GetSigmaZ(i))*(track2->GetDz(i)/track2->GetSigmaZ(i));
//chi22 = (track2->fDy[i]*track2->fDy[i])/(nerry[i]*nerry[i])+
// (track2->fDz[i]*track2->fDz[i])/(nerrz[i]*nerrz[i]);
}
else{
- if (TMath::Abs(track2->fSigmaY[i]>0.)) c2=1;
+ if (TMath::Abs(track2->GetSigmaY(i)>0.)) c2=1;
}
sumchi2+=w1*(1.+c1)*(1+c1)*(chi21+c1)+w2*(1.+c2)*(1+c2)*(chi22+c2);
if (chi21>0) sum+=w1;
if (chi22>0) sum+=w2;
conflict+=(c1+c2);
}
- Double_t norm = sum-w1*track1->fNSkipped-w2*track2->fNSkipped;
- if (norm<0) norm =1/(w1*track1->fNSkipped+w2*track2->fNSkipped);
+ Double_t norm = sum-w1*track1->GetNSkipped()-w2*track2->GetNSkipped();
+ if (norm<0) norm =1/(w1*track1->GetNSkipped()+w2*track2->GetNSkipped());
Double_t normchi2 = 2*conflict+sumchi2/sum;
if ( normchi2 <maxchi2 ){
index1 = itrack1;
//
// if (maxconflicts<4 && maxchi2<th0){
if (maxchi2<th0*2.){
- Float_t orig = track10->fFakeRatio*track10->GetNumberOfClusters();
+ Float_t orig = track10->GetFakeRatio()*track10->GetNumberOfClusters();
AliITStrackMI* track1=(AliITStrackMI*) arr1->UncheckedAt(index1);
- track1->fChi2MIP[5] = maxconflicts;
- track1->fChi2MIP[6] = maxchi2;
- track1->fChi2MIP[7] = 0.01+orig-(track1->fFakeRatio*track1->GetNumberOfClusters());
+ track1->SetChi2MIP(5,maxconflicts);
+ track1->SetChi2MIP(6,maxchi2);
+ track1->SetChi2MIP(7,0.01+orig-(track1->GetFakeRatio()*track1->GetNumberOfClusters()));
// track1->UpdateESDtrack(AliESDtrack::kITSin);
- track1->fChi2MIP[8] = index1;
+ track1->SetChi2MIP(8,index1);
fBestTrackIndex[trackID1] =index1;
UpdateESDtrack(track1, AliESDtrack::kITSin);
}
- else if (track10->fChi2MIP[0]<th1){
- track10->fChi2MIP[5] = maxconflicts;
- track10->fChi2MIP[6] = maxchi2;
+ else if (track10->GetChi2MIP(0)<th1){
+ track10->SetChi2MIP(5,maxconflicts);
+ track10->SetChi2MIP(6,maxchi2);
// track10->UpdateESDtrack(AliESDtrack::kITSin);
UpdateESDtrack(track10,AliESDtrack::kITSin);
}
UnRegisterClusterTracks(track,trackID2);
}
- if (track10->fConstrain&&track10->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track10->fChi2MIP[1]<kMaxChi2PerCluster[1]
- &&track10->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track10->fChi2MIP[3]<kMaxChi2PerCluster[3]){
- // if (track10->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track10->fChi2MIP[1]<kMaxChi2PerCluster[1]
- // &&track10->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track10->fChi2MIP[3]<kMaxChi2PerCluster[3]){
+ if (track10->GetConstrain()&&track10->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track10->GetChi2MIP(1)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+ &&track10->GetChi2MIP(2)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track10->GetChi2MIP(3)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){
+ // if (track10->fChi2MIP[0]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track10->fChi2MIP[1]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+ // &&track10->fChi2MIP[2]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track10->fChi2MIP[3]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){
RegisterClusterTracks(track10,trackID1);
}
- if (track20->fConstrain&&track20->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track20->fChi2MIP[1]<kMaxChi2PerCluster[1]
- &&track20->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track20->fChi2MIP[3]<kMaxChi2PerCluster[3]){
- //if (track20->fChi2MIP[0]<kMaxChi2PerCluster[0]&&track20->fChi2MIP[1]<kMaxChi2PerCluster[1]
- // &&track20->fChi2MIP[2]<kMaxChi2PerCluster[2]&&track20->fChi2MIP[3]<kMaxChi2PerCluster[3]){
+ if (track20->GetConstrain()&&track20->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track20->GetChi2MIP(1)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+ &&track20->GetChi2MIP(2)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track20->GetChi2MIP(3)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){
+ //if (track20->fChi2MIP[0]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track20->fChi2MIP[1]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+ // &&track20->fChi2MIP[2]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&track20->fChi2MIP[3]<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){
RegisterClusterTracks(track20,trackID2);
}
return track10;
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::UseClusters(const AliKalmanTrack *t, Int_t from) const {
//--------------------------------------------------------------------
// This function marks clusters assigned to the track
//--------------------------------------------------------------------
AliTracker::UseClusters(t,from);
- AliITSclusterV2 *c=(AliITSclusterV2 *)GetCluster(t->GetClusterIndex(0));
+ AliITSRecPoint *c=(AliITSRecPoint *)GetCluster(t->GetClusterIndex(0));
//if (c->GetQ()>2) c->Use();
if (c->GetSigmaZ2()>0.1) c->Use();
- c=(AliITSclusterV2 *)GetCluster(t->GetClusterIndex(1));
+ c=(AliITSRecPoint *)GetCluster(t->GetClusterIndex(1));
//if (c->GetQ()>2) c->Use();
if (c->GetSigmaZ2()>0.1) c->Use();
}
-
-
+//------------------------------------------------------------------------
void AliITStrackerMI::AddTrackHypothesys(AliITStrackMI * track, Int_t esdindex)
{
//------------------------------------------------------------------
}
array->AddLast(track);
}
-
+//------------------------------------------------------------------------
void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mode)
{
//-------------------------------------------------------------------
if (!track) continue;
Float_t chi2 = NormalizedChi2(track,0);
//
- Int_t tpcLabel=track->fESDtrack->GetTPCLabel();
+ Int_t tpcLabel=track->GetESDtrack()->GetTPCLabel();
track->SetLabel(tpcLabel);
CookdEdx(track);
- track->fFakeRatio=1.;
+ track->SetFakeRatio(1.);
CookLabel(track,0.); //For comparison only
//
- //if (chi2<kMaxChi2PerCluster[0]&&track->fFakeRatio==0){
- if (chi2<kMaxChi2PerCluster[0]){
+ //if (chi2<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&track->fFakeRatio==0){
+ if (chi2<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)){
if (track->GetNumberOfClusters()<maxn) continue;
maxn = track->GetNumberOfClusters();
if (chi2<minchi2){
}
}
else{
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(itrack);
}
}
Float_t *erry = GetErrY(esdindex), *errz = GetErrZ(esdindex);
Float_t *ny = GetNy(esdindex), *nz = GetNz(esdindex);
for (Int_t i=0;i<6;i++) {
- if (besttrack->fClIndex[i]>0){
- erry[i] = besttrack->fSigmaY[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- errz[i] = besttrack->fSigmaZ[i]; errz[i+6] = besttrack->fSigmaZ[i+6];
- ny[i] = besttrack->fNy[i];
- nz[i] = besttrack->fNz[i];
+ if (besttrack->GetClIndex(i)>0){
+ erry[i] = besttrack->GetSigmaY(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ errz[i] = besttrack->GetSigmaZ(i); errz[i+6] = besttrack->GetSigmaZ(i+6);
+ ny[i] = besttrack->GetNy(i);
+ nz[i] = besttrack->GetNz(i);
}
}
//
for (Int_t itrack=0;itrack<entries;itrack++){
AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
if (track){
- track->fChi2MIP[0] = GetNormalizedChi2(track, mode);
- if (track->fChi2MIP[0]<kMaxChi2PerCluster[0])
- chi2[itrack] = track->fChi2MIP[0];
+ track->SetChi2MIP(0,GetNormalizedChi2(track, mode));
+ if (track->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0))
+ chi2[itrack] = track->GetChi2MIP(0);
else{
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(itrack);
}
}
//
TMath::Sort(entries,chi2,index,kFALSE);
besttrack = (AliITStrackMI*)array->At(index[0]);
- if (besttrack&&besttrack->fChi2MIP[0]<kMaxChi2PerCluster[0]){
+ if (besttrack&&besttrack->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)){
for (Int_t i=0;i<6;i++){
- if (besttrack->fClIndex[i]>0){
- erry[i] = besttrack->fSigmaY[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- errz[i] = besttrack->fSigmaZ[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- ny[i] = besttrack->fNy[i];
- nz[i] = besttrack->fNz[i];
+ if (besttrack->GetClIndex(i)>0){
+ erry[i] = besttrack->GetSigmaY(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ errz[i] = besttrack->GetSigmaZ(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ ny[i] = besttrack->GetNy(i);
+ nz[i] = besttrack->GetNz(i);
}
}
}
for (Int_t itrack=0;itrack<entries;itrack++){
AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
if (track){
- track->fChi2MIP[0] = GetNormalizedChi2(track,mode);
- if (track->fChi2MIP[0]<kMaxChi2PerCluster[0])
- chi2[itrack] = track->fChi2MIP[0]-0*(track->GetNumberOfClusters()+track->fNDeadZone);
+ track->SetChi2MIP(0,GetNormalizedChi2(track,mode));
+ if (track->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0))
+ chi2[itrack] = track->GetChi2MIP(0)-0*(track->GetNumberOfClusters()+track->GetNDeadZone());
else
{
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(itrack);
}
}
if (besttrack){
//
for (Int_t i=0;i<6;i++){
- if (besttrack->fNz[i]>0&&besttrack->fNy[i]>0){
- erry[i] = besttrack->fSigmaY[i]; erry[i+6] = besttrack->fSigmaY[i+6];
- errz[i] = besttrack->fSigmaZ[i]; errz[i+6] = besttrack->fSigmaZ[i+6];
- ny[i] = besttrack->fNy[i];
- nz[i] = besttrack->fNz[i];
+ if (besttrack->GetNz(i)>0&&besttrack->GetNy(i)>0){
+ erry[i] = besttrack->GetSigmaY(i); erry[i+6] = besttrack->GetSigmaY(i+6);
+ errz[i] = besttrack->GetSigmaZ(i); errz[i+6] = besttrack->GetSigmaZ(i+6);
+ ny[i] = besttrack->GetNy(i);
+ nz[i] = besttrack->GetNz(i);
}
}
- besttrack->fChi2MIP[0] = GetNormalizedChi2(besttrack,mode);
- Float_t minchi2 = TMath::Min(besttrack->fChi2MIP[0]+5.+besttrack->fNUsed, double(kMaxChi2PerCluster[0]));
+ besttrack->SetChi2MIP(0,GetNormalizedChi2(besttrack,mode));
+ Float_t minchi2 = TMath::Min(besttrack->GetChi2MIP(0)+5.+besttrack->GetNUsed(), double(AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)));
Float_t minn = besttrack->GetNumberOfClusters()-3;
Int_t accepted=0;
for (Int_t i=0;i<entries;i++){
AliITStrackMI * track = (AliITStrackMI*)array->At(index[i]);
if (!track) continue;
if (accepted>maxcut) break;
- track->fChi2MIP[0] = GetNormalizedChi2(track,mode);
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
- if (track->GetNumberOfClusters()<6 && (track->fChi2MIP[0]+track->fNUsed>minchi2)){
+ track->SetChi2MIP(0,GetNormalizedChi2(track,mode));
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
+ if (track->GetNumberOfClusters()<6 && (track->GetChi2MIP(0)+track->GetNUsed()>minchi2)){
delete array->RemoveAt(index[i]);
continue;
}
}
- Bool_t shortbest = !track->fConstrain && track->fN<6;
- if ((track->fChi2MIP[0]+track->fNUsed<minchi2 && track->GetNumberOfClusters()>=minn) ||shortbest){
+ Bool_t shortbest = !track->GetConstrain() && track->GetNumberOfClusters()<6;
+ if ((track->GetChi2MIP(0)+track->GetNUsed()<minchi2 && track->GetNumberOfClusters()>=minn) ||shortbest){
if (!shortbest) accepted++;
//
newarray->AddLast(array->RemoveAt(index[i]));
for (Int_t i=0;i<6;i++){
if (nz[i]==0){
- erry[i] = track->fSigmaY[i]; erry[i+6] = track->fSigmaY[i+6];
- errz[i] = track->fSigmaZ[i]; errz[i] = track->fSigmaZ[i+6];
- ny[i] = track->fNy[i];
- nz[i] = track->fNz[i];
+ erry[i] = track->GetSigmaY(i); erry[i+6] = track->GetSigmaY(i+6);
+ errz[i] = track->GetSigmaZ(i); errz[i] = track->GetSigmaZ(i+6);
+ ny[i] = track->GetNy(i);
+ nz[i] = track->GetNz(i);
}
}
}
delete [] chi2;
delete [] index;
}
-
-
-
+//------------------------------------------------------------------------
AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI * original, Int_t checkmax)
{
//-------------------------------------------------------------
//
AliITStrackMI * backtrack = new AliITStrackMI(*original);
AliITStrackMI * forwardtrack = new AliITStrackMI(*original);
- Double_t xyzv[]={GetX(),GetY(),GetZ()};
- Double_t ersv[]={GetSigmaX()/3.,GetSigmaY()/3.,GetSigmaZ()/3.};
+ Double_t xyzVtx[]={GetX(),GetY(),GetZ()};
+ Double_t ersVtx[]={GetSigmaX()/3.,GetSigmaY()/3.,GetSigmaZ()/3.};
//
for (Int_t i=0;i<entries;i++){
AliITStrackMI * track = (AliITStrackMI*)array->At(i);
if (!track) continue;
Float_t sigmarfi,sigmaz;
GetDCASigma(track,sigmarfi,sigmaz);
- track->fDnorm[0] = sigmarfi;
- track->fDnorm[1] = sigmaz;
+ track->SetDnorm(0,sigmarfi);
+ track->SetDnorm(1,sigmaz);
//
- track->fChi2MIP[1] = 1000000;
- track->fChi2MIP[2] = 1000000;
- track->fChi2MIP[3] = 1000000;
+ track->SetChi2MIP(1,1000000);
+ track->SetChi2MIP(2,1000000);
+ track->SetChi2MIP(3,1000000);
//
// backtrack
backtrack = new(backtrack) AliITStrackMI(*track);
- if (track->fConstrain){
- if (!backtrack->PropagateTo(3.,0.0028,65.19)) continue;
- if (!backtrack->Improve(0,xyzv,ersv)) continue;
- if (!backtrack->PropagateTo(2.,0.0028,0)) continue;
- if (!backtrack->Improve(0,xyzv,ersv)) continue;
- if (!backtrack->PropagateTo(1.,0.0028,0)) continue;
- if (!backtrack->Improve(0,xyzv,ersv)) continue;
- if (!backtrack->PropagateToVertex()) continue;
- backtrack->ResetCovariance();
- if (!backtrack->Improve(0,xyzv,ersv)) continue;
+ if (track->GetConstrain()) {
+ if(fUseTGeo) {
+ if (!backtrack->PropagateToTGeo(krInsidePipe,1)) continue;
+ } else {
+ if (!backtrack->PropagateTo(krInsidePipe,kdPipe,kX0Be)) continue;
+ }
+ if (!backtrack->Improve(0,xyzVtx,ersVtx)) continue;
+ backtrack->ResetCovariance(10.);
}else{
- backtrack->ResetCovariance();
+ backtrack->ResetCovariance(10.);
}
backtrack->ResetClusters();
Double_t x = original->GetX();
if (!RefitAt(x,backtrack,track)) continue;
//
- track->fChi2MIP[1] = NormalizedChi2(backtrack,0);
+ track->SetChi2MIP(1,NormalizedChi2(backtrack,0));
//for (Int_t i=2;i<6;i++){track->fDy[i]+=backtrack->fDy[i]; track->fDz[i]+=backtrack->fDz[i];}
- if (track->fChi2MIP[1]>kMaxChi2PerCluster[1]*6.) continue;
- track->fChi22 = GetMatchingChi2(backtrack,original);
+ if (track->GetChi2MIP(1)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)*6.) continue;
+ track->SetChi22(GetMatchingChi2(backtrack,original));
- if ((track->fConstrain) && track->fChi22>90.) continue;
- if ((!track->fConstrain) && track->fChi22>30.) continue;
- if ( track->fChi22/track->GetNumberOfClusters()>11.) continue;
+ if ((track->GetConstrain()) && track->GetChi22()>90.) continue;
+ if ((!track->GetConstrain()) && track->GetChi22()>30.) continue;
+ if ( track->GetChi22()/track->GetNumberOfClusters()>11.) continue;
- if (!(track->fConstrain)&&track->fChi2MIP[1]>kMaxChi2PerCluster[1]) continue;
- Bool_t isOK=kTRUE;
- if(!isOK) continue;
+ if (!(track->GetConstrain())&&track->GetChi2MIP(1)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)) continue;
//
//forward track - without constraint
forwardtrack = new(forwardtrack) AliITStrackMI(*original);
forwardtrack->ResetClusters();
x = track->GetX();
RefitAt(x,forwardtrack,track);
- track->fChi2MIP[2] = NormalizedChi2(forwardtrack,0);
- if (track->fChi2MIP[2]>kMaxChi2PerCluster[2]*6.0) continue;
- if (!(track->fConstrain)&&track->fChi2MIP[2]>kMaxChi2PerCluster[2]) continue;
+ track->SetChi2MIP(2,NormalizedChi2(forwardtrack,0));
+ if (track->GetChi2MIP(2)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)*6.0) continue;
+ if (!(track->GetConstrain())&&track->GetChi2MIP(2)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)) continue;
- track->fD[0] = forwardtrack->GetD(GetX(),GetY());
- track->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
- forwardtrack->fD[0] = track->fD[0];
- forwardtrack->fD[1] = track->fD[1];
+ //track->fD[0] = forwardtrack->GetD(GetX(),GetY());
+ //track->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
+ forwardtrack->GetDZ(GetX(),GetY(),GetZ(),track->GetDP()); //I.B.
+ forwardtrack->SetD(0,track->GetD(0));
+ forwardtrack->SetD(1,track->GetD(1));
{
Int_t list[6];
- AliITSclusterV2* clist[6];
- track->fChi2MIP[4] = GetNumberOfSharedClusters(track,esdindex,list,clist);
- if ( (!track->fConstrain) && track->fChi2MIP[4]>1.0) continue;
+ AliITSRecPoint* clist[6];
+ track->SetChi2MIP(4,GetNumberOfSharedClusters(track,esdindex,list,clist));
+ if ( (!track->GetConstrain()) && track->GetChi2MIP(4)>1.0) continue;
}
- track->fChi2MIP[3] = GetInterpolatedChi2(forwardtrack,backtrack);
- if ( (track->fChi2MIP[3]>6.*kMaxChi2PerCluster[3])) continue;
- if ( (!track->fConstrain) && (track->fChi2MIP[3]>2*kMaxChi2PerCluster[3])) {
- track->fChi2MIP[3]=1000;
+ track->SetChi2MIP(3,GetInterpolatedChi2(forwardtrack,backtrack));
+ if ( (track->GetChi2MIP(3)>6.*AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3))) continue;
+ if ( (!track->GetConstrain()) && (track->GetChi2MIP(3)>2*AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3))) {
+ track->SetChi2MIP(3,1000);
continue;
}
- Double_t chi2 = track->fChi2MIP[0]+track->fNUsed;
+ Double_t chi2 = track->GetChi2MIP(0)+track->GetNUsed();
//
for (Int_t ichi=0;ichi<5;ichi++){
- forwardtrack->fChi2MIP[ichi] = track->fChi2MIP[ichi];
+ forwardtrack->SetChi2MIP(ichi, track->GetChi2MIP(ichi));
}
if (chi2 < minchi2){
//besttrack = new AliITStrackMI(*forwardtrack);
besttrack = track;
besttrack->SetLabel(track->GetLabel());
- besttrack->fFakeRatio = track->fFakeRatio;
+ besttrack->SetFakeRatio(track->GetFakeRatio());
minchi2 = chi2;
- original->fD[0] = forwardtrack->GetD(GetX(),GetY());
- original->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
+ //original->fD[0] = forwardtrack->GetD(GetX(),GetY());
+ //original->fD[1] = forwardtrack->GetZat(GetX())-GetZ();
+ forwardtrack->GetDZ(GetX(),GetY(),GetZ(),original->GetDP()); //I.B.
}
}
delete backtrack;
AliITStrackMI * track = (AliITStrackMI*)array->At(i);
if (!track) continue;
- if (accepted>checkmax || track->fChi2MIP[3]>kMaxChi2PerCluster[3]*6. ||
+ if (accepted>checkmax || track->GetChi2MIP(3)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)*6. ||
(track->GetNumberOfClusters()<besttrack->GetNumberOfClusters()-1.)||
- track->fChi2MIP[0]>besttrack->fChi2MIP[0]+2.*besttrack->fNUsed+3.){
- if (track->fConstrain || track->fN>5){ //keep best short tracks - without vertex constrain
+ track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*besttrack->GetNUsed()+3.){
+ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain
delete array->RemoveAt(i);
continue;
}
array->Compress();
SortTrackHypothesys(esdindex,checkmax,1);
array = (TObjArray*) fTrackHypothesys.At(esdindex);
+ if (!array) return 0; // PH What can be the reason? Check SortTrackHypothesys
besttrack = (AliITStrackMI*)array->At(0);
if (!besttrack) return 0;
- besttrack->fChi2MIP[8]=0;
+ besttrack->SetChi2MIP(8,0);
fBestTrackIndex[esdindex]=0;
entries = array->GetEntriesFast();
AliITStrackMI *longtrack =0;
minchi2 =1000;
- Float_t minn=besttrack->GetNumberOfClusters()+besttrack->fNDeadZone;
+ Float_t minn=besttrack->GetNumberOfClusters()+besttrack->GetNDeadZone();
for (Int_t itrack=entries-1;itrack>0;itrack--){
AliITStrackMI * track = (AliITStrackMI*)array->At(itrack);
- if (!track->fConstrain) continue;
- if (track->GetNumberOfClusters()+track->fNDeadZone<minn) continue;
- if (track->fChi2MIP[0]-besttrack->fChi2MIP[0]>0.0) continue;
- if (track->fChi2MIP[0]>4.) continue;
- minn = track->GetNumberOfClusters()+track->fNDeadZone;
+ if (!track->GetConstrain()) continue;
+ if (track->GetNumberOfClusters()+track->GetNDeadZone()<minn) continue;
+ if (track->GetChi2MIP(0)-besttrack->GetChi2MIP(0)>0.0) continue;
+ if (track->GetChi2MIP(0)>4.) continue;
+ minn = track->GetNumberOfClusters()+track->GetNDeadZone();
longtrack =track;
}
//if (longtrack) besttrack=longtrack;
Int_t list[6];
- AliITSclusterV2 * clist[6];
+ AliITSRecPoint * clist[6];
Float_t shared = GetNumberOfSharedClusters(besttrack,esdindex,list,clist);
- if (besttrack->fConstrain&&besttrack->fChi2MIP[0]<kMaxChi2PerCluster[0]&&besttrack->fChi2MIP[1]<kMaxChi2PerCluster[1]
- &&besttrack->fChi2MIP[2]<kMaxChi2PerCluster[2]&&besttrack->fChi2MIP[3]<kMaxChi2PerCluster[3]){
+ if (besttrack->GetConstrain()&&besttrack->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)&&besttrack->GetChi2MIP(1)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(1)
+ &&besttrack->GetChi2MIP(2)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(2)&&besttrack->GetChi2MIP(3)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)){
RegisterClusterTracks(besttrack,esdindex);
}
//
// Don't sign clusters if not gold track
//
if (!besttrack->IsGoldPrimary()) return besttrack;
- if (besttrack->fESDtrack->GetKinkIndex(0)!=0) return besttrack; //track belong to kink
+ if (besttrack->GetESDtrack()->GetKinkIndex(0)!=0) return besttrack; //track belong to kink
//
if (fConstraint[fPass]){
//
//
Float_t *ny = GetNy(esdindex), *nz = GetNz(esdindex);
for (Int_t i=0;i<6;i++){
- Int_t index = besttrack->fClIndex[i];
+ Int_t index = besttrack->GetClIndex(i);
if (index<=0) continue;
Int_t ilayer = (index & 0xf0000000) >> 28;
- if (besttrack->fSigmaY[ilayer]<0.00000000001) continue;
- AliITSclusterV2 *c = (AliITSclusterV2*)GetCluster(index);
+ if (besttrack->GetSigmaY(ilayer)<0.00000000001) continue;
+ AliITSRecPoint *c = (AliITSRecPoint*)GetCluster(index);
if (!c) continue;
if (ilayer>3&&c->GetNy()+c->GetNz()>6) continue;
if ( (c->GetNy()+c->GetNz() )> ny[i]+nz[i]+0.7) continue; //shared track
if ( c->GetNz()> nz[i]+0.7) continue; //shared track
- if ( ilayer>2&& besttrack->fNormQ[ilayer]/besttrack->fExpQ>1.5) continue;
+ if ( ilayer>2&& besttrack->GetNormQ(ilayer)/besttrack->GetExpQ()>1.5) continue;
//if ( c->GetNy()> ny[i]+0.7) continue; //shared track
Bool_t cansign = kTRUE;
for (Int_t itrack=0;itrack<entries; itrack++){
AliITStrackMI * track = (AliITStrackMI*)array->At(i);
if (!track) continue;
- if (track->fChi2MIP[0]>besttrack->fChi2MIP[0]+2.*shared+1.) break;
- if ( (track->fClIndex[ilayer]>0) && (track->fClIndex[ilayer]!=besttrack->fClIndex[ilayer])){
+ if (track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*shared+1.) break;
+ if ( (track->GetClIndex(ilayer)>0) && (track->GetClIndex(ilayer)!=besttrack->GetClIndex(ilayer))){
cansign = kFALSE;
break;
}
}
if (cansign){
- if (TMath::Abs(besttrack->fDy[ilayer]/besttrack->fSigmaY[ilayer])>3.) continue;
- if (TMath::Abs(besttrack->fDz[ilayer]/besttrack->fSigmaZ[ilayer])>3.) continue;
+ if (TMath::Abs(besttrack->GetDy(ilayer)/besttrack->GetSigmaY(ilayer))>3.) continue;
+ if (TMath::Abs(besttrack->GetDz(ilayer)/besttrack->GetSigmaZ(ilayer))>3.) continue;
if (!c->IsUsed()) c->Use();
}
}
}
return besttrack;
}
-
-
-
+//------------------------------------------------------------------------
void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks)
{
//
for (Int_t j=0;j<array->GetEntriesFast();j++){
AliITStrackMI* track = (AliITStrackMI*)array->At(j);
if (!track) continue;
- if (track->fGoldV0) {
+ if (track->GetGoldV0()) {
longtrack = track; //gold V0 track taken
break;
}
- if (track->GetNumberOfClusters()+track->fNDeadZone<minn) continue;
- Float_t chi2 = track->fChi2MIP[0];
+ if (track->GetNumberOfClusters()+track->GetNDeadZone()<minn) continue;
+ Float_t chi2 = track->GetChi2MIP(0);
if (fAfterV0){
- if (!track->fGoldV0&&track->fConstrain==kFALSE) chi2+=5;
+ if (!track->GetGoldV0()&&track->GetConstrain()==kFALSE) chi2+=5;
}
- if (track->GetNumberOfClusters()+track->fNDeadZone>minn) maxchi2 = track->fChi2MIP[0];
+ if (track->GetNumberOfClusters()+track->GetNDeadZone()>minn) maxchi2 = track->GetChi2MIP(0);
//
if (chi2 > maxchi2) continue;
- minn= track->GetNumberOfClusters()+track->fNDeadZone;
+ minn= track->GetNumberOfClusters()+track->GetNDeadZone();
maxchi2 = chi2;
longtrack=track;
}
if (!longtrack) {longtrack = besttrack;}
else besttrack= longtrack;
//
- if (besttrack){
+ if (besttrack) {
Int_t list[6];
- AliITSclusterV2 * clist[6];
+ AliITSRecPoint * clist[6];
Float_t shared = GetNumberOfSharedClusters(longtrack,i,list,clist);
//
- track->fNUsed = shared;
- track->fNSkipped = besttrack->fNSkipped;
- track->fChi2MIP[0] = besttrack->fChi2MIP[0];
- if (shared>0){
+ track->SetNUsed(shared);
+ track->SetNSkipped(besttrack->GetNSkipped());
+ track->SetChi2MIP(0,besttrack->GetChi2MIP(0));
+ if (shared>0) {
+ if(!AliITSReconstructor::GetRecoParam()->GetAllowSharedClusters()) continue;
Int_t nshared;
Int_t overlist[6];
//
Int_t sharedtrack = GetOverlapTrack(longtrack, i, nshared, list, overlist);
//if (sharedtrack==-1) sharedtrack=0;
- if (sharedtrack>=0){
+ if (sharedtrack>=0) {
besttrack = GetBest2Tracks(i,sharedtrack,10,5.5);
}
}
- if (besttrack&&fAfterV0){
+ if (besttrack&&fAfterV0) {
UpdateESDtrack(besttrack,AliESDtrack::kITSin);
}
if (besttrack&&fConstraint[fPass])
UpdateESDtrack(besttrack,AliESDtrack::kITSin);
- //if (besttrack&&besttrack->fConstrain)
- // UpdateESDtrack(besttrack,AliESDtrack::kITSin);
- if (besttrack->fChi2MIP[0]+besttrack->fNUsed>1.5){
- if ( (TMath::Abs(besttrack->fD[0])>0.1) && fConstraint[fPass]) {
- track->fReconstructed= kFALSE;
- }
- if ( (TMath::Abs(besttrack->fD[1])>0.1) && fConstraint[fPass]){
- track->fReconstructed= kFALSE;
- }
+ if (besttrack->GetChi2MIP(0)+besttrack->GetNUsed()>1.5 && fConstraint[fPass]) {
+ if ( TMath::Abs(besttrack->GetD(0))>0.1 ||
+ TMath::Abs(besttrack->GetD(1))>0.1 ) track->SetReconstructed(kFALSE);
}
}
}
}
-
-
+//------------------------------------------------------------------------
void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const {
//--------------------------------------------------------------------
//This function "cooks" a track label. If label<0, this track is fake.
//--------------------------------------------------------------------
Int_t tpcLabel=-1;
- if ( track->fESDtrack) tpcLabel = TMath::Abs(track->fESDtrack->GetTPCLabel());
+ if ( track->GetESDtrack()) tpcLabel = TMath::Abs(track->GetESDtrack()->GetTPCLabel());
- track->fChi2MIP[9]=0;
+ track->SetChi2MIP(9,0);
Int_t nwrong=0;
for (Int_t i=0;i<track->GetNumberOfClusters();i++){
Int_t cindex = track->GetClusterIndex(i);
Int_t l=(cindex & 0xf0000000) >> 28;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(cindex);
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex);
Int_t isWrong=1;
for (Int_t ind=0;ind<3;ind++){
if (tpcLabel>0)
if (cl->GetLabel(ind)==tpcLabel) isWrong=0;
}
- track->fChi2MIP[9]+=isWrong*(2<<l);
+ track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
nwrong+=isWrong;
}
- track->fFakeRatio = double(nwrong)/double(track->GetNumberOfClusters());
+ Int_t nclusters = track->GetNumberOfClusters();
+ if (nclusters > 0) //PH Some tracks don't have any cluster
+ track->SetFakeRatio(double(nwrong)/double(nclusters));
if (tpcLabel>0){
- if (track->fFakeRatio>wrong) track->fLab = -tpcLabel;
+ if (track->GetFakeRatio()>wrong) track->SetLabel(-tpcLabel);
else
- track->fLab = tpcLabel;
+ track->SetLabel(tpcLabel);
}
}
-
-
-
+//------------------------------------------------------------------------
void AliITStrackerMI::CookdEdx(AliITStrackMI* track)
{
//
//
// Int_t list[6];
- //AliITSclusterV2 * clist[6];
+ //AliITSRecPoint * clist[6];
// Int_t shared = GetNumberOfSharedClusters(track,index,list,clist);
Float_t dedx[4];
Int_t accepted=0;
- track->fChi2MIP[9]=0;
+ track->SetChi2MIP(9,0);
for (Int_t i=0;i<track->GetNumberOfClusters();i++){
Int_t cindex = track->GetClusterIndex(i);
Int_t l=(cindex & 0xf0000000) >> 28;
- AliITSclusterV2 *cl = (AliITSclusterV2*)GetCluster(cindex);
- Int_t lab = TMath::Abs(track->fESDtrack->GetTPCLabel());
+ AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex);
+ Int_t lab = TMath::Abs(track->GetESDtrack()->GetTPCLabel());
Int_t isWrong=1;
for (Int_t ind=0;ind<3;ind++){
if (cl->GetLabel(ind)==lab) isWrong=0;
}
- track->fChi2MIP[9]+=isWrong*(2<<l);
+ track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
if (l<2) continue;
//if (l>3 && (cl->GetNy()>4) || (cl->GetNz()>4)) continue; //shared track
//if (l>3&& !(cl->GetType()==1||cl->GetType()==10)) continue;
//if (l<4&& !(cl->GetType()==1)) continue;
- dedx[accepted]= track->fdEdxSample[i];
+ dedx[accepted]= track->GetSampledEdx(i);
//dedx[accepted]= track->fNormQ[l];
accepted++;
}
}
track->SetdEdx(sumamp/sumweight);
}
-
-
-void AliITStrackerMI::MakeCoeficients(Int_t ntracks){
+//------------------------------------------------------------------------
+void AliITStrackerMI::MakeCoefficients(Int_t ntracks){
//
//
- if (fCoeficients) delete []fCoeficients;
- fCoeficients = new Float_t[ntracks*48];
- for (Int_t i=0;i<ntracks*48;i++) fCoeficients[i]=-1.;
+ if (fCoefficients) delete []fCoefficients;
+ fCoefficients = new Float_t[ntracks*48];
+ for (Int_t i=0;i<ntracks*48;i++) fCoefficients[i]=-1.;
}
-
-
-Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSclusterV2 *cluster,Int_t layer)
+//------------------------------------------------------------------------
+Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSRecPoint *cluster,Int_t layer)
{
//
//
Float_t theta = track->GetTgl();
Float_t phi = track->GetSnp();
phi = TMath::Sqrt(phi*phi/(1.-phi*phi));
- GetError(layer,cluster,theta,phi,track->fExpQ,erry,errz);
+ GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz);
Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz);
Float_t ny,nz;
GetNTeor(layer,cluster, theta,phi,ny,nz);
chi2+=2.*cluster->GetDeltaProbability();
}
//
- track->fNy[layer] =ny;
- track->fNz[layer] =nz;
- track->fSigmaY[layer] = erry;
- track->fSigmaZ[layer] = errz;
+ track->SetNy(layer,ny);
+ track->SetNz(layer,nz);
+ track->SetSigmaY(layer,erry);
+ track->SetSigmaZ(layer, errz);
//track->fNormQ[layer] = cluster->GetQ()/TMath::Sqrt(1+theta*theta+phi*phi);
- track->fNormQ[layer] = cluster->GetQ()/TMath::Sqrt((1.+ track->fP3*track->fP3)/(1.- track->fP2*track->fP2));
+ track->SetNormQ(layer,cluster->GetQ()/TMath::Sqrt((1.+ track->GetTgl()*track->GetTgl())/(1.- track->GetSnp()*track->GetSnp())));
return chi2;
}
-Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSclusterV2* cl,Double_t chi2,Int_t index) const
+Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,Double_t chi2,Int_t index) const
{
//
//
//
Int_t layer = (index & 0xf0000000) >> 28;
- track->fClIndex[layer] = index;
- if ( (layer>1) &&track->fNormQ[layer]/track->fExpQ<0.5 ) {
- chi2+= (0.5-track->fNormQ[layer]/track->fExpQ)*10.;
- track->fdEdxMismatch+=(0.5-track->fNormQ[layer]/track->fExpQ)*10.;
+ track->SetClIndex(layer, index);
+ if ( (layer>1) &&track->GetNormQ(layer)/track->GetExpQ()<0.5 ) {
+ chi2+= (0.5-track->GetNormQ(layer)/track->GetExpQ())*10.;
+ track->SetdEdxMismatch(track->GetdEdxMismatch()+(0.5-track->GetNormQ(layer)/track->GetExpQ())*10.);
}
- return track->UpdateMI(cl->GetY(),cl->GetZ(),track->fSigmaY[layer],track->fSigmaZ[layer],chi2,index);
+
+ if (cl->GetQ()<=0) return 0; // ingore the "virtual" clusters
+
+ //Float_t clxyz[3]; cl->GetGlobalXYZ(clxyz);Double_t trxyz[3]; track->GetXYZ(trxyz);printf("gtr %f %f %f\n",trxyz[0],trxyz[1],trxyz[2]);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]);
+
+
+ // Take into account the mis-alignment
+ Double_t x=track->GetX()+cl->GetX();
+ if (!track->PropagateTo(x,0.,0.)) return 0;
+
+ return track->UpdateMI(cl->GetY(),cl->GetZ(),track->GetSigmaY(layer),track->GetSigmaZ(layer),chi2,index);
}
-void AliITStrackerMI::GetNTeor(Int_t layer, const AliITSclusterV2* /*cl*/, Float_t theta, Float_t phi, Float_t &ny, Float_t &nz)
+void AliITStrackerMI::GetNTeor(Int_t layer, const AliITSRecPoint* /*cl*/, Float_t theta, Float_t phi, Float_t &ny, Float_t &nz)
{
//
//get "mean shape"
-Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSclusterV2*cl, Float_t theta, Float_t phi,Float_t expQ, Float_t &erry, Float_t &errz)
+Int_t AliITStrackerMI::GetError(Int_t layer, const AliITSRecPoint*cl, Float_t theta, Float_t phi,Float_t expQ, Float_t &erry, Float_t &errz)
{
//calculate cluster position error
//
//
// PIXELS
if (layer<2){
-
if (TMath::Abs(ny-cl->GetNy())>0.6) {
if (ny<cl->GetNy()){
erry*=0.4+TMath::Abs(ny-cl->GetNy());
}
erry*=0.85;
errz*=0.85;
- erry= TMath::Min(erry,float(0.005));
- errz= TMath::Min(errz,float(0.03));
+ erry= TMath::Min(erry,float(0.0050));
+ errz= TMath::Min(errz,float(0.0300));
return 10;
}
-//STRIPS
+ //STRIPS
if (layer>3){
//factor 1.8 appears in new simulation
//
errz= TMath::Min(errz,float(0.05));
return 200;
}
-
-
-
+//------------------------------------------------------------------------
void AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Float_t &sigmaz)
{
//
//to be paramterized using external parameters in future
//
//
- sigmarfi = 0.004+1.4 *TMath::Abs(track->fP4)+332.*track->fP4*track->fP4;
- sigmaz = 0.011+4.37*TMath::Abs(track->fP4);
+ sigmarfi = 0.0040+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC();
+ sigmaz = 0.0110+4.37*TMath::Abs(track->GetC());
}
//
Int_t entries = ClusterArray->GetEntriesFast();
if (entries<4) return;
- AliITSclusterV2* cluster = (AliITSclusterV2*)ClusterArray->At(0);
+ AliITSRecPoint* cluster = (AliITSRecPoint*)ClusterArray->At(0);
Int_t layer = cluster->GetLayer();
if (layer>1) return;
Int_t index[10000];
Float_t r = (layer>0)? 7:4;
//
for (Int_t i=0;i<entries;i++){
- AliITSclusterV2* cl0 = (AliITSclusterV2*)ClusterArray->At(i);
+ AliITSRecPoint* cl0 = (AliITSRecPoint*)ClusterArray->At(i);
Float_t nz = 1+TMath::Abs((cl0->GetZ()-vz)/r);
if (cl0->GetNy()+cl0->GetNz()<=5+2*layer+nz) continue;
index[ncandidates] = i; //candidate to belong to delta electron track
//
//
for (Int_t i=0;i<ncandidates;i++){
- AliITSclusterV2* cl0 = (AliITSclusterV2*)ClusterArray->At(index[i]);
+ AliITSRecPoint* cl0 = (AliITSRecPoint*)ClusterArray->At(index[i]);
if (cl0->GetDeltaProbability()>0.8) continue;
//
Int_t ncl = 0;
sumy=sumz=sumy2=sumyz=sumw=0.0;
for (Int_t j=0;j<ncandidates;j++){
if (i==j) continue;
- AliITSclusterV2* cl1 = (AliITSclusterV2*)ClusterArray->At(index[j]);
+ AliITSRecPoint* cl1 = (AliITSRecPoint*)ClusterArray->At(index[j]);
//
Float_t dz = cl0->GetZ()-cl1->GetZ();
Float_t dy = cl0->GetY()-cl1->GetY();
}
}
}
-
-
+//------------------------------------------------------------------------
void AliITStrackerMI::UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const
{
//
//
track->UpdateESDtrack(flags);
- AliITStrackMI * oldtrack = (AliITStrackMI*)(track->fESDtrack->GetITStrack());
+ AliITStrackMI * oldtrack = (AliITStrackMI*)(track->GetESDtrack()->GetITStrack());
if (oldtrack) delete oldtrack;
- track->fESDtrack->SetITStrack(new AliITStrackMI(*track));
- if (TMath::Abs(track->fDnorm[1])<0.000000001){
+ track->GetESDtrack()->SetITStrack(new AliITStrackMI(*track));
+ if (TMath::Abs(track->GetDnorm(1))<0.000000001){
printf("Problem\n");
}
}
-
-
-
+//------------------------------------------------------------------------
Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{
//
//Get nearest upper layer close to the point xr.
// rough approximation
//
- const Float_t radiuses[6]={4,6.5,15.03,24.,38.5,43.7};
+ const Float_t kRadiuses[6]={4,6.5,15.03,24.,38.5,43.7};
Float_t radius = TMath::Sqrt(xr[0]*xr[0]+xr[1]*xr[1]);
Int_t res =6;
for (Int_t i=0;i<6;i++){
- if (radius<radiuses[i]){
+ if (radius<kRadiuses[i]){
res =i;
break;
}
}
return res;
}
-
-
-void AliITStrackerMI::UpdateTPCV0(AliESD *event){
+//------------------------------------------------------------------------
+void AliITStrackerMI::UpdateTPCV0(AliESDEvent *event){
//
//try to update, or reject TPC V0s
//
- Int_t nv0s = event->GetNumberOfV0MIs();
+ Int_t nv0s = event->GetNumberOfV0s();
Int_t nitstracks = fTrackHypothesys.GetEntriesFast();
for (Int_t i=0;i<nv0s;i++){
- AliESDV0MI * vertex = event->GetV0MI(i);
+ AliESDv0 * vertex = event->GetV0(i);
Int_t ip = vertex->GetIndex(0);
Int_t im = vertex->GetIndex(1);
//
//
//
if (trackp){
- if (trackp->fN+trackp->fNDeadZone>5.5){
- if (trackp->fConstrain&&trackp->fChi2MIP[0]<3) vertex->SetStatus(-100);
- if (!trackp->fConstrain&&trackp->fChi2MIP[0]<2) vertex->SetStatus(-100);
+ if (trackp->GetNumberOfClusters()+trackp->GetNDeadZone()>5.5){
+ if (trackp->GetConstrain()&&trackp->GetChi2MIP(0)<3) vertex->SetStatus(-100);
+ if (!trackp->GetConstrain()&&trackp->GetChi2MIP(0)<2) vertex->SetStatus(-100);
}
}
if (trackm){
- if (trackm->fN+trackm->fNDeadZone>5.5){
- if (trackm->fConstrain&&trackm->fChi2MIP[0]<3) vertex->SetStatus(-100);
- if (!trackm->fConstrain&&trackm->fChi2MIP[0]<2) vertex->SetStatus(-100);
+ if (trackm->GetNumberOfClusters()+trackm->GetNDeadZone()>5.5){
+ if (trackm->GetConstrain()&&trackm->GetChi2MIP(0)<3) vertex->SetStatus(-100);
+ if (!trackm->GetConstrain()&&trackm->GetChi2MIP(0)<2) vertex->SetStatus(-100);
}
}
if (vertex->GetStatus()==-100) continue;
//
- Int_t clayer = GetNearestLayer(vertex->GetXrp());
+ Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B.
+ Int_t clayer = GetNearestLayer(xrp); //I.B.
vertex->SetNBefore(clayer); //
vertex->SetChi2Before(9*clayer); //
vertex->SetNAfter(6-clayer); //
//
if (trackp){
for (Int_t ilayer=0;ilayer<clayer;ilayer++){
- if (trackp->fClIndex[ilayer]>0){
- chi2p+=trackp->fDy[ilayer]*trackp->fDy[ilayer]/(trackp->fSigmaY[ilayer]*trackp->fSigmaY[ilayer])+
- trackp->fDz[ilayer]*trackp->fDz[ilayer]/(trackp->fSigmaZ[ilayer]*trackp->fSigmaZ[ilayer]);
+ if (trackp->GetClIndex(ilayer)>0){
+ chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+
+ trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer));
}
else{
chi2p+=9;
//
if (trackm){
for (Int_t ilayer=0;ilayer<clayer;ilayer++){
- if (trackm->fClIndex[ilayer]>0){
- chi2m+=trackm->fDy[ilayer]*trackm->fDy[ilayer]/(trackm->fSigmaY[ilayer]*trackm->fSigmaY[ilayer])+
- trackm->fDz[ilayer]*trackm->fDz[ilayer]/(trackm->fSigmaZ[ilayer]*trackm->fSigmaZ[ilayer]);
+ if (trackm->GetClIndex(ilayer)>0){
+ chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+
+ trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer));
}
else{
chi2m+=9;
if (clayer < 5 ){ // calculate chi2 after vertex
Float_t chi2p = 0, chi2m=0;
//
- if (trackp&&TMath::Abs(trackp->fP3)<1.){
+ if (trackp&&TMath::Abs(trackp->GetTgl())<1.){
for (Int_t ilayer=clayer;ilayer<6;ilayer++){
- if (trackp->fClIndex[ilayer]>0){
- chi2p+=trackp->fDy[ilayer]*trackp->fDy[ilayer]/(trackp->fSigmaY[ilayer]*trackp->fSigmaY[ilayer])+
- trackp->fDz[ilayer]*trackp->fDz[ilayer]/(trackp->fSigmaZ[ilayer]*trackp->fSigmaZ[ilayer]);
+ if (trackp->GetClIndex(ilayer)>0){
+ chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+
+ trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer));
}
else{
chi2p+=9;
chi2p = 0;
}
//
- if (trackm&&TMath::Abs(trackm->fP3)<1.){
+ if (trackm&&TMath::Abs(trackm->GetTgl())<1.){
for (Int_t ilayer=clayer;ilayer<6;ilayer++){
- if (trackm->fClIndex[ilayer]>0){
- chi2m+=trackm->fDy[ilayer]*trackm->fDy[ilayer]/(trackm->fSigmaY[ilayer]*trackm->fSigmaY[ilayer])+
- trackm->fDz[ilayer]*trackm->fDz[ilayer]/(trackm->fSigmaZ[ilayer]*trackm->fSigmaZ[ilayer]);
+ if (trackm->GetClIndex(ilayer)>0){
+ chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+
+ trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer));
}
else{
chi2m+=9;
}
//
}
-
-void AliITStrackerMI::FindV02(AliESD *event)
+//------------------------------------------------------------------------
+void AliITStrackerMI::FindV02(AliESDEvent *event)
{
//
// V0 finder
Float_t *minr = new Float_t[ntracks+2];
Float_t *minPointAngle= new Float_t[ntracks+2];
//
- AliESDV0MI *pvertex = new AliESDV0MI;
+ AliV0 *pvertex = new AliV0;
AliITStrackMI * dummy= new AliITStrackMI;
dummy->SetLabel(0);
AliITStrackMI trackat0; //temporary track for DCA calculation
//
Float_t primvertex[3]={GetX(),GetY(),GetZ()};
//
- // make its - esd map
+ // make ITS - ESD map
//
for (Int_t itrack=0;itrack<ntracks+2;itrack++) {
itsmap[itrack] = -1;
}
for (Int_t itrack=0;itrack<nitstracks;itrack++){
AliITStrackMI * original = (AliITStrackMI*)(fOriginal.At(itrack));
- Int_t esdindex = original->fESDtrack->GetID();
+ Int_t esdindex = original->GetESDtrack()->GetID();
itsmap[esdindex] = itrack;
}
//
- // create its tracks from esd tracks if not done before
+ // create ITS tracks from ESD tracks if not done before
//
for (Int_t itrack=0;itrack<ntracks;itrack++){
if (itsmap[itrack]>=0) continue;
AliITStrackMI * tpctrack = new AliITStrackMI(*(event->GetTrack(itrack)));
- tpctrack->fD[0] = tpctrack->GetD(GetX(),GetY());
- tpctrack->fD[1] = tpctrack->GetZat(GetX())-GetZ();
- if (tpctrack->fD[0]<20 && tpctrack->fD[1]<20){
+ //tpctrack->fD[0] = tpctrack->GetD(GetX(),GetY());
+ //tpctrack->fD[1] = tpctrack->GetZat(GetX())-GetZ();
+ tpctrack->GetDZ(GetX(),GetY(),GetZ(),tpctrack->GetDP()); //I.B.
+ if (tpctrack->GetD(0)<20 && tpctrack->GetD(1)<20){
// tracks which can reach inner part of ITS
// propagate track to outer its volume - with correction for material
- CorrectForDeadZoneMaterial(tpctrack);
+ CorrectForTPCtoITSDeadZoneMaterial(tpctrack);
}
itsmap[itrack] = nitstracks;
fOriginal.AddAt(tpctrack,nitstracks);
// Get best track with vertex constrain
for (Int_t ih=0;ih<hentries;ih++){
AliITStrackMI * trackh = (AliITStrackMI*)array->At(ih);
- if (!trackh->fConstrain) continue;
+ if (!trackh->GetConstrain()) continue;
if (!bestConst) bestConst = trackh;
- if (trackh->fN>5.0){
+ if (trackh->GetNumberOfClusters()>5.0){
bestConst = trackh; // full track - with minimal chi2
break;
}
- if (trackh->fN+trackh->fNDeadZone<=bestConst->fN+bestConst->fNDeadZone) continue;
+ if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()) continue;
bestConst = trackh;
break;
}
// Get best long track without vertex constrain and best track without vertex constrain
for (Int_t ih=0;ih<hentries;ih++){
AliITStrackMI * trackh = (AliITStrackMI*)array->At(ih);
- if (trackh->fConstrain) continue;
+ if (trackh->GetConstrain()) continue;
if (!best) best = trackh;
if (!bestLong) bestLong = trackh;
- if (trackh->fN>5.0){
+ if (trackh->GetNumberOfClusters()>5.0){
bestLong = trackh; // full track - with minimal chi2
break;
}
- if (trackh->fN+trackh->fNDeadZone<=bestLong->fN+bestLong->fNDeadZone) continue;
+ if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()) continue;
bestLong = trackh;
}
if (!best) {
best = original;
bestLong = original;
}
- trackat0 = *bestLong;
+ //I.B. trackat0 = *bestLong;
+ new (&trackat0) AliITStrackMI(*bestLong);
Double_t xx,yy,zz,alpha;
bestLong->GetGlobalXYZat(bestLong->GetX(),xx,yy,zz);
alpha = TMath::ATan2(yy,xx);
trackat0.Propagate(alpha,0);
// calculate normalized distances to the vertex
//
- if ( bestLong->fN>3 ){
- dist[itsindex] = trackat0.fP0;
- norm[itsindex] = TMath::Sqrt(trackat0.fC00);
- normdist0[itsindex] = TMath::Abs(trackat0.fP0/norm[itsindex]);
- normdist1[itsindex] = TMath::Abs((trackat0.fP1-primvertex[2])/TMath::Sqrt(trackat0.fC11));
+ Float_t ptfac = (1.+100.*TMath::Abs(trackat0.GetC()));
+ if ( bestLong->GetNumberOfClusters()>3 ){
+ dist[itsindex] = trackat0.GetY();
+ norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2());
+ normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]);
+ normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2())));
normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
+ if (!bestConst){
+ if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<6) normdist[itsindex]*=2.;
+ if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<5) normdist[itsindex]*=2.;
+ if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<4) normdist[itsindex]*=2.;
+ }else{
+ if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<6) normdist[itsindex]*=1.5;
+ if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<5) normdist[itsindex]*=1.5;
+ }
}
else{
- if (bestConst&&bestConst->fN+bestConst->fNDeadZone>4.5){
- dist[itsindex] = bestConst->fD[0];
- norm[itsindex] = bestConst->fDnorm[0];
- normdist0[itsindex] = TMath::Abs(bestConst->fD[0]/norm[itsindex]);
- normdist1[itsindex] = TMath::Abs(bestConst->fD[0]/norm[itsindex]);
+ if (bestConst&&bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5){
+ dist[itsindex] = bestConst->GetD(0);
+ norm[itsindex] = bestConst->GetDnorm(0);
+ normdist0[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]);
+ normdist1[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]);
normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
}else{
- dist[itsindex] = trackat0.fP0;
- norm[itsindex] = TMath::Sqrt(trackat0.fC00);
- normdist0[itsindex] = TMath::Abs(trackat0.fP0/norm[itsindex]);
- normdist1[itsindex] = TMath::Abs((trackat0.fP1-primvertex[2])/TMath::Sqrt(trackat0.fC11));
+ dist[itsindex] = trackat0.GetY();
+ norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2());
+ normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]);
+ normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2())));
normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]);
- if (TMath::Abs(trackat0.fP3)>1.1){
- if (normdist[itsindex]<10) forbidden[itsindex]=kTRUE;
+ if (TMath::Abs(trackat0.GetTgl())>1.05){
+ if (normdist[itsindex]<3) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]>3) {
+ minr[itsindex] = TMath::Max(Float_t(40.),minr[itsindex]);
+ }
}
}
}
//treetr->SetAlias("forbidden5","ND<5&&Tr1.fNormChi2[0]<1");
//-----------------------------------------------------------
if (bestConst){
- if (bestLong->fN<4 && bestConst->fN+bestConst->fNDeadZone>4.5) forbidden[itsindex]=kTRUE;
- if (normdist[itsindex]<3 && bestConst->fN+bestConst->fNDeadZone>5.5) forbidden[itsindex]=kTRUE;
- if (normdist[itsindex]<2 && bestConst->fClIndex[0]>0 && bestConst->fClIndex[1]>0 ) forbidden[itsindex]=kTRUE;
- if (normdist[itsindex]<1 && bestConst->fClIndex[0]>0) forbidden[itsindex]=kTRUE;
- if (normdist[itsindex]<4 && bestConst->fNormChi2[0]<2) forbidden[itsindex]=kTRUE;
- if (normdist[itsindex]<5 && bestConst->fNormChi2[0]<1) forbidden[itsindex]=kTRUE;
- if (bestConst->fNormChi2[0]<2.5) {
+ if (bestLong->GetNumberOfClusters()<4 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<3 && bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>5.5) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<2 && bestConst->GetClIndex(0)>0 && bestConst->GetClIndex(1)>0 ) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<1 && bestConst->GetClIndex(0)>0) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<4 && bestConst->GetNormChi2(0)<2) forbidden[itsindex]=kTRUE;
+ if (normdist[itsindex]<5 && bestConst->GetNormChi2(0)<1) forbidden[itsindex]=kTRUE;
+ if (bestConst->GetNormChi2(0)<2.5) {
minPointAngle[itsindex]= 0.9999;
maxr[itsindex] = 10;
}
//
if (esdtrack->GetKinkIndex(0)>0) forbidden[itsindex] = kTRUE;
Bool_t isElectron = kTRUE;
+ Bool_t isProton = kTRUE;
Double_t pid[5];
esdtrack->GetESDpid(pid);
for (Int_t i=1;i<5;i++){
if (pid[0]<pid[i]) isElectron= kFALSE;
+ if (pid[4]<pid[i]) isProton= kFALSE;
}
if (isElectron){
forbidden[itsindex]=kFALSE;
- normdist[itsindex]+=4;
+ normdist[itsindex]*=-1;
+ }
+ if (isProton){
+ if (normdist[itsindex]>2) forbidden[itsindex]=kFALSE;
+ normdist[itsindex]*=-1;
}
+
//
// Causality cuts in TPC volume
//
if (esdtrack->GetTPCdensity(20,40)>0.6) maxr[itsindex] = TMath::Min(Float_t(130),maxr[itsindex]);
if (esdtrack->GetTPCdensity(30,50)>0.6) maxr[itsindex] = TMath::Min(Float_t(140),maxr[itsindex]);
//
- if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->fN<3) minr[itsindex]=100;
+ if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->GetNumberOfClusters()<3) minr[itsindex]=100;
//
//
- if (0){
+ if (kFALSE){
cstream<<"Track"<<
"Tr0.="<<best<<
"Tr1.="<<((bestConst)? bestConst:dummy)<<
if (forbidden[itrack0]) continue;
AliITStrackMI * btrack0 = (AliITStrackMI*)trackarray.At(itrack0);
if (!btrack0) continue;
- if (btrack0->fP4>0) continue;
+ if (btrack0->GetSign()>0) continue;
AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0);
//
for (Int_t iesd1=0;iesd1<ntracks;iesd1++){
AliITStrackMI * btrack1 = (AliITStrackMI*)trackarray.At(itrack1);
if (!btrack1) continue;
- if (btrack1->fP4<0) continue;
+ if (btrack1->GetSign()<0) continue;
Bool_t isGold = kFALSE;
if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){
isGold = kTRUE;
Double_t phase[2][2],radius[2];
Int_t points = h1.GetRPHIintersections(h2, phase, radius);
if (points==0) continue;
- Double_t delta[2]={1000,1000};
+ Double_t delta[2]={1000000,1000000};
rmin = radius[0];
h1.ParabolicDCA(h2,phase[0][0],phase[0][1],radius[0],delta[0]);
if (points==2){
Double_t distance = 0;
Double_t radiusC = 0;
Int_t iphase = 0;
- if (delta[0]<delta[1]){
+ if (points==1 || delta[0]<delta[1]){
distance = TMath::Sqrt(delta[0]);
radiusC = TMath::Sqrt(radius[0]);
}else{
}
//
//
- pvertex->SetM(*track0);
- pvertex->SetP(*track1);
+ pvertex->SetParamN(*track0);
+ pvertex->SetParamP(*track1);
pvertex->Update(primvertex);
+ pvertex->SetClusters(track0->ClIndex(),track1->ClIndex()); // register clusters
+
if (pvertex->GetRr()<kMinR) continue;
if (pvertex->GetRr()>kMaxR) continue;
- if (pvertex->GetPointAngle()<kMinPointAngle) continue;
- if (pvertex->GetDist2()>maxDist) continue;
- pvertex->SetLab(0,track0->GetLabel());
- pvertex->SetLab(1,track1->GetLabel());
-
+ if (pvertex->GetV0CosineOfPointingAngle()<kMinPointAngle) continue;
+//Bo: if (pvertex->GetDist2()>maxDist) continue;
+ if (pvertex->GetDcaV0Daughters()>maxDist) continue;
+//Bo: pvertex->SetLab(0,track0->GetLabel());
+//Bo: pvertex->SetLab(1,track1->GetLabel());
+ pvertex->SetIndex(0,track0->GetESDtrack()->GetID());
+ pvertex->SetIndex(1,track1->GetESDtrack()->GetID());
//
AliITStrackMI * htrackc0 = trackc0 ? trackc0:dummy;
AliITStrackMI * htrackc1 = trackc1 ? trackc1:dummy;
//
//
TObjArray * array0b = (TObjArray*)fBestHypothesys.At(itrack0);
- if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->fP3)<1.1)
+ if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->GetTgl())<1.1)
FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack0),itrack0, kFALSE);
TObjArray * array1b = (TObjArray*)fBestHypothesys.At(itrack1);
- if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->fP3)<1.1)
+ if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->GetTgl())<1.1)
FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack1),itrack1, kFALSE);
//
AliITStrackMI * track0b = (AliITStrackMI*)fOriginal.At(itrack0);
Float_t minchi2before1=16;
Float_t minchi2after0 =16;
Float_t minchi2after1 =16;
- Int_t maxLayer = GetNearestLayer(pvertex->GetXrp());
+ Double_t xrp[3]; pvertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B.
+ Int_t maxLayer = GetNearestLayer(xrp); //I.B.
if (array0b) for (Int_t i=0;i<5;i++){
// best track after vertex
AliITStrackMI * btrack = (AliITStrackMI*)array0b->At(i);
if (!btrack) continue;
- if (btrack->fN>track0l->fN) track0l = btrack;
- if (btrack->fX<pvertex->GetRr()-2) {
- if (maxLayer>i+2 && btrack->fN==(6-i)&&i<2){
+ if (btrack->GetNumberOfClusters()>track0l->GetNumberOfClusters()) track0l = btrack;
+ // if (btrack->fX<pvertex->GetRr()-2.-0.5/(0.1+pvertex->GetAnglep()[2])) {
+ if (btrack->GetX()<pvertex->GetRr()-2.) {
+ if ( (maxLayer>i+2|| (i==0)) && btrack->GetNumberOfClusters()==(6-i)&&i<3){
Float_t sumchi2= 0;
Float_t sumn = 0;
+ if (maxLayer<3){ // take prim vertex as additional measurement
+ if (normdist[itrack0]>0 && htrackc0){
+ sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack0]*normdist[itrack0],16.);
+ }else{
+ sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack0]*normdist[itrack0]+3.),16.);
+ }
+ sumn += 3-maxLayer;
+ }
for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
- sumn+=1.;
- if (!btrack->fClIndex[ilayer]){
+ sumn+=1.;
+ if (!btrack->GetClIndex(ilayer)){
sumchi2+=25;
continue;
}else{
- sumchi2+=btrack->fDy[ilayer]*btrack->fDy[ilayer]/(btrack->fSigmaY[ilayer]*btrack->fSigmaY[ilayer]);
- sumchi2+=btrack->fDz[ilayer]*btrack->fDz[ilayer]/(btrack->fSigmaZ[ilayer]*btrack->fSigmaZ[ilayer]);
+ Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);
+ for (Int_t itrack=0;itrack<4;itrack++){
+ if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack0){
+ sumchi2+=18.; //shared cluster
+ break;
+ }
+ }
+ sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer));
+ sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer));
}
}
sumchi2/=sumn;
continue; //safety space - Geo manager will give exact layer
}
track0b = btrack;
- minchi2after0 = btrack->fNormChi2[i];
+ minchi2after0 = btrack->GetNormChi2(i);
break;
}
if (array1b) for (Int_t i=0;i<5;i++){
// best track after vertex
AliITStrackMI * btrack = (AliITStrackMI*)array1b->At(i);
if (!btrack) continue;
- if (btrack->fN>track1l->fN) track1l = btrack;
- if (btrack->fX<pvertex->GetRr()-2){
- if (maxLayer>i+2&&btrack->fN==(6-i)&&(i<2)){
+ if (btrack->GetNumberOfClusters()>track1l->GetNumberOfClusters()) track1l = btrack;
+ // if (btrack->fX<pvertex->GetRr()-2-0.5/(0.1+pvertex->GetAnglep()[2])){
+ if (btrack->GetX()<pvertex->GetRr()-2){
+ if ((maxLayer>i+2 || (i==0))&&btrack->GetNumberOfClusters()==(6-i)&&(i<3)){
Float_t sumchi2= 0;
Float_t sumn = 0;
+ if (maxLayer<3){ // take prim vertex as additional measurement
+ if (normdist[itrack1]>0 && htrackc1){
+ sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack1]*normdist[itrack1],16.);
+ }else{
+ sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack1]*normdist[itrack1]+3.),16.);
+ }
+ sumn += 3-maxLayer;
+ }
for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
sumn+=1.;
- if (!btrack->fClIndex[ilayer]){
+ if (!btrack->GetClIndex(ilayer)){
sumchi2+=30;
continue;
}else{
- sumchi2+=btrack->fDy[ilayer]*btrack->fDy[ilayer]/(btrack->fSigmaY[ilayer]*btrack->fSigmaY[ilayer]);
- sumchi2+=btrack->fDz[ilayer]*btrack->fDz[ilayer]/(btrack->fSigmaZ[ilayer]*btrack->fSigmaZ[ilayer]);
+ Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff);
+ for (Int_t itrack=0;itrack<4;itrack++){
+ if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack1){
+ sumchi2+=18.; //shared cluster
+ break;
+ }
+ }
+ sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer));
+ sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer));
}
}
sumchi2/=sumn;
continue; //safety space - Geo manager will give exact layer
}
track1b = btrack;
- minchi2after1 = btrack->fNormChi2[i];
+ minchi2after1 = btrack->GetNormChi2(i);
break;
}
//
// position resolution - used for DCA cut
- Float_t sigmad = track0b->fC00+track0b->fC11+track1b->fC00+track1b->fC11+
- (track0b->fX-pvertex->GetRr())*(track0b->fX-pvertex->GetRr())*(track0b->fC22+track0b->fC33)+
- (track1b->fX-pvertex->GetRr())*(track1b->fX-pvertex->GetRr())*(track1b->fC22+track1b->fC33);
+ Float_t sigmad = track0b->GetSigmaY2()+track0b->GetSigmaZ2()+track1b->GetSigmaY2()+track1b->GetSigmaZ2()+
+ (track0b->GetX()-pvertex->GetRr())*(track0b->GetX()-pvertex->GetRr())*(track0b->GetSigmaSnp2()+track0b->GetSigmaTgl2())+
+ (track1b->GetX()-pvertex->GetRr())*(track1b->GetX()-pvertex->GetRr())*(track1b->GetSigmaSnp2()+track1b->GetSigmaTgl2());
sigmad =TMath::Sqrt(sigmad)+0.04;
if (pvertex->GetRr()>50){
Double_t cov0[15],cov1[15];
- track0b->fESDtrack->GetInnerExternalCovariance(cov0);
- track1b->fESDtrack->GetInnerExternalCovariance(cov1);
+ track0b->GetESDtrack()->GetInnerExternalCovariance(cov0);
+ track1b->GetESDtrack()->GetInnerExternalCovariance(cov1);
sigmad = cov0[0]+cov0[2]+cov1[0]+cov1[2]+
(80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov0[5]+cov0[9])+
(80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov1[5]+cov1[9]);
sigmad =TMath::Sqrt(sigmad)+0.05;
}
//
- AliESDV0MI vertex2;
- vertex2.SetM(*track0b);
- vertex2.SetP(*track1b);
+ AliV0 vertex2;
+ vertex2.SetParamN(*track0b);
+ vertex2.SetParamP(*track1b);
vertex2.Update(primvertex);
- if (vertex2.GetDist2()<=pvertex->GetDist2()&&(vertex2.GetPointAngle()>=pvertex->GetPointAngle())){
- pvertex->SetM(*track0b);
- pvertex->SetP(*track1b);
+ //Bo: if (vertex2.GetDist2()<=pvertex->GetDist2()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){
+ if (vertex2.GetDcaV0Daughters()<=pvertex->GetDcaV0Daughters()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){
+ pvertex->SetParamN(*track0b);
+ pvertex->SetParamP(*track1b);
pvertex->Update(primvertex);
+ pvertex->SetClusters(track0b->ClIndex(),track1b->ClIndex()); // register clusters
+ pvertex->SetIndex(0,track0->GetESDtrack()->GetID());
+ pvertex->SetIndex(1,track1->GetESDtrack()->GetID());
}
pvertex->SetDistSigma(sigmad);
- pvertex->SetDistNorm(pvertex->GetDist2()/sigmad);
+ //Bo: pvertex->SetDistNorm(pvertex->GetDist2()/sigmad);
+ pvertex->SetNormDCAPrim(normdist[itrack0],normdist[itrack1]);
//
// define likelihhod and causalities
//
Float_t pa0=1, pa1=1, pb0=0.26, pb1=0.26;
- if (maxLayer<2){
- if (pvertex->GetAnglep()[2]>0.2){
- pb0 = TMath::Exp(-TMath::Min(normdist[itrack0],Float_t(16.))/12.);
- pb1 = TMath::Exp(-TMath::Min(normdist[itrack1],Float_t(16.))/12.);
- }
+ if (maxLayer<1){
+ Float_t fnorm0 = normdist[itrack0];
+ if (fnorm0<0) fnorm0*=-3;
+ Float_t fnorm1 = normdist[itrack1];
+ if (fnorm1<0) fnorm1*=-3;
+ if (pvertex->GetAnglep()[2]>0.1 || (pvertex->GetRr()<10.5)&& pvertex->GetAnglep()[2]>0.05 || pvertex->GetRr()<3){
+ pb0 = TMath::Exp(-TMath::Min(fnorm0,Float_t(16.))/12.);
+ pb1 = TMath::Exp(-TMath::Min(fnorm1,Float_t(16.))/12.);
+ }
pvertex->SetChi2Before(normdist[itrack0]);
pvertex->SetChi2After(normdist[itrack1]);
pvertex->SetNAfter(0);
}else{
pvertex->SetChi2Before(minchi2before0);
pvertex->SetChi2After(minchi2before1);
- if (pvertex->GetAnglep()[2]>0.2){
- pb0 = TMath::Exp(-TMath::Min(minchi2before0,Float_t(16))/12.);
- pb1 = TMath::Exp(-TMath::Min(minchi2before1,float_t(16))/12.);
- }
- pvertex->SetNAfter(maxLayer);
- pvertex->SetNBefore(maxLayer);
+ if (pvertex->GetAnglep()[2]>0.1 || ( pvertex->GetRr()<10.5 && pvertex->GetAnglep()[2]>0.05) || pvertex->GetRr()<3){
+ pb0 = TMath::Exp(-TMath::Min(minchi2before0,Float_t(16))/12.);
+ pb1 = TMath::Exp(-TMath::Min(minchi2before1,Float_t(16))/12.);
+ }
+ pvertex->SetNAfter(maxLayer);
+ pvertex->SetNBefore(maxLayer);
}
if (pvertex->GetRr()<90){
- pa0 *= TMath::Min(track0->fESDtrack->GetTPCdensity(0,60),Float_t(1.));
- pa1 *= TMath::Min(track1->fESDtrack->GetTPCdensity(0,60),Float_t(1.));
+ pa0 *= TMath::Min(track0->GetESDtrack()->GetTPCdensity(0,60),Float_t(1.));
+ pa1 *= TMath::Min(track1->GetESDtrack()->GetTPCdensity(0,60),Float_t(1.));
}
if (pvertex->GetRr()<20){
pa0 *= (0.2+TMath::Exp(-TMath::Min(minchi2after0,Float_t(16))/8.))/1.2;
//
Bool_t v0OK = kTRUE;
Float_t p12 = pvertex->GetParamP()->GetParameter()[4]*pvertex->GetParamP()->GetParameter()[4];
- p12 += pvertex->GetParamM()->GetParameter()[4]*pvertex->GetParamM()->GetParameter()[4];
+ p12 += pvertex->GetParamN()->GetParameter()[4]*pvertex->GetParamN()->GetParameter()[4];
p12 = TMath::Sqrt(p12); // "mean" momenta
Float_t sigmap0 = 0.0001+0.001/(0.1+pvertex->GetRr());
Float_t sigmap = 0.5*sigmap0*(0.6+0.4*p12); // "resolution: of point angle - as a function of radius and momenta
- Float_t CausalityA = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]);
- Float_t CausalityB = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Float_t(0.7))*
+ Float_t causalityA = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]);
+ Float_t causalityB = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Float_t(0.7))*
TMath::Min(pvertex->GetCausalityP()[3],Float_t(0.7)));
//
- Float_t Likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5);
-
- Float_t Likelihood1 = TMath::Exp(-(1.0001-pvertex->GetPointAngle())/sigmap)+
- 0.4*TMath::Exp(-(1.0001-pvertex->GetPointAngle())/(4.*sigmap))+
- 0.4*TMath::Exp(-(1.0001-pvertex->GetPointAngle())/(8.*sigmap))+
- 0.1*TMath::Exp(-(1.0001-pvertex->GetPointAngle())/0.01);
+ //Bo: Float_t likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5);
+ Float_t lDistNorm = pvertex->GetDcaV0Daughters()/pvertex->GetDistSigma();
+ Float_t likelihood0 = (TMath::Exp(-lDistNorm)+0.1) *(pvertex->GetDcaV0Daughters()<0.5)*(lDistNorm<5);
+
+ Float_t likelihood1 = TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/sigmap)+
+ 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(4.*sigmap))+
+ 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(8.*sigmap))+
+ 0.1*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/0.01);
//
- if (CausalityA<kCausality0Cut) v0OK = kFALSE;
- if (TMath::Sqrt(Likelihood0*Likelihood1)<kLikelihood01Cut) v0OK = kFALSE;
- if (Likelihood1<kLikelihood1Cut) v0OK = kFALSE;
- if (TMath::Power(Likelihood0*Likelihood1*CausalityB,0.33)<kCombinedCut) v0OK = kFALSE;
+ if (causalityA<kCausality0Cut) v0OK = kFALSE;
+ if (TMath::Sqrt(likelihood0*likelihood1)<kLikelihood01Cut) v0OK = kFALSE;
+ if (likelihood1<kLikelihood1Cut) v0OK = kFALSE;
+ if (TMath::Power(likelihood0*likelihood1*causalityB,0.33)<kCombinedCut) v0OK = kFALSE;
//
//
- if (kTRUE){
+ if (kFALSE){
Bool_t gold = TMath::Abs(TMath::Abs(track0->GetLabel())-TMath::Abs(track1->GetLabel()))==1;
cstream<<"It0"<<
"Tr0.="<<track0<< //best without constrain
"Tr1C.="<<htrackc1<< //best with constrain if exist
"Tr0L.="<<track0l<< //longest best
"Tr1L.="<<track1l<< //longest best
- "Esd0.="<<track0->fESDtrack<< // esd track0 params
- "Esd1.="<<track1->fESDtrack<< // esd track1 params
+ "Esd0.="<<track0->GetESDtrack()<< // esd track0 params
+ "Esd1.="<<track1->GetESDtrack()<< // esd track1 params
"V0.="<<pvertex<< //vertex properties
"V0b.="<<&vertex2<< //vertex properties at "best" track
"ND0="<<normdist[itrack0]<< //normalize distance for track0
// if (rejectBase) {
// pvertex->SetStatus(-100);
//}
- if (pvertex->GetPointAngle()>kMinPointAngle2) {
+ if (pvertex->GetV0CosineOfPointingAngle()>kMinPointAngle2) {
+ //Bo: pvertex->SetESDindexes(track0->GetESDtrack()->GetID(),track1->GetESDtrack()->GetID());
+ pvertex->SetIndex(0,track0->GetESDtrack()->GetID());//Bo: consistency 0 for neg
+ pvertex->SetIndex(1,track1->GetESDtrack()->GetID());//Bo: consistency 1 for pos
if (v0OK){
- AliV0vertex vertexjuri(*track0,*track1);
- vertexjuri.SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID());
- pvertex->SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID());
- event->AddV0(&vertexjuri);
+ // AliV0vertex vertexjuri(*track0,*track1);
+ // vertexjuri.SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID());
+ // event->AddV0(&vertexjuri);
pvertex->SetStatus(100);
}
- event->AddV0MI(pvertex);
+ pvertex->SetOnFlyStatus(kTRUE);
+ pvertex->ChangeMassHypothesis(kK0Short);
+ event->AddV0(pvertex);
}
}
}
//
// delete temporary arrays
//
+ delete[] forbidden;
delete[] minPointAngle;
delete[] maxr;
delete[] minr;
delete[] helixes;
delete pvertex;
}
-
-
-
-
-
+//------------------------------------------------------------------------
+void AliITStrackerMI::RefitV02(AliESDEvent *event)
+{
+ //
+ //try to refit V0s in the third path of the reconstruction
+ //
+ TTreeSRedirector &cstream = *fDebugStreamer;
+ //
+ Int_t nv0s = event->GetNumberOfV0s();
+ Float_t primvertex[3]={GetX(),GetY(),GetZ()};
+ AliV0 v0temp;
+ for (Int_t iv0 = 0; iv0<nv0s;iv0++){
+ AliV0 * v0mi = (AliV0*)event->GetV0(iv0);
+ if (!v0mi) continue;
+ Int_t itrack0 = v0mi->GetIndex(0);
+ Int_t itrack1 = v0mi->GetIndex(1);
+ AliESDtrack *esd0 = event->GetTrack(itrack0);
+ AliESDtrack *esd1 = event->GetTrack(itrack1);
+ if (!esd0||!esd1) continue;
+ AliITStrackMI tpc0(*esd0);
+ AliITStrackMI tpc1(*esd1);
+ Double_t x,y,z; v0mi->GetXYZ(x,y,z); //I.B.
+ Double_t alpha =TMath::ATan2(y,x); //I.B.
+ if (v0mi->GetRr()>85){
+ if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
+ v0temp.SetParamN(tpc0);
+ v0temp.SetParamP(tpc1);
+ v0temp.Update(primvertex);
+ if (kFALSE) cstream<<"Refit"<<
+ "V0.="<<v0mi<<
+ "V0refit.="<<&v0temp<<
+ "Tr0.="<<&tpc0<<
+ "Tr1.="<<&tpc1<<
+ "\n";
+ //Bo: if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ v0mi->SetParamN(tpc0);
+ v0mi->SetParamP(tpc1);
+ v0mi->Update(primvertex);
+ }
+ }
+ continue;
+ }
+ if (v0mi->GetRr()>35){
+ CorrectForTPCtoITSDeadZoneMaterial(&tpc0);
+ CorrectForTPCtoITSDeadZoneMaterial(&tpc1);
+ if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
+ v0temp.SetParamN(tpc0);
+ v0temp.SetParamP(tpc1);
+ v0temp.Update(primvertex);
+ if (kFALSE) cstream<<"Refit"<<
+ "V0.="<<v0mi<<
+ "V0refit.="<<&v0temp<<
+ "Tr0.="<<&tpc0<<
+ "Tr1.="<<&tpc1<<
+ "\n";
+ //Bo: if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ v0mi->SetParamN(tpc0);
+ v0mi->SetParamP(tpc1);
+ v0mi->Update(primvertex);
+ }
+ }
+ continue;
+ }
+ CorrectForTPCtoITSDeadZoneMaterial(&tpc0);
+ CorrectForTPCtoITSDeadZoneMaterial(&tpc1);
+ // if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){
+ if (RefitAt(v0mi->GetRr(),&tpc0, v0mi->GetClusters(0)) && RefitAt(v0mi->GetRr(),&tpc1, v0mi->GetClusters(1))){
+ v0temp.SetParamN(tpc0);
+ v0temp.SetParamP(tpc1);
+ v0temp.Update(primvertex);
+ if (kFALSE) cstream<<"Refit"<<
+ "V0.="<<v0mi<<
+ "V0refit.="<<&v0temp<<
+ "Tr0.="<<&tpc0<<
+ "Tr1.="<<&tpc1<<
+ "\n";
+ //Bo: if (v0temp.GetDist2()<v0mi->GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ if (v0temp.GetDcaV0Daughters()<v0mi->GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){
+ v0mi->SetParamN(tpc0);
+ v0mi->SetParamP(tpc1);
+ v0mi->Update(primvertex);
+ }
+ }
+ }
+}
+//------------------------------------------------------------------------
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff