From 6d171107b1f276bb09a04486958d068b86dc8d61 Mon Sep 17 00:00:00 2001 From: alibrary Date: Thu, 15 Apr 2004 07:46:45 +0000 Subject: [PATCH] Coding Convention Violations corrections --- TPC/AliTPCTrackHits.cxx | 31 +++++++++------------------ TPC/AliTPCTrackHits.h | 14 +++++-------- TPC/AliTPCclusterMI.cxx | 12 +++++++++++ TPC/AliTPCclusterMI.h | 46 ++++++++++++++++++++++------------------- TPC/AliTPCtrackerMI.cxx | 24 +++++++++------------ TPC/AliTPCtrackerMI.h | 11 +++++++--- 6 files changed, 70 insertions(+), 68 deletions(-) diff --git a/TPC/AliTPCTrackHits.cxx b/TPC/AliTPCTrackHits.cxx index 59075ecf98e..49a9448b91a 100644 --- a/TPC/AliTPCTrackHits.cxx +++ b/TPC/AliTPCTrackHits.cxx @@ -34,14 +34,10 @@ // // /////////////////////////////////////////////////////////////////////////////// -//#include "TVector3.h" -//#include "TClonesArray.h" -#include "AliTPCTrackHits.h" -#include "AliTPC.h" - -//#include - +#include +#include "AliTPC.h" +#include "AliTPCTrackHits.h" ClassImp(AliTPCTrackHits) LClassImp(AliTrackHitsInfo) @@ -60,14 +56,7 @@ const Double_t AliTPCTrackHits::fgkPrecision=1e-6; //precision const Double_t AliTPCTrackHits::fgkPrecision2=1e-20; //precision -/************************************************************/ -// Interface classes // -#include "AliTPCTrackHitsInterfaces.h" - - - - -struct AliTPCCurrentHit { +class AliTPCCurrentHit { friend class AliTPCTrackHits; private: AliTPChit fHit; // - hit in "standard" representation @@ -79,16 +68,16 @@ private: }; -struct AliTPCTempHitInfo { +class AliTPCTempHitInfo { friend class AliTPCTrackHits; private: enum { kStackSize = 100}; AliTPCTempHitInfo(); - AliTPCTempHitInfo(const AliTPCTempHitInfo &t){ - } - AliTPCTempHitInfo & operator=(const AliTPCTempHitInfo& r){ - return *this; - } + AliTPCTempHitInfo(const AliTPCTempHitInfo &) + {::Fatal("copy ctor","Not implemented\n");} + AliTPCTempHitInfo & operator = (const AliTPCTempHitInfo &) + {::Fatal("= operator","Not implemented\n");return *this;} + void NewParam(Double_t r, Double_t z, Double_t fi, Int_t q); void SetHit(Double_t r, Double_t z, Double_t fi, Int_t q); Double_t * GetPosition(Int_t index){return &fPositionStack[index*3];} diff --git a/TPC/AliTPCTrackHits.h b/TPC/AliTPCTrackHits.h index 045c80429ed..071c135f8df 100644 --- a/TPC/AliTPCTrackHits.h +++ b/TPC/AliTPCTrackHits.h @@ -8,15 +8,11 @@ // Manager class for TPC clusters // //////////////////////////////////////////////// +class TClonesArray; + #include "AliCTypes.h" -//#include "AliSegmentID.h" -//#include "AliArrayS.h" -//#include "AliTPC.h" -//#include "TVector3.h" -//#include "AliObjectArray.h" #include "TArrayOfArray.h" -class TClonesArray; class AliArrayS; class AliTPChit; class AliTPCTempHitInfo; @@ -42,7 +38,7 @@ class AliTrackHitsInfo { class AliTrackHitsParam { friend class AliTPCTrackHits; - friend struct AliTPCTempHitInfo; + friend class AliTPCTempHitInfo; public: AliTrackHitsParam(){fgCounter1++;fgCounter2++;} ~AliTrackHitsParam(){fgCounter1--;} @@ -63,7 +59,7 @@ class AliTrackHitsParam { class AliHitInfo { friend class AliTPCTrackHits; - friend struct AliTPCTempHitInfo; + friend class AliTPCTempHitInfo; public: AliHitInfo(){fgCounter1++;fgCounter2++;} ~AliHitInfo(){fgCounter1--;} @@ -80,7 +76,7 @@ public: class AliTPCTrackHits : public TObject{ friend class AliTPC; - friend struct AliTPCTempHitInfo; + friend class AliTPCTempHitInfo; public: AliTPCTrackHits(); ~AliTPCTrackHits(); diff --git a/TPC/AliTPCclusterMI.cxx b/TPC/AliTPCclusterMI.cxx index 469ca53abec..ca51617915b 100644 --- a/TPC/AliTPCclusterMI.cxx +++ b/TPC/AliTPCclusterMI.cxx @@ -13,6 +13,18 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ +//------------------------------------------------------- +// Implementation of the TPC cluser +// +// Origin: Marian Ivanov Marian.Ivanov@cern.ch +// +// AliTPC parallel tracker - +// Description of this class together with its intended usage +// will follow shortly +// +//------------------------------------------------------- + +/* $Id$ */ #include "AliTPCclusterMI.h" diff --git a/TPC/AliTPCclusterMI.h b/TPC/AliTPCclusterMI.h index 6c01d55626f..195bd7bd3aa 100644 --- a/TPC/AliTPCclusterMI.h +++ b/TPC/AliTPCclusterMI.h @@ -3,10 +3,13 @@ //------------------------------------------------------- // TPC Cluster Class -// +// Parallel tracking // Origin: Marian Ivanov //------------------------------------------------------- +/* $Id$ */ + + #include "AliCluster.h" #include "TMath.h" @@ -15,6 +18,7 @@ class AliTPCclusterMI : public AliCluster { public: AliTPCclusterMI():AliCluster(){fQ=0; fUsed=0;} AliTPCclusterMI(Int_t *lab, Float_t *hit) : AliCluster(lab,hit) {fQ = (Short_t)hit[4];} + virtual ~AliTPCclusterMI() {} virtual Bool_t IsSortable() const; virtual Int_t Compare(const TObject* obj) const; inline void Use(Int_t inc=10); @@ -42,25 +46,17 @@ void AliTPCclusterMI::Use(Int_t inc) } class AliTPCclusterLMI { - private: - Short_t fCZ; // current cluster position Z in cm - 100 mum precision - Short_t fCY; // current cluster position Y in cm - 100 mum precision - UChar_t fSigmaZ; // shape Z - normalised shape - normaliziation 1 - precision 2 percent - UChar_t fSigmaY; // shape Y - normalised shape - normaliziation 1 - precision 2 percent - UShort_t fQ; // total charge in cluster - UShort_t fMax; // charge at maximum - Char_t fCType; // type of the cluster - Int_t fLabel[3]; // track indexes - public: + +public: AliTPCclusterLMI(){fCZ=fCY=fSigmaZ=fSigmaY=fQ=fMax=fCType=0;} - inline Float_t GetZ() {return (fCZ*0.01);} - inline Float_t GetY() {return (fCY*0.01);} - inline Float_t GetSigmaZ() {return (fSigmaZ*0.02);} - inline Float_t GetSigmaY() {return (fSigmaY*0.02);} - inline Int_t GetType() {return fCType;} - inline Int_t GetMax() {return fMax;} - inline Float_t GetQ() {return fQ;} - inline Int_t GelLabel(Int_t i){return fLabel[i];} + Float_t GetZ() const {return (fCZ*0.01);} + Float_t GetY() const {return (fCY*0.01);} + Float_t GetSigmaZ() const {return (fSigmaZ*0.02);} + Float_t GetSigmaY() const {return (fSigmaY*0.02);} + Int_t GetType() const {return fCType;} + Int_t GetMax() const {return fMax;} + Float_t GetQ() const {return fQ;} + Int_t GelLabel(Int_t i) const {return fLabel[i];} // void SetY(Float_t y){ fCY = Short_t(TMath::Nint(y*100.));} void SetZ(Float_t z){ fCZ = Short_t(TMath::Nint(z*100.));} @@ -70,8 +66,16 @@ class AliTPCclusterLMI { void SetMax(Float_t max) {fMax = UShort_t(max);} void SetType(Char_t type) {fCType = type;} void SetLabels(Int_t labels[3]){fLabel[0] = labels[0];fLabel[1] = labels[1];fLabel[2] = labels[2];} - // - public: + +private: + Short_t fCZ; // current cluster position Z in cm - 100 mum precision + Short_t fCY; // current cluster position Y in cm - 100 mum precision + UChar_t fSigmaZ; // shape Z - normalised shape - normaliziation 1 - precision 2 percent + UChar_t fSigmaY; // shape Y - normalised shape - normaliziation 1 - precision 2 percent + UShort_t fQ; // total charge in cluster + UShort_t fMax; // charge at maximum + Char_t fCType; // type of the cluster + Int_t fLabel[3]; // track indexes ClassDef(AliTPCclusterLMI,1) }; diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx index d0f3689fd6a..c8b03ff9f3d 100644 --- a/TPC/AliTPCtrackerMI.cxx +++ b/TPC/AliTPCtrackerMI.cxx @@ -31,28 +31,25 @@ /* $Id$ */ -#include -#include -#include -#include #include "Riostream.h" +#include +#include +#include +#include -#include "AliTPCclusterMI.h" #include "AliComplexCluster.h" -#include "AliTPCParam.h" -#include "AliTPCClustersRow.h" -#include "AliTPCpolyTrack.h" -#include "TStopwatch.h" #include "AliESD.h" #include "AliHelix.h" -// #include "AliRunLoader.h" -// +#include "AliTPCClustersRow.h" +#include "AliTPCParam.h" +#include "AliTPCclusterMI.h" +#include "AliTPCpolyTrack.h" #include "AliTPCreco.h" #include "AliTPCtrackerMI.h" - - +#include "TStopwatch.h" +// ClassImp(AliTPCseed) ClassImp(AliTPCtrackerMI) @@ -67,7 +64,6 @@ public: }; Double_t AliTPCFastMath::fgFastAsin[20000]; -AliTPCFastMath gAliTPCFastMath; AliTPCFastMath::AliTPCFastMath(){ // diff --git a/TPC/AliTPCtrackerMI.h b/TPC/AliTPCtrackerMI.h index e08d05c6e77..1d2c5d83661 100644 --- a/TPC/AliTPCtrackerMI.h +++ b/TPC/AliTPCtrackerMI.h @@ -12,6 +12,9 @@ // // Origin: //------------------------------------------------------- + +#include + #include "AliTracker.h" #include "AliTPCtrack.h" #include "AliComplexCluster.h" @@ -67,6 +70,8 @@ class AliTPCseed : public AliTPCtrack { // // private: + AliTPCseed & operator = (const AliTPCseed &) + {::Fatal("= operator","Not Implemented\n");return *this;} AliESDtrack * fEsd; //! AliTPCclusterMI* fClusterPointer[160]; //! array of cluster pointers - TClonesArray * fPoints; // array with points along the track @@ -133,7 +138,7 @@ public: // AliCluster * GetCluster (int) const {return 0;} AliTPCclusterMI *GetClusterMI(Int_t index) const; - Int_t Clusters2Tracks(const TFile */*in*/, TFile */*out*/){return 0;} + Int_t Clusters2Tracks(const TFile */*in*/, TFile */*out*/) const {return 0;} Int_t Clusters2Tracks(); virtual void CookLabel(AliTPCseed *t,Float_t wrong) const; @@ -149,7 +154,7 @@ public: Int_t UpdateClusters(AliTPCseed& t, Int_t nr); Int_t FollowToNextCluster( AliTPCseed& t, Int_t nr); - virtual Int_t PropagateBack (const TFile *, TFile *){return 0;} + virtual Int_t PropagateBack (const TFile *, TFile *) const {return 0;} Int_t PropagateBack(TObjArray * arr); Int_t PropagateBack(AliESD * event); Int_t PropagateBack(AliTPCseed *pt, Int_t row0, Int_t row1); @@ -195,7 +200,7 @@ public: void SetX(Double_t x) {fX=x;} Double_t GetX() const {return fX;} - private: +private: Float_t fDeadZone; // the width of the dead zone AliTPCclusterMI *fClusters1; //array with clusters 1 Int_t fN1; //number of clusters on left side -- 2.43.0