From f43e383bab3e9a6a9566af016d67d920327df805 Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 24 Aug 2004 13:15:34 +0000 Subject: [PATCH] Coding conventions (M.Ivanov) --- ITS/AliITStrackerMI.cxx | 21 ++++++++++----------- ITS/AliITStrackerMI.h | 24 ++++++++++++++---------- TPC/AliTPCTrackHitsV2.cxx | 7 ++----- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index f9967da1f31..534e824574d 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -18,25 +18,21 @@ // It reads AliITSclusterV2 clusters and creates AliITStrackV2 tracks // and fills with them the ESD // Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch +// Marian Ivanov, CERN, Marian.Ivanov@cern.ch // dEdx analysis by: Boris Batyunya, JINR, Boris.Batiounia@cern.ch +// //------------------------------------------------------------------------- - -#include - -#include +#include "AliITSrecoV2.h" #include -#include - #include "AliITSgeom.h" -#include "AliITSRecPoint.h" #include "AliTPCtrack.h" #include "AliESD.h" #include "AliITSclusterV2.h" -//#include "AliITStrackerV2.h" #include "AliITStrackerMI.h" #include "TMatrixD.h" #include "AliHelix.h" -#include "AliV0vertex.h" + + ClassImp(AliITStrackerMI) ClassImp(AliITSRecV0Info) @@ -2837,7 +2833,7 @@ Double_t AliITStrackerMI::GetPredictedChi2MI(AliITStrackV2* track, const AliITSc } -Int_t AliITStrackerMI::UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t index) +Int_t AliITStrackerMI::UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t index) const { // // @@ -3101,7 +3097,7 @@ void AliITStrackerMI::SignDeltas( TObjArray *ClusterArray, Float_t vz) } -void AliITStrackerMI::UpdateESDtrack(AliITStrackV2* track, ULong_t flags) +void AliITStrackerMI::UpdateESDtrack(AliITStrackV2* track, ULong_t flags) const { // // @@ -3221,6 +3217,9 @@ Double_t AliITStrackerMI::FindBestPair(Int_t esdtrack0, Int_t esdtrack1,AliITSR void AliITSRecV0Info::Update(Float_t vertex[3], Float_t mass1, Float_t mass2) { + // + //Update V0 information + // Float_t v[3] = {fXr[0]-vertex[0],fXr[1]-vertex[1],fXr[2]-vertex[2]}; Float_t p[3] = {fPdr[0]+fPm[0], fPdr[1]+fPm[1],fPdr[2]+fPm[2]}; diff --git a/ITS/AliITStrackerMI.h b/ITS/AliITStrackerMI.h index 43b39b8e51e..fc790f714fa 100644 --- a/ITS/AliITStrackerMI.h +++ b/ITS/AliITStrackerMI.h @@ -7,12 +7,12 @@ // ITS tracker // reads AliITSclusterMI clusters and creates AliITStrackV2 tracks // Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch +// Marian Ivanov, CERN, Marian.Ivanov@cern.ch //------------------------------------------------------------------------- #include #include "AliTracker.h" -#include "AliITSrecoV2.h" #include "AliITStrackV2.h" #include "AliITSclusterV2.h" @@ -26,7 +26,8 @@ class AliV0vertex; class AliITSRecV0Info: public TObject { -public: + friend class AliITStrackerMI; +protected: void Update(Float_t vertex[3], Float_t mass1, Float_t mass2); Double_t fDist1; //info about closest distance according closest MC - linear DCA Double_t fDist2; //info about closest distance parabolic DCA @@ -74,7 +75,7 @@ public: void GetNTeor(Int_t layer, const AliITSclusterV2* cl, Float_t theta, Float_t phi, Float_t &ny, Float_t &nz); Int_t GetError(Int_t layer, const AliITSclusterV2*cl, Float_t theta, Float_t phi, Float_t expQ, Float_t &erry, Float_t &errz); Double_t GetPredictedChi2MI(AliITStrackV2* track, const AliITSclusterV2 *cluster,Int_t layer); - Int_t UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t layer); + Int_t UpdateMI(AliITStrackV2* track, const AliITSclusterV2* cl,Double_t chi2,Int_t layer) const; class AliITSdetector { public: AliITSdetector(){} @@ -119,7 +120,7 @@ public: Double_t GetR() const {return fR;} Int_t FindClusterIndex(Float_t z) const; AliITSclusterV2 *GetCluster(Int_t i) const {return i -//#include "TVector3.h" #include "AliTPCTrackHitsV2.h" - #include "TClonesArray.h" #include "AliTPC.h" -#include - ClassImp(AliTPCTrackHitsV2) @@ -81,6 +76,8 @@ const Double_t AliTPCTrackHitsV2::fgkPrecision2=1e-20; //precision struct AliTPCTempHitInfoV2 { + friend class AliTPCTrackHitsV2; +protected: enum { kStackSize = 10000}; AliTPCTempHitInfoV2(); AliTPCTempHitInfoV2(const AliTPCTempHitInfoV2 &hit) -- 2.43.0