From: alibrary Date: Wed, 17 Mar 2004 07:55:47 +0000 (+0000) Subject: Correcting code violations X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=9e9f6402832c0262e05f7ee1d38f1b1ece34f748 Correcting code violations --- diff --git a/ALIFAST/AliFTrack.cxx b/ALIFAST/AliFTrack.cxx index 20cdcf127dc..4db1e288888 100644 --- a/ALIFAST/AliFTrack.cxx +++ b/ALIFAST/AliFTrack.cxx @@ -6,7 +6,6 @@ ////////////////////////////////////////////////////////////////////////// #include "AliFTrack.h" -#include "AliFast.h" ClassImp(AliFTrack) @@ -16,6 +15,9 @@ AliFTrack::AliFTrack(Int_t code, Double_t charge, Double_t v11, Double_t v22,Double_t v33, Double_t v12, Double_t v13, Double_t v23, Int_t iFlag) { + // + // Class constructor + // fIdTrack = code; fChTrack = charge; fPT = pT; diff --git a/ALIFAST/AliFTrack.h b/ALIFAST/AliFTrack.h index 645bac3f48d..c0fda3561f0 100644 --- a/ALIFAST/AliFTrack.h +++ b/ALIFAST/AliFTrack.h @@ -7,26 +7,10 @@ // // ////////////////////////////////////////////////////////////////////////// -#ifndef ROOT_TObject #include -#endif class AliFTrack : public TObject { -private: - Int_t fIdTrack; //Track code - Double_t fChTrack; //Track charge - Double_t fPT; //Track transverse momenta - Double_t fEta; //Track eta - Double_t fPhi; //Track phi - Double_t fV11; // - Double_t fV22; // - Double_t fV33; // - Double_t fV12; // - Double_t fV13; // - Double_t fV23; // - Int_t fIFlag; // - public: AliFTrack() {;} AliFTrack(Int_t code, Double_t charge, Double_t pT, Double_t eta, Double_t phi, @@ -37,18 +21,32 @@ public: virtual void Paint(Option_t *option=""); //getters - Int_t IdTrack() {return fIdTrack;} - Double_t ChTrack() {return fChTrack;} - Double_t PT() {return fPT;} - Double_t Eta() {return fEta;} - Double_t Phi() {return fPhi;} - Double_t V11() {return fV11;} - Double_t V22() {return fV22;} - Double_t V33() {return fV33;} - Double_t V12() {return fV12;} - Double_t V13() {return fV13;} - Double_t V23() {return fV23;} - Int_t IFlag() {return fIFlag;} + Int_t IdTrack() const {return fIdTrack;} + Double_t ChTrack() const {return fChTrack;} + Double_t PT() const {return fPT;} + Double_t Eta() const {return fEta;} + Double_t Phi() const {return fPhi;} + Double_t V11() const {return fV11;} + Double_t V22() const {return fV22;} + Double_t V33() const {return fV33;} + Double_t V12() const {return fV12;} + Double_t V13() const {return fV13;} + Double_t V23() const {return fV23;} + Int_t IFlag() const {return fIFlag;} + +private: + Int_t fIdTrack; //Track code + Double_t fChTrack; //Track charge + Double_t fPT; //Track transverse momenta + Double_t fEta; //Track eta + Double_t fPhi; //Track phi + Double_t fV11; //Element of the covariance matrix + Double_t fV22; //Element of the covariance matrix + Double_t fV33; //Element of the covariance matrix + Double_t fV12; //Element of the covariance matrix + Double_t fV13; //Element of the covariance matrix + Double_t fV23; //Element of the covariance matrix + Int_t fIFlag; //Status flag ClassDef(AliFTrack, 1) //AliFast track class