From: skowron Date: Wed, 18 Jun 2003 13:26:29 +0000 (+0000) Subject: Putting back corrections for coding connsion X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=aa4e0a70b6d674a7951957f986cd06396a6c4d7a Putting back corrections for coding connsion --- diff --git a/HBTAN/AliHBTAnalysis.h b/HBTAN/AliHBTAnalysis.h index e6dc69a305d..46254ae7043 100644 --- a/HBTAN/AliHBTAnalysis.h +++ b/HBTAN/AliHBTAnalysis.h @@ -1,8 +1,6 @@ #ifndef ALIHBTANALYSIS_H #define ALIHBTANALYSIS_H -/* $Id$ */ - #include class AliHBTParticleCut; @@ -30,7 +28,7 @@ class AliHBTAnalysis: public TObject public: AliHBTAnalysis(); AliHBTAnalysis(const AliHBTAnalysis& in); - AliHBTAnalysis& operator=(const AliHBTAnalysis& right); + const AliHBTAnalysis& operator=(const AliHBTAnalysis& right); virtual ~AliHBTAnalysis(); virtual void Process(Option_t* option = "TracksAndParticles"); @@ -109,7 +107,7 @@ class AliHBTAnalysis: public TObject static const UInt_t fgkFctnArraySize;//! static const UInt_t fgkDefaultMixingInfo;//! static const Int_t fgkDefaultBufferSize;//! - + public: ClassDef(AliHBTAnalysis,0) }; diff --git a/HBTAN/AliHBTEvent.h b/HBTAN/AliHBTEvent.h index 8cd982b12bd..1b0f52d1ead 100644 --- a/HBTAN/AliHBTEvent.h +++ b/HBTAN/AliHBTEvent.h @@ -23,7 +23,7 @@ class AliHBTEvent: public TObject AliHBTEvent(); virtual ~AliHBTEvent(); const static UInt_t fgkInitEventSize; //initial number of the array - //if expanded, this size is used also + //if expanded, this size is used also AliHBTParticle* GetParticle(Int_t n); //gets particle AliHBTParticle* GetParticleSafely(Int_t n); //gets particle with index check @@ -36,15 +36,15 @@ class AliHBTEvent: public TObject void Reset(); //deletes all entries void SetOwner(Bool_t owns = kTRUE){ fOwner = owns; } Bool_t IsOwner() {return fOwner;} + protected: AliHBTParticle ** fParticles; //!array of pointers to the particles Int_t fNParticles; //!number of particles in Event Int_t fSize; //!current size of the array Bool_t fOwner; //flag if that event owns the void Expand(); //expands the array if necessary + private: - - public: ClassDef(AliHBTEvent,1) }; /**************************************************************************/ diff --git a/HBTAN/AliHBTFunction.cxx b/HBTAN/AliHBTFunction.cxx index 30266ff99d8..110a1737cbc 100644 --- a/HBTAN/AliHBTFunction.cxx +++ b/HBTAN/AliHBTFunction.cxx @@ -749,12 +749,14 @@ ClassImp( AliHBTOnePairFctn1D ) AliHBTOnePairFctn1D::AliHBTOnePairFctn1D(Int_t nbins, Float_t maxXval, Float_t minXval): AliHBTFunction1D(nbins,maxXval,minXval) { + //constructor } /******************************************************************/ AliHBTOnePairFctn1D::AliHBTOnePairFctn1D(const Char_t *name, const Char_t *title): AliHBTFunction1D(name,title) { + } /******************************************************************/ @@ -762,6 +764,7 @@ AliHBTOnePairFctn1D::AliHBTOnePairFctn1D(const Char_t *name, const Char_t *title Int_t nbins, Float_t maxXval, Float_t minXval): AliHBTFunction1D(name,title,nbins,maxXval,minXval) { + //constructor } /******************************************************************/ @@ -802,6 +805,7 @@ ClassImp( AliHBTOnePairFctn2D ) AliHBTOnePairFctn2D::AliHBTOnePairFctn2D(const Char_t *name, const Char_t *title): AliHBTFunction2D(name,title) { + //constructor } /******************************************************************/ @@ -809,6 +813,7 @@ AliHBTOnePairFctn2D::AliHBTOnePairFctn2D(Int_t nXbins, Double_t maxXval, Double_ Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTFunction2D(nXbins, maxXval, minXval, nYbins, maxYval, minYval) { + //constructor } /******************************************************************/ @@ -817,6 +822,7 @@ AliHBTOnePairFctn2D::AliHBTOnePairFctn2D(const Char_t *name, const Char_t *title Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTFunction2D(name,title, nXbins, maxXval, minXval, nYbins, maxYval, minYval) { + //constructor } /******************************************************************/ @@ -867,6 +873,7 @@ ClassImp( AliHBTOnePairFctn3D) AliHBTOnePairFctn3D::AliHBTOnePairFctn3D(const Char_t *name, const Char_t *title): AliHBTFunction3D(name,title) { + //constructor } /******************************************************************/ @@ -875,6 +882,7 @@ AliHBTOnePairFctn3D::AliHBTOnePairFctn3D(Int_t nXbins, Double_t maxXval, Double_ Int_t nZbins, Double_t maxZval, Double_t minZval): AliHBTFunction3D(nXbins, maxXval, minXval, nYbins, maxYval, minYval, nZbins, maxZval, minZval) { + //constructor } /******************************************************************/ @@ -884,6 +892,7 @@ AliHBTOnePairFctn3D::AliHBTOnePairFctn3D(const Char_t *name, const Char_t *title Int_t nZbins, Double_t maxZval, Double_t minZval): AliHBTFunction3D(name,title,nXbins, maxXval, minXval, nYbins, maxYval, minYval, nZbins, maxZval, minZval) { + //constructor } /******************************************************************/ @@ -937,12 +946,14 @@ ClassImp(AliHBTTwoPairFctn1D) AliHBTTwoPairFctn1D::AliHBTTwoPairFctn1D(Int_t nbins, Float_t maxXval, Float_t minXval): AliHBTFunction1D(nbins,maxXval,minXval) { + //constructor } /******************************************************************/ AliHBTTwoPairFctn1D::AliHBTTwoPairFctn1D(const Char_t *name, const Char_t *title): AliHBTFunction1D(name,title) { + //constructor } /******************************************************************/ @@ -950,6 +961,7 @@ AliHBTTwoPairFctn1D::AliHBTTwoPairFctn1D(const Char_t *name, const Char_t *title Int_t nbins, Float_t maxXval, Float_t minXval): AliHBTFunction1D(name,title,nbins,maxXval,minXval) { + //constructor } /******************************************************************/ @@ -1000,6 +1012,7 @@ ClassImp(AliHBTTwoPairFctn2D) AliHBTTwoPairFctn2D::AliHBTTwoPairFctn2D(const Char_t *name, const Char_t *title): AliHBTFunction2D(name,title) { + //constructor } /******************************************************************/ @@ -1007,6 +1020,7 @@ AliHBTTwoPairFctn2D::AliHBTTwoPairFctn2D(Int_t nXbins, Double_t maxXval, Double_ Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTFunction2D(nXbins, maxXval, minXval, nYbins, maxYval, minYval) { + //constructor } /******************************************************************/ @@ -1015,6 +1029,7 @@ AliHBTTwoPairFctn2D::AliHBTTwoPairFctn2D(const Char_t *name, const Char_t *title Int_t nYbins, Double_t maxYval, Double_t minYval): AliHBTFunction2D(name,title,nXbins, maxXval, minXval, nYbins, maxYval, minYval) { + //constructor } /******************************************************************/ @@ -1068,6 +1083,7 @@ ClassImp(AliHBTTwoPairFctn3D) AliHBTTwoPairFctn3D::AliHBTTwoPairFctn3D(const Char_t *name, const Char_t *title): AliHBTFunction3D(name,title) { + //constructor } /******************************************************************/ @@ -1076,6 +1092,7 @@ AliHBTTwoPairFctn3D::AliHBTTwoPairFctn3D(Int_t nXbins, Double_t maxXval, Double_ Int_t nZbins, Double_t maxZval, Double_t minZval): AliHBTFunction3D(nXbins, maxXval, minXval, nYbins, maxYval, minYval, nZbins, maxZval, minZval) { + //constructor } /******************************************************************/ @@ -1085,6 +1102,7 @@ AliHBTTwoPairFctn3D::AliHBTTwoPairFctn3D(const Char_t *name, const Char_t *title Int_t nZbins, Double_t maxZval, Double_t minZval): AliHBTFunction3D(name,title,nXbins, maxXval, minXval, nYbins, maxYval, minYval, nZbins, maxZval, minZval) { + //constructor } /******************************************************************/ @@ -1114,7 +1132,6 @@ void AliHBTTwoPairFctn3D::ProcessDiffEventParticles(AliHBTPair* trackpair, AliHB } - /******************************************************************/ /******************************************************************/ /******************************************************************/