From e2429969d0865ef23a3854ae8214d560c75c3639 Mon Sep 17 00:00:00 2001 From: kharlov Date: Fri, 25 Aug 2006 16:00:53 +0000 Subject: [PATCH] Compliance with Effective C++AliPHOSHit.cxx --- PHOS/AliPHOSHit.h | 2 +- PHOS/AliPHOSLoader.cxx | 10 ++++++++++ PHOS/AliPHOSLoader.h | 11 ++++++++--- PHOS/AliPHOSPID.cxx | 9 ++++++++- PHOS/AliPHOSPID.h | 12 +++++++++++- PHOS/AliPHOSTrackSegmentMaker.cxx | 12 ++++++++++++ PHOS/AliPHOSTrackSegmentMaker.h | 12 +++++++++++- 7 files changed, 61 insertions(+), 7 deletions(-) diff --git a/PHOS/AliPHOSHit.h b/PHOS/AliPHOSHit.h index 2dc855cdc8c..af937aac0d4 100644 --- a/PHOS/AliPHOSHit.h +++ b/PHOS/AliPHOSHit.h @@ -25,7 +25,7 @@ class AliPHOSHit : public AliHit { public: - AliPHOSHit() { + AliPHOSHit() : fId(0),fELOS(0),fTime(0) { // default ctor } AliPHOSHit(const AliPHOSHit & hit) ; diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx index 57cce58e1d9..1dc5edce934 100644 --- a/PHOS/AliPHOSLoader.cxx +++ b/PHOS/AliPHOSLoader.cxx @@ -18,6 +18,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.16 2006/08/01 12:15:04 cvetan + * Adding a constructor from TFolder. Needed by AliReconstruction plugin scheme + * * Revision 1.15 2005/07/12 20:07:35 hristov * Changes needed to run simulation and reconstrruction in the same AliRoot session * @@ -99,6 +102,13 @@ AliPHOSLoader::AliPHOSLoader(const Char_t *detname,TFolder *topfolder): fDebug=0; } //____________________________________________________________________________ +AliPHOSLoader::AliPHOSLoader(const AliPHOSLoader & obj): + AliLoader(obj),fBranchTitle(obj.GetBranchTitle()),fcdb(obj.CalibrationDB()), + fDebug(obj.GetDebug()) +{ + // Copy constructor +} +//____________________________________________________________________________ AliPHOSLoader::~AliPHOSLoader() { diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h index d67a17ba866..46c342611b9 100644 --- a/PHOS/AliPHOSLoader.h +++ b/PHOS/AliPHOSLoader.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.11 2006/08/01 12:15:03 cvetan + * Adding a constructor from TFolder. Needed by AliReconstruction plugin scheme + * * Revision 1.10 2005/05/28 14:19:04 schutz * Compilation warnings fixed by T.P. * @@ -61,7 +64,7 @@ class AliPHOSLoader : public AliLoader { public: AliPHOSLoader(); - AliPHOSLoader(const AliPHOSLoader & obj) : AliLoader(obj) {} + AliPHOSLoader(const AliPHOSLoader & obj); AliPHOSLoader(const Char_t *detname,const Char_t *eventfoldername); AliPHOSLoader(const Char_t *detname,TFolder *topfolder); @@ -186,8 +189,10 @@ public: void SetDebug(Int_t level) {fDebug = level;} // Set debug level void SetBranchTitle(const TString& btitle); - - AliPHOSCalibrationDB * CalibrationDB(){return fcdb; } + + Int_t GetDebug() const {return fDebug; } + TString GetBranchTitle() const {return fBranchTitle;} + AliPHOSCalibrationDB * CalibrationDB() const {return fcdb; } void ReadCalibrationDB(const char * name, const char * filename); protected: diff --git a/PHOS/AliPHOSPID.cxx b/PHOS/AliPHOSPID.cxx index 4d64c1d1109..85cc8a57cf0 100644 --- a/PHOS/AliPHOSPID.cxx +++ b/PHOS/AliPHOSPID.cxx @@ -38,7 +38,7 @@ ClassImp(AliPHOSPID) //____________________________________________________________________________ - AliPHOSPID::AliPHOSPID():TTask("","") +AliPHOSPID::AliPHOSPID():TTask("","") { // ctor fEventFolderName = "" ; @@ -57,6 +57,13 @@ AliPHOSPID::AliPHOSPID(const TString alirunFileName, const TString eventFolderNa fLastEvent = -1 ; } +//____________________________________________________________________________ +AliPHOSPID::AliPHOSPID(const AliPHOSPID & pid) : + TTask(pid),fEventFolderName(pid.GetEventFolderName()), + fFirstEvent(pid.GetFirstEvent()),fLastEvent(pid.GetLastEvent()) +{ + // Copy constructor +} //____________________________________________________________________________ AliPHOSPID::~AliPHOSPID() { diff --git a/PHOS/AliPHOSPID.h b/PHOS/AliPHOSPID.h index 899782dabc9..e345327e750 100644 --- a/PHOS/AliPHOSPID.h +++ b/PHOS/AliPHOSPID.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.35 2005/05/28 14:19:04 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -38,13 +41,20 @@ class AliPHOSPID : public TTask { AliPHOSPID() ; // ctor AliPHOSPID (const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; - AliPHOSPID(const AliPHOSPID & pid) : TTask(pid) {;} + AliPHOSPID(const AliPHOSPID & pid) ; virtual ~AliPHOSPID() ; // dtor + AliPHOSPID & operator = (const AliPHOSPID & obj); virtual Int_t GetRecParticlesInRun() const { Warning("GetRecParticlesInRun", "not defined" ) ; return 0 ;} virtual void Print(const Option_t * = "") const { Warning("Print", "not defined" ) ;} + void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } void SetEventFolderName(TString name) { fEventFolderName = name ; } + + TString GetEventFolderName() const {return fEventFolderName;} + Int_t GetFirstEvent() const {return fFirstEvent; } + Int_t GetLastEvent() const {return fLastEvent; } + virtual const char * Version() const { Warning("Version", "not defined" ) ; return 0 ; } virtual void WriteRecParticles() = 0; diff --git a/PHOS/AliPHOSTrackSegmentMaker.cxx b/PHOS/AliPHOSTrackSegmentMaker.cxx index 28505e3577b..3c3f0e5a0b3 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.cxx +++ b/PHOS/AliPHOSTrackSegmentMaker.cxx @@ -17,6 +17,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.25 2005/05/28 14:19:05 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -58,6 +61,15 @@ AliPHOSTrackSegmentMaker::AliPHOSTrackSegmentMaker(const TString alirunFileName, fLastEvent = -1 ; } +//____________________________________________________________________________ +AliPHOSTrackSegmentMaker::AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) : + TTask(tsmaker),fEventFolderName(tsmaker.GetEventFolderName()), + fFirstEvent(tsmaker.GetFirstEvent()),fLastEvent(tsmaker.GetLastEvent()), + fESD(tsmaker.GetESD()) +{ + //Copy constructor +} + //____________________________________________________________________________ AliPHOSTrackSegmentMaker::~AliPHOSTrackSegmentMaker() { diff --git a/PHOS/AliPHOSTrackSegmentMaker.h b/PHOS/AliPHOSTrackSegmentMaker.h index 3a5aac85130..730ac8c5af2 100644 --- a/PHOS/AliPHOSTrackSegmentMaker.h +++ b/PHOS/AliPHOSTrackSegmentMaker.h @@ -8,6 +8,9 @@ /* History of cvs commits: * * $Log$ + * Revision 1.38 2005/05/28 14:19:05 schutz + * Compilation warnings fixed by T.P. + * */ //_________________________________________________________________________ @@ -38,16 +41,23 @@ public: AliPHOSTrackSegmentMaker(); AliPHOSTrackSegmentMaker(const TString alirunFileName, const TString eventFolderName = AliConfig::GetDefaultEventFolderName()) ; - AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) : TTask(tsmaker) { ; } + AliPHOSTrackSegmentMaker(const AliPHOSTrackSegmentMaker & tsmaker) ; virtual ~ AliPHOSTrackSegmentMaker() ; + AliPHOSTrackSegmentMaker & operator = (const AliPHOSTrackSegmentMaker & obj); virtual Int_t GetTrackSegmentsInRun() const {Warning("GetTrackSegmentsInRun", "Not Defined" ) ; return 0 ; } virtual void Print(const Option_t * = "")const {Warning("Print", "Not Defined" ) ; } + void SetEventRange(Int_t first=0, Int_t last=-1) {fFirstEvent=first; fLastEvent=last; } void SetEventFolderName(TString name) { fEventFolderName = name ; } void SetESD(AliESD *esd) { fESD = esd; } + TString GetEventFolderName() const {return fEventFolderName;} + Int_t GetFirstEvent() const {return fFirstEvent; } + Int_t GetLastEvent() const {return fLastEvent; } + AliESD *GetESD() const {return fESD; } + virtual void WriteTrackSegments() = 0; protected: -- 2.43.0