X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliAODTrack.cxx;h=c440da1da9483db8eb459776affa94d56b7b1afb;hb=ec10fec556bc4b54ea5c21a3c5d761112e115478;hp=611dc6208aad7f799522de7a241de4686d215925;hpb=f12d42ce278a59610f20e1e05a794238bdc9f2ab;p=u%2Fmrichter%2FAliRoot.git diff --git a/STEER/AliAODTrack.cxx b/STEER/AliAODTrack.cxx index 611dc6208aa..c440da1da94 100644 --- a/STEER/AliAODTrack.cxx +++ b/STEER/AliAODTrack.cxx @@ -16,7 +16,7 @@ /* $Id$ */ //------------------------------------------------------------------------- -// AOD track implementation of AliVParticle +// AOD track implementation of AliVTrack // Author: Markus Oldenburg, CERN // Markus.Oldenburg@cern.ch //------------------------------------------------------------------------- @@ -28,7 +28,7 @@ ClassImp(AliAODTrack) //______________________________________________________________________________ AliAODTrack::AliAODTrack() : - AliVParticle(), + AliVTrack(), fChi2perNDF(-999.), fChi2MatchTrigger(0.), fFlags(0), @@ -68,7 +68,7 @@ AliAODTrack::AliAODTrack(Short_t id, AODTrk_t ttype, UInt_t selectInfo, Float_t chi2perNDF) : - AliVParticle(), + AliVTrack(), fChi2perNDF(chi2perNDF), fChi2MatchTrigger(0.), fFlags(0), @@ -112,7 +112,7 @@ AliAODTrack::AliAODTrack(Short_t id, AODTrk_t ttype, UInt_t selectInfo, Float_t chi2perNDF) : - AliVParticle(), + AliVTrack(), fChi2perNDF(chi2perNDF), fChi2MatchTrigger(0.), fFlags(0), @@ -150,7 +150,7 @@ AliAODTrack::~AliAODTrack() //______________________________________________________________________________ AliAODTrack::AliAODTrack(const AliAODTrack& trk) : - AliVParticle(trk), + AliVTrack(trk), fChi2perNDF(trk.fChi2perNDF), fChi2MatchTrigger(trk.fChi2MatchTrigger), fFlags(trk.fFlags), @@ -183,7 +183,7 @@ AliAODTrack& AliAODTrack::operator=(const AliAODTrack& trk) // Assignment operator if(this!=&trk) { - AliVParticle::operator=(trk); + AliVTrack::operator=(trk); trk.GetP(fMomentum); trk.GetPosition(fPosition); @@ -450,9 +450,10 @@ void AliAODTrack::Print(Option_t* /* option */) const printf(" charge = %d\n", Charge()); } -void AliAODTrack::SetMatchTrigger(Int_t matchTrig){ -// -// Set the MUON trigger information +//______________________________________________________________________________ +void AliAODTrack::SetMatchTrigger(Int_t matchTrig) +{ + // Set the MUON trigger information switch(matchTrig){ case 0: // 0 track does not match trigger fITSMuonClusterMap=fITSMuonClusterMap&0x3fffffff; @@ -472,182 +473,38 @@ void AliAODTrack::SetMatchTrigger(Int_t matchTrig){ } } -Int_t AliAODTrack::HitsMT(Int_t istation, Int_t iplane, Option_t *cathode){ -// -// Retrieve hit information for MUON identified by (station, plane, cathode) - if(cathode){ - if(cathode[0]=='x'||cathode[0]=='X'){ - if(istation==1){ - if(iplane==1) - return (fITSMuonClusterMap&0x8000)?1:0; - else if(iplane==2) - return (fITSMuonClusterMap&0x4000)?1:0; - else - return 0; - }else if(istation==2){ - if(iplane==1) - return (fITSMuonClusterMap&0x2000)?1:0; - else if(iplane==2) - return (fITSMuonClusterMap&0x1000)?1:0; - else - return 0; - }else{ - return 0; - } - }else if(cathode[0]=='y'||cathode[0]=='Y'){ - if(istation==1){ - if(iplane==1) - return (fITSMuonClusterMap&0x0800)?1:0; - else if(iplane==2) - return (fITSMuonClusterMap&0x0400)?1:0; - else - return 0; - }else if(istation==2){ - if(iplane==1) - return (fITSMuonClusterMap&0x0200)?1:0; - else if(iplane==2) - return (fITSMuonClusterMap&0x0100)?1:0; - else - return 0; - }else{ - return 0; - } - }else{ - return 0; - } - }else{ - if(istation==1){ - if(iplane==1) - return (HitsMT(1,1,"X")||HitsMT(1,1,"Y"))?1:0; - else if(iplane==2) - return (HitsMT(1,2,"X")||HitsMT(1,2,"Y"))?1:0; - else - return 0; - }else if(istation==2){ - if(iplane==1) - return (HitsMT(2,1,"X")||HitsMT(2,1,"Y"))?1:0; - else if(iplane==2) - return (HitsMT(2,2,"X")||HitsMT(2,2,"Y"))?1:0; - else - return 0; - }else{ - return 0; - } - } -} - -Int_t AliAODTrack::HitsMuonChamber(Int_t MuonChamber){ - // - // Retrieve hit information for MUON Tracker/Trigger Chamber - // WARNING: chamber number start from 1 instead of 0 +//______________________________________________________________________________ +Bool_t AliAODTrack::HitsMuonChamber(Int_t MuonChamber, Int_t cathode) const +{ + // return kTRUE if the track fires the given tracking or trigger chamber. + // If the chamber is a trigger one: + // - if cathode = 0 or 1, the track matches the corresponding cathode + // - if cathode = -1, the track matches both cathodes - if (MuonChamber > 0 && MuonChamber < 11) { - return ((GetMUONClusterMap() & BIT(MuonChamber-1)) != 0) ? 1 : 0; - } else { - switch(MuonChamber){ - case 11: - return HitsMT(1,1); - case 12: - return HitsMT(1,2); - case 13: - return HitsMT(2,1); - case 14: - return HitsMT(2,2); - default: - printf("Unknown MUON chamber: %d\n",MuonChamber); - return 0; - } + if (MuonChamber < 0) return kFALSE; + + if (MuonChamber < 10) return TESTBIT(GetMUONClusterMap(), MuonChamber); + + if (MuonChamber < 14) { + + if (cathode < 0) return TESTBIT(GetHitsPatternInTrigCh(), 13-MuonChamber) && + TESTBIT(GetHitsPatternInTrigCh(), 13-MuonChamber+4); + + if (cathode < 2) return TESTBIT(GetHitsPatternInTrigCh(), 13-MuonChamber+(1-cathode)*4); + } + + return kFALSE; } -Bool_t AliAODTrack::PropagateTo(Double_t xk, Double_t b) { - //---------------------------------------------------------------- - // Propagate this track to the plane X=xk (cm) in the field "b" (kG) - // This is in local coordinates!!! - //---------------------------------------------------------------- - - Double_t alpha = 0.; - Double_t localP[3] = {Px(), Py(), Pz()}; // set global (sic!) p - Global2LocalMomentum(localP, Charge(), alpha); // convert global to local momentum - - AliAODVertex *origin = (AliAODVertex*)fProdVertex.GetObject(); - Double_t localX[3] = {origin->GetX(), origin->GetY(), origin->GetZ()}; // set global (sic!) location of first track point - Global2LocalPosition(localX, alpha); // convert global to local position - - Double_t &fX = localX[0]; - - Double_t dx=xk-fX; - if (TMath::Abs(dx)<=kAlmost0) return kTRUE; - - Double_t crv=localP[0]*b*kB2C; - if (TMath::Abs(b) < kAlmost0Field) crv=0.; - - Double_t f1=localP[1], f2=f1 + crv*dx; - if (TMath::Abs(f1) >= kAlmost1) return kFALSE; - if (TMath::Abs(f2) >= kAlmost1) return kFALSE; - - Double_t &fP0=localX[1], &fP1=localX[2], &fP2=localP[0], &fP3=localP[1], &fP4=localP[2]; - /* covariance matrix to be fixed! - Double_t - &fC00=fC[0], - &fC10=fC[1], &fC11=fC[2], - &fC20=fC[3], &fC21=fC[4], &fC22=fC[5], - &fC30=fC[6], &fC31=fC[7], &fC32=fC[8], &fC33=fC[9], - &fC40=fC[10], &fC41=fC[11], &fC42=fC[12], &fC43=fC[13], &fC44=fC[14]; - */ - Double_t r1=TMath::Sqrt(1.- f1*f1), r2=TMath::Sqrt(1.- f2*f2); - - fX=xk; - fP0 += dx*(f1+f2)/(r1+r2); - fP1 += dx*(r2 + f2*(f1+f2)/(r1+r2))*fP3; - fP2 += dx*crv; - - //f = F - 1 - - //Double_t f02= dx/(r1*r1*r1); - Double_t cc=crv/fP4; - Double_t f04=0.5*dx*dx/(r1*r1*r1); f04*=cc; - //Double_t f12= dx*fP3*f1/(r1*r1*r1); - Double_t f14=0.5*dx*dx*fP3*f1/(r1*r1*r1); f14*=cc; - //Double_t f13= dx/r1; - Double_t f24= dx; f24*=cc; - - /* covariance matrix to be fixed! - //b = C*ft - Double_t b00=f02*fC20 + f04*fC40, b01=f12*fC20 + f14*fC40 + f13*fC30; - Double_t b02=f24*fC40; - Double_t b10=f02*fC21 + f04*fC41, b11=f12*fC21 + f14*fC41 + f13*fC31; - Double_t b12=f24*fC41; - Double_t b20=f02*fC22 + f04*fC42, b21=f12*fC22 + f14*fC42 + f13*fC32; - Double_t b22=f24*fC42; - Double_t b40=f02*fC42 + f04*fC44, b41=f12*fC42 + f14*fC44 + f13*fC43; - Double_t b42=f24*fC44; - Double_t b30=f02*fC32 + f04*fC43, b31=f12*fC32 + f14*fC43 + f13*fC33; - Double_t b32=f24*fC43; +//______________________________________________________________________________ +Bool_t AliAODTrack::MatchTriggerDigits() const +{ + // return kTRUE if the track matches a digit on both planes of at least 2 trigger chambers - //a = f*b = f*C*ft - Double_t a00=f02*b20+f04*b40,a01=f02*b21+f04*b41,a02=f02*b22+f04*b42; - Double_t a11=f12*b21+f14*b41+f13*b31,a12=f12*b22+f14*b42+f13*b32; - Double_t a22=f24*b42; - - //F*C*Ft = C + (b + bt + a) - fC00 += b00 + b00 + a00; - fC10 += b10 + b01 + a01; - fC20 += b20 + b02 + a02; - fC30 += b30; - fC40 += b40; - fC11 += b11 + b11 + a11; - fC21 += b21 + b12 + a12; - fC31 += b31; - fC41 += b41; - fC22 += b22 + b22 + a22; - fC32 += b32; - fC42 += b42; - */ + Int_t nMatchedChambers = 0; + for (Int_t ich=10; ich<14; ich++) if (HitsMuonChamber(ich)) nMatchedChambers++; - Local2GlobalMomentum(localP, alpha); // convert local to global momentum - SetP(localP); - - return kTRUE; + return (nMatchedChambers >= 2); }