X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerMI.cxx;h=4b0953dee26193106982b0e9bb950d4fd70b3805;hb=4cbef9fba538a1bf23541e9f3760754c7b1cd802;hp=f52a7ee95a2dde6de29dcfe4e71c34894dd65ad7;hpb=67178f341a0b0808fc488f31ff7d771aed38bb94;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index f52a7ee95a2..4b0953dee26 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -32,25 +32,21 @@ #include #include #include - +#include +#include #include "AliLog.h" +#include "AliGeomManager.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 "AliESDV0Params.h" #include "AliESDtrack.h" #include "AliV0.h" -#include "AliHelix.h" #include "AliITSChannelStatus.h" #include "AliITSDetTypeRec.h" #include "AliITSRecPoint.h" +#include "AliITSRecPointContainer.h" #include "AliITSgeomTGeo.h" #include "AliITSReconstructor.h" #include "AliITSClusterParam.h" @@ -61,6 +57,9 @@ #include "AliITSPlaneEffSSD.h" #include "AliITSV0Finder.h" #include "AliITStrackerMI.h" +#include "AliMathBase.h" +#include "AliPID.h" + ClassImp(AliITStrackerMI) @@ -82,6 +81,9 @@ fEsd(0), fTrackingPhase("Default"), fUseTGeo(3), fNtracks(0), +fFlagFakes(kFALSE), +fSelectBestMIP03(kFALSE), +fUseImproveKalman(kFALSE), fxOverX0Pipe(-1.), fxTimesRhoPipe(-1.), fxOverX0PipeTrks(0), @@ -93,12 +95,25 @@ fxTimesRhoLayerTrks(0), fDebugStreamer(0), fITSChannelStatus(0), fkDetTypeRec(0), -fPlaneEff(0) { +fPlaneEff(0), +fSPDChipIntPlaneEff(0), +fITSPid(0) + + { //Default constructor Int_t i; for(i=0;i<4;i++) fSPDdetzcentre[i]=0.; - for(i=0;i<2;i++) {fxOverX0Shield[i]=-1.;fxTimesRhoShield[i]=-1.;} + for(i=0;i<2;i++) { + fxOverX0Shield[i]=-1.; + fxTimesRhoShield[i]=-1.; + fConstraint[i]=0; + } for(i=0;i<6;i++) {fxOverX0Layer[i]=-1.;fxTimesRhoLayer[i]=-1.;} + fOriginal.SetOwner(); + for(i=0;iGetSigmaZVdef()}; SetVertex(xyzVtx,ersVtx); - for (Int_t i=0; iGetUseTGeoInTracker(); if(AliITSReconstructor::GetRecoParam()->GetExtendedEtaAcceptance() && fUseTGeo!=1 && fUseTGeo!=3) { @@ -227,7 +263,8 @@ fPlaneEff(0) { for(Int_t i=0;i<2;i++) {fxOverX0Shield[i]=-1.;fxTimesRhoShield[i]=-1.;} for(Int_t i=0;i<6;i++) {fxOverX0Layer[i]=-1.;fxTimesRhoLayer[i]=-1.;} - fDebugStreamer = new TTreeSRedirector("ITSdebug.root"); + if (AliITSReconstructor::GetRecoParam()->GetESDV0Params()->StreamLevel()>0) + fDebugStreamer = new TTreeSRedirector("ITSdebug.root"); // only for plane efficiency evaluation if (AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() && @@ -235,14 +272,26 @@ fPlaneEff(0) { Int_t iplane=AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff(); 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(); + if (iplane<2) { + fPlaneEff = new AliITSPlaneEffSPD(); + fSPDChipIntPlaneEff = new Bool_t[AliITSPlaneEffSPD::kNModule*AliITSPlaneEffSPD::kNChip]; + for (UInt_t i=0; iGetReadPlaneEffFromOCDB()) if(!fPlaneEff->ReadFromCDB()) {AliWarning("AliITStrackerMI reading of AliITSPlaneEff from OCDB failed") ;} if(AliITSReconstructor::GetRecoParam()->GetHistoPlaneEff()) fPlaneEff->SetCreateHistos(kTRUE); } + // + // RS + fSelectBestMIP03 = kFALSE;//AliITSReconstructor::GetRecoParam()->GetSelectBestMIP03(); + fFlagFakes = AliITSReconstructor::GetRecoParam()->GetFlagFakes(); + fUseImproveKalman = AliITSReconstructor::GetRecoParam()->GetUseImproveKalman(); + // + fITSPid=new AliITSPIDResponse(); } +/* //------------------------------------------------------------------------ AliITStrackerMI::AliITStrackerMI(const AliITStrackerMI &tracker):AliTracker(tracker), fI(tracker.fI), @@ -260,6 +309,8 @@ fEsd(tracker.fEsd), fTrackingPhase(tracker.fTrackingPhase), fUseTGeo(tracker.fUseTGeo), fNtracks(tracker.fNtracks), +fFlagFakes(tracker.fFlagFakes), +fSelectBestMIP03(tracker.fSelectBestMIP03), fxOverX0Pipe(tracker.fxOverX0Pipe), fxTimesRhoPipe(tracker.fxTimesRhoPipe), fxOverX0PipeTrks(0), @@ -273,6 +324,7 @@ fITSChannelStatus(tracker.fITSChannelStatus), fkDetTypeRec(tracker.fkDetTypeRec), fPlaneEff(tracker.fPlaneEff) { //Copy constructor + fOriginal.SetOwner(); Int_t i; for(i=0;i<4;i++) { fSPDdetzcentre[i]=tracker.fSPDdetzcentre[i]; @@ -286,6 +338,7 @@ fPlaneEff(tracker.fPlaneEff) { fxTimesRhoShield[i]=tracker.fxTimesRhoShield[i]; } } + //------------------------------------------------------------------------ AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){ //Assignment operator @@ -293,6 +346,7 @@ AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){ new(this) AliITStrackerMI(tracker); return *this; } +*/ //------------------------------------------------------------------------ AliITStrackerMI::~AliITStrackerMI() { @@ -307,13 +361,9 @@ AliITStrackerMI::~AliITStrackerMI() } if(fITSChannelStatus) delete fITSChannelStatus; if(fPlaneEff) delete fPlaneEff; -} -//------------------------------------------------------------------------ -void AliITStrackerMI::SetLayersNotToSkip(const Int_t *l) { - //-------------------------------------------------------------------- - //This function set masks of the layers which must be not skipped - //-------------------------------------------------------------------- - for (Int_t i=0; iGetBranch("ITSRecPoints"); - if (!branch) { - Error("LoadClusters"," can't get the branch !\n"); - return 1; - } - - static TClonesArray dummy("AliITSRecPoint",10000), *clusters=&dummy; - branch->SetAddress(&clusters); + + TClonesArray *clusters = NULL; + AliITSRecPointContainer* rpcont=AliITSRecPointContainer::Instance(); + clusters=rpcont->FetchClusters(0,cTree); + if(!clusters) return 1; + if(!(rpcont->IsSPDActive() || rpcont->IsSDDActive() || rpcont->IsSSDActive())){ + AliError("ITS is not in a known running configuration: SPD, SDD and SSD are not active"); + return 1; + } Int_t i=0,j=0,ndet=0; Int_t detector=0; for (i=0; iGetEvent(j)) continue; + // if (!cTree->GetEvent(j)) continue; + clusters = rpcont->UncheckedGetClusters(j); + if(!clusters)continue; Int_t ncl=clusters->GetEntriesFast(); SignDeltas(clusters,GetZ()); @@ -378,22 +431,28 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) { detector=c->GetDetectorIndex(); if (!c->Misalign()) AliWarning("Can't misalign this cluster !"); - - fgLayers[i].InsertCluster(new AliITSRecPoint(*c)); + + Int_t retval = fgLayers[i].InsertCluster(new AliITSRecPoint(*c)); + if(retval) { + AliWarning(Form("Too many clusters on layer %d!",i)); + break; + } } - clusters->Delete(); + // add dead zone "virtual" cluster in SPD, if there is a cluster within // zwindow cm from the dead zone + // This method assumes that fSPDdetzcentre is ordered from -z to +z if (i<2 && AliITSReconstructor::GetRecoParam()->GetAddVirtualClustersInDeadZone()) { for (Float_t xdead = 0; xdead < AliITSRecoParam::GetSPDdetxlength(); 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.; // this identifies virtual clusters - Float_t hit[5] = {xdead, + Float_t hit[6] = {xdead, 0., AliITSReconstructor::GetRecoParam()->GetSigmaXDeadZoneHit2(), AliITSReconstructor::GetRecoParam()->GetSigmaZDeadZoneHit2(), - q}; + q, + 0.}; Bool_t local = kTRUE; Double_t zwindow = AliITSReconstructor::GetRecoParam()->GetZWindowDeadZone(); hit[1] = fSPDdetzcentre[0]+0.5*AliITSRecoParam::GetSPDdetzlength(); @@ -423,7 +482,8 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) { fgLayers[i].SortClusters(); } - dummy.Clear(); + // check whether we have to skip some layers + SetForceSkippingOfLayer(); return 0; } @@ -479,9 +539,15 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { // The clusters must be already loaded ! //-------------------------------------------------------------------- + AliDebug(2,Form("SKIPPING %d %d %d %d %d %d",ForceSkippingOfLayer(0),ForceSkippingOfLayer(1),ForceSkippingOfLayer(2),ForceSkippingOfLayer(3),ForceSkippingOfLayer(4),ForceSkippingOfLayer(5))); fTrackingPhase="Clusters2Tracks"; - + // + // RS + fSelectBestMIP03 = kFALSE;//AliITSReconstructor::GetRecoParam()->GetSelectBestMIP03(); + fFlagFakes = AliITSReconstructor::GetRecoParam()->GetFlagFakes(); + fUseImproveKalman = AliITSReconstructor::GetRecoParam()->GetUseImproveKalman(); + // TObjArray itsTracks(15000); fOriginal.Clear(); fEsd = event; // store pointer to the esd @@ -496,11 +562,11 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { } } // temporary - + Int_t noesd = 0; {/* 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); + noesd=nentr; + // Info("Clusters2Tracks", "Number of ESD tracks: %d\n", nentr); while (nentr--) { AliESDtrack *esd=event->GetTrack(nentr); // ---- for debugging: @@ -510,20 +576,10 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { if (esd->GetStatus()&AliESDtrack::kTPCout) continue; if (esd->GetStatus()&AliESDtrack::kITSin) continue; if (esd->GetKinkIndex(0)>0) continue; //kink daughter - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("Clusters2Tracks",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); 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->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); @@ -594,6 +650,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { besttrack->SetFakeRatio(1.); CookLabel(besttrack,0.); //For comparison only UpdateESDtrack(besttrack,AliESDtrack::kITSin); + t->SetWinner(besttrack); if (fConstraint[fPass]&&(!besttrack->IsGoldPrimary())) continue; //to be tracked also without vertex constrain @@ -603,28 +660,36 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { } GetBestHypothesysMIP(itsTracks); } // end loop on the two tracking passes - + // + if (fFlagFakes) FlagFakes(itsTracks); + // if(event->GetNumberOfV0s()>0) AliITSV0Finder::UpdateTPCV0(event,this); if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::FindV02(event,this); fAfterV0 = kTRUE; // - itsTracks.Delete(); + itsTracks.Clear(); // Int_t entries = fTrackHypothesys.GetEntriesFast(); for (Int_t ientry=0; ientryDelete(); delete fTrackHypothesys.RemoveAt(ientry); } fTrackHypothesys.Delete(); + entries = fBestHypothesys.GetEntriesFast(); + for (Int_t ientry=0; ientryDelete(); + delete fBestHypothesys.RemoveAt(ientry); + } fBestHypothesys.Delete(); fOriginal.Clear(); delete [] fCoefficients; fCoefficients=0; DeleteTrksMaterialLUT(); - Info("Clusters2Tracks","Number of prolonged tracks: %d\n",ntrk); + AliInfo(Form("Number of prolonged tracks: %d out of %d ESD tracks",ntrk,noesd)); fTrackingPhase="Default"; @@ -638,63 +703,64 @@ Int_t AliITStrackerMI::PropagateBack(AliESDEvent *event) { //-------------------------------------------------------------------- fTrackingPhase="PropagateBack"; Int_t nentr=event->GetNumberOfTracks(); - Info("PropagateBack", "Number of ESD tracks: %d\n", nentr); - + // Info("PropagateBack", "Number of ESD tracks: %d\n", nentr); + double bz0 = GetBz(); + const double kWatchStep=10.; // for larger steps watch arc vs segment difference + // Int_t ntrk=0; for (Int_t i=0; iGetTrack(i); - if ((esd->GetStatus()&AliESDtrack::kITSin)==0) continue; - if (esd->GetStatus()&AliESDtrack::kITSout) continue; - - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("PropagateBack",msg); - delete t; - continue; - } - t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); - - ResetTrackToFollow(*t); - /* - // propagate to vertex [SR, GSI 17.02.2003] - // Start Time measurement [SR, GSI 17.02.2003], corrected by I.Belikov - if (CorrectForPipeMaterial(&fTrackToFollow,"inward")) { - if (fTrackToFollow.PropagateToVertex(event->GetVertex())) - fTrackToFollow.StartTimeIntegral(); - // from vertex to outside pipe - CorrectForPipeMaterial(&fTrackToFollow,"outward"); - }*/ // Start time integral and add distance from current position to vertex + if (esd->GetStatus()&AliESDtrack::kITSout) continue; + AliITStrackMI t(*esd); Double_t xyzTrk[3],xyzVtx[3]={GetX(),GetY(),GetZ()}; - fTrackToFollow.GetXYZ(xyzTrk); + t.GetXYZ(xyzTrk); Double_t dst2 = 0.; - for (Int_t icoord=0; icoord<3; icoord++) { - Double_t di = xyzTrk[icoord] - xyzVtx[icoord]; - dst2 += di*di; + { + double dxs = xyzTrk[0] - xyzVtx[0]; + double dys = xyzTrk[1] - xyzVtx[1]; + double dzs = xyzTrk[2] - xyzVtx[2]; + // RS: for large segment steps d use approximation of cicrular arc s by + // s = 2R*asin(d/2R) = d/p asin(p) \approx d/p (p + 1/6 p^3) = d (1+1/6 p^2) + // where R is the track radius, p = d/2R = 2C*d (C is the abs curvature) + // Hence s^2/d^2 = (1+1/6 p^2)^2 + dst2 = dxs*dxs + dys*dys; + if (dst2 > kWatchStep*kWatchStep) { // correct circular part for arc/segment factor + double crv = TMath::Abs(esd->GetC(bz0)); + double fcarc = 1.+crv*crv*dst2/6.; + dst2 *= fcarc*fcarc; + } + dst2 += dzs*dzs; } - fTrackToFollow.StartTimeIntegral(); - fTrackToFollow.AddTimeStep(TMath::Sqrt(dst2)); + t.StartTimeIntegral(); + t.AddTimeStep(TMath::Sqrt(dst2)); + // + // transfer the time integral to ESD track + esd->SetStatus(AliESDtrack::kTIME); + Double_t times[AliPID::kSPECIESC]; + t.GetIntegratedTimes(times,AliPID::kSPECIESC); + esd->SetIntegratedTimes(times); + esd->SetIntegratedLength(t.GetIntegratedLength()); + // + if ((esd->GetStatus()&AliESDtrack::kITSin)==0) continue; + t.SetExpQ(TMath::Max(0.8*t.GetESDtrack()->GetTPCsignal(),30.)); + ResetTrackToFollow(t); + // fTrackToFollow.ResetCovariance(10.); fTrackToFollow.ResetClusters(); - if (RefitAt(AliITSRecoParam::GetrInsideITSscreen(),&fTrackToFollow,t)) { - if (!CorrectForTPCtoITSDeadZoneMaterial(&fTrackToFollow)) { - delete t; - continue; - } - fTrackToFollow.SetLabel(t->GetLabel()); - //fTrackToFollow.CookdEdx(); - CookLabel(&fTrackToFollow,0.); //For comparison only - fTrackToFollow.UpdateESDtrack(AliESDtrack::kITSout); - //UseClusters(&fTrackToFollow); - ntrk++; + if (RefitAt(AliITSRecoParam::GetrInsideITSscreen(),&fTrackToFollow,&t)) { + if (!CorrectForTPCtoITSDeadZoneMaterial(&fTrackToFollow)) continue; + // fTrackToFollow.SetLabel(t.GetLabel()); // why do we neet this + //fTrackToFollow.CookdEdx(); + CookLabel(&fTrackToFollow,0.); //For comparison only // why do we need this? + fTrackToFollow.UpdateESDtrack(AliESDtrack::kITSout); + //UseClusters(&fTrackToFollow); + ntrk++; } - delete t; } - Info("PropagateBack","Number of back propagated ITS tracks: %d\n",ntrk); + AliInfo(Form("Number of back propagated ITS tracks: %d out of %d ESD tracks",ntrk,nentr)); fTrackingPhase="Default"; @@ -711,8 +777,18 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) AliITSV0Finder::RefitV02(event,this); + Bool_t doExtra=AliITSReconstructor::GetRecoParam()->GetSearchForExtraClusters(); + if(!doExtra) AliDebug(2,"Do not search for extra clusters"); + Int_t nentr=event->GetNumberOfTracks(); - Info("RefitInward", "Number of ESD tracks: %d\n", nentr); + // Info("RefitInward", "Number of ESD tracks: %d\n", nentr); + + // only for PlaneEff and in case of SPD (for FO studies) + if( AliITSReconstructor::GetRecoParam()->GetComputePlaneEff() && + AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()>=0 && + AliITSReconstructor::GetRecoParam()->GetIPlanePlaneEff()<2) { + for (UInt_t i=0; iGetStatus()&AliESDtrack::kTPCout) if ((esd->GetStatus()&AliESDtrack::kTPCrefit)==0) continue; - AliITStrackMI *t=0; - try { - t=new AliITStrackMI(*esd); - } catch (const Char_t *msg) { - //Warning("RefitInward",msg); - delete t; - continue; - } + AliITStrackMI *t = new AliITStrackMI(*esd); + t->SetExpQ(TMath::Max(0.8*t->GetESDtrack()->GetTPCsignal(),30.)); if (!CorrectForTPCtoITSDeadZoneMaterial(t)) { delete t; @@ -740,21 +810,29 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { ResetTrackToFollow(*t); fTrackToFollow.ResetClusters(); - if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) + // ITS standalone tracks + if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) { fTrackToFollow.ResetCovariance(10.); + // protection for loopers that can have parameters screwed up + if(TMath::Abs(fTrackToFollow.GetY())>1000. || + TMath::Abs(fTrackToFollow.GetZ())>1000.) { + delete t; + continue; + } + } //Refitting... 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)) { + if (RefitAt(AliITSRecoParam::GetrInsideSPD1(),&fTrackToFollow,t,doExtra,pe)) { AliDebug(2," refit OK"); fTrackToFollow.SetLabel(t->GetLabel()); // fTrackToFollow.CookdEdx(); CookdEdx(&fTrackToFollow); - CookLabel(&fTrackToFollow,0.0); //For comparison only + CookLabel(&fTrackToFollow,0.0); //For comparison only // RS why do we need this? //The beam pipe if (CorrectForPipeMaterial(&fTrackToFollow,"inward")) { @@ -771,7 +849,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { delete t; } - Info("RefitInward","Number of refitted tracks: %d\n",ntrk); + AliInfo(Form("Number of refitted tracks: %d out of %d ESD tracks",ntrk,nentr)); fTrackingPhase="Default"; @@ -805,6 +883,7 @@ Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const { p.SetCharge(cl->GetQ()); p.SetDriftTime(cl->GetDriftTime()); p.SetChargeRatio(cl->GetChargeRatio()); + p.SetClusterType(cl->GetClusterType()); AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; switch (l) { case 0: @@ -854,29 +933,30 @@ Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index, 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,GetBz())); + Float_t phi = TMath::ASin(t->GetSnpAt(xdetintrackframe+cl->GetX(),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; + Float_t errtrky,errtrkz,covyz; Bool_t addMisalErr=kFALSE; - AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errlocalx,errlocalz,addMisalErr); + AliITSClusterParam::GetError(l,cl,tgl,tgphi,expQ,errtrky,errtrkz,covyz,addMisalErr); 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); + AliCluster tmpcl((UShort_t)cl->GetVolumeId(),pos[0],pos[1],pos[2],errtrky*errtrky,errtrkz*errtrkz,covyz); tmpcl.GetGlobalCov(cov); p.SetXYZ(xyz, cov); p.SetCharge(cl->GetQ()); p.SetDriftTime(cl->GetDriftTime()); p.SetChargeRatio(cl->GetChargeRatio()); + p.SetClusterType(cl->GetClusterType()); AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer; switch (l) { @@ -940,20 +1020,22 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin TObjArray *bestarray = (TObjArray*)fBestHypothesys.At(esdindex); if (!bestarray){ bestarray = new TObjArray(5); + bestarray->SetOwner(); fBestHypothesys.AddAt(bestarray,esdindex); } // //setup tree of the prolongations // - static AliITStrackMI tracks[7][100]; + const int kMaxTr = 100; //RS + static AliITStrackMI tracks[7][kMaxTr]; AliITStrackMI *currenttrack; static AliITStrackMI currenttrack1; static AliITStrackMI currenttrack2; static AliITStrackMI backuptrack; Int_t ntracks[7]; - Int_t nindexes[7][100]; - Float_t normalizedchi2[100]; + Int_t nindexes[7][kMaxTr]; + Float_t normalizedchi2[kMaxTr]; for (Int_t ilayer=0;ilayer<6;ilayer++) ntracks[ilayer]=0; otrack->SetNSkipped(0); new (&(tracks[6][0])) AliITStrackMI(*otrack); @@ -976,8 +1058,9 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin Int_t nskipped=0; Float_t nused =0; for (Int_t itrack =0; itrack=100) break; + if (ntracks[ilayer]>=kMaxTr) break; 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){ @@ -1002,8 +1085,13 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin if (!currenttrack1.GetXYZ(trackGlobXYZ1)) continue; // Get the budget to the primary vertex for the current track being prolonged - Double_t budgetToPrimVertex = GetEffectiveThickness(); - + Double_t budgetToPrimVertex = 0; + double xMSLrs[9],x2X0MSLrs[9]; // needed for ImproveKalman + int nMSLrs = 0; + // + if (fUseImproveKalman) nMSLrs = GetEffectiveThicknessLbyL(xMSLrs,x2X0MSLrs); + else budgetToPrimVertex = GetEffectiveThickness(); + // // check if we allow a prolongation without point Int_t skip = CheckSkipLayer(¤ttrack1,ilayer,idet); if (skip) { @@ -1020,7 +1108,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin if(LocalModuleCoord(ilayer,idet,vtrack,xloc,zloc)) { // local module coords vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); } - if(constrain) vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if(constrain && AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + vtrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } ntracks[ilayer]++; continue; } @@ -1111,7 +1203,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin TMath::Abs(updatetrack->GetD(1)/(1.+ilayer)) > // z AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk()) isPrim=kFALSE; } - if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if (isPrim && AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + updatetrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } } updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1); if (dead) { @@ -1130,9 +1226,9 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin clidx=-1; // loop over clusters in the road while ((cl=layer.GetNextCluster(clidx))!=0) { - if (ntracks[ilayer]>95) break; //space for skipped clusters + if (ntracks[ilayer]>int(0.95*kMaxTr)) break; //space for skipped clusters Bool_t changedet =kFALSE; - if (cl->GetQ()==0 && deadzoneSPD==kTRUE) continue; + if (TMath::Abs(cl->GetQ())<1.e-13 && deadzoneSPD==kTRUE) continue; Int_t idetc=cl->GetDetectorIndex(); if (currenttrack->GetDetectorIndex()==idetc) { // track already on the cluster's detector @@ -1144,6 +1240,9 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin (currenttrack->GetY()-cl->GetY())*(currenttrack->GetY()-cl->GetY())*msy > 1. ) { // cluster not associated to track AliDebug(2,"not associated"); + // MvL: added here as well + // bring track back to ideal detector plane + currenttrack->Propagate(xTrOrig); continue; } // bring track back to ideal detector plane @@ -1176,13 +1275,13 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin // chi2 cut AliDebug(2,Form("chi2 %f max %f",chi2trkcl,AliITSReconstructor::GetRecoParam()->GetMaxChi2s(ilayer))); if (chi2trkcl < AliITSReconstructor::GetRecoParam()->GetMaxChi2s(ilayer)) { - if (cl->GetQ()==0) deadzoneSPD=kTRUE; // only 1 prolongation with virtual cluster - if (ntracks[ilayer]>=100) continue; + if (TMath::Abs(cl->GetQ())<1.e-13) deadzoneSPD=kTRUE; // only 1 prolongation with virtual cluster + if (ntracks[ilayer]>=kMaxTr) continue; AliITStrackMI * updatetrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(*currenttrack); updatetrack->SetClIndex(ilayer,-1); if (changedet) new (¤ttrack2) AliITStrackMI(backuptrack); - if (cl->GetQ()!=0) { // real cluster + if (TMath::Abs(cl->GetQ())>1.e-13) { // real cluster if (!UpdateMI(updatetrack,cl,chi2trkcl,(ilayer<<28)+clidx)) { AliDebug(2,"update failed"); continue; @@ -1218,7 +1317,11 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin TMath::Abs(updatetrack->GetD(1)/(1.+ilayer)) > // z AliITSReconstructor::GetRecoParam()->GetMaxDZforPrimTrk()) isPrim=kFALSE; } - if (isPrim) updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if (isPrim && AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + updatetrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + updatetrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } } //apply vertex constrain ntracks[ilayer]++; } // create new hypothesis @@ -1229,32 +1332,23 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin } // loop over possible prolongations // allow one prolongation without clusters - if (constrain && itrack<=1 && currenttrack1.GetNSkipped()==0 && deadzoneSPD==kFALSE && ntracks[ilayer]<100) { + if (constrain && itrack<=1 && TMath::Abs(currenttrack1.GetNSkipped())<1.e-13 && deadzoneSPD==kFALSE && ntracks[ilayer]SetClIndex(ilayer,-1); modstatus = 3; // skipped vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); - vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if(AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + vtrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } vtrack->IncrementNSkipped(); ntracks[ilayer]++; } - - // allow one prolongation without clusters for tracks with |tgl|>1.1 - if (constrain && itrack==0 && TMath::Abs(currenttrack1.GetTgl())>1.1) { //big theta - for low flux - 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,-1); - modstatus = 3; // skipped - vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); - vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); - vtrack->SetNDeadZone(vtrack->GetNDeadZone()+1); - ntracks[ilayer]++; - } - + } // loop over tracks in layer ilayer+1 //loop over track candidates for the current layer @@ -1283,7 +1377,8 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin TMath::Sort(ntracks[ilayer],normalizedchi2,nindexes[ilayer],kFALSE); ntracks[ilayer] = TMath::Min(accepted,7+2*ilayer); if (ntracks[ilayer]90) ntracks[ilayer]=90; + // if (ntracks[ilayer]>90) ntracks[ilayer]=90; + if (ntracks[ilayer]>int(kMaxTr*0.9)) ntracks[ilayer]=int(kMaxTr*0.9); } // end loop over layers @@ -1325,15 +1420,12 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin for (Int_t i=0;i + if (track.GetNormChi2(2) > AliITSReconstructor::GetRecoParam()->GetMaxNormChi2NonCForHypothesis()) continue; - if (constrain) track.SetNSkipped(track.GetNSkipped()+2); - if (!constrain){ - 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()); - } + 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); } @@ -1372,7 +1464,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin 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++){ + for (Int_t ilayer =nearest;ilayer<7;ilayer++){ if (ntracks[nearest]==0){ nearest = ilayer; } @@ -1428,6 +1520,7 @@ fYcs(0), fZcs(0), fNcs(0), fCurrentSlice(-1), +fZmin(0), fZmax(0), fYmin(0), fYmax(0), @@ -1435,7 +1528,11 @@ fI(0), fImax(0), fSkip(0), fAccepted(0), -fRoad(0){ +fRoad(0), +fMaxSigmaClY(0), +fMaxSigmaClZ(0), +fNMaxSigmaCl(3) +{ //-------------------------------------------------------------------- //default AliITSlayer constructor //-------------------------------------------------------------------- @@ -1444,7 +1541,51 @@ fRoad(0){ fClusterTracks[0][i]=-1; fClusterTracks[1][i]=-1; fClusterTracks[2][i]=-1; - fClusterTracks[3][i]=-1; + fClusterTracks[3][i]=-1; + fY[i]=0; + fZ[i]=0; + } + fYB[0]=0; + fYB[1]=0; + + for (Int_t j=0; jGetDetectorIndex()); + //AD + Double_t nSigmaY=fNMaxSigmaCl*TMath::Sqrt(cl->GetSigmaY2()); + Double_t nSigmaZ=fNMaxSigmaCl*TMath::Sqrt(cl->GetSigmaZ2()); + if (cl->GetY()-nSigmaYGetY()-nSigmaY); + if (cl->GetY()+nSigmaY>det.GetYmax()) det.SetYmax(cl->GetY()+nSigmaY); + if (cl->GetZ()-nSigmaZGetZ()-nSigmaZ); + if (cl->GetZ()+nSigmaZ>det.GetZmax()) det.SetZmax(cl->GetZ()+nSigmaZ); + //AD + /* if (cl->GetY()GetY()); if (cl->GetY()>det.GetYmax()) det.SetYmax(cl->GetY()); if (cl->GetZ()GetZ()); if (cl->GetZ()>det.GetZmax()) det.SetZmax(cl->GetZ()); - + */ return 0; } //------------------------------------------------------------------------ @@ -1599,8 +1812,14 @@ void AliITStrackerMI::AliITSlayer::SortClusters() Float_t *z = new Float_t[fN]; Int_t * index = new Int_t[fN]; // + fMaxSigmaClY=0.; //AD + fMaxSigmaClZ=0.; //AD + for (Int_t i=0;iGetZ(); + // save largest errors in y and z for this layer + fMaxSigmaClY=TMath::Max(fMaxSigmaClY,TMath::Sqrt(fClusters[i]->GetSigmaY2())); + fMaxSigmaClZ=TMath::Max(fMaxSigmaClZ,TMath::Sqrt(fClusters[i]->GetSigmaZ2())); } TMath::Sort(fN,z,index,kFALSE); for (Int_t i=0;i=fNdetectors) return -1; - if (nz<0) return -1; + if (nz>=fNdetectors || nz<0) { + //printf("ndet %d phi %f z %f np %d nz %d\n",fNdetectors,phi,z,np,nz); + return -1; + } // ad hoc correction for 3rd ladder of SDD inner layer, // which is reversed (rotated by pi around local y) // this correction is OK only from AliITSv11Hybrid onwards if (GetR()>12. && GetR()<20.) { // SDD inner if(np==2) { // 3rd ladder - nz = (fNdetectors-1) - nz; - } + Double_t posMod252[3]; + AliITSgeomTGeo::GetTranslation(252,posMod252); + // check the Z coordinate of Mod 252: if negative + // (old SDD geometry in AliITSv11Hybrid) + // the swap of numeration whould be applied + if(posMod252[2]<0.){ + nz = (fNdetectors-1) - nz; + } + } } //printf("ndet %d phi %f z %f np %d nz %d\n",fNdetectors,phi,z,np,nz); @@ -1901,11 +2139,18 @@ const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci,Boo Double_t rpi2 = 2.*fR*TMath::Pi(); for (Int_t i=fI; iy) y += rpi2; if (yfYmax) continue; - if (fClusters[i]->GetQ()==0&&fSkip==2) continue; + // AD + // skip clusters that are in "extended" road but they + // 3sigma error does not touch the original road + if (z+fNMaxSigmaCl*TMath::Sqrt(fClusters[i]->GetSigmaZ2())GetSigmaZ2())>fZmax-fNMaxSigmaCl*fMaxSigmaClZ) continue; + // + if (TMath::Abs(fClusters[i]->GetQ())<1.e-13 && fSkip==2) continue; ci=i; if (!test) fI=i+1; return fClusters[i]; @@ -1914,7 +2159,7 @@ const AliITSRecPoint *AliITStrackerMI::AliITSlayer::GetNextCluster(Int_t &ci,Boo for (Int_t i=fI; ifYmax) continue; - if (fClustersCs[i]->GetQ()==0&&fSkip==2) continue; + if (TMath::Abs(fClustersCs[i]->GetQ())<1.e-13 && fSkip==2) continue; ci=fClusterIndexCs[i]; if (!test) fI=i+1; return fClustersCs[i]; @@ -2127,6 +2372,46 @@ Double_t AliITStrackerMI::GetEffectiveThickness() } return d/(xn*xn); } + +//------------------------------------------------------------------------ +Int_t AliITStrackerMI::GetEffectiveThicknessLbyL(Double_t* xMS, Double_t* x2x0MS) +{ + //-------------------------------------------------------------------- + // Returns the array of layers between the current layer and the vertex + //-------------------------------------------------------------------- + // + if(fUseTGeo!=0) { + if(fxOverX0Layer[0]<0) BuildMaterialLUT("Layers"); + if(fxOverX0Shield[0]<0) BuildMaterialLUT("Shields"); + if(fxOverX0Pipe<0) BuildMaterialLUT("Pipe"); + } + + int nl = 0; + double x0 = 0; + for (int il=fI;il--;) { + // + if (il==3) { + x2x0MS[nl] = (fUseTGeo==0 ? AliITSRecoParam::Getdshield(1) : fxOverX0Shield[1]); + xMS[nl++] = AliITSRecoParam::GetrInsideShield(1); + } + else if (il==1) { + x2x0MS[nl] = (fUseTGeo==0 ? AliITSRecoParam::Getdshield(0) : fxOverX0Shield[0]); + xMS[nl++] = AliITSRecoParam::GetrInsideShield(0); + } + // + x2x0MS[nl] = (fUseTGeo==0 ? fgLayers[il].GetThickness(0,0,x0) : fxOverX0Layer[il]); + xMS[nl++] = fgLayers[il].GetR(); + // + } + // + // beam pipe + x2x0MS[nl] = (fUseTGeo==0 ? AliITSRecoParam::GetdPipe() : fxOverX0Pipe); + xMS[nl++] = AliITSRecoParam::GetrPipe(); + // + return nl; +} + + //------------------------------------------------------------------------ Int_t AliITStrackerMI::AliITSlayer::InRoad() const { //------------------------------------------------------------------- @@ -2194,14 +2479,32 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, index[k]=clusters[k]; } - // special for cosmics: check which the innermost layer crossed - // by the track - Int_t innermostlayer=5; - Double_t drphi = TMath::Abs(track->GetD(0.,0.)); - for(innermostlayer=0; innermostlayerGetEventSpecie(); + ULong_t trStatus=0; + if(track->GetESDtrack()) trStatus=track->GetStatus(); + Int_t innermostlayer=0; + if((evsp&AliRecoParam::kCosmic) || (trStatus&AliESDtrack::kTPCin)) { + innermostlayer=5; + Double_t drphi = TMath::Abs(track->GetD(0.,0.)); + for(innermostlayer=0; innermostlayer= 0 ) break; + } + + AliDebug(2,Form(" drphi %f innermost %d",drphi,innermostlayer)); } - //printf(" drphi %f innermost %d\n",drphi,innermostlayer); Int_t modstatus=1; // found Float_t xloc,zloc; @@ -2218,6 +2521,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, for (Int_t ilayer = from; ilayer != to; ilayer += step) { AliITSlayer &layer=fgLayers[ilayer]; Double_t r=layer.GetR(); + if (step<0 && xx>r) break; // material between SSD and SDD, SDD and SPD @@ -2257,7 +2561,11 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, if (idet<0) return kFALSE; + const AliITSdetector &det=layer.GetDetector(idet); + // only for ITS-SA tracks refit + if (ilayer>1 && fTrackingPhase.Contains("RefitInward") && !(track->GetStatus()&AliESDtrack::kTPCin)) track->SetCheckInvariant(kFALSE); + // if (!track->Propagate(det.GetPhi(),det.GetR())) return kFALSE; track->SetDetectorIndex(idet); @@ -2317,7 +2625,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, track->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); - if (extra) { // search for extra clusters in overlapped modules + if (extra && clAcc) { // search for extra clusters in overlapped modules AliITStrackV2 tmp(*track); if (!ComputeRoad(track,ilayer,idet,zmin,zmax,ymin,ymax)) return kFALSE; layer.SelectClusters(zmin,zmax,ymin,ymax); @@ -2351,7 +2659,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, // cross material // add time if going outward if(!CorrectForLayerMaterial(track,ilayer,oldGlobXYZ,dir)) return kFALSE; - + track->SetCheckInvariant(kTRUE); } // end loop on layers if (!track->PropagateTo(xx,0.,0.)) return kFALSE; @@ -2459,12 +2767,17 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) // or there is a dead from OCDB) Float_t deadzonefactor = 0.; if (track->GetNDeadZone()>0.) { - Float_t sumDeadZoneProbability=0; - for(Int_t ilay=0;ilay<6;ilay++) sumDeadZoneProbability+=track->GetDeadZoneProbability(ilay); - Float_t nDeadZoneWithProbNot1=(Float_t)(track->GetNDeadZone())-sumDeadZoneProbability; - if(nDeadZoneWithProbNot1>0.) { - Float_t deadZoneProbability = sumDeadZoneProbability - (Float_t)((Int_t)sumDeadZoneProbability); - deadZoneProbability /= nDeadZoneWithProbNot1; + Int_t sumDeadZoneProbability=0; + for(Int_t ilay=0;ilay<6;ilay++) { + if(track->GetDeadZoneProbability(ilay)>0.) sumDeadZoneProbability++; + } + Int_t nDeadZoneWithProbNot1=(Int_t)(track->GetNDeadZone())-sumDeadZoneProbability; + if(nDeadZoneWithProbNot1>0) { + Float_t deadZoneProbability = track->GetNDeadZone()-(Float_t)sumDeadZoneProbability; + AliDebug(2,Form("nDeadZone %f sumDZProbability %d nDZWithProbNot1 %d deadZoneProb %f\n",track->GetNDeadZone(),sumDeadZoneProbability,nDeadZoneWithProbNot1,deadZoneProbability)); + deadZoneProbability /= (Float_t)nDeadZoneWithProbNot1; + Float_t one = 1.; + deadZoneProbability = TMath::Min(deadZoneProbability,one); deadzonefactor = 3.*(1.1-deadZoneProbability); } } @@ -2472,8 +2785,9 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) 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; + AliDebug(2,Form("match %f deadzonefactor %f chi2 %f sum %f skipped %f\n",match,deadzonefactor,chi2,sum,track->GetNSkipped())); + AliDebug(2,Form("NormChi2 %f cls %d\n",normchi2,track->GetNumberOfClusters())); + return normchi2; } //------------------------------------------------------------------------ Double_t AliITStrackerMI::GetMatchingChi2(const AliITStrackMI * track1,const AliITStrackMI * track2) @@ -2523,30 +2837,46 @@ Double_t AliITStrackerMI::GetSPDDeadZoneProbability(Double_t zpos, Double_t zer // // return probability that given point (characterized by z position and error) // is in SPD dead zone + // This method assumes that fSPDdetzcentre is ordered from -z to +z // Double_t probability = 0.; - Double_t absz = TMath::Abs(zpos); - 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 nearestz = 0.,distz=0.; + Int_t nearestzone = -1; + Double_t mindistz = 1000.; + + // find closest dead zone + for (Int_t i=0; i<3; i++) { + distz=TMath::Abs(zpos-0.5*(fSPDdetzcentre[i]+fSPDdetzcentre[i+1])); + if (distz0.25+3.*zerr) return probability; + + Double_t zmin, zmax; - if (zpos<-6.) { // dead zone at z = -7 + if (nearestzone==0) { // dead zone at z = -7 zmin = fSPDdetzcentre[0] + 0.5*AliITSRecoParam::GetSPDdetzlength(); zmax = fSPDdetzcentre[1] - 0.5*AliITSRecoParam::GetSPDdetzlength(); - } else if (zpos>6.) { // dead zone at z = +7 - zmin = fSPDdetzcentre[2] + 0.5*AliITSRecoParam::GetSPDdetzlength(); - zmax = fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength(); - } else if (absz<2.) { // dead zone at z = 0 + } else if (nearestzone==1) { // dead zone at z = 0 zmin = fSPDdetzcentre[1] + 0.5*AliITSRecoParam::GetSPDdetzlength(); zmax = fSPDdetzcentre[2] - 0.5*AliITSRecoParam::GetSPDdetzlength(); + } else if (nearestzone==2) { // dead zone at z = +7 + zmin = fSPDdetzcentre[2] + 0.5*AliITSRecoParam::GetSPDdetzlength(); + zmax = fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength(); } else { zmin = 0.; zmax = 0.; } // 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.)) ); + probability = 0.5*( AliMathBase::ErfFast((zpos-zmin)/zerr/TMath::Sqrt(2.)) - + AliMathBase::ErfFast((zpos-zmax)/zerr/TMath::Sqrt(2.)) ); + AliDebug(2,Form("zpos %f +- %f nearestzone %d zmin zmax %f %f prob %f\n",zpos,zerr,nearestzone,zmin,zmax,probability)); return probability; } //------------------------------------------------------------------------ @@ -2674,9 +3004,9 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id Int_t l=(index & 0xf0000000) >> 28; Int_t c=(index & 0x0fffffff) >> 00; if (c>fgLayers[l].GetNumberOfClusters()) continue; - if (ny[l]==0){ - printf("problem\n"); - } + // if (ny[l]<1.e-13){ + // printf("problem\n"); + // } AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index); Float_t weight=1; // @@ -2697,6 +3027,7 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id if (fgLayers[l].GetClusterTracks(itrack,c)>=0 && fgLayers[l].GetClusterTracks(itrack,c)!=id){ list[l]=index; clist[l] = (AliITSRecPoint*)GetCluster(index); + track->SetSharedWeight(l,weight); shared+=weight; break; } @@ -2724,9 +3055,9 @@ Int_t AliITStrackerMI::GetOverlapTrack(const AliITStrackMI *track, Int_t trackID Int_t index = clusterlist[icluster]; Int_t l=(index & 0xf0000000) >> 28; Int_t c=(index & 0x0fffffff) >> 00; - if (ny[l]==0){ - printf("problem\n"); - } + // if (ny[l]<1.e-13){ + // printf("problem\n"); + // } if (c>fgLayers[l].GetNumberOfClusters()) continue; //if (l>3) continue; AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(index); @@ -2759,7 +3090,7 @@ Int_t AliITStrackerMI::GetOverlapTrack(const AliITStrackMI *track, Int_t trackID else{ // Int_t tracks2[24], cluster[24]; - for (Int_t i=0;iUncheckedAt(0); AliITStrackMI * track20=(AliITStrackMI*) arr2->UncheckedAt(0); if (track10->Pt()>0.5+track20->Pt()) return track10; - + // for (Int_t itrack=0;itrackUncheckedAt(itrack); UnRegisterClusterTracks(track,trackID1); @@ -3028,12 +3359,14 @@ AliITStrackMI * AliITStrackerMI::GetBest2Tracks(Int_t trackID1, Int_t trackID2, track1->SetChi2MIP(8,index1); fBestTrackIndex[trackID1] =index1; UpdateESDtrack(track1, AliESDtrack::kITSin); + original->SetWinner(track1); } else if (track10->GetChi2MIP(0)SetChi2MIP(5,maxconflicts); track10->SetChi2MIP(6,maxchi2); // track10->UpdateESDtrack(AliESDtrack::kITSin); UpdateESDtrack(track10,AliESDtrack::kITSin); + original->SetWinner(track10); } for (Int_t itrack=0;itrack=fTrackHypothesys.GetEntriesFast()) - fTrackHypothesys.Expand(TMath::Max(fTrackHypothesys.GetSize(),esdindex*2+10)); // TObjArray * array = (TObjArray*) fTrackHypothesys.At(esdindex); if (!array) { array = new TObjArray(10); - fTrackHypothesys.AddAt(array,esdindex); + fTrackHypothesys.AddAtAndExpand(array,esdindex); } array->AddLast(track); } @@ -3109,6 +3440,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo Float_t minchi2=10000; Int_t maxn=0; AliITStrackMI * besttrack=0; + // for (Int_t itrack=0;itrackGetEntriesFast();itrack++){ AliITStrackMI * track = (AliITStrackMI*)array->At(itrack); if (!track) continue; @@ -3124,6 +3456,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo if (chi2GetMaxChi2PerCluster(0)){ if (track->GetNumberOfClusters()GetNumberOfClusters(); + // if (fSelectBestMIP03 && track->GetChi2MIP(3)>0) chi2 *= track->GetChi2MIP(3); // RS if (chi2At(itrack); if (track){ - track->SetChi2MIP(0,GetNormalizedChi2(track, mode)); - if (track->GetChi2MIP(0)GetMaxChi2PerCluster(0)) - chi2[itrack] = track->GetChi2MIP(0); + AliDebug(2,Form("track %d ncls %d\n",itrack,track->GetNumberOfClusters())); + double chi2t = GetNormalizedChi2(track, mode); + track->SetChi2MIP(0,chi2t); + if (chi2tGetMaxChi2PerCluster(0)) { + if (fSelectBestMIP03 && track->GetChi2MIP(3)>0) chi2t *= track->GetChi2MIP(3); // RS + chi2[itrack] = chi2t; + } else{ if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain delete array->RemoveAt(itrack); @@ -3171,6 +3508,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo // TMath::Sort(entries,chi2,index,kFALSE); besttrack = (AliITStrackMI*)array->At(index[0]); + if(besttrack) AliDebug(2,Form("ncls best track %d\n",besttrack->GetNumberOfClusters())); if (besttrack&&besttrack->GetChi2MIP(0)GetMaxChi2PerCluster(0)){ for (Int_t j=0;j<6;j++){ if (besttrack->GetClIndex(j)>=0){ @@ -3187,15 +3525,18 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo for (Int_t itrack=0;itrackAt(itrack); if (track){ - track->SetChi2MIP(0,GetNormalizedChi2(track,mode)); - if (track->GetChi2MIP(0)GetMaxChi2PerCluster(0)) - chi2[itrack] = track->GetChi2MIP(0)-0*(track->GetNumberOfClusters()+track->GetNDeadZone()); - else - { - if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain - delete array->RemoveAt(itrack); - } + double chi2t = GetNormalizedChi2(track, mode); + track->SetChi2MIP(0,chi2t); + AliDebug(2,Form("track %d ncls %d\n",itrack,track->GetNumberOfClusters())); + if (track->GetChi2MIP(0)GetMaxChi2PerCluster(0)) { + if (fSelectBestMIP03 && track->GetChi2MIP(3)>0) chi2t *= track->GetChi2MIP(3); // RS + chi2[itrack] = chi2t; //-0*(track->GetNumberOfClusters()+track->GetNDeadZone()); + } + else { + if (track->GetConstrain() || track->GetNumberOfClusters()>5){ //keep best short tracks - without vertex constrain + delete array->RemoveAt(itrack); } + } } } entries = array->GetEntriesFast(); @@ -3206,6 +3547,7 @@ void AliITStrackerMI::SortTrackHypothesys(Int_t esdindex, Int_t maxcut, Int_t mo TMath::Sort(entries,chi2,index,kFALSE); besttrack = (AliITStrackMI*)array->At(index[0]); if (besttrack){ + AliDebug(2,Form("ncls best track %d %f %f\n",besttrack->GetNumberOfClusters(),besttrack->GetChi2MIP(0),chi2[index[0]])); // for (Int_t j=0;j<6;j++){ if (besttrack->GetNz(j)>0&&besttrack->GetNy(j)>0){ @@ -3266,6 +3608,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI //------------------------------------------------------------- // try to find best hypothesy // currently - minimal chi2 of track+backpropagated track+matching to the tpc track + // RS: optionally changing this to product of Chi2MIP(0)*Chi2MIP(3) == (chi2*chi2_interpolated) //------------------------------------------------------------- if (fTrackHypothesys.GetEntriesFast()<=esdindex) return 0; TObjArray * array = (TObjArray*) fTrackHypothesys.At(esdindex); @@ -3296,7 +3639,10 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI backtrack = new(backtrack) AliITStrackMI(*track); if (track->GetConstrain()) { if (!CorrectForPipeMaterial(backtrack,"inward")) continue; - if (!backtrack->Improve(0,xyzVtx,ersVtx)) continue; + if (AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + if (fUseImproveKalman) {if (!backtrack->ImproveKalman(xyzVtx,ersVtx,0,0,0)) continue;} + else {if (!backtrack->Improve(0,xyzVtx,ersVtx)) continue;} + } backtrack->ResetCovariance(10.); }else{ backtrack->ResetCovariance(10.); @@ -3322,7 +3668,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI forwardtrack = new(forwardtrack) AliITStrackMI(*original); forwardtrack->ResetClusters(); x = track->GetX(); - RefitAt(x,forwardtrack,track); + if (!RefitAt(x,forwardtrack,track) && fSelectBestMIP03) continue; // w/o fwd track MIP03 is meaningless 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; @@ -3345,7 +3691,9 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI track->SetChi2MIP(3,1000); continue; } - Double_t chi2 = track->GetChi2MIP(0)+track->GetNUsed(); + Double_t chi2 = track->GetChi2MIP(0); // +track->GetNUsed(); //RS + if (fSelectBestMIP03) chi2 *= track->GetChi2MIP(3); + else chi2 += track->GetNUsed(); // for (Int_t ichi=0;ichi<5;ichi++){ forwardtrack->SetChi2MIP(ichi, track->GetChi2MIP(ichi)); @@ -3363,6 +3711,9 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI } delete backtrack; delete forwardtrack; + + if (!besttrack) return 0; + Int_t accepted=0; for (Int_t i=0;iAt(i); @@ -3370,8 +3721,10 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI if (!track) continue; if (accepted>checkmax || track->GetChi2MIP(3)>AliITSReconstructor::GetRecoParam()->GetMaxChi2PerCluster(3)*6. || - (track->GetNumberOfClusters()GetNumberOfClusters()-1.)|| - track->GetChi2MIP(0)>besttrack->GetChi2MIP(0)+2.*besttrack->GetNUsed()+3.){ + (track->GetNumberOfClusters()GetNumberOfClusters()-1.) + // RS: don't apply this cut when fSelectBestMIP03 is on + || (!fSelectBestMIP03 && (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; @@ -3405,6 +3758,9 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI longtrack =track; } //if (longtrack) besttrack=longtrack; + // + // RS do shared cluster analysis here only if the new sharing analysis is not requested + //RRR if (fFlagFakes) return besttrack; Int_t list[6]; AliITSRecPoint * clist[6]; @@ -3421,7 +3777,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI Int_t sharedtrack = GetOverlapTrack(besttrack, esdindex, nshared, list, overlist); if (sharedtrack>=0){ // - besttrack = GetBest2Tracks(esdindex,sharedtrack,10,5.5); + besttrack = GetBest2Tracks(esdindex,sharedtrack,10,5.5,original); if (besttrack){ shared = GetNumberOfSharedClusters(besttrack,esdindex,list,clist); } @@ -3502,13 +3858,15 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) } if (trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone()GetChi2MIP(0); - if (fAfterV0){ + if (fSelectBestMIP03) chi2 *= trackHyp->GetChi2MIP(3); + if (trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone()>minn) maxchi2 = chi2; //trackHyp->GetChi2MIP(0); + // + if (fAfterV0){ // ??? RS if (!trackHyp->GetGoldV0()&&trackHyp->GetConstrain()==kFALSE) chi2+=5; } - if (trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone()>minn) maxchi2 = trackHyp->GetChi2MIP(0); - // if (chi2 > maxchi2) continue; - minn= trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone(); + minn = trackHyp->GetNumberOfClusters()+trackHyp->GetNDeadZone(); + if (fSelectBestMIP03) minn++; // allow next to longest to win maxchi2 = chi2; longtrack=trackHyp; } @@ -3535,22 +3893,156 @@ void AliITStrackerMI::GetBestHypothesysMIP(TObjArray &itsTracks) Int_t sharedtrack = GetOverlapTrack(longtrack, i, nshared, list, overlist); //if (sharedtrack==-1) sharedtrack=0; if (sharedtrack>=0) { - besttrack = GetBest2Tracks(i,sharedtrack,10,5.5); + besttrack = GetBest2Tracks(i,sharedtrack,10,5.5,track); } } if (besttrack&&fAfterV0) { UpdateESDtrack(besttrack,AliESDtrack::kITSin); + track->SetWinner(besttrack); } - if (besttrack&&fConstraint[fPass]) - UpdateESDtrack(besttrack,AliESDtrack::kITSin); - 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); - } - - } + if (besttrack) { + if (fConstraint[fPass]) { + UpdateESDtrack(besttrack,AliESDtrack::kITSin); + track->SetWinner(besttrack); + } + 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::FlagFakes(const TObjArray &itsTracks) +{ + // + // RS: flag those tracks which are suxpected to have fake clusters + // + const double kThreshPt = 0.5; + AliRefArray *refArr[6]; + // + for (int i=0;i<6;i++) { + int ncl = fgLayers[i].GetNumberOfClusters(); + refArr[i] = new AliRefArray(ncl,TMath::Min(ncl,1000)); + } + Int_t nentries = itsTracks.GetEntriesFast(); + // + // fill cluster->track associations + for (Int_t itr=0;itrGetWinner(); + if (!trackITS) continue; + for (int il=trackITS->GetNumberOfClusters();il--;) { + int idx = trackITS->GetClusterIndex(il); + Int_t l=(idx & 0xf0000000) >> 28, c=(idx & 0x0fffffff) >> 00; + // if (c>fgLayers[l].GetNumberOfClusters()) continue; + refArr[l]->AddReference(c, itr); + } + } + // + const UInt_t kMaxRef = 100; + UInt_t crefs[kMaxRef]; + Int_t ncrefs=0; + // process tracks with shared clusters + for (int itr=0;itrGetWinner(); + if (!trackH0) continue; + AliESDtrack* esd0 = track0->GetESDtrack(); + // + for (int il=0;ilGetNumberOfClusters();il++) { + int idx = trackH0->GetClusterIndex(il); + Int_t l=(idx & 0xf0000000) >> 28, c=(idx & 0x0fffffff) >> 00; + ncrefs = refArr[l]->GetReferences(c,crefs,kMaxRef); + if (ncrefs<2) continue; // there will be always self-reference, for sharing needs at least 2 + esd0->SetITSSharedFlag(l); + for (int ir=ncrefs;ir--;) { + if (int(crefs[ir]) <= itr) continue; // ==:selfreference, <: the same pair will be checked with > + AliITStrackMI* track1 = (AliITStrackMI*)itsTracks.UncheckedAt(crefs[ir]); + AliITStrackMI* trackH1 = track1->GetWinner(); + AliESDtrack* esd1 = track1->GetESDtrack(); + esd1->SetITSSharedFlag(l); + // + double pt0 = trackH0->Pt(), pt1 = trackH1->Pt(), res = 0.; + if (pt0>kThreshPt && pt0-pt1>0.2+0.2*(pt0-kThreshPt) ) res = -100; + else if (pt1>kThreshPt && pt1-pt0>0.2+0.2*(pt1-kThreshPt) ) res = 100; + + // select the one with smallest chi2's product + res += trackH0->GetChi2MIP(0)*trackH0->GetChi2MIP(3); + res -= trackH1->GetChi2MIP(0)*trackH1->GetChi2MIP(3); + // + if (res<0) esd1->SetITSFakeFlag(); // esd0 is winner + else esd0->SetITSFakeFlag(); // esd1 is winner + } + // + } + // + } + // + for (int i=6;i--;) delete refArr[i]; +} + + + +//------------------------------------------------------------------------ +void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const { + //-------------------------------------------------------------------- + //This function "cooks" a track label. If label<0, this track is fake. + //-------------------------------------------------------------------- + const int kMaxLbPerCl = 3; + int lbID[36],lbStat[36]; + Int_t nLab=0, nCl = track->GetNumberOfClusters(); + // + // track->SetLabel(-1); + // track->SetFakeRatio(0); + // + for (Int_t i=0;iGetClusterIndex(i); + // Int_t l=(cindex & 0xf0000000) >> 28; + AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex); + // + for (int imc=0;imcGetLabel(imc); + if (trLb<0) break; + // search this mc track in already accounted ones + int iLab; + for (iLab=0;iLabGetESDtrack() && track->GetESDtrack()->IsOn(AliESDtrack::kTPCin)){ + tpcLabel = TMath::Abs(track->GetESDtrack()->GetTPCLabel()); + } + // + // find majority label + if (nCl && nLab) { + int maxLab=0,tpcLabID=-1; + for (int ilb=nLab;ilb--;) { + int st = lbStat[ilb]; + if (lbStat[maxLab]0 && (tpcLabID!=maxLab) && lbStat[maxLab]==lbStat[tpcLabID]) maxLab=tpcLabID; + + track->SetFakeRatio(1.-float(lbStat[maxLab])/nCl); + track->SetLabel( lbStat[maxLab]>=nCl-wrong ? lbID[maxLab] : -lbID[maxLab]); + } + // +} + +/* //------------------------------------------------------------------------ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const { //-------------------------------------------------------------------- @@ -3558,8 +4050,11 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const { //-------------------------------------------------------------------- Int_t tpcLabel=-1; - if ( track->GetESDtrack()) tpcLabel = TMath::Abs(track->GetESDtrack()->GetTPCLabel()); - + if (track->GetESDtrack()){ + tpcLabel = track->GetESDtrack()->GetTPCLabel(); + ULong_t trStatus=track->GetESDtrack()->GetStatus(); + if(!(trStatus&AliESDtrack::kTPCin)) tpcLabel=track->GetLabel(); // for ITSsa tracks + } track->SetChi2MIP(9,0); Int_t nwrong=0; for (Int_t i=0;iGetNumberOfClusters();i++){ @@ -3568,9 +4063,8 @@ void AliITStrackerMI::CookLabel(AliITStrackMI *track,Float_t wrong) const { 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; - AliDebug(2,Form("icl %d ilab %d lab %d",i,ind,cl->GetLabel(ind))); + if (cl->GetLabel(ind)==TMath::Abs(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<GetNumberOfClusters(); if (nclusters > 0) //PH Some tracks don't have any cluster track->SetFakeRatio(double(nwrong)/double(nclusters)); - if (tpcLabel>0){ - if (track->GetFakeRatio()>wrong) track->SetLabel(-tpcLabel); - else - track->SetLabel(tpcLabel); + if (tpcLabel>0 && track->GetFakeRatio()>wrong) { + track->SetLabel(-tpcLabel); + } else { + track->SetLabel(tpcLabel); } - AliDebug(2,Form(" nls %d wrong %d label %d tpcLabel %d\n",nclusters,nwrong,track->GetLabel(),tpcLabel)); - + AliDebug(2,Form(" nls %d wrong %d label %d tpcLabel %d\n",nclusters,nwrong,track->GetLabel(),tpcLabel)); } +*/ + //------------------------------------------------------------------------ -void AliITStrackerMI::CookdEdx(AliITStrackMI* track) -{ +void AliITStrackerMI::CookdEdx(AliITStrackMI* track){ + // + // Fill the dE/dx in this track // track->SetChi2MIP(9,0); for (Int_t i=0;iGetNumberOfClusters();i++){ @@ -3621,17 +4117,17 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR // // Compute predicted chi2 // - Float_t erry,errz; - Float_t theta = track->GetTgl(); - Float_t phi = track->GetSnp(); - 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->Propagate(xTrOrig+cluster->GetX())) return 1000.; + Float_t erry,errz,covyz; + Float_t theta = track->GetTgl(); + Float_t phi = track->GetSnp(); + phi *= TMath::Sqrt(1./((1.-phi)*(1.+phi))); + AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz,covyz); + 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())); 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); + Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz,covyz); // Bring the track back to detector plane in ideal geometry // [mis-alignment will be accounted for in UpdateMI()] if (!track->Propagate(xTrOrig)) return 1000.; @@ -3647,6 +4143,7 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR track->SetNz(layer,nz); track->SetSigmaY(layer,erry); track->SetSigmaZ(layer, errz); + track->SetSigmaYZ(layer,covyz); //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())*(1.+track->GetSnp())))); return chi2; @@ -3667,7 +4164,7 @@ Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,D } } - if (cl->GetQ()<=0) return 0; // ingore the "virtual" clusters + if (TMath::Abs(cl->GetQ())<1.e-13) return 0; // ingore the "virtual" clusters // Take into account the mis-alignment (bring track to cluster plane) @@ -3678,18 +4175,17 @@ Int_t AliITStrackerMI::UpdateMI(AliITStrackMI* track, const AliITSRecPoint* cl,D AliDebug(2,Form(" xtr %f xcl %f",track->GetX(),cl->GetX())); if (!track->Propagate(xTrOrig+cl->GetX())) return 0; - AliCluster c(*cl); c.SetSigmaY2(track->GetSigmaY(layer)*track->GetSigmaY(layer)); c.SetSigmaZ2(track->GetSigmaZ(layer)*track->GetSigmaZ(layer)); + c.SetSigmaYZ(track->GetSigmaYZ(layer)); Int_t updated = track->UpdateMI(&c,chi2,index); - // Bring the track back to detector plane in ideal geometry if (!track->Propagate(xTrOrig)) return 0; - + if(!updated) AliDebug(2,"update failed"); return updated; } @@ -3702,8 +4198,9 @@ void AliITStrackerMI::GetDCASigma(const AliITStrackMI* track, Float_t & sigmarfi //to be paramterized using external parameters in future // // - sigmarfi = 0.0040+1.4 *TMath::Abs(track->GetC())+332.*track->GetC()*track->GetC(); - sigmaz = 0.0110+4.37*TMath::Abs(track->GetC()); + Double_t curv=track->GetC(); + sigmarfi = 0.0040+1.4 *TMath::Abs(curv)+332.*curv*curv; + sigmaz = 0.0110+4.37*TMath::Abs(curv); } //------------------------------------------------------------------------ void AliITStrackerMI::SignDeltas(const TObjArray *clusterArray, Float_t vz) @@ -3785,9 +4282,9 @@ void AliITStrackerMI::UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const AliITStrackMI * oldtrack = (AliITStrackMI*)(track->GetESDtrack()->GetITStrack()); if (oldtrack) delete oldtrack; track->GetESDtrack()->SetITStrack(new AliITStrackMI(*track)); - if (TMath::Abs(track->GetDnorm(1))<0.000000001){ - printf("Problem\n"); - } + // if (TMath::Abs(track->GetDnorm(1))<0.000000001){ + // printf("Problem\n"); + // } } //------------------------------------------------------------------------ Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{ @@ -3830,7 +4327,7 @@ void AliITStrackerMI::BuildMaterialLUT(TString material) { } else { Error("BuildMaterialLUT","Wrong layer name\n"); } - + const double kAngEps = 1e-4; // tiny slope to avoid tracks strictly normal to Z axis for(Int_t imat=ifirst; imat<=ilast; imat++) { Double_t param[5]={0.,0.,0.,0.,0.}; for (Int_t i=0; i999) {n--; continue;} // skip anomalous values in failed propagation for(Int_t j=0;j<5;j++) param[j]+=mparam[j]; } for(Int_t j=0;j<5;j++) param[j]/=(Float_t)n; @@ -4227,6 +4725,36 @@ void AliITStrackerMI::DeleteTrksMaterialLUT() { return; } //------------------------------------------------------------------------ +void AliITStrackerMI::SetForceSkippingOfLayer() { + //----------------------------------------------------------------- + // Check if we are forced to skip layers + // either we set to skip them in RecoParam + // or they were off during data-taking + //----------------------------------------------------------------- + + const AliEventInfo *eventInfo = GetEventInfo(); + + for(Int_t l=0; lGetLayersToSkip(l)) fForceSkippingOfLayer[l] = 1; + // check run info + + if(eventInfo && + AliITSReconstructor::GetRecoParam()->GetSkipSubdetsNotInTriggerCluster()) { + AliDebug(2,Form("GetEventInfo->GetTriggerCluster: %s",eventInfo->GetTriggerCluster())); + if(l==0 || l==1) { + if(!strstr(eventInfo->GetTriggerCluster(),"ITSSPD")) fForceSkippingOfLayer[l] = 1; + } else if(l==2 || l==3) { + if(!strstr(eventInfo->GetTriggerCluster(),"ITSSDD")) fForceSkippingOfLayer[l] = 1; + } else { + if(!strstr(eventInfo->GetTriggerCluster(),"ITSSSD")) fForceSkippingOfLayer[l] = 1; + } + } + } + return; +} +//------------------------------------------------------------------------ Int_t AliITStrackerMI::CheckSkipLayer(const AliITStrackMI *track, Int_t ilayer,Int_t idet) const { //----------------------------------------------------------------- @@ -4234,17 +4762,22 @@ Int_t AliITStrackerMI::CheckSkipLayer(const AliITStrackMI *track, // without clusters, because we want to skip the layer. // In this case the return value is > 0: // return 1: the user requested to skip a layer - // return 2: track outside z acceptance of SSD/SDD and will cross both SPD + // return 2: track outside z acceptance //----------------------------------------------------------------- - if (AliITSReconstructor::GetRecoParam()->GetLayersToSkip(ilayer)) return 1; + if (ForceSkippingOfLayer(ilayer)) return 1; - if (idet<0 && ilayer>1 && AliITSReconstructor::GetRecoParam()->GetExtendedEtaAcceptance()) { + Int_t innerLayCanSkip=0; // was 2, changed on 05.11.2009 + + if (idet<0 && // out in z + ilayer>innerLayCanSkip && + AliITSReconstructor::GetRecoParam()->GetExtendedEtaAcceptance()) { // check if track will cross SPD outer layer Double_t phiAtSPD2,zAtSPD2; if (track->GetPhiZat(fgLayers[1].GetR(),phiAtSPD2,zAtSPD2)) { if (TMath::Abs(zAtSPD2)<2.*AliITSRecoParam::GetSPDdetzlength()) return 2; } + return 2; // always allow skipping, changed on 05.11.2009 } return 0; @@ -4259,6 +4792,7 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, // without clusters, because there is a dead zone in the road. // In this case the return value is > 0: // return 1: dead zone at z=0,+-7cm in SPD + // This method assumes that fSPDdetzcentre is ordered from -z to +z // return 2: all road is "bad" (dead or noisy) from the OCDB // return 3: at least a chip is "bad" (dead or noisy) from the OCDB // return 4: at least a single channel is "bad" (dead or noisy) from the OCDB @@ -4274,8 +4808,8 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength()}; for (Int_t i=0; i<3; i++) if (track->GetZ()-dzGetZ()+dz>zmindead[i]) { - AliDebug(2,Form("crack SPD %d",ilayer)); - return 1; + AliDebug(2,Form("crack SPD %d track z %f %f %f %f\n",ilayer,track->GetZ(),dz,zmaxdead[i],zmindead[i])); + if (GetSPDDeadZoneProbability(track->GetZ(),TMath::Sqrt(track->GetSigmaZ2()))>0.1) return 1; } } @@ -4303,7 +4837,7 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, // check if the road overlaps with bad chips Float_t xloc,zloc; - LocalModuleCoord(ilayer,idet,track,xloc,zloc); + if(!(LocalModuleCoord(ilayer,idet,track,xloc,zloc)))return 0; Float_t zlocmin = zloc-dz; Float_t zlocmax = zloc+dz; Float_t xlocmin = xloc-dy; @@ -4312,10 +4846,10 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, // check if road goes out of detector Bool_t touchNeighbourDet=kFALSE; - if (TMath::Abs(xlocmin)>0.5*detSizeX) {xlocmin=-0.5*detSizeX; touchNeighbourDet=kTRUE;} - if (TMath::Abs(xlocmax)>0.5*detSizeX) {xlocmax=+0.5*detSizeX; touchNeighbourDet=kTRUE;} - if (TMath::Abs(zlocmin)>0.5*detSizeZ) {zlocmin=-0.5*detSizeZ; touchNeighbourDet=kTRUE;} - if (TMath::Abs(zlocmax)>0.5*detSizeZ) {zlocmax=+0.5*detSizeZ; touchNeighbourDet=kTRUE;} + if (TMath::Abs(xlocmin)>0.5*detSizeX) {xlocmin=-0.4999*detSizeX; touchNeighbourDet=kTRUE;} + if (TMath::Abs(xlocmax)>0.5*detSizeX) {xlocmax=+0.4999*detSizeX; touchNeighbourDet=kTRUE;} + if (TMath::Abs(zlocmin)>0.5*detSizeZ) {zlocmin=-0.4999*detSizeZ; touchNeighbourDet=kTRUE;} + if (TMath::Abs(zlocmax)>0.5*detSizeZ) {zlocmax=+0.4999*detSizeZ; touchNeighbourDet=kTRUE;} AliDebug(2,Form("layer %d det %d zmim zmax %f %f xmin xmax %f %f %f %f",ilayer,idet,zlocmin,zlocmax,xlocmin,xlocmax,detSizeZ,detSizeX)); // check if this detector is bad @@ -4328,6 +4862,7 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, } } + if(zlocmin>zlocmax)return 0; Int_t nChipsInRoad = segm->GetChipsInLocalWindow(chipsInRoad,zlocmin,zlocmax,xlocmin,xlocmax); AliDebug(2,Form("lay %d nChipsInRoad %d",ilayer,nChipsInRoad)); if (!nChipsInRoad) return 0; @@ -4386,7 +4921,7 @@ Bool_t AliITStrackerMI::LocalModuleCoord(Int_t ilayer,Int_t idet, xloc=0.; zloc=0.; - if(idet<0) return kFALSE; + if(idet<0) return kTRUE; // track out of z acceptance of layer Int_t ndet=AliITSgeomTGeo::GetNDetectors(ilayer+1); // layers from 1 to 6 @@ -4408,7 +4943,8 @@ Bool_t AliITStrackerMI::LocalModuleCoord(Int_t ilayer,Int_t idet, return kTRUE; } //------------------------------------------------------------------------ -Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t *clusters, Int_t ilayer) const { +//------------------------------------------------------------------------ +Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t *clusters, Int_t ilayer){ // // Method to be optimized further: // Aim: decide whether a track can be used for PlaneEff evaluation @@ -4444,19 +4980,30 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t AliITStrackMI tmp(*track); // require a minimal number of cluster in other layers and eventually clusters in closest layers - Int_t ncl=0; - for(Int_t lay=AliITSgeomTGeo::kNLayers-1;lay>ilayer;lay--) { + Int_t nclout=0; Int_t nclin=0; + for(Int_t lay=AliITSgeomTGeo::kNLayers-1;lay>ilayer;lay--) { // count n. of cluster in outermost layers + 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) nclout++; +if(index[lay]>=0)nclout++; + } + for(Int_t lay=ilayer-1; lay>=0;lay--) { // count n. of cluster in innermost layers 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 (index[lay]>=0) nclin++; } + Int_t ncl=nclout+nclin; 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 ); Bool_t nextin = kFALSE; if(ilayer==0) nextin=kTRUE; // you are already on the innermost layer else nextin = ((index[ilayer-1]>=0)? kTRUE : kFALSE ); - if(nclGetMaxMissingClustersPlaneEff()) + // maximum number of missing clusters allowed in outermost layers + if(ncloutGetMaxMissingClustersOutPlaneEff()) + return kFALSE; + // maximum number of missing clusters allowed (both in innermost and in outermost layers) + if(nclGetMaxMissingClustersPlaneEff()) return kFALSE; if(AliITSReconstructor::GetRecoParam()->GetRequireClusterInOuterLayerPlaneEff() && !nextout) return kFALSE; if(AliITSReconstructor::GetRecoParam()->GetRequireClusterInInnerLayerPlaneEff() && !nextin) return kFALSE; @@ -4486,14 +5033,22 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t //*************** // DEFINITION OF SEARCH ROAD FOR accepting a track // - //For the time being they are hard-wired, later on from AliITSRecoParam - // Double_t nsigx=AliITSRecoParam::GetNSigXFarFromBoundary(); - // Double_t nsigz=AliITSRecoParam::GetNSigZFarFromBoundary(); - Double_t nsigz=4; - Double_t nsigx=4; - Double_t dx=nsigx*TMath::Sqrt(tmp.GetSigmaY2()); // those are precisions in the tracking reference system - Double_t dz=nsigz*TMath::Sqrt(tmp.GetSigmaZ2()); // Use it also for the module reference system, as it is - // done for RecPoints + Double_t nsigx=AliITSReconstructor::GetRecoParam()->GetNSigXFromBoundaryPlaneEff(); + Double_t nsigz=AliITSReconstructor::GetRecoParam()->GetNSigZFromBoundaryPlaneEff(); + Double_t distx=AliITSReconstructor::GetRecoParam()->GetDistXFromBoundaryPlaneEff(); + Double_t distz=AliITSReconstructor::GetRecoParam()->GetDistZFromBoundaryPlaneEff(); + Double_t dx=nsigx*TMath::Sqrt(tmp.GetSigmaY2()) + distx; + // those are precisions in the tracking reference system + Double_t dz=nsigz*TMath::Sqrt(tmp.GetSigmaZ2()) + distz; + // Use it also for the module reference system, as it is done for RecPoints + + if(AliITSReconstructor::GetRecoParam()->GetSwitchOnMaxDistNSigFrmBndPlaneEff()){ + if(nsigx*TMath::Sqrt(tmp.GetSigmaY2())<=distx) dx -= nsigx*TMath::Sqrt(tmp.GetSigmaY2()); + else dx -= distx; + + if(nsigz*TMath::Sqrt(tmp.GetSigmaZ2())<=distz) dz -= nsigz*TMath::Sqrt(tmp.GetSigmaZ2()); + else dz -= distz; + } // exclude tracks at boundary between detectors //Double_t boundaryWidth=AliITSRecoParam::GetBoundaryWidthPlaneEff(); @@ -4501,11 +5056,32 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(const AliITStrackMI* track, const Int_t AliDebug(2,Form("Tracking: track impact x=%f, y=%f, z=%f",tmp.GetX(), tmp.GetY(), tmp.GetZ())); AliDebug(2,Form("Local: track impact x=%f, z=%f",locx,locz)); AliDebug(2,Form("Search Road. Tracking: dy=%f , dz=%f",dx,dz)); - if ( (locx-dx < blockXmn+boundaryWidth) || (locx+dx > blockXmx-boundaryWidth) || (locz-dz < blockZmn+boundaryWidth) || (locz+dz > blockZmx-boundaryWidth) ) return kFALSE; + + if(ilayer==0){ + const AliESDEvent *myesd = ((AliESDtrack*)tmp.GetESDtrack())->GetESDEvent(); + //The beam pipe + if (CorrectForPipeMaterial(&tmp,"inward")) { + const AliESDVertex* vtx = myesd->GetVertex(); + if(!vtx) return kFALSE; + Double_t ddz[2],cov[3]; + Double_t maxD=3.; + if(!tmp.PropagateToDCA(vtx,AliTracker::GetBz(),maxD,ddz,cov)) return kFALSE; + if(TMath::Abs(ddz[0])>=AliITSReconstructor::GetRecoParam()->GetDCACutPlaneEff()) return kFALSE; + + Double_t covar[6]; vtx->GetCovMatrix(covar); + Double_t p[2]={tmp.GetParameter()[0]-ddz[0],tmp.GetParameter()[1]-ddz[1]}; + Double_t c[3]={covar[2],0.,covar[5]}; + Double_t chi2= ((AliESDtrack*)tmp.GetESDtrack())->GetPredictedChi2(p,c); + if (chi2>AliITSReconstructor::GetRecoParam()->GetVertexChi2CutPlaneEff()) return kFALSE; // Use this to cut on chi^2 + + } else return kFALSE; + } + + return kTRUE; } //------------------------------------------------------------------------ @@ -4584,9 +5160,32 @@ void AliITStrackerMI::UseTrackForPlaneEff(const AliITStrackMI* track, Int_t ilay msz *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadZNonC(); msy *= AliITSReconstructor::GetRecoParam()->GetNSigma2RoadYNonC(); } + + if(AliITSReconstructor::GetRecoParam()->GetSwitchOffStdSearchClusPlaneEff()){ + Double_t nsigx=AliITSReconstructor::GetRecoParam()->GetNSigXSearchClusterPlaneEff(); + Double_t nsigz=AliITSReconstructor::GetRecoParam()->GetNSigZSearchClusterPlaneEff(); + Double_t distx=AliITSReconstructor::GetRecoParam()->GetDistXSearchClusterPlaneEff(); + Double_t distz=AliITSReconstructor::GetRecoParam()->GetDistZSearchClusterPlaneEff(); + msy = nsigx*TMath::Sqrt(tmp.GetSigmaY2()) + distx; + msz = nsigz*TMath::Sqrt(tmp.GetSigmaZ2()) + distz; + + if(AliITSReconstructor::GetRecoParam()->GetSwitchOnMaxDistNSigSrhClusPlaneEff()){ + if(nsigx*TMath::Sqrt(tmp.GetSigmaY2())<=distx) msy -= nsigx*TMath::Sqrt(tmp.GetSigmaY2()); + else msy -= distx; + + if(nsigz*TMath::Sqrt(tmp.GetSigmaZ2())<=distz) msz -= nsigz*TMath::Sqrt(tmp.GetSigmaZ2()); + else msz -= distz; + } + + msy *= msy; + msz *= msz; + + } + + if(msz==0 || msy==0){AliWarning("UseTrackForPlaneEff: null search frame"); return;} + msz = 1./msz; // 1/RoadZ^2 msy = 1./msy; // 1/RoadY^2 -// const AliITSRecPoint *cl=0; Int_t clidx=-1, ci=-1; Int_t idetc=-1; @@ -4633,10 +5232,36 @@ void AliITStrackerMI::UseTrackForPlaneEff(const AliITStrackMI* track, Int_t ilay } if(!fPlaneEff->UpDatePlaneEff(found,key)) AliWarning(Form("UseTrackForPlaneEff: cannot UpDate PlaneEff for key=%d",key)); + +// this for FO efficiency studies (only for SPD) // + UInt_t keyFO=999999; + Bool_t foundFO=kFALSE; + if(ilayer<2){ //ONLY SPD layers for FastOr studies + TBits mapFO = fkDetTypeRec->GetFastOrFiredMap(); + Int_t phase = (fEsd->GetBunchCrossNumber())%4; + if(!fSPDChipIntPlaneEff[key]){ + AliITSPlaneEffSPD spd; + keyFO = spd.SwitchChipKeyNumbering(key); + if(mapFO.TestBitNumber(keyFO))foundFO=kTRUE; + keyFO = key + (AliITSPlaneEffSPD::kNModule*AliITSPlaneEffSPD::kNChip)*(phase+1); + if(keyFOUpDatePlaneEff(foundFO,keyFO)) + AliWarning(Form("UseTrackForPlaneEff: cannot UpDate PlaneEff for FastOR for key=%d",keyFO)); + } + } + + + if(fPlaneEff->GetCreateHistos()&& AliITSReconstructor::GetRecoParam()->GetHistoPlaneEff()) { Float_t tr[4]={99999.,99999.,9999.,9999.}; // initialize to high values Float_t clu[4]={-99999.,-99999.,9999.,9999.}; // (in some cases GetCov fails) Int_t cltype[2]={-999,-999}; + // and the module + + Float_t angleModTrack[3]={99999.,99999.,99999.}; // angles (phi, z and "absolute angle") between the track and the mormal to the module (see below) tr[0]=locx; tr[1]=locz; @@ -4666,7 +5291,105 @@ void AliITStrackerMI::UseTrackForPlaneEff(const AliITStrackMI* track, Int_t ilay clu[3]=TMath::Sqrt(c.GetSigmaZ2()); //} } - fPlaneEff->FillHistos(key,found,tr,clu,cltype); + // Compute the angles between the track and the module + // compute the angle "in phi direction", i.e. the angle in the transverse plane + // between the normal to the module and the projection (in the transverse plane) of the + // track trajectory + // tgphi and tglambda of the track in tracking frame with alpha=det.GetPhi + Float_t tgl = tmp.GetTgl(); + Float_t phitr = tmp.GetSnp(); + phitr = TMath::ASin(phitr); + Int_t volId = AliGeomManager::LayerToVolUIDSafe(ilayer+1 ,idet ); + + Double_t tra[3]; AliGeomManager::GetOrigTranslation(volId,tra); + Double_t rot[9]; AliGeomManager::GetOrigRotation(volId,rot); + Double_t alpha =0.; + alpha = tmp.GetAlpha(); + Double_t phiglob = alpha+phitr; + Double_t p[3]; + p[0] = TMath::Cos(phiglob); + p[1] = TMath::Sin(phiglob); + p[2] = tgl; + TVector3 pvec(p[0],p[1],p[2]); + TVector3 normvec(rot[1],rot[4],rot[7]); + Double_t angle = pvec.Angle(normvec); + + if(angle>0.5*TMath::Pi()) angle = (TMath::Pi()-angle); + angle *= 180./TMath::Pi(); + + //Trasverse Plane + TVector3 pt(p[0],p[1],0); + TVector3 normt(rot[1],rot[4],0); + Double_t anglet = pt.Angle(normt); + + Double_t phiPt = TMath::ATan2(p[1],p[0]); + if(phiPt<0)phiPt+=2.*TMath::Pi(); + Double_t phiNorm = TMath::ATan2(rot[4],rot[1]); + if(phiNorm<0) phiNorm+=2.*TMath::Pi(); + if(anglet>0.5*TMath::Pi()) anglet = (TMath::Pi()-anglet); + if(phiNorm>phiPt) anglet*=-1.;// pt-->normt clockwise: anglet>0 + if((phiNorm-phiPt)>TMath::Pi()) anglet*=-1.; + anglet *= 180./TMath::Pi(); + + angleModTrack[2]=(Float_t) angle; + angleModTrack[0]=(Float_t) anglet; + // now the "angle in z" (much easier, i.e. the angle between the z axis and the track momentum + 90) + angleModTrack[1]=TMath::ACos(tgl/TMath::Sqrt(tgl*tgl+1.)); + angleModTrack[1]-=TMath::Pi()/2.; // range of angle is -pi/2 , pi/2 + angleModTrack[1]*=180./TMath::Pi(); // in degree + + fPlaneEff->FillHistos(key,found,tr,clu,cltype,angleModTrack); + + // For FO efficiency studies of SPD + if(ilayer<2 && !fSPDChipIntPlaneEff[key]) fPlaneEff->FillHistos(keyFO,foundFO,tr,clu,cltype,angleModTrack); } + if(ilayer<2) fSPDChipIntPlaneEff[key]=kTRUE; return; } + +Int_t AliITStrackerMI::FindClusterOfTrack(int label, int lr, int* store) const //RS +{ + // find the MC cluster for the label + return fgLayers[lr].FindClusterForLabel(label,store); +} + +/* +Int_t AliITStrackerMI::GetPattern(const AliITStrackMI* track, char* patt) +{ + // creates pattarn of hits marking fake/corrects by f/c. Used for debugging (RS) + strncpy(patt,"......",6); + int tpcLabel = 0; + if (track->GetESDtrack()) tpcLabel = track->GetESDtrack()->GetTPCLabel(); + // + int nwrong = 0; + for (Int_t i=0;iGetNumberOfClusters();i++){ + Int_t cindex = track->GetClusterIndex(i); + Int_t l=(cindex & 0xf0000000) >> 28; + AliITSRecPoint *cl = (AliITSRecPoint*)GetCluster(cindex); + Int_t isWrong=1; + for (Int_t ind=0;ind<3;ind++) if (cl->GetLabel(ind)==TMath::Abs(tpcLabel)) isWrong=0; + patt[l] = isWrong ? 'f':'c'; + nwrong+=isWrong; + } + return nwrong; +} +*/ +//------------------------------------------------------------------------ +Int_t AliITStrackerMI::AliITSlayer::FindClusterForLabel(Int_t label, Int_t *store) const +{ //RS + //-------------------------------------------------------------------- + + int nfound = 0; + for (int ic=0;icGetLabel(i)==label) { + if (nfound<50) { + if (store) store[nfound] = ic; + nfound++; + } + break; + } + } + return nfound; +} +