X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITStrackerMI.cxx;h=b7d73309eae1a60234cb4962097a36d76ef496c2;hb=b37e765f2bafb85a8a3d8f7b5632894ee7410f12;hp=bfa4e01e1c5af7882df6b7b97e23ae32f1df9c58;hpb=70e83b263dd38088abb5bfa8df59cbc575214838;p=u%2Fmrichter%2FAliRoot.git diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index bfa4e01e1c5..b7d73309eae 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -28,35 +28,37 @@ #include #include -#include #include #include #include +#include +#include +#include - +#include "AliLog.h" +#include "AliGeomManager.h" +#include "AliITSPlaneEff.h" +#include "AliTrackPointArray.h" #include "AliESDEvent.h" +#include "AliESDV0Params.h" #include "AliESDtrack.h" -#include "AliESDVertex.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 "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" +#include "AliMathBase.h" + ClassImp(AliITStrackerMI) @@ -78,6 +80,9 @@ fEsd(0), fTrackingPhase("Default"), fUseTGeo(3), fNtracks(0), +fFlagFakes(kFALSE), +fSelectBestMIP03(kFALSE), +fUseImproveKalman(kFALSE), fxOverX0Pipe(-1.), fxTimesRhoPipe(-1.), fxOverX0PipeTrks(0), @@ -88,13 +93,26 @@ fxOverX0LayerTrks(0), fxTimesRhoLayerTrks(0), fDebugStreamer(0), fITSChannelStatus(0), -fDetTypeRec(0), -fPlaneEff(0) { +fkDetTypeRec(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) { @@ -223,21 +262,35 @@ 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()) { + 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(); + 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), @@ -255,6 +308,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), @@ -265,9 +320,10 @@ fxOverX0LayerTrks(0), fxTimesRhoLayerTrks(0), fDebugStreamer(tracker.fDebugStreamer), fITSChannelStatus(tracker.fITSChannelStatus), -fDetTypeRec(tracker.fDetTypeRec), +fkDetTypeRec(tracker.fkDetTypeRec), fPlaneEff(tracker.fPlaneEff) { //Copy constructor + fOriginal.SetOwner(); Int_t i; for(i=0;i<4;i++) { fSPDdetzcentre[i]=tracker.fSPDdetzcentre[i]; @@ -281,6 +337,7 @@ fPlaneEff(tracker.fPlaneEff) { fxTimesRhoShield[i]=tracker.fxTimesRhoShield[i]; } } + //------------------------------------------------------------------------ AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){ //Assignment operator @@ -288,6 +345,7 @@ AliITStrackerMI & AliITStrackerMI::operator=(const AliITStrackerMI &tracker){ new(this) AliITStrackerMI(tracker); return *this; } +*/ //------------------------------------------------------------------------ AliITStrackerMI::~AliITStrackerMI() { @@ -302,13 +360,9 @@ AliITStrackerMI::~AliITStrackerMI() } if(fITSChannelStatus) delete fITSChannelStatus; if(fPlaneEff) delete fPlaneEff; -} -//------------------------------------------------------------------------ -void AliITStrackerMI::SetLayersNotToSkip(Int_t *l) { - //-------------------------------------------------------------------- - //This function set masks of the layers which must be not skipped - //-------------------------------------------------------------------- - for (Int_t i=0; iGetUseBadZonesFromOCDB()) return; - Info("ReadBadFromDetTypeRec","Reading info about bad ITS detectors and channels\n"); + 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(AliCDBManager::Instance()); + fITSChannelStatus = new AliITSChannelStatus(fkDetTypeRec); // ITS detectors and chips Int_t i=0,j=0,k=0,ndet=0; for (i=1; 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()); @@ -370,22 +430,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(); @@ -415,7 +481,8 @@ Int_t AliITStrackerMI::LoadClusters(TTree *cTree) { fgLayers[i].SortClusters(); } - dummy.Clear(); + // check whether we have to skip some layers + SetForceSkippingOfLayer(); return 0; } @@ -445,7 +512,7 @@ void AliITStrackerMI::FillClusterArray(TObjArray* array) const { return; } //------------------------------------------------------------------------ -static Int_t CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) { +Int_t AliITStrackerMI::CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) { //-------------------------------------------------------------------- // Correction for the material between the TPC and the ITS //-------------------------------------------------------------------- @@ -458,7 +525,7 @@ static Int_t CorrectForTPCtoITSDeadZoneMaterial(AliITStrackMI *t) { 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; } @@ -471,9 +538,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 @@ -488,26 +561,22 @@ 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: + //if(TMath::Abs(esd->GetX()-83.65)<0.1) { FILE *f=fopen("tpc.dat","a"); fprintf(f,"%f %f %f %f %f %f\n",(Float_t)event->GetEventNumberInFile(),(Float_t)TMath::Abs(esd->GetLabel()),(Float_t)esd->GetX(),(Float_t)esd->GetY(),(Float_t)esd->GetZ(),(Float_t)esd->Pt()); fclose(f); } if ((esd->GetStatus()&AliESDtrack::kTPCin)==0) continue; 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)); @@ -566,6 +635,7 @@ Int_t AliITStrackerMI::Clusters2Tracks(AliESDEvent *event) { } Int_t tpcLabel=t->GetLabel(); //save the TPC track label + AliDebug(2,Form("LABEL %d pass %d",tpcLabel,fPass)); fI = 6; ResetTrackToFollow(*t); ResetBestTrack(); @@ -583,36 +653,46 @@ 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 t->SetReconstructed(kTRUE); ntrk++; + AliDebug(2,Form("TRACK! (label %d) ncls %d",besttrack->GetLabel(),besttrack->GetNumberOfClusters())); } GetBestHypothesysMIP(itsTracks); } // end loop on the two tracking passes - - if(event->GetNumberOfV0s()>0) UpdateTPCV0(event); - if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) FindV02(event); + // + 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"; @@ -626,53 +706,62 @@ 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; + // Start time integral and add distance from current position to vertex 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"); + AliITStrackMI t(*esd); + Double_t xyzTrk[3],xyzVtx[3]={GetX(),GetY(),GetZ()}; + t.GetXYZ(xyzTrk); + Double_t dst2 = 0.; + { + 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; } + t.StartTimeIntegral(); + t.AddTimeStep(TMath::Sqrt(dst2)); + // + // transfer the time integral to ESD track + esd->SetStatus(AliESDtrack::kTIME); + Double_t times[10];t.GetIntegratedTimes(times); 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()); + //fTrackToFollow.CookdEdx(); + CookLabel(&fTrackToFollow,0.); //For comparison only + 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"; @@ -686,9 +775,21 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { // The clusters must be loaded ! //-------------------------------------------------------------------- fTrackingPhase="RefitInward"; - if(AliITSReconstructor::GetRecoParam()->GetFindV0s()) RefitV02(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; @@ -716,12 +811,24 @@ 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(); - if (RefitAt(AliITSRecoParam::GetrInsideSPD1(),&fTrackToFollow,t,kTRUE,pe)) { + 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,doExtra,pe)) { + AliDebug(2," refit OK"); fTrackToFollow.SetLabel(t->GetLabel()); // fTrackToFollow.CookdEdx(); CookdEdx(&fTrackToFollow); @@ -734,7 +841,7 @@ Int_t AliITStrackerMI::RefitInward(AliESDEvent *event) { 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++; @@ -743,7 +850,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"; @@ -774,7 +881,10 @@ Bool_t AliITStrackerMI::GetTrackPoint(Int_t index, AliTrackPoint& p) const { cl->GetGlobalXYZ(xyz); cl->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) { case 0: @@ -815,6 +925,7 @@ Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index, Int_t c=(index & 0x0fffffff) >> 00; const AliITSRecPoint *cl = fgLayers[l].GetCluster(c); Int_t idet = cl->GetDetectorIndex(); + const AliITSdetector &det=fgLayers[l].GetDetector(idet); // tgphi and tglambda of the track in tracking frame with alpha=det.GetPhi @@ -823,26 +934,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,AliTracker::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) { @@ -869,6 +984,7 @@ Bool_t AliITStrackerMI::GetTrackPointTrackingError(Int_t index, break; }; UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,idet); + p.SetVolumeID((UShort_t)volid); return kTRUE; } @@ -905,20 +1021,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); @@ -930,7 +1048,7 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin // // follow prolongations for (Int_t ilayer=5; ilayer>=0; ilayer--) { - //printf("FollowProlongationTree: layer %d\n",ilayer); + AliDebug(2,Form("FollowProlongationTree: layer %d",ilayer)); fI = ilayer; // AliITSlayer &layer=fgLayers[ilayer]; @@ -941,8 +1059,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){ @@ -964,26 +1083,37 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin Int_t idet=layer.FindDetectorIndex(phi,z); Double_t trackGlobXYZ1[3]; - currenttrack1.GetXYZ(trackGlobXYZ1); + 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) { AliITStrackMI* vtrack = new (&tracks[ilayer][ntracks[ilayer]]) AliITStrackMI(currenttrack1); // propagate to the layer radius - Double_t xToGo; vtrack->GetLocalXat(r,xToGo); - vtrack->AliExternalTrackParam::PropagateTo(xToGo,GetBz()); + Double_t xToGo; if (!vtrack->GetLocalXat(r,xToGo)) 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->SetDeadZoneProbability(ilayer,1.); // no penalty for missing cluster + vtrack->SetClIndex(ilayer,-1); modstatus = (skip==1 ? 3 : 4); // skipped : out in z - LocalModuleCoord(ilayer,idet,vtrack,xloc,zloc); // local module coords - vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); - if(constrain) vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + if(LocalModuleCoord(ilayer,idet,vtrack,xloc,zloc)) { // local module coords + vtrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); + } + if(constrain && AliITSReconstructor::GetRecoParam()->GetImproveWithVertex()) { + fUseImproveKalman ? + vtrack->ImproveKalman(xyzVtx,ersVtx,xMSLrs,x2X0MSLrs,nMSLrs) : + vtrack->Improve(budgetToPrimVertex,xyzVtx,ersVtx); + } ntracks[ilayer]++; continue; } @@ -995,10 +1125,10 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin const AliITSdetector &det=layer.GetDetector(idet); new(¤ttrack2) AliITStrackMI(currenttrack1); if (!currenttrack1.Propagate(det.GetPhi(),det.GetR())) continue; - currenttrack2.Propagate(det.GetPhi(),det.GetR()); + if (!currenttrack2.Propagate(det.GetPhi(),det.GetR())) continue; currenttrack1.SetDetectorIndex(idet); currenttrack2.SetDetectorIndex(idet); - LocalModuleCoord(ilayer,idet,¤ttrack1,xloc,zloc); // local module coords + if(!LocalModuleCoord(ilayer,idet,¤ttrack1,xloc,zloc)) continue; // local module coords //*************** // DEFINITION OF SEARCH ROAD AND CLUSTERS SELECTION @@ -1043,21 +1173,22 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin // check if the road contains a dead zone Bool_t noClusters = kFALSE; if (!layer.GetNextCluster(clidx,kTRUE)) noClusters=kTRUE; - //if (noClusters) printf("no clusters in road\n"); + if (noClusters) AliDebug(2,"no clusters in road"); Double_t dz=0.5*(zmax-zmin); Double_t dy=0.5*(ymax-ymin); Int_t dead = CheckDeadZone(¤ttrack1,ilayer,idet,dz,dy,noClusters); + if(dead) AliDebug(2,Form("DEAD (%d)\n",dead)); // create a prolongation without clusters (check also if there are no clusters in the road) if (dead || (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) { modstatus = 7; // holes in z in SPD - } else if (dead==2 || dead==3) { + } else if (dead==2 || dead==3 || dead==4) { modstatus = 2; // dead from OCDB } updatetrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); @@ -1073,14 +1204,22 @@ 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) { - updatetrack->SetNDeadZone(updatetrack->GetNDeadZone()+1); if (dead==1) { // dead zone at z=0,+-7cm in SPD - updatetrack->SetDeadZoneProbability(GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); + updatetrack->SetDeadZoneProbability(ilayer,GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); deadzoneSPD=kTRUE; - } + } else if (dead==2 || dead==3) { // dead module or chip from OCDB + updatetrack->SetDeadZoneProbability(ilayer,1.); + } else if (dead==4) { // at least a single dead channel from OCDB + updatetrack->SetDeadZoneProbability(ilayer,0.); + } } ntracks[ilayer]++; } @@ -1088,24 +1227,27 @@ 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 // take into account misalignment (bring track to real detector plane) Double_t xTrOrig = currenttrack->GetX(); - currenttrack->PropagateTo(xTrOrig+cl->GetX(),0.,0.); + 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. ) { // cluster not associated to track - //printf("not ass\n"); + 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 - currenttrack->PropagateTo(xTrOrig,0.,0.); + 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 @@ -1132,31 +1274,32 @@ void AliITStrackerMI::FollowProlongationTree(AliITStrackMI * otrack, Int_t esdin // calculate track-clusters chi2 chi2trkcl = GetPredictedChi2MI(currenttrack,cl,ilayer); // chi2 cut - //printf("chi2 %f max %f\n",chi2trkcl,AliITSReconstructor::GetRecoParam()->GetMaxChi2s(ilayer)); + 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,0); + 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)) { - //printf("update failed\n"); + 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); - updatetrack->SetDeadZoneProbability(GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); + updatetrack->SetDeadZoneProbability(ilayer,GetSPDDeadZoneProbability(updatetrack->GetZ(),TMath::Sqrt(updatetrack->GetSigmaZ2()))); modstatus = 7; // holes in z in SPD } if (changedet) { Float_t xlocnewdet,zlocnewdet; - LocalModuleCoord(ilayer,idet,updatetrack,xlocnewdet,zlocnewdet); // local module coords - updatetrack->SetModuleIndexInfo(ilayer,idet,modstatus,xlocnewdet,zlocnewdet); + if(LocalModuleCoord(ilayer,idet,updatetrack,xlocnewdet,zlocnewdet)) { // local module coords + updatetrack->SetModuleIndexInfo(ilayer,idet,modstatus,xlocnewdet,zlocnewdet); + } } else { updatetrack->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); } @@ -1175,40 +1318,38 @@ 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 - //else printf("chi2 too large\n"); + else { + AliDebug(2,"chi2 too large"); + } + } // 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,0); + vtrack->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,0); - 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 @@ -1237,7 +1378,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 @@ -1279,15 +1421,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); } @@ -1326,7 +1465,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; } @@ -1382,6 +1521,7 @@ fYcs(0), fZcs(0), fNcs(0), fCurrentSlice(-1), +fZmin(0), fZmax(0), fYmin(0), fYmax(0), @@ -1389,7 +1529,11 @@ fI(0), fImax(0), fSkip(0), fAccepted(0), -fRoad(0){ +fRoad(0), +fMaxSigmaClY(0), +fMaxSigmaClZ(0), +fNMaxSigmaCl(3) +{ //-------------------------------------------------------------------- //default AliITSlayer constructor //-------------------------------------------------------------------- @@ -1398,7 +1542,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; } //------------------------------------------------------------------------ @@ -1553,8 +1813,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); @@ -1855,11 +2140,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]; @@ -1868,7 +2160,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]; @@ -1993,7 +2285,7 @@ fChipIsBad(det.fChipIsBad) } //------------------------------------------------------------------------ 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 @@ -2018,13 +2310,14 @@ void AliITStrackerMI::AliITSdetector::ReadBadDetectorAndChips(Int_t ilayer,Int_t // Get calibration from AliITSDetTypeRec AliITSCalibration *calib = (AliITSCalibration*)detTypeRec->GetCalibrationModel(idet); + calib->SetModuleIndex(idet); AliITSCalibration *calibSPDdead = 0; if(detType==0) calibSPDdead = (AliITSCalibration*)detTypeRec->GetSPDDeadModel(idet); // TEMPORARY if (calib->IsBad() || (detType==0 && calibSPDdead->IsBad())) // TEMPORARY { SetBad(); - printf("lay %d bad %d\n",ilayer,idet); + // printf("lay %d bad %d\n",ilayer,idet); } // Get segmentation from AliITSDetTypeRec @@ -2038,6 +2331,7 @@ void AliITStrackerMI::AliITSdetector::ReadBadDetectorAndChips(Int_t ilayer,Int_t for (Int_t iCh=0;iChIsChipBad(iCh); if (detType==0 && calibSPDdead->IsChipBad(iCh)) fChipIsBad[iCh] = kTRUE; // TEMPORARY + //if(fChipIsBad[iCh]) {printf("lay %d det %d bad chip %d\n",ilayer,idet,iCh);} } return; @@ -2079,6 +2373,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 { //------------------------------------------------------------------- @@ -2146,14 +2480,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; @@ -2170,6 +2522,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 @@ -2179,15 +2532,14 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, 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) { - track->GetGlobalXYZat(track->GetX(),oldX,oldY,oldZ); - } - // Double_t oldGlobXYZ[3]; - track->GetXYZ(oldGlobXYZ); + if (!track->GetXYZ(oldGlobXYZ)) return kFALSE; + + // continue if we are already beyond this layer + Double_t oldGlobR = TMath::Sqrt(oldGlobXYZ[0]*oldGlobXYZ[0]+oldGlobXYZ[1]*oldGlobXYZ[1]); + if(step>0 && oldGlobR > r) continue; // going outward + if(step<0 && oldGlobR < r) continue; // going inward Double_t phi,z; if (!track->GetPhiZat(r,phi,z)) return kFALSE; @@ -2197,32 +2549,28 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, // 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; track->GetLocalXat(r,xToGo); - track->AliExternalTrackParam::PropagateTo(xToGo,GetBz()); - // apply correction for material of the current layer - CorrectForLayerMaterial(track,ilayer,oldGlobXYZ,dir); modstatus = 4; // out in z - 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; - track->GetGlobalXYZat(track->GetX(),newX,newY,newZ); - Double_t dL2 = (oldX-newX)*(oldX-newX) + (oldY-newY)*(oldY-newY) + - (oldZ-newZ)*(oldZ-newZ); - track->AddTimeStep(TMath::Sqrt(dL2)); + if(LocalModuleCoord(ilayer,idet,track,xloc,zloc)) { // local module coords + track->SetModuleIndexInfo(ilayer,idet,modstatus,xloc,zloc); } + // cross layer + // apply correction for material of the current layer + // add time if going outward + CorrectForLayerMaterial(track,ilayer,oldGlobXYZ,dir); continue; } 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); - LocalModuleCoord(ilayer,idet,track,xloc,zloc); // local module coords + if(!LocalModuleCoord(ilayer,idet,track,xloc,zloc)) return kFALSE; // local module coords Double_t dz,zmin,zmax,dy,ymin,ymax; @@ -2239,7 +2587,7 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, const AliITSdetector &detc=layer.GetDetector(idet); if (!track->Propagate(detc.GetPhi(),detc.GetR())) return kFALSE; track->SetDetectorIndex(idet); - LocalModuleCoord(ilayer,idet,track,xloc,zloc); // local module coords + if(!LocalModuleCoord(ilayer,idet,track,xloc,zloc)) return kFALSE; // local module coords } Int_t cllayer = (idx & 0xf0000000) >> 28;; Double_t chi2=GetPredictedChi2MI(track,cl,cllayer); @@ -2267,18 +2615,18 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, dy = 0.5*(ymax-ymin); Int_t dead = CheckDeadZone(track,ilayer,idet,dz,dy,kTRUE); if (dead==1) modstatus = 7; // holes in z in SPD - if (dead==2 || dead==3) modstatus = 2; // dead from OCDB + if (dead==2 || dead==3 || dead==4) modstatus = 2; // dead from OCDB } } 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); - 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); @@ -2309,18 +2657,10 @@ Bool_t AliITStrackerMI::RefitAt(Double_t xx,AliITStrackMI *track, } // 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; - track->GetGlobalXYZat(track->GetX(),newX,newY,newZ); - Double_t dL2 = (oldX-newX)*(oldX-newX) + (oldY-newY)*(oldY-newY) + - (oldZ-newZ)*(oldZ-newZ); - track->AddTimeStep(TMath::Sqrt(dL2)); - } - // - + track->SetCheckInvariant(kTRUE); } // end loop on layers if (!track->PropagateTo(xx,0.,0.)) return kFALSE; @@ -2341,7 +2681,7 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) Float_t *ny = GetNy(fCurrentEsdTrack), *nz = GetNz(fCurrentEsdTrack); if (mode<100){ for (Int_t i = 0;i<6;i++){ - if (track->GetClIndex(i)>0){ + if (track->GetClIndex(i)>=0){ Float_t cerry, cerrz; if (ny[i]>0) {cerry = erry[i]; cerrz=errz[i];} else @@ -2373,7 +2713,7 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) } 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);} @@ -2385,7 +2725,7 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) } } 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);} @@ -2422,20 +2762,43 @@ Double_t AliITStrackerMI::GetNormalizedChi2(AliITStrackMI * track, Int_t mode) } } if (match<0) match=0; - Float_t deadzonefactor = (track->GetNDeadZone()>0) ? 3*(1.1-track->GetDeadZoneProbability()):0.; + + // penalty factor for missing points (NDeadZone>0), but no penalty + // for layer with deadZoneProb close to 1 (either we wanted to skip layer + // or there is a dead from OCDB) + Float_t deadzonefactor = 0.; + if (track->GetNDeadZone()>0.) { + 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); + } + } + 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(AliITStrackMI * track1, AliITStrackMI * track2) +Double_t AliITStrackerMI::GetMatchingChi2(const AliITStrackMI * track1,const AliITStrackMI * track2) { // // return matching chi2 between two tracks + Double_t largeChi2=1000.; + AliITStrackMI track3(*track2); - track3.Propagate(track1->GetAlpha(),track1->GetX()); + if (!track3.Propagate(track1->GetAlpha(),track1->GetX())) return largeChi2; TMatrixD vec(5,1); vec(0,0)=track1->GetY() - track3.GetY(); vec(1,0)=track1->GetZ() - track3.GetZ(); @@ -2470,39 +2833,55 @@ Double_t AliITStrackerMI::GetMatchingChi2(AliITStrackMI * track1, AliITStrackMI 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) // 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; } //------------------------------------------------------------------------ -Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackMI * track, Float_t fac) +Double_t AliITStrackerMI::GetTruncatedChi2(const AliITStrackMI * track, Float_t fac) { // // calculate normalized chi2 @@ -2530,7 +2909,7 @@ Double_t AliITStrackerMI::GetTruncatedChi2(AliITStrackMI * track, Float_t fac) return normchi2; } //------------------------------------------------------------------------ -Double_t AliITStrackerMI::GetInterpolatedChi2(AliITStrackMI * forwardtrack, AliITStrackMI * backtrack) +Double_t AliITStrackerMI::GetInterpolatedChi2(const AliITStrackMI * forwardtrack,const AliITStrackMI * backtrack) { // // calculate normalized chi2 @@ -2571,7 +2950,7 @@ Float_t *AliITStrackerMI::GetWeight(Int_t index) { 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 @@ -2593,7 +2972,7 @@ void AliITStrackerMI::RegisterClusterTracks(AliITStrackMI* track,Int_t id) } } //------------------------------------------------------------------------ -void AliITStrackerMI::UnRegisterClusterTracks(AliITStrackMI* track, Int_t id) +void AliITStrackerMI::UnRegisterClusterTracks(const AliITStrackMI* track, Int_t id) { //--------------------------------------------- // unregister track from the list @@ -2626,9 +3005,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; // @@ -2649,6 +3028,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; } @@ -2658,7 +3038,7 @@ Float_t AliITStrackerMI::GetNumberOfSharedClusters(AliITStrackMI* track,Int_t id 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 @@ -2676,9 +3056,9 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackMI *track, Int_t trackID, Int_ 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); @@ -2711,7 +3091,7 @@ Int_t AliITStrackerMI::GetOverlapTrack(AliITStrackMI *track, Int_t trackID, Int_ 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); @@ -2980,12 +3360,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); } @@ -3061,6 +3441,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; @@ -3076,6 +3457,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 (chi2GetClIndex(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); @@ -3110,9 +3492,13 @@ 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); + 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); @@ -3123,9 +3509,10 @@ 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){ + 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); @@ -3139,15 +3526,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(); @@ -3158,6 +3548,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){ @@ -3218,6 +3609,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); @@ -3248,7 +3640,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.); @@ -3274,7 +3669,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; @@ -3297,7 +3692,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)); @@ -3315,6 +3712,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); @@ -3322,8 +3722,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; @@ -3357,6 +3759,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]; @@ -3373,7 +3778,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); } @@ -3396,7 +3801,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI 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); @@ -3413,7 +3818,7 @@ AliITStrackMI * AliITStrackerMI::GetBestHypothesys(Int_t esdindex, AliITStrackMI 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; } @@ -3454,13 +3859,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; } @@ -3487,22 +3894,98 @@ 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 { //-------------------------------------------------------------------- @@ -3510,8 +3993,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++){ @@ -3520,8 +4006,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; + 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)); } //------------------------------------------------------------------------ -void AliITStrackerMI::CookdEdx(AliITStrackMI* track) -{ +void AliITStrackerMI::CookdEdx(AliITStrackMI* track){ // + // Fill the dE/dx in this 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;iGetNumberOfClusters();i++){ Int_t cindex = track->GetClusterIndex(i); @@ -3557,37 +4039,15 @@ void AliITStrackerMI::CookdEdx(AliITStrackMI* track) if (cl->GetLabel(ind)==lab) isWrong=0; } track->SetChi2MIP(9,track->GetChi2MIP(9)+isWrong*(2<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; inu-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]; @@ -3597,23 +4057,22 @@ void AliITStrackerMI::MakeCoefficients(Int_t ntracks){ 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)); - AliITSClusterParam::GetError(layer,cluster,theta,phi,track->GetExpQ(),erry,errz); - //printf(" chi2: tr-cl %f %f tr X %f cl X %f\n",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.; - //printf(" chi2: tr-cl %f %f tr X %f cl X %f\n",track->GetY()-cluster->GetY(),track->GetZ()-cluster->GetZ(),track->GetX(),cluster->GetX()); - Double_t chi2 = track->GetPredictedChi2MI(cluster->GetY(),cluster->GetZ(),erry,errz); + 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,covyz); // 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; @@ -3626,8 +4085,9 @@ 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()*track->GetSnp()))); + track->SetNormQ(layer,cluster->GetQ()/TMath::Sqrt((1.+ track->GetTgl()*track->GetTgl())/((1.-track->GetSnp())*(1.+track->GetSnp())))); return chi2; } @@ -3635,7 +4095,7 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackMI* track, const AliITSR 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); @@ -3646,50 +4106,53 @@ 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) Double_t xTrOrig=track->GetX(); - //Float_t clxyz[3]; cl->GetGlobalXYZ(clxyz);Double_t trxyz[3]; track->GetXYZ(trxyz);printf("gtr %f %f %f\n",trxyz[0],trxyz[1],trxyz[2]);printf("gcl %f %f %f\n",clxyz[0],clxyz[1],clxyz[2]); - //printf(" xtr %f xcl %f\n",track->GetX(),cl->GetX()); - - if (!track->PropagateTo(xTrOrig+cl->GetX(),0.,0.)) return 0; + Float_t clxyz[3]; cl->GetGlobalXYZ(clxyz);Double_t trxyz[3]; track->GetXYZ(trxyz); + AliDebug(2,Form("gtr %f %f %f",trxyz[0],trxyz[1],trxyz[2])); + 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->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->PropagateTo(xTrOrig,0.,0.)) return 0; - - //if(!updated) printf("update failed\n"); + 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 //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( 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]; @@ -3697,7 +4160,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) Float_t r = (layer>0)? 7:4; // for (Int_t i=0;iAt(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 @@ -3710,7 +4173,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) // // for (Int_t i=0;iAt(index[i]); + AliITSRecPoint* cl0 = (AliITSRecPoint*)clusterArray->At(index[i]); if (cl0->GetDeltaProbability()>0.8) continue; // Int_t ncl = 0; @@ -3718,7 +4181,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) sumy=sumz=sumy2=sumyz=sumw=0.0; for (Int_t j=0;jAt(index[j]); + AliITSRecPoint* cl1 = (AliITSRecPoint*)clusterArray->At(index[j]); // Float_t dz = cl0->GetZ()-cl1->GetZ(); Float_t dy = cl0->GetY()-cl1->GetY(); @@ -3755,14 +4218,15 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) void AliITStrackerMI::UpdateESDtrack(AliITStrackMI* track, ULong_t flags) const { // + // Update ESD track // track->UpdateESDtrack(flags); 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{ @@ -3782,829 +4246,6 @@ Int_t AliITStrackerMI::GetNearestLayer(const Double_t *xr) const{ return res; } //------------------------------------------------------------------------ -void AliITStrackerMI::UpdateTPCV0(AliESDEvent *event){ - // - //try to update, or reject TPC V0s - // - Int_t nv0s = event->GetNumberOfV0s(); - Int_t nitstracks = fTrackHypothesys.GetEntriesFast(); - - for (Int_t i=0;iGetV0(i); - Int_t ip = vertex->GetIndex(0); - Int_t im = vertex->GetIndex(1); - // - TObjArray * arrayp = (ipAt(0):0; - AliITStrackMI * trackm = (arraym!=0) ? (AliITStrackMI*)arraym->At(0):0; - // - // - if (trackp){ - if (trackp->GetNumberOfClusters()+trackp->GetNDeadZone()>5.5){ - if (trackp->GetConstrain()&&trackp->GetChi2MIP(0)<3) vertex->SetStatus(-100); - if (!trackp->GetConstrain()&&trackp->GetChi2MIP(0)<2) vertex->SetStatus(-100); - } - } - - if (trackm){ - if (trackm->GetNumberOfClusters()+trackm->GetNDeadZone()>5.5){ - if (trackm->GetConstrain()&&trackm->GetChi2MIP(0)<3) vertex->SetStatus(-100); - if (!trackm->GetConstrain()&&trackm->GetChi2MIP(0)<2) vertex->SetStatus(-100); - } - } - if (vertex->GetStatus()==-100) continue; - // - Double_t xrp[3]; vertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B. - Int_t clayer = GetNearestLayer(xrp); //I.B. - vertex->SetNBefore(clayer); // - vertex->SetChi2Before(9*clayer); // - vertex->SetNAfter(6-clayer); // - vertex->SetChi2After(0); // - // - if (clayer >1 ){ // calculate chi2 before vertex - Float_t chi2p = 0, chi2m=0; - // - if (trackp){ - for (Int_t ilayer=0;ilayerGetClIndex(ilayer)>0){ - chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+ - trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer)); - } - else{ - chi2p+=9; - } - } - }else{ - chi2p = 9*clayer; - } - // - if (trackm){ - for (Int_t ilayer=0;ilayerGetClIndex(ilayer)>0){ - chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+ - trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer)); - } - else{ - chi2m+=9; - } - } - }else{ - chi2m = 9*clayer; - } - vertex->SetChi2Before(TMath::Min(chi2p,chi2m)); - if (TMath::Min(chi2p,chi2m)/Float_t(clayer)<4) vertex->SetStatus(-10); // track exist before vertex - } - - if (clayer < 5 ){ // calculate chi2 after vertex - Float_t chi2p = 0, chi2m=0; - // - if (trackp&&TMath::Abs(trackp->GetTgl())<1.){ - for (Int_t ilayer=clayer;ilayer<6;ilayer++){ - if (trackp->GetClIndex(ilayer)>0){ - chi2p+=trackp->GetDy(ilayer)*trackp->GetDy(ilayer)/(trackp->GetSigmaY(ilayer)*trackp->GetSigmaY(ilayer))+ - trackp->GetDz(ilayer)*trackp->GetDz(ilayer)/(trackp->GetSigmaZ(ilayer)*trackp->GetSigmaZ(ilayer)); - } - else{ - chi2p+=9; - } - } - }else{ - chi2p = 0; - } - // - if (trackm&&TMath::Abs(trackm->GetTgl())<1.){ - for (Int_t ilayer=clayer;ilayer<6;ilayer++){ - if (trackm->GetClIndex(ilayer)>0){ - chi2m+=trackm->GetDy(ilayer)*trackm->GetDy(ilayer)/(trackm->GetSigmaY(ilayer)*trackm->GetSigmaY(ilayer))+ - trackm->GetDz(ilayer)*trackm->GetDz(ilayer)/(trackm->GetSigmaZ(ilayer)*trackm->GetSigmaZ(ilayer)); - } - else{ - chi2m+=9; - } - } - }else{ - chi2m = 0; - } - vertex->SetChi2After(TMath::Max(chi2p,chi2m)); - if (TMath::Max(chi2m,chi2p)/Float_t(6-clayer)>9) vertex->SetStatus(-20); // track not found in ITS - } - } - // -} -//------------------------------------------------------------------------ -void AliITStrackerMI::FindV02(AliESDEvent *event) -{ - // - // V0 finder - // - // Cuts on DCA - R dependent - // max distance DCA between 2 tracks cut - // maxDist = TMath::Min(kMaxDist,kMaxDist0+pvertex->GetRr()*kMaxDist); - // - const Float_t kMaxDist0 = 0.1; - const Float_t kMaxDist1 = 0.1; - const Float_t kMaxDist = 1; - const Float_t kMinPointAngle = 0.85; - const Float_t kMinPointAngle2 = 0.99; - const Float_t kMinR = 0.5; - const Float_t kMaxR = 220; - //const Float_t kCausality0Cut = 0.19; - //const Float_t kLikelihood01Cut = 0.25; - //const Float_t kPointAngleCut = 0.9996; - const Float_t kCausality0Cut = 0.19; - const Float_t kLikelihood01Cut = 0.45; - const Float_t kLikelihood1Cut = 0.5; - const Float_t kCombinedCut = 0.55; - - // - // - TTreeSRedirector &cstream = *fDebugStreamer; - Int_t ntracks = event->GetNumberOfTracks(); - Int_t nitstracks = fTrackHypothesys.GetEntriesFast(); - fOriginal.Expand(ntracks); - fTrackHypothesys.Expand(ntracks); - fBestHypothesys.Expand(ntracks); - // - AliHelix * helixes = new AliHelix[ntracks+2]; - TObjArray trackarray(ntracks+2); //array with tracks - with vertex constrain - TObjArray trackarrayc(ntracks+2); //array of "best tracks" - without vertex constrain - TObjArray trackarrayl(ntracks+2); //array of "longest tracks" - without vertex constrain - Bool_t * forbidden = new Bool_t [ntracks+2]; - Int_t *itsmap = new Int_t [ntracks+2]; - Float_t *dist = new Float_t[ntracks+2]; - Float_t *normdist0 = new Float_t[ntracks+2]; - Float_t *normdist1 = new Float_t[ntracks+2]; - Float_t *normdist = new Float_t[ntracks+2]; - Float_t *norm = new Float_t[ntracks+2]; - Float_t *maxr = new Float_t[ntracks+2]; - Float_t *minr = new Float_t[ntracks+2]; - Float_t *minPointAngle= new Float_t[ntracks+2]; - // - AliV0 *pvertex = new AliV0; - AliITStrackMI * dummy= new AliITStrackMI; - dummy->SetLabel(0); - AliITStrackMI trackat0; //temporary track for DCA calculation - // - Float_t primvertex[3]={GetX(),GetY(),GetZ()}; - // - // make ITS - ESD map - // - for (Int_t itrack=0;itrackGetESDtrack()->GetID(); - itsmap[esdindex] = itrack; - } - // - // create ITS tracks from ESD tracks if not done before - // - for (Int_t itrack=0;itrack=0) continue; - AliITStrackMI * tpctrack = new AliITStrackMI(*(event->GetTrack(itrack))); - //tpctrack->fD[0] = tpctrack->GetD(GetX(),GetY()); - //tpctrack->fD[1] = tpctrack->GetZat(GetX())-GetZ(); - tpctrack->GetDZ(GetX(),GetY(),GetZ(),tpctrack->GetDP()); //I.B. - if (tpctrack->GetD(0)<20 && tpctrack->GetD(1)<20){ - // tracks which can reach inner part of ITS - // propagate track to outer its volume - with correction for material - CorrectForTPCtoITSDeadZoneMaterial(tpctrack); - } - itsmap[itrack] = nitstracks; - fOriginal.AddAt(tpctrack,nitstracks); - nitstracks++; - } - // - // fill temporary arrays - // - for (Int_t itrack=0;itrackGetTrack(itrack); - Int_t itsindex = itsmap[itrack]; - AliITStrackMI *original = (AliITStrackMI*)fOriginal.At(itsmap[itrack]); - if (!original) continue; - AliITStrackMI *bestConst = 0; - AliITStrackMI *bestLong = 0; - AliITStrackMI *best = 0; - // - // - TObjArray * array = (TObjArray*) fTrackHypothesys.At(itsindex); - Int_t hentries = (array==0) ? 0 : array->GetEntriesFast(); - // Get best track with vertex constrain - for (Int_t ih=0;ihAt(ih); - if (!trackh->GetConstrain()) continue; - if (!bestConst) bestConst = trackh; - if (trackh->GetNumberOfClusters()>5.0){ - bestConst = trackh; // full track - with minimal chi2 - break; - } - if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()) continue; - bestConst = trackh; - break; - } - // Get best long track without vertex constrain and best track without vertex constrain - for (Int_t ih=0;ihAt(ih); - if (trackh->GetConstrain()) continue; - if (!best) best = trackh; - if (!bestLong) bestLong = trackh; - if (trackh->GetNumberOfClusters()>5.0){ - bestLong = trackh; // full track - with minimal chi2 - break; - } - if (trackh->GetNumberOfClusters()+trackh->GetNDeadZone()<=bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()) continue; - bestLong = trackh; - } - if (!best) { - best = original; - bestLong = original; - } - //I.B. trackat0 = *bestLong; - new (&trackat0) AliITStrackMI(*bestLong); - Double_t xx,yy,zz,alpha; - bestLong->GetGlobalXYZat(bestLong->GetX(),xx,yy,zz); - alpha = TMath::ATan2(yy,xx); - trackat0.Propagate(alpha,0); - // calculate normalized distances to the vertex - // - Float_t ptfac = (1.+100.*TMath::Abs(trackat0.GetC())); - if ( bestLong->GetNumberOfClusters()>3 ){ - dist[itsindex] = trackat0.GetY(); - norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2()); - normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]); - normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2()))); - normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]); - if (!bestConst){ - if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<6) normdist[itsindex]*=2.; - if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<5) normdist[itsindex]*=2.; - if (bestLong->GetNumberOfClusters()+bestLong->GetNDeadZone()<4) normdist[itsindex]*=2.; - }else{ - if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<6) normdist[itsindex]*=1.5; - if (bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()<5) normdist[itsindex]*=1.5; - } - } - else{ - if (bestConst&&bestConst->GetNumberOfClusters()+bestConst->GetNDeadZone()>4.5){ - dist[itsindex] = bestConst->GetD(0); - norm[itsindex] = bestConst->GetDnorm(0); - normdist0[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]); - normdist1[itsindex] = TMath::Abs(bestConst->GetD(0)/norm[itsindex]); - normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]); - }else{ - dist[itsindex] = trackat0.GetY(); - norm[itsindex] = ptfac*TMath::Sqrt(trackat0.GetSigmaY2()); - normdist0[itsindex] = TMath::Abs(trackat0.GetY()/norm[itsindex]); - normdist1[itsindex] = TMath::Abs((trackat0.GetZ()-primvertex[2])/(ptfac*TMath::Sqrt(trackat0.GetSigmaZ2()))); - normdist[itsindex] = TMath::Sqrt(normdist0[itsindex]*normdist0[itsindex]+normdist1[itsindex]*normdist1[itsindex]); - if (TMath::Abs(trackat0.GetTgl())>1.05){ - if (normdist[itsindex]<3) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]>3) { - minr[itsindex] = TMath::Max(Float_t(40.),minr[itsindex]); - } - } - } - } - // - //----------------------------------------------------------- - //Forbid primary track candidates - - // - //treetr->SetAlias("forbidden0","Tr0.fN<4&&Tr1.fN+Tr1.fNDeadZone>4.5"); - //treetr->SetAlias("forbidden1","ND<3&&Tr1.fN+Tr1.fNDeadZone>5.5"); - //treetr->SetAlias("forbidden2","ND<2&&Tr1.fClIndex[0]>0&&Tr1.fClIndex[0]>0"); - //treetr->SetAlias("forbidden3","ND<1&&Tr1.fClIndex[0]>0"); - //treetr->SetAlias("forbidden4","ND<4&&Tr1.fNormChi2[0]<2"); - //treetr->SetAlias("forbidden5","ND<5&&Tr1.fNormChi2[0]<1"); - //----------------------------------------------------------- - 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]<4 && bestConst->GetNormChi2(0)<2) forbidden[itsindex]=kTRUE; - if (normdist[itsindex]<5 && bestConst->GetNormChi2(0)<1) forbidden[itsindex]=kTRUE; - if (bestConst->GetNormChi2(0)<2.5) { - minPointAngle[itsindex]= 0.9999; - maxr[itsindex] = 10; - } - } - // - //forbid daughter kink candidates - // - if (esdtrack->GetKinkIndex(0)>0) forbidden[itsindex] = kTRUE; - Bool_t isElectron = kTRUE; - Bool_t isProton = kTRUE; - Double_t pid[5]; - esdtrack->GetESDpid(pid); - for (Int_t i=1;i<5;i++){ - if (pid[0]2) forbidden[itsindex]=kFALSE; - normdist[itsindex]*=-1; - } - - // - // Causality cuts in TPC volume - // - if (esdtrack->GetTPCdensity(0,10) >0.6) maxr[itsindex] = TMath::Min(Float_t(110),maxr[itsindex]); - if (esdtrack->GetTPCdensity(10,30)>0.6) maxr[itsindex] = TMath::Min(Float_t(120),maxr[itsindex]); - if (esdtrack->GetTPCdensity(20,40)>0.6) maxr[itsindex] = TMath::Min(Float_t(130),maxr[itsindex]); - if (esdtrack->GetTPCdensity(30,50)>0.6) maxr[itsindex] = TMath::Min(Float_t(140),maxr[itsindex]); - // - if (esdtrack->GetTPCdensity(0,60)<0.4&&bestLong->GetNumberOfClusters()<3) minr[itsindex]=100; - // - // - if (kFALSE){ - cstream<<"Track"<< - "Tr0.="<GetSign()>0) continue; - AliITStrackMI *trackc0 = (AliITStrackMI*)trackarrayc.At(itrack0); - // - for (Int_t iesd1=0;iesd1GetSign()<0) continue; - Bool_t isGold = kFALSE; - if (TMath::Abs(TMath::Abs(btrack0->GetLabel())-TMath::Abs(btrack1->GetLabel()))==1){ - isGold = kTRUE; - } - AliITStrackMI *trackc1 = (AliITStrackMI*)trackarrayc.At(itrack1); - AliHelix &h1 = helixes[itrack0]; - AliHelix &h2 = helixes[itrack1]; - // - // find linear distance - Double_t rmin =0; - // - // - // - Double_t phase[2][2],radius[2]; - Int_t points = h1.GetRPHIintersections(h2, phase, radius); - if (points==0) continue; - Double_t delta[2]={1000000,1000000}; - rmin = radius[0]; - h1.ParabolicDCA(h2,phase[0][0],phase[0][1],radius[0],delta[0]); - if (points==2){ - if (radius[1]TMath::Min(maxr[itrack0],maxr[itrack1])) continue; - Float_t maxDist = TMath::Min(kMaxDist,Float_t(kMaxDist0+radiusC*kMaxDist1)); - if (distance>maxDist) continue; - Float_t pointAngle = h1.GetPointAngle(h2,phase[iphase],primvertex); - if (pointAnglemaxDist) continue; - // if (pvertex->GetRr()GetRr()>kMaxR) continue; - AliITStrackMI * track0=btrack0; - AliITStrackMI * track1=btrack1; - // if (pvertex->GetRr()<3.5){ - if (radiusC<3.5){ - //use longest tracks inside the pipe - track0 = (AliITStrackMI*)trackarrayl.At(itrack0); - track1 = (AliITStrackMI*)trackarrayl.At(itrack1); - } - // - // - pvertex->SetParamN(*track0); - pvertex->SetParamP(*track1); - pvertex->Update(primvertex); - pvertex->SetClusters(track0->ClIndex(),track1->ClIndex()); // register clusters - - if (pvertex->GetRr()GetRr()>kMaxR) continue; - if (pvertex->GetV0CosineOfPointingAngle()GetDist2()>maxDist) continue; - if (pvertex->GetDcaV0Daughters()>maxDist) continue; -//Bo: pvertex->SetLab(0,track0->GetLabel()); -//Bo: pvertex->SetLab(1,track1->GetLabel()); - pvertex->SetIndex(0,track0->GetESDtrack()->GetID()); - pvertex->SetIndex(1,track1->GetESDtrack()->GetID()); - // - AliITStrackMI * htrackc0 = trackc0 ? trackc0:dummy; - AliITStrackMI * htrackc1 = trackc1 ? trackc1:dummy; - - // - // - TObjArray * array0b = (TObjArray*)fBestHypothesys.At(itrack0); - if (!array0b&&pvertex->GetRr()<40 && TMath::Abs(track0->GetTgl())<1.1) { - fCurrentEsdTrack = itrack0; - FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack0),itrack0, kFALSE); - } - TObjArray * array1b = (TObjArray*)fBestHypothesys.At(itrack1); - if (!array1b&&pvertex->GetRr()<40 && TMath::Abs(track1->GetTgl())<1.1) { - fCurrentEsdTrack = itrack1; - FollowProlongationTree((AliITStrackMI*)fOriginal.At(itrack1),itrack1, kFALSE); - } - // - AliITStrackMI * track0b = (AliITStrackMI*)fOriginal.At(itrack0); - AliITStrackMI * track1b = (AliITStrackMI*)fOriginal.At(itrack1); - AliITStrackMI * track0l = (AliITStrackMI*)fOriginal.At(itrack0); - AliITStrackMI * track1l = (AliITStrackMI*)fOriginal.At(itrack1); - - Float_t minchi2before0=16; - Float_t minchi2before1=16; - Float_t minchi2after0 =16; - Float_t minchi2after1 =16; - Double_t xrp[3]; pvertex->GetXYZ(xrp[0],xrp[1],xrp[2]); //I.B. - Int_t maxLayer = GetNearestLayer(xrp); //I.B. - - if (array0b) for (Int_t i=0;i<5;i++){ - // best track after vertex - AliITStrackMI * btrack = (AliITStrackMI*)array0b->At(i); - if (!btrack) continue; - if (btrack->GetNumberOfClusters()>track0l->GetNumberOfClusters()) track0l = btrack; - // if (btrack->fXGetRr()-2.-0.5/(0.1+pvertex->GetAnglep()[2])) { - if (btrack->GetX()GetRr()-2.) { - if ( (maxLayer>i+2|| (i==0)) && btrack->GetNumberOfClusters()==(6-i)&&i<3){ - Float_t sumchi2= 0; - Float_t sumn = 0; - if (maxLayer<3){ // take prim vertex as additional measurement - if (normdist[itrack0]>0 && htrackc0){ - sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack0]*normdist[itrack0],16.); - }else{ - sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack0]*normdist[itrack0]+3.),16.); - } - sumn += 3-maxLayer; - } - for (Int_t ilayer=i;ilayerGetClIndex(ilayer)){ - sumchi2+=25; - continue; - }else{ - Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff); - for (Int_t itrack=0;itrack<4;itrack++){ - if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack0){ - sumchi2+=18.; //shared cluster - break; - } - } - sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer)); - sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer)); - } - } - sumchi2/=sumn; - if (sumchi2GetNormChi2(i); - break; - } - if (array1b) for (Int_t i=0;i<5;i++){ - // best track after vertex - AliITStrackMI * btrack = (AliITStrackMI*)array1b->At(i); - if (!btrack) continue; - if (btrack->GetNumberOfClusters()>track1l->GetNumberOfClusters()) track1l = btrack; - // if (btrack->fXGetRr()-2-0.5/(0.1+pvertex->GetAnglep()[2])){ - if (btrack->GetX()GetRr()-2){ - if ((maxLayer>i+2 || (i==0))&&btrack->GetNumberOfClusters()==(6-i)&&(i<3)){ - Float_t sumchi2= 0; - Float_t sumn = 0; - if (maxLayer<3){ // take prim vertex as additional measurement - if (normdist[itrack1]>0 && htrackc1){ - sumchi2 += TMath::Min((3.-maxLayer)*normdist[itrack1]*normdist[itrack1],16.); - }else{ - sumchi2 += TMath::Min((3.-maxLayer)*(3*normdist[itrack1]*normdist[itrack1]+3.),16.); - } - sumn += 3-maxLayer; - } - for (Int_t ilayer=i;ilayerGetClIndex(ilayer)){ - sumchi2+=30; - continue; - }else{ - Int_t c=( btrack->GetClIndex(ilayer) & 0x0fffffff); - for (Int_t itrack=0;itrack<4;itrack++){ - if (fgLayers[ilayer].GetClusterTracks(itrack,c)>=0 && fgLayers[ilayer].GetClusterTracks(itrack,c)!=itrack1){ - sumchi2+=18.; //shared cluster - break; - } - } - sumchi2+=btrack->GetDy(ilayer)*btrack->GetDy(ilayer)/(btrack->GetSigmaY(ilayer)*btrack->GetSigmaY(ilayer)); - sumchi2+=btrack->GetDz(ilayer)*btrack->GetDz(ilayer)/(btrack->GetSigmaZ(ilayer)*btrack->GetSigmaZ(ilayer)); - } - } - sumchi2/=sumn; - if (sumchi2GetNormChi2(i); - break; - } - // - // position resolution - used for DCA cut - Float_t sigmad = track0b->GetSigmaY2()+track0b->GetSigmaZ2()+track1b->GetSigmaY2()+track1b->GetSigmaZ2()+ - (track0b->GetX()-pvertex->GetRr())*(track0b->GetX()-pvertex->GetRr())*(track0b->GetSigmaSnp2()+track0b->GetSigmaTgl2())+ - (track1b->GetX()-pvertex->GetRr())*(track1b->GetX()-pvertex->GetRr())*(track1b->GetSigmaSnp2()+track1b->GetSigmaTgl2()); - sigmad =TMath::Sqrt(sigmad)+0.04; - if (pvertex->GetRr()>50){ - Double_t cov0[15],cov1[15]; - track0b->GetESDtrack()->GetInnerExternalCovariance(cov0); - track1b->GetESDtrack()->GetInnerExternalCovariance(cov1); - sigmad = cov0[0]+cov0[2]+cov1[0]+cov1[2]+ - (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov0[5]+cov0[9])+ - (80.-pvertex->GetRr())*(80.-pvertex->GetRr())*(cov1[5]+cov1[9]); - sigmad =TMath::Sqrt(sigmad)+0.05; - } - // - AliV0 vertex2; - vertex2.SetParamN(*track0b); - vertex2.SetParamP(*track1b); - vertex2.Update(primvertex); - //Bo: if (vertex2.GetDist2()<=pvertex->GetDist2()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){ - if (vertex2.GetDcaV0Daughters()<=pvertex->GetDcaV0Daughters()&&(vertex2.GetV0CosineOfPointingAngle()>=pvertex->GetV0CosineOfPointingAngle())){ - pvertex->SetParamN(*track0b); - pvertex->SetParamP(*track1b); - pvertex->Update(primvertex); - pvertex->SetClusters(track0b->ClIndex(),track1b->ClIndex()); // register clusters - pvertex->SetIndex(0,track0->GetESDtrack()->GetID()); - pvertex->SetIndex(1,track1->GetESDtrack()->GetID()); - } - pvertex->SetDistSigma(sigmad); - //Bo: pvertex->SetDistNorm(pvertex->GetDist2()/sigmad); - pvertex->SetNormDCAPrim(normdist[itrack0],normdist[itrack1]); - // - // define likelihhod and causalities - // - Float_t pa0=1, pa1=1, pb0=0.26, pb1=0.26; - if (maxLayer<1){ - Float_t fnorm0 = normdist[itrack0]; - if (fnorm0<0) fnorm0*=-3; - Float_t fnorm1 = normdist[itrack1]; - if (fnorm1<0) fnorm1*=-3; - if (pvertex->GetAnglep()[2]>0.1 || (pvertex->GetRr()<10.5)&& pvertex->GetAnglep()[2]>0.05 || pvertex->GetRr()<3){ - pb0 = TMath::Exp(-TMath::Min(fnorm0,Float_t(16.))/12.); - pb1 = TMath::Exp(-TMath::Min(fnorm1,Float_t(16.))/12.); - } - pvertex->SetChi2Before(normdist[itrack0]); - pvertex->SetChi2After(normdist[itrack1]); - pvertex->SetNAfter(0); - pvertex->SetNBefore(0); - }else{ - pvertex->SetChi2Before(minchi2before0); - pvertex->SetChi2After(minchi2before1); - if (pvertex->GetAnglep()[2]>0.1 || ( pvertex->GetRr()<10.5 && pvertex->GetAnglep()[2]>0.05) || pvertex->GetRr()<3){ - pb0 = TMath::Exp(-TMath::Min(minchi2before0,Float_t(16))/12.); - pb1 = TMath::Exp(-TMath::Min(minchi2before1,Float_t(16))/12.); - } - pvertex->SetNAfter(maxLayer); - pvertex->SetNBefore(maxLayer); - } - if (pvertex->GetRr()<90){ - pa0 *= TMath::Min(track0->GetESDtrack()->GetTPCdensity(0,60),Double_t(1.)); - pa1 *= TMath::Min(track1->GetESDtrack()->GetTPCdensity(0,60),Double_t(1.)); - } - if (pvertex->GetRr()<20){ - pa0 *= (0.2+TMath::Exp(-TMath::Min(minchi2after0,Float_t(16))/8.))/1.2; - pa1 *= (0.2+TMath::Exp(-TMath::Min(minchi2after1,Float_t(16))/8.))/1.2; - } - // - pvertex->SetCausality(pb0,pb1,pa0,pa1); - // - // Likelihood calculations - apply cuts - // - Bool_t v0OK = kTRUE; - Float_t p12 = pvertex->GetParamP()->GetParameter()[4]*pvertex->GetParamP()->GetParameter()[4]; - p12 += pvertex->GetParamN()->GetParameter()[4]*pvertex->GetParamN()->GetParameter()[4]; - p12 = TMath::Sqrt(p12); // "mean" momenta - Float_t sigmap0 = 0.0001+0.001/(0.1+pvertex->GetRr()); - Float_t sigmap = 0.5*sigmap0*(0.6+0.4*p12); // "resolution: of point angle - as a function of radius and momenta - - Float_t causalityA = (1.0-pvertex->GetCausalityP()[0])*(1.0-pvertex->GetCausalityP()[1]); - Float_t causalityB = TMath::Sqrt(TMath::Min(pvertex->GetCausalityP()[2],Double_t(0.7))* - TMath::Min(pvertex->GetCausalityP()[3],Double_t(0.7))); - // - //Bo: Float_t likelihood0 = (TMath::Exp(-pvertex->GetDistNorm())+0.1) *(pvertex->GetDist2()<0.5)*(pvertex->GetDistNorm()<5); - Float_t lDistNorm = pvertex->GetDcaV0Daughters()/pvertex->GetDistSigma(); - Float_t likelihood0 = (TMath::Exp(-lDistNorm)+0.1) *(pvertex->GetDcaV0Daughters()<0.5)*(lDistNorm<5); - - Float_t likelihood1 = TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/sigmap)+ - 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(4.*sigmap))+ - 0.4*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/(8.*sigmap))+ - 0.1*TMath::Exp(-(1.0001-pvertex->GetV0CosineOfPointingAngle())/0.01); - // - if (causalityAGetLabel())-TMath::Abs(track1->GetLabel()))==1; - cstream<<"It0"<< - "Tr0.="<SetStatus(0); - // if (rejectBase) { - // pvertex->SetStatus(-100); - //} - if (pvertex->GetV0CosineOfPointingAngle()>kMinPointAngle2) { - //Bo: pvertex->SetESDindexes(track0->GetESDtrack()->GetID(),track1->GetESDtrack()->GetID()); - pvertex->SetIndex(0,track0->GetESDtrack()->GetID());//Bo: consistency 0 for neg - pvertex->SetIndex(1,track1->GetESDtrack()->GetID());//Bo: consistency 1 for pos - if (v0OK){ - // AliV0vertex vertexjuri(*track0,*track1); - // vertexjuri.SetESDindexes(track0->fESDtrack->GetID(),track1->fESDtrack->GetID()); - // event->AddV0(&vertexjuri); - pvertex->SetStatus(100); - } - pvertex->SetOnFlyStatus(kTRUE); - pvertex->ChangeMassHypothesis(kK0Short); - event->AddV0(pvertex); - } - } - } - // - // - // delete temporary arrays - // - delete[] forbidden; - delete[] minPointAngle; - delete[] maxr; - delete[] minr; - delete[] norm; - delete[] normdist; - delete[] normdist1; - delete[] normdist0; - delete[] dist; - delete[] itsmap; - delete[] helixes; - delete pvertex; -} -//------------------------------------------------------------------------ -void AliITStrackerMI::RefitV02(AliESDEvent *event) -{ - // - //try to refit V0s in the third path of the reconstruction - // - TTreeSRedirector &cstream = *fDebugStreamer; - // - Int_t nv0s = event->GetNumberOfV0s(); - Float_t primvertex[3]={GetX(),GetY(),GetZ()}; - AliV0 v0temp; - for (Int_t iv0 = 0; iv0GetV0(iv0); - if (!v0mi) continue; - Int_t itrack0 = v0mi->GetIndex(0); - Int_t itrack1 = v0mi->GetIndex(1); - AliESDtrack *esd0 = event->GetTrack(itrack0); - AliESDtrack *esd1 = event->GetTrack(itrack1); - if (!esd0||!esd1) continue; - AliITStrackMI tpc0(*esd0); - AliITStrackMI tpc1(*esd1); - Double_t x,y,z; v0mi->GetXYZ(x,y,z); //I.B. - Double_t alpha =TMath::ATan2(y,x); //I.B. - if (v0mi->GetRr()>85){ - if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){ - v0temp.SetParamN(tpc0); - v0temp.SetParamP(tpc1); - v0temp.Update(primvertex); - if (kFALSE) cstream<<"Refit"<< - "V0.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - v0mi->SetParamN(tpc0); - v0mi->SetParamP(tpc1); - v0mi->Update(primvertex); - } - } - continue; - } - if (v0mi->GetRr()>35){ - CorrectForTPCtoITSDeadZoneMaterial(&tpc0); - CorrectForTPCtoITSDeadZoneMaterial(&tpc1); - if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){ - v0temp.SetParamN(tpc0); - v0temp.SetParamP(tpc1); - v0temp.Update(primvertex); - if (kFALSE) cstream<<"Refit"<< - "V0.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - v0mi->SetParamN(tpc0); - v0mi->SetParamP(tpc1); - v0mi->Update(primvertex); - } - } - continue; - } - CorrectForTPCtoITSDeadZoneMaterial(&tpc0); - CorrectForTPCtoITSDeadZoneMaterial(&tpc1); - // if (tpc0.Propagate(alpha,v0mi->GetRr())&&tpc1.Propagate(alpha,v0mi->GetRr())){ - if (RefitAt(v0mi->GetRr(),&tpc0, v0mi->GetClusters(0)) && RefitAt(v0mi->GetRr(),&tpc1, v0mi->GetClusters(1))){ - v0temp.SetParamN(tpc0); - v0temp.SetParamP(tpc1); - v0temp.Update(primvertex); - if (kFALSE) cstream<<"Refit"<< - "V0.="<GetDist2() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - if (v0temp.GetDcaV0Daughters()GetDcaV0Daughters() || v0temp.GetV0CosineOfPointingAngle()>v0mi->GetV0CosineOfPointingAngle()){ - v0mi->SetParamN(tpc0); - v0mi->SetParamP(tpc1); - v0mi->Update(primvertex); - } - } - } -} -//------------------------------------------------------------------------ void AliITStrackerMI::BuildMaterialLUT(TString material) { //-------------------------------------------------------------------- // Fill a look-up table with mean material @@ -4628,7 +4269,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; @@ -4679,13 +4321,14 @@ Int_t AliITStrackerMI::CorrectForPipeMaterial(AliITStrackMI *t, //------------------------------------------------------------------- // 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: @@ -4719,43 +4362,42 @@ Int_t AliITStrackerMI::CorrectForPipeMaterial(AliITStrackMI *t, 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; } //------------------------------------------------------------------------ @@ -4765,13 +4407,15 @@ Int_t AliITStrackerMI::CorrectForShieldMaterial(AliITStrackMI *t, //------------------------------------------------------------------- // 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: @@ -4810,49 +4454,57 @@ Int_t AliITStrackerMI::CorrectForShieldMaterial(AliITStrackMI *t, Error("CorrectForShieldMaterial"," Wrong shield name\n"); return 0; } + + // do nothing if we are already beyond the shield + Double_t rTrack = TMath::Sqrt(t->GetX()*t->GetX()+t->GetY()*t->GetY()); + if(dir<0 && rTrack > rToGo) return 1; // going outward + if(dir>0 && rTrack < rToGo) return 1; // going inward + + Double_t xToGo; if (!t->GetLocalXat(rToGo,xToGo)) return 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; } //------------------------------------------------------------------------ @@ -4863,13 +4515,15 @@ Int_t AliITStrackerMI::CorrectForLayerMaterial(AliITStrackMI *t, //------------------------------------------------------------------- // 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: @@ -4906,52 +4560,54 @@ Int_t AliITStrackerMI::CorrectForLayerMaterial(AliITStrackMI *t, Int_t index=6*fCurrentEsdTrack+layerindex; - // Bring the track beyond the material - if (!t->AliExternalTrackParam::PropagateTo(xToGo,GetBz())) return 0; - Double_t globXYZ[3]; - t->GetXYZ(globXYZ); 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; } @@ -5011,24 +4667,59 @@ void AliITStrackerMI::DeleteTrksMaterialLUT() { return; } //------------------------------------------------------------------------ -Int_t AliITStrackerMI::CheckSkipLayer(AliITStrackMI *track, +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 { //----------------------------------------------------------------- // This method is used to decide whether to allow a prolongation // 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; @@ -5043,8 +4734,10 @@ 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: something "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 //----------------------------------------------------------------- // check dead zones at z=0,+-7cm in the SPD @@ -5056,7 +4749,10 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, fSPDdetzcentre[2] - 0.5*AliITSRecoParam::GetSPDdetzlength(), fSPDdetzcentre[3] - 0.5*AliITSRecoParam::GetSPDdetzlength()}; for (Int_t i=0; i<3; i++) - if (track->GetZ()-dzGetZ()+dz>zmindead[i]) return 1; + if (track->GetZ()-dzGetZ()+dz>zmindead[i]) { + 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; + } } // check bad zones from OCDB @@ -5066,12 +4762,6 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, AliITSdetector &det=fgLayers[ilayer].GetDetector(idet); - // check if this detector is bad - if (det.IsBad()) { - //printf("lay %d bad detector %d\n",ilayer,idet); - return 2; - } - Int_t detType=-1; Float_t detSizeFactorX=0.0001,detSizeFactorZ=0.0001; if (ilayer==0 || ilayer==1) { // ---------- SPD @@ -5082,31 +4772,47 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, } 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(); // 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; Float_t xlocmax = xloc+dy; Int_t chipsInRoad[100]; - if (TMath::Max(TMath::Abs(xlocmin),TMath::Abs(xlocmax))>0.5*detSizeX || - TMath::Max(TMath::Abs(zlocmin),TMath::Abs(zlocmax))>0.5*detSizeZ) return 0; - //printf("lay %d det %d zmim zmax %f %f xmin xmax %f %f %f %f\n",ilayer,idet,zlocmin,zlocmax,xlocmin,xlocmax,segm->Dx(),segm->Dz()); + // check if road goes out of detector + Bool_t touchNeighbourDet=kFALSE; + 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 + if (det.IsBad()) { + AliDebug(2,Form("lay %d bad detector %d",ilayer,idet)); + if(!touchNeighbourDet) { + return 2; // all detectors in road are bad + } else { + return 3; // at least one is bad + } + } + + if(zlocmin>zlocmax)return 0; Int_t nChipsInRoad = segm->GetChipsInLocalWindow(chipsInRoad,zlocmin,zlocmax,xlocmin,xlocmax); - //printf("lay %d nChipsInRoad %d\n",ilayer,nChipsInRoad); + AliDebug(2,Form("lay %d nChipsInRoad %d",ilayer,nChipsInRoad)); if (!nChipsInRoad) return 0; Bool_t anyBad=kFALSE,anyGood=kFALSE; for (Int_t iCh=0; iChdet.GetNChips()-1) continue; - //printf(" chip %d bad %d\n",chipsInRoad[iCh],(Int_t)det.IsChipBad(chipsInRoad[iCh])); + AliDebug(2,Form(" chip %d bad %d",chipsInRoad[iCh],(Int_t)det.IsChipBad(chipsInRoad[iCh]))); if (det.IsChipBad(chipsInRoad[iCh])) { anyBad=kTRUE; } else { @@ -5114,30 +4820,41 @@ Int_t AliITStrackerMI::CheckDeadZone(AliITStrackMI *track, } } - if (!anyGood) return 2; // all chips in road are bad + if (!anyGood) { + if(!touchNeighbourDet) { + AliDebug(2,"all bad in road"); + return 2; // all chips in road are bad + } else { + return 3; // at least a bad chip in road + } + } - if (anyBad) return 3; // at least a bad chip in road + if (anyBad) { + AliDebug(2,"at least a bad in road"); + return 3; // at least a bad chip in road + } if (!AliITSReconstructor::GetRecoParam()->GetUseSingleBadChannelsFromOCDB() - || ilayer==4 || ilayer==5 // SSD || !noClusters) return 0; // There are no clusters in road: check if there is at least - // a bad SPD pixel or SDD anode + // a bad SPD pixel or SDD anode or SSD strips on both sides - if(ilayer==1 || ilayer==3 || ilayer==5) - idet += AliITSgeomTGeo::GetNLadders(ilayer)*AliITSgeomTGeo::GetNDetectors(ilayer); + Int_t idetInITS=idet; + for(Int_t l=0;lAnyBadInRoad(idet,zlocmin,zlocmax,xlocmin,xlocmax)) return 3; - - if (fITSChannelStatus->FractionOfBadInRoad(idet,zlocmin,zlocmax,xlocmin,xlocmax) > AliITSReconstructor::GetRecoParam()->GetMinFractionOfBadInRoad()) return 3; + if (fITSChannelStatus->AnyBadInRoad(idetInITS,zlocmin,zlocmax,xlocmin,xlocmax)) { + AliDebug(2,Form("Bad channel in det %d of layer %d\n",idet,ilayer)); + return 4; + } + //if (fITSChannelStatus->FractionOfBadInRoad(idet,zlocmin,zlocmax,xlocmin,xlocmax) > AliITSReconstructor::GetRecoParam()->GetMinFractionOfBadInRoad()) return 3; return 0; } //------------------------------------------------------------------------ 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 @@ -5146,7 +4863,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 @@ -5158,9 +4875,9 @@ Bool_t AliITStrackerMI::LocalModuleCoord(Int_t ilayer,Int_t idet, AliITSdetector &detector = fgLayers[ilayer].GetDetector(idet); // take into account the misalignment: xyz at real detector plane - track->GetXYZAt(detector.GetRmisal(),GetBz(),xyzGlob); + if(!track->GetXYZAt(detector.GetRmisal(),GetBz(),xyzGlob)) return kFALSE; - AliITSgeomTGeo::GlobalToLocal(ilayer+1,lad,det,xyzGlob,xyzLoc); + if(!AliITSgeomTGeo::GlobalToLocal(ilayer+1,lad,det,xyzGlob,xyzLoc)) return kFALSE; xloc = (Float_t)xyzLoc[0]; zloc = (Float_t)xyzLoc[2]; @@ -5168,7 +4885,8 @@ Bool_t AliITStrackerMI::LocalModuleCoord(Int_t ilayer,Int_t idet, 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){ // // Method to be optimized further: // Aim: decide whether a track can be used for PlaneEff evaluation @@ -5204,19 +4922,30 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(AliITStrackMI* track, const Int_t *clust 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 ); + 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; @@ -5246,14 +4975,22 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(AliITStrackMI* track, const Int_t *clust //*************** // 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(); @@ -5261,15 +4998,36 @@ Bool_t AliITStrackerMI::IsOKForPlaneEff(AliITStrackMI* track, const Int_t *clust 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; } //------------------------------------------------------------------------ -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. @@ -5344,9 +5102,32 @@ void AliITStrackerMI::UseTrackForPlaneEff(AliITStrackMI* track, Int_t ilayer) { 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; @@ -5393,10 +5174,36 @@ void AliITStrackerMI::UseTrackForPlaneEff(AliITStrackMI* track, Int_t ilayer) { } 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; @@ -5426,7 +5233,104 @@ void AliITStrackerMI::UseTrackForPlaneEff(AliITStrackMI* track, Int_t ilayer) { 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; +}