#include <TMatrixD.h>
#include <TTree.h>
-#include <TTreeStream.h>
#include <TDatabasePDG.h>
#include <TString.h>
#include <TRandom.h>
+#include <TTreeStream.h>
#include "AliLog.h"
+#include "AliITSPlaneEff.h"
+#include "AliITSCalibrationSPD.h"
+#include "AliITSCalibrationSDD.h"
+#include "AliITSCalibrationSSD.h"
+#include "AliCDBEntry.h"
+#include "AliCDBManager.h"
+#include "AliAlignObj.h"
+#include "AliTrackPointArray.h"
+#include "AliESDVertex.h"
#include "AliESDEvent.h"
#include "AliESDtrack.h"
-#include "AliESDVertex.h"
#include "AliV0.h"
#include "AliHelix.h"
+#include "AliITSChannelStatus.h"
+#include "AliITSDetTypeRec.h"
#include "AliITSRecPoint.h"
#include "AliITSgeomTGeo.h"
#include "AliITSReconstructor.h"
-#include "AliTrackPointArray.h"
-#include "AliAlignObj.h"
#include "AliITSClusterParam.h"
-#include "AliCDBManager.h"
-#include "AliCDBEntry.h"
#include "AliITSsegmentation.h"
#include "AliITSCalibration.h"
-#include "AliITSCalibrationSPD.h"
-#include "AliITSCalibrationSDD.h"
-#include "AliITSCalibrationSSD.h"
-#include "AliITSPlaneEff.h"
#include "AliITSPlaneEffSPD.h"
#include "AliITSPlaneEffSDD.h"
#include "AliITSPlaneEffSSD.h"
+#include "AliITSV0Finder.h"
#include "AliITStrackerMI.h"
ClassImp(AliITStrackerMI)
fxTimesRhoLayerTrks(0),
fDebugStreamer(0),
fITSChannelStatus(0),
-fDetTypeRec(0),
+fkDetTypeRec(0),
fPlaneEff(0) {
//Default constructor
Int_t i;
fxTimesRhoLayerTrks(0),
fDebugStreamer(0),
fITSChannelStatus(0),
-fDetTypeRec(0),
+fkDetTypeRec(0),
fPlaneEff(0) {
//--------------------------------------------------------------------
//This is the AliITStrackerMI constructor
fDebugStreamer = new TTreeSRedirector("ITSdebug.root");
// only for plane efficiency evaluation
- if (AliITSReconstructor::GetRecoParam()->GetComputePlaneEff()) {
+ if (AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() &&
+ AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()>=0) {
Int_t iplane=AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff();
- if(AliITSReconstructor::GetRecoParam()->GetLayersToSkip(iplane))
+ if(!AliITSReconstructor::GetRecoParam()->GetLayersToSkip(iplane)==1)
AliWarning(Form("Evaluation of Plane Eff for layer %d will be attempted without removing it from tracker",iplane));
if (iplane<2) fPlaneEff = new AliITSPlaneEffSPD();
else if (iplane<4) fPlaneEff = new AliITSPlaneEffSDD();
fxTimesRhoLayerTrks(0),
fDebugStreamer(tracker.fDebugStreamer),
fITSChannelStatus(tracker.fITSChannelStatus),
-fDetTypeRec(tracker.fDetTypeRec),
+fkDetTypeRec(tracker.fkDetTypeRec),
fPlaneEff(tracker.fPlaneEff) {
//Copy constructor
Int_t i;
if(fPlaneEff) delete fPlaneEff;
}
//------------------------------------------------------------------------
-void AliITStrackerMI::SetLayersNotToSkip(Int_t *l) {
+void AliITStrackerMI::SetLayersNotToSkip(const Int_t *l) {
//--------------------------------------------------------------------
//This function set masks of the layers which must be not skipped
//--------------------------------------------------------------------
Info("ReadBadFromDetTypeRec","Reading info about bad ITS detectors and channels");
- if(!fDetTypeRec) Error("ReadBadFromDetTypeRec","AliITSDetTypeRec nof found!\n");
+ if(!fkDetTypeRec) Error("ReadBadFromDetTypeRec","AliITSDetTypeRec nof found!\n");
// ITS channels map
if(fITSChannelStatus) delete fITSChannelStatus;
- fITSChannelStatus = new AliITSChannelStatus(fDetTypeRec);
+ fITSChannelStatus = new AliITSChannelStatus(fkDetTypeRec);
// ITS detectors and chips
Int_t i=0,j=0,k=0,ndet=0;
for (j=1; j<AliITSgeomTGeo::GetNLadders(i)+1; j++) {
for (k=1; k<ndet+1; k++) {
AliITSdetector &det=fgLayers[i-1].GetDetector((j-1)*ndet + k-1);
- det.ReadBadDetectorAndChips(i-1,(j-1)*ndet + k-1,fDetTypeRec);
+ det.ReadBadDetectorAndChips(i-1,(j-1)*ndet + k-1,fkDetTypeRec);
if(det.IsBad()) {nBadDetsPerLayer++;}
} // end loop on detectors
} // end loop on ladders
return;
}
//------------------------------------------------------------------------
-static Int_t CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) {
+Int_t AliITStrackerMI::CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) {
//--------------------------------------------------------------------
// Correction for the material between the TPC and the ITS
//--------------------------------------------------------------------
if (!t->PropagateToTGeo(AliITSRecoParam::Getrcd(),1)) return 0;// TPC central drum
if (!t->PropagateToTGeo(AliITSRecoParam::Getriw()+0.001,1)) return 0;// TPC inner wall
} else {
- Error("CorrectForTPCtoITSDeadZoneMaterial","Track is already in the dead zone !");
+ printf("CorrectForTPCtoITSDeadZoneMaterial: Track is already in the dead zone !\n");
return 0;
}
if(event->GetNumberOfV0s()>0) UpdateTPCV0(event);
if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) FindV02(event);
+ //if(event->GetNumberOfV0s()>0) AliITSV0Finder::UpdateTPCV0(event,this);
+ //if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::FindV02(event,this);
fAfterV0 = kTRUE;
//
itsTracks.Delete();
// The clusters must be loaded !
//--------------------------------------------------------------------
fTrackingPhase="RefitInward";
+
if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) RefitV02(event);
+ //if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::RefitV02(event,this);
+
Int_t nentr=event->GetNumberOfTracks();
Info("RefitInward", "Number of ESD tracks: %d\n", nentr);
fTrackToFollow.ResetCovariance(10.);
//Refitting...
- Bool_t pe=AliITSReconstructor::GetRecoParam()->GetComputePlaneEff();
+ Bool_t pe=(AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() &&
+ AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()>=0);
+
AliDebug(2,Form("Refit LABEL %d %d",t->GetLabel(),t->GetNumberOfClusters()));
if (RefitAt(AliITSRecoParam::GetrInsideSPD1(),&fTrackToFollow,t,kTRUE,pe)) {
AliDebug(2," refit OK");
AliESDtrack *esdTrack =fTrackToFollow.GetESDtrack();
//printf(" %d\n",esdTrack->GetITSModuleIndex(0));
//esdTrack->UpdateTrackParams(&fTrackToFollow,AliESDtrack::kITSrefit); //original line
- Float_t r[3]={0.,0.,0.};
+ Double_t r[3]={0.,0.,0.};
Double_t maxD=3.;
esdTrack->RelateToVertex(event->GetVertex(),GetBz(r),maxD);
ntrk++;
p.SetXYZ(xyz, cov);
p.SetCharge(cl->GetQ());
p.SetDriftTime(cl->GetDriftTime());
+ p.SetChargeRatio(cl->GetChargeRatio());
AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
switch (l) {
case 0:
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()));
+ Float_t phi = TMath::ASin(t->GetSnpAt(xdetintrackframe,GetBz()));
phi += alpha-det.GetPhi();
Float_t tgphi = TMath::Tan(phi);
p.SetXYZ(xyz, cov);
p.SetCharge(cl->GetQ());
p.SetDriftTime(cl->GetDriftTime());
+ p.SetChargeRatio(cl->GetChargeRatio());
AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
switch (l) {
AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
// propagate to the layer radius
Double_t xToGo; if (!vtrack->GetLocalXat(r,xToGo)) continue;
- if(!vtrack->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) continue;
+ if(!vtrack->Propagate(xToGo)) continue;
// apply correction for material of the current layer
CorrectForLayerMaterial(vtrack,ilayer,trackGlobXYZ1,"inward");
vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1);
- vtrack->SetClIndex(ilayer,0);
+ vtrack->SetClIndex(ilayer,-1);
modstatus = (skip==1 ? 3 : 4); // skipped : out in z
if(LocalModuleCoord(ilayer,idet,vtrack,xloc,zloc)) { // local module coords
vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
(noClusters &&
AliITSReconstructor::GetRecoParam()->GetAllowProlongationWithEmptyRoad())) {
AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack);
- updatetrack->SetClIndex(ilayer,0);
+ updatetrack->SetClIndex(ilayer,-1);
if (dead==0) {
modstatus = 5; // no cls in road
} else if (dead==1) {
if (currenttrack->GetDetectorIndex()==idetc) { // track already on the cluster's detector
// take into account misalignment (bring track to real detector plane)
Double_t xTrOrig = currenttrack->GetX();
- if (!currenttrack->PropagateTo(xTrOrig+cl->GetX(),0.,0.)) continue;
+ if (!currenttrack->Propagate(xTrOrig+cl->GetX())) continue;
// 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;
}
// bring track back to ideal detector plane
- if (!currenttrack->PropagateTo(xTrOrig,0.,0.)) continue;
+ if (!currenttrack->Propagate(xTrOrig)) continue;
} else { // have to move track to cluster's detector
const AliITSdetector &detc=layer.GetDetector(idetc);
// a first cut on track-cluster distance
if (cl->GetQ()==0) deadzoneSPD=kTRUE; // only 1 prolongation with virtual cluster
if (ntracks[ilayer]>=100) continue;
AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack);
- updatetrack->SetClIndex(ilayer,0);
+ updatetrack->SetClIndex(ilayer,-1);
if (changedet) new (¤ttrack2) AliITStrackMI(backuptrack);
if (cl->GetQ()!=0) { // real cluster
AliDebug(2,"update failed");
continue;
}
- updatetrack->SetSampledEdx(cl->GetQ(),updatetrack->GetNumberOfClusters()-1); //b.b.
+ updatetrack->SetSampledEdx(cl->GetQ(),ilayer-2);
modstatus = 1; // found
} else { // virtual cluster in dead zone
updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1);
AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
// apply correction for material of the current layer
CorrectForLayerMaterial(vtrack,ilayer,trackGlobXYZ1,"inward");
- vtrack->SetClIndex(ilayer,0);
+ vtrack->SetClIndex(ilayer,-1);
modstatus = 3; // skipped
vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1);
// apply correction for material of the current layer
CorrectForLayerMaterial(vtrack,ilayer,trackGlobXYZ1,"inward");
- vtrack->SetClIndex(ilayer,0);
+ vtrack->SetClIndex(ilayer,-1);
modstatus = 3; // skipped
vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx);
}
//------------------------------------------------------------------------
void AliITStrackerMI::AliITSdetector::ReadBadDetectorAndChips(Int_t ilayer,Int_t idet,
- AliITSDetTypeRec *detTypeRec)
+ const AliITSDetTypeRec *detTypeRec)
{
//--------------------------------------------------------------------
// Read bad detectors and chips from calibration objects in AliITSDetTypeRec
if (TMath::Abs(hI-1.5)<0.01) // SPDouter
if(!CorrectForShieldMaterial(track,"SPD",dir)) return kFALSE;
- // remember old position [SR, GSI 18.02.2003]
- Double_t oldX=0., oldY=0., oldZ=0.;
- if (track->IsStartedTimeIntegral() && step==1) {
- if (!track->GetGlobalXYZat(track->GetX(),oldX,oldY,oldZ)) return kFALSE;
- }
- //
Double_t oldGlobXYZ[3];
if (!track->GetXYZ(oldGlobXYZ)) return kFALSE;
// check if we allow a prolongation without point for large-eta tracks
Int_t skip = CheckSkipLayer(track,ilayer,idet);
if (skip==2) {
- // propagate to the layer radius
- Double_t xToGo; if (!track->GetLocalXat(r,xToGo)) return kFALSE;
- if (!track->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return kFALSE;
- // apply correction for material of the current layer
- CorrectForLayerMaterial(track,ilayer,oldGlobXYZ,dir);
modstatus = 4; // out in z
if(LocalModuleCoord(ilayer,idet,track,xloc,zloc)) { // local module coords
track->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
}
- // track time update [SR, GSI 17.02.2003]
- if (track->IsStartedTimeIntegral() && step==1) {
- Double_t newX, newY, newZ;
- if (!track->GetGlobalXYZat(track->GetX(),newX,newY,newZ)) return kFALSE;
- Double_t dL2 = (oldX-newX)*(oldX-newX) + (oldY-newY)*(oldY-newY) +
- (oldZ-newZ)*(oldZ-newZ);
- track->AddTimeStep(TMath::Sqrt(dL2));
- }
+ // cross layer
+ // apply correction for material of the current layer
+ // add time if going outward
+ CorrectForLayerMaterial(track,ilayer,oldGlobXYZ,dir);
continue;
}
if (clAcc) {
if (!UpdateMI(track,clAcc,maxchi2,idx)) return kFALSE;
- track->SetSampledEdx(clAcc->GetQ(),track->GetNumberOfClusters()-1);
+ track->SetSampledEdx(clAcc->GetQ(),ilayer-2);
}
track->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc);
} // end search for extra clusters in overlapped modules
// Correct for material of the current layer
+ // cross material
+ // add time if going outward
if(!CorrectForLayerMaterial(track,ilayer,oldGlobXYZ,dir)) return kFALSE;
- // track time update [SR, GSI 17.02.2003]
- if (track->IsStartedTimeIntegral() && step==1) {
- Double_t newX, newY, newZ;
- if (!track->GetGlobalXYZat(track->GetX(),newX,newY,newZ)) return kFALSE;
- Double_t dL2 = (oldX-newX)*(oldX-newX) + (oldY-newY)*(oldY-newY) +
- (oldZ-newZ)*(oldZ-newZ);
- track->AddTimeStep(TMath::Sqrt(dL2));
- }
- //
-
} // end loop on layers
if (!track->PropagateTo(xx,0.,0.)) return kFALSE;
Float_t *ny = GetNy(fCurrentEsdTrack), *nz = GetNz(fCurrentEsdTrack);
if (mode<100){
for (Int_t i = 0;i<6;i++){
- if (track->GetClIndex(i)>0){
+ if (track->GetClIndex(i)>=0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
else
}
else{
for (Int_t i = 0;i<4;i++){
- if (track->GetClIndex(i)>0){
+ if (track->GetClIndex(i)>=0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
else { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
}
}
for (Int_t i = 4;i<6;i++){
- if (track->GetClIndex(i)>0){
+ if (track->GetClIndex(i)>=0){
Float_t cerry, cerrz;
if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];}
else { cerry= track->GetSigmaY(i); cerrz = track->GetSigmaZ(i);}
return normchi2;
}
//------------------------------------------------------------------------
-Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI * track2)
+Double_t AliITStrackerMI::GetMatchingChi2(const AliITStrackMI * track1,const AliITStrackMI * track2)
{
//
// return matching chi2 between two tracks
return chi2(0,0);
}
//------------------------------------------------------------------------
-Double_t AliITStrackerMI::GetSPDDeadZoneProbability(Double_t zpos, Double_t zerr)
+Double_t AliITStrackerMI::GetSPDDeadZoneProbability(Double_t zpos, Double_t zerr) const
{
//
// return probability that given point (characterized by z position and error)
return probability;
}
//------------------------------------------------------------------------
-Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackMI * track, Float_t fac)
+Double_t AliITStrackerMI::GetTruncatedChi2(const AliITStrackMI * track, Float_t fac)
{
//
// calculate normalized chi2
return normchi2;
}
//------------------------------------------------------------------------
-Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackMI * forwardtrack, AliITStrackMI * backtrack)
+Double_t AliITStrackerMI::GetInterpolatedChi2(const AliITStrackMI * forwardtrack,const AliITStrackMI * backtrack)
{
//
// calculate normalized chi2
return fgLayers[l].GetWeight(c);
}
//------------------------------------------------------------------------
-void AliITStrackerMI::RegisterClusterTracks(AliITStrackMI* track,Int_t id)
+void AliITStrackerMI::RegisterClusterTracks(const AliITStrackMI* track,Int_t id)
{
//---------------------------------------------
// register track to the list
}
}
//------------------------------------------------------------------------
-void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackMI* track, Int_t id)
+void AliITStrackerMI::UnRegisterClusterTracks(const AliITStrackMI* track, Int_t id)
{
//---------------------------------------------
// unregister track from the list
return shared;
}
//------------------------------------------------------------------------
-Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackMI *track, Int_t trackID, Int_t &shared, Int_t clusterlist[6],Int_t overlist[6])
+Int_t AliITStrackerMI::GetOverlapTrack(const AliITStrackMI *track, Int_t trackID, Int_t &shared, Int_t clusterlist[6],Int_t overlist[6])
{
//
// find first shared track
Float_t *erry = GetErrY(esdindex), *errz = GetErrZ(esdindex);
Float_t *ny = GetNy(esdindex), *nz = GetNz(esdindex);
for (Int_t j=0;j<6;j++) {
- if (besttrack->GetClIndex(j)>0){
+ if (besttrack->GetClIndex(j)>=0){
erry[j] = besttrack->GetSigmaY(j); erry[j+6] = besttrack->GetSigmaY(j+6);
errz[j] = besttrack->GetSigmaZ(j); errz[j+6] = besttrack->GetSigmaZ(j+6);
ny[j] = besttrack->GetNy(j);
besttrack = (AliITStrackMI*)array->At(index[0]);
if (besttrack&&besttrack->GetChi2MIP(0)<AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(0)){
for (Int_t j=0;j<6;j++){
- if (besttrack->GetClIndex(j)>0){
+ if (besttrack->GetClIndex(j)>=0){
erry[j] = besttrack->GetSigmaY(j); erry[j+6] = besttrack->GetSigmaY(j+6);
errz[j] = besttrack->GetSigmaZ(j); erry[j+6] = besttrack->GetSigmaY(j+6);
ny[j] = besttrack->GetNy(j);
Float_t *ny = GetNy(esdindex), *nz = GetNz(esdindex);
for (Int_t i=0;i<6;i++){
Int_t index = besttrack->GetClIndex(i);
- if (index<=0) continue;
+ if (index<0) continue;
Int_t ilayer = (index & 0xf0000000) >> 28;
if (besttrack->GetSigmaY(ilayer)<0.00000000001) continue;
AliITSRecPoint *c = (AliITSRecPoint*)GetCluster(index);
AliITStrackMI * track = (AliITStrackMI*)array->At(i);
if (!track) continue;
if (track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*shared+1.) break;
- if ( (track->GetClIndex(ilayer)>0) && (track->GetClIndex(ilayer)!=besttrack->GetClIndex(ilayer))){
+ if ( (track->GetClIndex(ilayer)>=0) && (track->GetClIndex(ilayer)!=besttrack->GetClIndex(ilayer))){
cansign = kFALSE;
break;
}
for (Int_t ind=0;ind<3;ind++){
if (tpcLabel>0)
if (cl->GetLabel(ind)==tpcLabel) isWrong=0;
+ AliDebug(2,Form("icl %d ilab %d lab %d",i,ind,cl->GetLabel(ind)));
}
track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<<l));
nwrong+=isWrong;
else
track->SetLabel(tpcLabel);
}
+ AliDebug(2,Form(" nls %d wrong %d label %d tpcLabel %d\n",nclusters,nwrong,track->GetLabel(),tpcLabel));
}
//------------------------------------------------------------------------
void AliITStrackerMI::CookdEdx(AliITStrackMI* track)
{
//
- //
- // Int_t list[6];
- //AliITSRecPoint * clist[6];
- // Int_t shared = GetNumberOfSharedClusters(track,index,list,clist);
- Float_t dedx[4];
- Int_t accepted=0;
track->SetChi2MIP(9,0);
for (Int_t i=0;i<track->GetNumberOfClusters();i++){
Int_t cindex = track->GetClusterIndex(i);
if (cl->GetLabel(ind)==lab) isWrong=0;
}
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->GetSampledEdx(i);
- //dedx[accepted]= track->fNormQ[l];
- accepted++;
}
- if (accepted<1) {
- track->SetdEdx(0);
- return;
- }
- Int_t indexes[4];
- TMath::Sort(accepted,dedx,indexes,kFALSE);
Double_t low=0.;
Double_t up=0.51;
- Double_t nl=low*accepted, nu =up*accepted;
- Float_t sumamp = 0;
- Float_t sumweight =0;
- for (Int_t i=0; i<accepted; i++) {
- Float_t weight =1;
- if (i<nl+0.1) weight = TMath::Max(1.-(nl-i),0.);
- if (i>nu-1) weight = TMath::Max(nu-i,0.);
- sumamp+= dedx[indexes[i]]*weight;
- sumweight+=weight;
- }
- track->SetdEdx(sumamp/sumweight);
+ track->CookdEdx(low,up);
}
//------------------------------------------------------------------------
void AliITStrackerMI::MakeCoefficients(Int_t ntracks){
//
+ // Create some arrays
//
if (fCoefficients) delete []fCoefficients;
fCoefficients = new Float_t[ntracks*48];
Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSRecPoint *cluster,Int_t layer)
{
//
- //
+ // Compute predicted chi2
//
Float_t erry,errz;
Float_t theta = track->GetTgl();
Float_t phi = track->GetSnp();
- phi = TMath::Sqrt(phi*phi/(1.-phi*phi));
+ phi = TMath::Abs(phi)*TMath::Sqrt(1./((1.-phi)*(1.+phi)));
AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz);
AliDebug(2,Form(" chi2: tr-cl %f %f tr X %f cl X %f",track->GetY()-cluster->GetY(),track->GetZ()-cluster->GetZ(),track->GetX(),cluster->GetX()));
// Take into account the mis-alignment (bring track to cluster plane)
Double_t xTrOrig=track->GetX();
- if (!track->PropagateTo(xTrOrig+cluster->GetX(),0.,0.)) return 1000.;
+ if (!track->Propagate(xTrOrig+cluster->GetX())) return 1000.;
AliDebug(2,Form(" chi2: tr-cl %f %f tr X %f cl X %f",track->GetY()-cluster->GetY(),track->GetZ()-cluster->GetZ(),track->GetX(),cluster->GetX()));
Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz);
// Bring the track back to detector plane in ideal geometry
// [mis-alignment will be accounted for in UpdateMI()]
- if (!track->PropagateTo(xTrOrig,0.,0.)) return 1000.;
+ if (!track->Propagate(xTrOrig)) return 1000.;
Float_t ny,nz;
AliITSClusterParam::GetNTeor(layer,cluster,theta,phi,ny,nz);
Double_t delta = cluster->GetNy()+cluster->GetNz()-nz-ny;
track->SetSigmaY(layer,erry);
track->SetSigmaZ(layer, errz);
//track->fNormQ[layer] = cluster->GetQ()/TMath::Sqrt(1+theta*theta+phi*phi);
- track->SetNormQ(layer,cluster->GetQ()/TMath::Sqrt((1.+ track->GetTgl()*track->GetTgl())/(1.- track->GetSnp()*track->GetSnp())));
+ track->SetNormQ(layer,cluster->GetQ()/TMath::Sqrt((1.+ track->GetTgl()*track->GetTgl())/((1.-track->GetSnp())*(1.+track->GetSnp()))));
return chi2;
}
Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,Double_t chi2,Int_t index) const
{
//
- //
+ // Update ITS track
//
Int_t layer = (index & 0xf0000000) >> 28;
track->SetClIndex(layer, index);
AliDebug(2,Form("gcl %f %f %f",clxyz[0],clxyz[1],clxyz[2]));
AliDebug(2,Form(" xtr %f xcl %f",track->GetX(),cl->GetX()));
- if (!track->PropagateTo(xTrOrig+cl->GetX(),0.,0.)) return 0;
+ if (!track->Propagate(xTrOrig+cl->GetX())) return 0;
AliCluster c(*cl);
Int_t updated = track->UpdateMI(&c,chi2,index);
// Bring the track back to detector plane in ideal geometry
- if (!track->PropagateTo(xTrOrig,0.,0.)) return 0;
+ if (!track->Propagate(xTrOrig)) return 0;
if(!updated) AliDebug(2,"update failed");
return updated;
}
//------------------------------------------------------------------------
-void AliITStrackerMI::GetDCASigma(AliITStrackMI* track, Float_t & sigmarfi, Float_t &sigmaz)
+void AliITStrackerMI::GetDCASigma(const AliITStrackMI* track, Float_t & sigmarfi, Float_t &sigmaz)
{
//
//DCA sigmas parameterization
sigmaz = 0.0110+4.37*TMath::Abs(track->GetC());
}
//------------------------------------------------------------------------
-void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz)
+void AliITStrackerMI::SignDeltas(const TObjArray *clusterArray, Float_t vz)
{
//
+ // Clusters from delta electrons?
//
- Int_t entries = ClusterArray->GetEntriesFast();
+ Int_t entries = clusterArray->GetEntriesFast();
if (entries<4) return;
- AliITSRecPoint* cluster = (AliITSRecPoint*)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++){
- AliITSRecPoint* cl0 = (AliITSRecPoint*)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++){
- AliITSRecPoint* cl0 = (AliITSRecPoint*)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;
- AliITSRecPoint* cl1 = (AliITSRecPoint*)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
{
//
+ // Update ESD track
//
track->UpdateESDtrack(flags);
AliITStrackMI * oldtrack = (AliITStrackMI*)(track->GetESDtrack()->GetITStrack());
}
return res;
}
+
//------------------------------------------------------------------------
-void AliITStrackerMI::UpdateTPCV0(AliESDEvent *event){
+void AliITStrackerMI::UpdateTPCV0(const AliESDEvent *event){
//
//try to update, or reject TPC V0s
//
//
if (trackp){
for (Int_t ilayer=0;ilayer<clayer;ilayer++){
- if (trackp->GetClIndex(ilayer)>0){
+ 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));
}
//
if (trackm){
for (Int_t ilayer=0;ilayer<clayer;ilayer++){
- if (trackm->GetClIndex(ilayer)>0){
+ 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));
}
//
if (trackp&&TMath::Abs(trackp->GetTgl())<1.){
for (Int_t ilayer=clayer;ilayer<6;ilayer++){
- if (trackp->GetClIndex(ilayer)>0){
+ 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));
}
//
if (trackm&&TMath::Abs(trackm->GetTgl())<1.){
for (Int_t ilayer=clayer;ilayer<6;ilayer++){
- if (trackm->GetClIndex(ilayer)>0){
+ 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));
}
Double_t xx,yy,zz,alpha;
if (!bestLong->GetGlobalXYZat(bestLong->GetX(),xx,yy,zz)) continue;
alpha = TMath::ATan2(yy,xx);
- if (!trackat0.Propagate(alpha,0)) continue;
+ trackat0.Propagate(alpha,0); //PH The check on the return value is temporarily disabled (bug 45751)
// calculate normalized distances to the vertex
//
Float_t ptfac = (1.+100.*TMath::Abs(trackat0.GetC()));
if (bestConst){
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]<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) {
if (forbidden[itrack0]) continue;
AliITStrackMI * btrack0 = (AliITStrackMI*)trackarray.At(itrack0);
if (!btrack0) continue;
- if (btrack0->GetSign()>0) continue;
+ if (btrack0->GetSign()>0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue;
AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0);
//
- for (Int_t iesd1=0;iesd1<ntracks;iesd1++){
+ for (Int_t iesd1=iesd0+1;iesd1<ntracks;iesd1++){
Int_t itrack1 = itsmap[iesd1];
if (forbidden[itrack1]) continue;
AliITStrackMI * btrack1 = (AliITStrackMI*)trackarray.At(itrack1);
if (!btrack1) continue;
- if (btrack1->GetSign()<0) continue;
+ if (btrack1->GetSign()<0 && !AliITSReconstructor::GetRecoParam()->GetStoreLikeSignV0s()) continue;
Bool_t isGold = kFALSE;
if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){
isGold = kTRUE;
}
for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
sumn+=1.;
- if (!btrack->GetClIndex(ilayer)){
+ if (btrack->GetClIndex(ilayer)<0){
sumchi2+=25;
continue;
}else{
}
for (Int_t ilayer=i;ilayer<maxLayer;ilayer++){
sumn+=1.;
- if (!btrack->GetClIndex(ilayer)){
+ if (btrack->GetClIndex(ilayer)<0){
sumchi2+=30;
continue;
}else{
delete pvertex;
}
//------------------------------------------------------------------------
-void AliITStrackerMI::RefitV02(AliESDEvent *event)
+void AliITStrackerMI::RefitV02(const AliESDEvent *event)
{
//
//try to refit V0s in the third path of the reconstruction
}
}
}
+
//------------------------------------------------------------------------
void AliITStrackerMI::BuildMaterialLUT(TString material) {
//--------------------------------------------------------------------
//-------------------------------------------------------------------
// Propagate beyond beam pipe and correct for material
// (material budget in different ways according to fUseTGeo value)
+ // Add time if going outward (PropagateTo or PropagateToTGeo)
//-------------------------------------------------------------------
// Define budget mode:
// 0: material from AliITSRecoParam (hard coded)
- // 1: material from TGeo (on the fly)
+ // 1: material from TGeo in one step (on the fly)
// 2: material from lut
- // 3: material from TGeo (same for all hypotheses)
+ // 3: material from TGeo in one step (same for all hypotheses)
Int_t mode;
switch(fUseTGeo) {
case 0:
if (!t->GetLocalXat(rToGo,xToGo)) return 0;
Double_t xOverX0,x0,lengthTimesMeanDensity;
- Bool_t anglecorr=kTRUE;
switch(mode) {
case 0:
xOverX0 = AliITSRecoParam::GetdPipe();
x0 = AliITSRecoParam::GetX0Be();
lengthTimesMeanDensity = xOverX0*x0;
+ lengthTimesMeanDensity *= dir;
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
case 1:
if (!t->PropagateToTGeo(xToGo,1)) return 0;
- return 1;
break;
case 2:
if(fxOverX0Pipe<0) BuildMaterialLUT("Pipe");
xOverX0 = fxOverX0Pipe;
lengthTimesMeanDensity = fxTimesRhoPipe;
+ lengthTimesMeanDensity *= dir;
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
case 3:
if(!fxOverX0PipeTrks || index<0 || index>=fNtracks) Error("CorrectForPipeMaterial","Incorrect usage of UseTGeo option!\n");
if(fxOverX0PipeTrks[index]<0) {
if (!t->PropagateToTGeo(xToGo,1,xOverX0,lengthTimesMeanDensity)) return 0;
Double_t angle=TMath::Sqrt((1.+t->GetTgl()*t->GetTgl())/
- (1.-t->GetSnp()*t->GetSnp()));
+ ((1.-t->GetSnp())*(1.+t->GetSnp())));
fxOverX0PipeTrks[index] = TMath::Abs(xOverX0)/angle;
fxTimesRhoPipeTrks[index] = TMath::Abs(lengthTimesMeanDensity)/angle;
return 1;
}
xOverX0 = fxOverX0PipeTrks[index];
lengthTimesMeanDensity = fxTimesRhoPipeTrks[index];
+ lengthTimesMeanDensity *= dir;
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
}
- lengthTimesMeanDensity *= dir;
-
- if (!t->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return 0;
- if (!t->CorrectForMeanMaterial(xOverX0,lengthTimesMeanDensity,anglecorr)) return 0;
-
return 1;
}
//------------------------------------------------------------------------
//-------------------------------------------------------------------
// Propagate beyond SPD or SDD shield and correct for material
// (material budget in different ways according to fUseTGeo value)
+ // Add time if going outward (PropagateTo or PropagateToTGeo)
//-------------------------------------------------------------------
// Define budget mode:
// 0: material from AliITSRecoParam (hard coded)
- // 1: material from TGeo (on the fly)
+ // 1: material from TGeo in steps of X cm (on the fly)
+ // X = AliITSRecoParam::GetStepSizeTGeo()
// 2: material from lut
- // 3: material from TGeo (same for all hypotheses)
+ // 3: material from TGeo in one step (same for all hypotheses)
Int_t mode;
switch(fUseTGeo) {
case 0:
Int_t index=2*fCurrentEsdTrack+shieldindex;
Double_t xOverX0,x0,lengthTimesMeanDensity;
- Bool_t anglecorr=kTRUE;
+ Int_t nsteps=1;
switch(mode) {
case 0:
xOverX0 = AliITSRecoParam::Getdshield(shieldindex);
x0 = AliITSRecoParam::GetX0shield(shieldindex);
lengthTimesMeanDensity = xOverX0*x0;
+ lengthTimesMeanDensity *= dir;
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
case 1:
- if (!t->PropagateToTGeo(xToGo,1)) return 0;
- return 1;
+ nsteps= (Int_t)(TMath::Abs(t->GetX()-xToGo)/AliITSReconstructor::GetRecoParam()->GetStepSizeTGeo())+1;
+ if (!t->PropagateToTGeo(xToGo,nsteps)) return 0; // cross the material and apply correction
break;
case 2:
if(fxOverX0Shield[shieldindex]<0) BuildMaterialLUT("Shields");
xOverX0 = fxOverX0Shield[shieldindex];
lengthTimesMeanDensity = fxTimesRhoShield[shieldindex];
+ lengthTimesMeanDensity *= dir;
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
case 3:
if(!fxOverX0ShieldTrks || index<0 || index>=2*fNtracks) Error("CorrectForShieldMaterial","Incorrect usage of UseTGeo option!\n");
if(fxOverX0ShieldTrks[index]<0) {
if (!t->PropagateToTGeo(xToGo,1,xOverX0,lengthTimesMeanDensity)) return 0;
Double_t angle=TMath::Sqrt((1.+t->GetTgl()*t->GetTgl())/
- (1.-t->GetSnp()*t->GetSnp()));
+ ((1.-t->GetSnp())*(1.+t->GetSnp())));
fxOverX0ShieldTrks[index] = TMath::Abs(xOverX0)/angle;
fxTimesRhoShieldTrks[index] = TMath::Abs(lengthTimesMeanDensity)/angle;
return 1;
}
xOverX0 = fxOverX0ShieldTrks[index];
lengthTimesMeanDensity = fxTimesRhoShieldTrks[index];
+ lengthTimesMeanDensity *= dir;
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
}
- lengthTimesMeanDensity *= dir;
-
- if (!t->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return 0;
- if (!t->CorrectForMeanMaterial(xOverX0,lengthTimesMeanDensity,anglecorr)) return 0;
-
return 1;
}
//------------------------------------------------------------------------
//-------------------------------------------------------------------
// Propagate beyond layer and correct for material
// (material budget in different ways according to fUseTGeo value)
+ // Add time if going outward (PropagateTo or PropagateToTGeo)
//-------------------------------------------------------------------
// Define budget mode:
// 0: material from AliITSRecoParam (hard coded)
- // 1: material from TGeo (on the fly)
+ // 1: material from TGeo in stepsof X cm (on the fly)
+ // X = AliITSRecoParam::GetStepSizeTGeo()
// 2: material from lut
- // 3: material from TGeo (same for all hypotheses)
+ // 3: material from TGeo in one step (same for all hypotheses)
Int_t mode;
switch(fUseTGeo) {
case 0:
Int_t index=6*fCurrentEsdTrack+layerindex;
- // Bring the track beyond the material
- if (!t->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return 0;
- Double_t globXYZ[3];
- if (!t->GetXYZ(globXYZ)) return 0;
Double_t xOverX0=0.0,x0=0.0,lengthTimesMeanDensity=0.0;
- Double_t mparam[7];
- Bool_t anglecorr=kTRUE;
+ Int_t nsteps=1;
+
+ // back before material (no correction)
+ Double_t rOld,xOld;
+ rOld=TMath::Sqrt(oldGlobXYZ[0]*oldGlobXYZ[0]+oldGlobXYZ[1]*oldGlobXYZ[1]);
+ if (!t->GetLocalXat(rOld,xOld)) return 0;
+ if (!t->Propagate(xOld)) return 0;
switch(mode) {
case 0:
xOverX0 = fgLayers[layerindex].GetThickness(t->GetY(),t->GetZ(),x0);
lengthTimesMeanDensity = xOverX0*x0;
+ lengthTimesMeanDensity *= dir;
+ // Bring the track beyond the material
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
case 1:
- AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
- if(mparam[1]>900000) return 0;
- xOverX0=mparam[1];
- lengthTimesMeanDensity=mparam[0]*mparam[4];
- anglecorr=kFALSE;
+ nsteps = (Int_t)(TMath::Abs(xOld-xToGo)/AliITSReconstructor::GetRecoParam()->GetStepSizeTGeo())+1;
+ if (!t->PropagateToTGeo(xToGo,nsteps)) return 0; // cross the material and apply correction
break;
case 2:
if(fxOverX0Layer[layerindex]<0) BuildMaterialLUT("Layers");
xOverX0 = fxOverX0Layer[layerindex];
lengthTimesMeanDensity = fxTimesRhoLayer[layerindex];
+ lengthTimesMeanDensity *= dir;
+ // Bring the track beyond the material
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
case 3:
if(!fxOverX0LayerTrks || index<0 || index>=6*fNtracks) Error("CorrectForLayerMaterial","Incorrect usage of UseTGeo option!\n");
if(fxOverX0LayerTrks[index]<0) {
- AliTracker::MeanMaterialBudget(oldGlobXYZ,globXYZ,mparam);
- if(mparam[1]>900000) return 0;
+ nsteps = (Int_t)(TMath::Abs(xOld-xToGo)/AliITSReconstructor::GetRecoParam()->GetStepSizeTGeo())+1;
+ if (!t->PropagateToTGeo(xToGo,nsteps,xOverX0,lengthTimesMeanDensity)) return 0;
Double_t angle=TMath::Sqrt((1.+t->GetTgl()*t->GetTgl())/
- (1.-t->GetSnp()*t->GetSnp()));
- xOverX0=mparam[1]/angle;
- lengthTimesMeanDensity=mparam[0]*mparam[4]/angle;
- fxOverX0LayerTrks[index] = TMath::Abs(xOverX0);
- fxTimesRhoLayerTrks[index] = TMath::Abs(lengthTimesMeanDensity);
+ ((1.-t->GetSnp())*(1.+t->GetSnp())));
+ fxOverX0LayerTrks[index] = TMath::Abs(xOverX0)/angle;
+ fxTimesRhoLayerTrks[index] = TMath::Abs(lengthTimesMeanDensity)/angle;
+ return 1;
}
xOverX0 = fxOverX0LayerTrks[index];
lengthTimesMeanDensity = fxTimesRhoLayerTrks[index];
+ lengthTimesMeanDensity *= dir;
+ if (!t->PropagateTo(xToGo,xOverX0,lengthTimesMeanDensity/xOverX0)) return 0;
break;
}
- lengthTimesMeanDensity *= dir;
-
- if (!t->CorrectForMeanMaterial(xOverX0,lengthTimesMeanDensity,anglecorr)) return 0;
return 1;
}
return;
}
//------------------------------------------------------------------------
-Int_t AliITStrackerMI::CheckSkipLayer(AliITStrackMI *track,
+Int_t AliITStrackerMI::CheckSkipLayer(const AliITStrackMI *track,
Int_t ilayer,Int_t idet) const {
//-----------------------------------------------------------------
// This method is used to decide whether to allow a prolongation
} else if (ilayer==4 || ilayer==5) { // ---------- SSD
detType = 2;
}
- AliITSsegmentation *segm = (AliITSsegmentation*)fDetTypeRec->GetSegmentationModel(detType);
+ AliITSsegmentation *segm = (AliITSsegmentation*)fkDetTypeRec->GetSegmentationModel(detType);
if (detType==2) segm->SetLayer(ilayer+1);
Float_t detSizeX = detSizeFactorX*segm->Dx();
Float_t detSizeZ = detSizeFactorZ*segm->Dz();
}
//------------------------------------------------------------------------
Bool_t AliITStrackerMI::LocalModuleCoord(Int_t ilayer,Int_t idet,
- AliITStrackMI *track,
+ const AliITStrackMI *track,
Float_t &xloc,Float_t &zloc) const {
//-----------------------------------------------------------------
// Gives position of track in local module ref. frame
return kTRUE;
}
//------------------------------------------------------------------------
-Bool_t AliITStrackerMI::IsOKForPlaneEff(AliITStrackMI* track, const Int_t *clusters, Int_t ilayer) const {
+Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t *clusters, Int_t ilayer) const {
//
// Method to be optimized further:
// Aim: decide whether a track can be used for PlaneEff evaluation
for(Int_t lay=AliITSgeomTGeo::kNLayers-1;lay>ilayer;lay--) {
AliDebug(2,Form("trak=%d lay=%d ; index=%d ESD label= %d",tmp.GetLabel(),lay,
tmp.GetClIndex(lay),((AliESDtrack*)tmp.GetESDtrack())->GetLabel())) ;
- if (tmp.GetClIndex(lay)>0) ncl++;
+ if (tmp.GetClIndex(lay)>=0) ncl++;
}
Bool_t nextout = kFALSE;
if(ilayer==AliITSgeomTGeo::kNLayers-1) nextout=kTRUE; // you are already on the outermost layer
- else nextout = ((tmp.GetClIndex(ilayer+1)>0)? kTRUE : kFALSE );
+ else nextout = ((tmp.GetClIndex(ilayer+1)>=0)? kTRUE : kFALSE );
Bool_t nextin = kFALSE;
if(ilayer==0) nextin=kTRUE; // you are already on the innermost layer
else nextin = ((index[ilayer-1]>=0)? kTRUE : kFALSE );
return kTRUE;
}
//------------------------------------------------------------------------
-void AliITStrackerMI::UseTrackForPlaneEff(AliITStrackMI* track, Int_t ilayer) {
+void AliITStrackerMI::UseTrackForPlaneEff(const AliITStrackMI* track, Int_t ilayer) {
//
// This Method has to be optimized! For the time-being it uses the same criteria
// as those used in the search of extra clusters for overlapping modules.
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff