From 6ff24c60916ca29332930a97a82e03604318ad0e Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 23 Feb 2015 15:59:48 +0100 Subject: [PATCH] ALIROOT-5836 AliESDpid not respecting the AliVTrack interface (patch from Mihaela) --- STEER/ESD/AliESDpid.cxx | 18 +++++++++--------- STEER/STEERBase/AliVTrack.h | 2 ++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/STEER/ESD/AliESDpid.cxx b/STEER/ESD/AliESDpid.cxx index 197af80840f..5ab6fe37eb0 100644 --- a/STEER/ESD/AliESDpid.cxx +++ b/STEER/ESD/AliESDpid.cxx @@ -71,13 +71,13 @@ Int_t AliESDpid::MakePID(AliESDEvent *event, Bool_t TPConly, Float_t /*timeZeroT } //_________________________________________________________________________ Float_t AliESDpid::GetTPCsignalTunedOnData(const AliVTrack *t) const { - AliESDtrack *track = (AliESDtrack *) t; - Float_t dedx = track->GetTPCsignalTunedOnData(); +// AliESDtrack *track = (AliESDtrack *) t; + Float_t dedx = t->GetTPCsignalTunedOnData(); if(dedx > 0) return dedx; dedx = t->GetTPCsignal(); - track->SetTPCsignalTunedOnData(dedx); + ((AliVTrack*)t)->SetTPCsignalTunedOnData(dedx); if(dedx < 20) return dedx; AliPID::EParticleType type = AliPID::kPion; @@ -125,9 +125,9 @@ Float_t AliESDpid::GetTPCsignalTunedOnData(const AliVTrack *t) const { if(kGood){ //TODO maybe introduce different dEdxSources? - Double_t bethe = fTPCResponse.GetExpectedSignal(track, type, AliTPCPIDResponse::kdEdxDefault, this->UseTPCEtaCorrection(), + Double_t bethe = fTPCResponse.GetExpectedSignal(t, type, AliTPCPIDResponse::kdEdxDefault, this->UseTPCEtaCorrection(), this->UseTPCMultiplicityCorrection()); - Double_t sigma = fTPCResponse.GetExpectedSigma(track, type, AliTPCPIDResponse::kdEdxDefault, this->UseTPCEtaCorrection(), + Double_t sigma = fTPCResponse.GetExpectedSigma(t, type, AliTPCPIDResponse::kdEdxDefault, this->UseTPCEtaCorrection(), this->UseTPCMultiplicityCorrection()); dedx = gRandom->Gaus(bethe,sigma); // if(iS == AliPID::ParticleCode(AliPID::kHe3) || iS == AliPID::ParticleCode(AliPID::kAlpha)) dedx *= 5; @@ -135,13 +135,13 @@ Float_t AliESDpid::GetTPCsignalTunedOnData(const AliVTrack *t) const { } } - track->SetTPCsignalTunedOnData(dedx); + ((AliVTrack*)t)->SetTPCsignalTunedOnData(dedx); return dedx; } //_________________________________________________________________________ Float_t AliESDpid::GetTOFsignalTunedOnData(const AliVTrack *t) const { - AliESDtrack *track = (AliESDtrack *) t; - Double_t tofSignal = track->GetTOFsignalTunedOnData(); +// AliESDtrack *track = (AliESDtrack *) t; + Double_t tofSignal = t->GetTOFsignalTunedOnData(); if(tofSignal < 99999) return (Float_t)tofSignal; // it has been already set // read additional mismatch fraction @@ -153,7 +153,7 @@ Float_t AliESDpid::GetTOFsignalTunedOnData(const AliVTrack *t) const { } tofSignal = t->GetTOFsignal() + fTOFResponse.GetTailRandomValue(t->Pt(),t->Eta(),t->GetTOFsignal(),addmism); - track->SetTOFsignalTunedOnData(tofSignal); + ((AliVTrack*)t)->SetTOFsignalTunedOnData(tofSignal); return (Float_t)tofSignal; } //_________________________________________________________________________ diff --git a/STEER/STEERBase/AliVTrack.h b/STEER/STEERBase/AliVTrack.h index de7817edb09..3e2d1215b23 100644 --- a/STEER/STEERBase/AliVTrack.h +++ b/STEER/STEERBase/AliVTrack.h @@ -124,12 +124,14 @@ public: virtual Double_t GetITSsignal() const {return 0.;} virtual Double_t GetTPCsignal() const {return 0.;} virtual Double_t GetTPCsignalTunedOnData() const {return 0.;} + virtual void SetTPCsignalTunedOnData(Double_t /*signal*/) {} virtual UShort_t GetTPCsignalN() const {return 0 ;} virtual Double_t GetTPCmomentum() const {return 0.;} virtual Double_t GetTPCTgl() const {return 0.;} virtual Double_t GetTgl() const {return 0.;} virtual Double_t GetTOFsignal() const {return 0.;} virtual Double_t GetTOFsignalTunedOnData() const {return 0.;} + virtual void SetTOFsignalTunedOnData(Double_t /*signal*/) {} virtual Double_t GetHMPIDsignal() const {return 0.;} virtual Double_t GetTRDsignal() const {return 0.;} virtual UChar_t GetTRDNchamberdEdx() const {return 0;} -- 2.43.0