From dc86eb511832cb913ca6931aaae3fde4438ba9a2 Mon Sep 17 00:00:00 2001 From: fca Date: Mon, 1 Dec 2008 16:19:46 +0000 Subject: [PATCH] Removing unused code --- EMCAL/AliEMCALLoader.cxx | 12 ------------ EMCAL/AliEMCALLoader.h | 8 ++++---- PHOS/AliPHOSLoader.cxx | 8 +------- PHOS/AliPHOSLoader.h | 8 ++++---- STEER/AliBaseLoader.cxx | 24 ------------------------ STEER/AliBaseLoader.h | 6 ++++-- STEER/AliDataLoader.cxx | 34 ---------------------------------- STEER/AliDataLoader.h | 4 ++-- STEER/AliLoader.cxx | 27 --------------------------- STEER/AliLoader.h | 4 ++-- STEER/AliObjectLoader.cxx | 19 ------------------- STEER/AliObjectLoader.h | 13 ++++++++----- STEER/AliRunLoader.cxx | 21 --------------------- STEER/AliRunLoader.h | 6 +++--- STEER/AliTaskLoader.cxx | 21 --------------------- STEER/AliTaskLoader.h | 5 +++-- STEER/AliTreeLoader.cxx | 20 -------------------- STEER/AliTreeLoader.h | 10 ++++++---- 18 files changed, 37 insertions(+), 213 deletions(-) diff --git a/EMCAL/AliEMCALLoader.cxx b/EMCAL/AliEMCALLoader.cxx index 2d28dbc553d..f96c9fbf4be 100644 --- a/EMCAL/AliEMCALLoader.cxx +++ b/EMCAL/AliEMCALLoader.cxx @@ -112,18 +112,6 @@ AliEMCALLoader::AliEMCALLoader(const Char_t *name, TFolder *topfolder) fRecPoints = new TObjArray(); } -//____________________________________________________________________________ -AliEMCALLoader::AliEMCALLoader(const AliEMCALLoader & obj) - : AliLoader(obj), - fDebug(obj.fDebug), - fHits(obj.fHits), - fDigits(obj.fDigits), - fSDigits(obj.fSDigits), - fRecPoints(obj.fRecPoints) -{ - //copy ctor -} - //____________________________________________________________________________ AliEMCALLoader::~AliEMCALLoader() { diff --git a/EMCAL/AliEMCALLoader.h b/EMCAL/AliEMCALLoader.h index 9cb52b0de6b..a923c84c37d 100644 --- a/EMCAL/AliEMCALLoader.h +++ b/EMCAL/AliEMCALLoader.h @@ -40,15 +40,11 @@ class AliEMCALLoader : public AliLoader { public: AliEMCALLoader(); - AliEMCALLoader(const AliEMCALLoader & obj); AliEMCALLoader(const Char_t *detname,const Char_t *eventfoldername); AliEMCALLoader(const Char_t *name,TFolder *topfolder); virtual ~AliEMCALLoader() ; - // assignement operator requested by coding convention, but not needed - const AliEMCALLoader & operator = (const AliEMCALLoader & ) {return *this;} - virtual Int_t GetEvent(); // Overload to fill TClonesArray virtual void CleanHits() const @@ -110,6 +106,10 @@ class AliEMCALLoader : public AliLoader { private: + // assignement operator requested by coding convention, but not needed + AliEMCALLoader(const AliEMCALLoader &); //Not implemented + const AliEMCALLoader & operator = (const AliEMCALLoader &); //Not implemented + static const TString fgkECARecPointsBranchName; //! Name of branch with ECA Reconstructed Points Int_t fDebug ; // Debug level diff --git a/PHOS/AliPHOSLoader.cxx b/PHOS/AliPHOSLoader.cxx index bd88259f52f..2d40ac33167 100644 --- a/PHOS/AliPHOSLoader.cxx +++ b/PHOS/AliPHOSLoader.cxx @@ -111,13 +111,7 @@ AliPHOSLoader::AliPHOSLoader(const Char_t *detname,TFolder *topfolder): //ctor fTmpHits = new TClonesArray("AliPHOSHit",1000); } -//____________________________________________________________________________ -AliPHOSLoader::AliPHOSLoader(const AliPHOSLoader & obj): - AliLoader(obj),fBranchTitle(obj.GetBranchTitle()),fcdb(obj.CalibrationDB()), - fDebug(obj.GetDebug()),fTmpHits(obj.fTmpHits) -{ - // Copy constructor -} + //____________________________________________________________________________ AliPHOSLoader::~AliPHOSLoader() diff --git a/PHOS/AliPHOSLoader.h b/PHOS/AliPHOSLoader.h index c6ea78badfa..0701805d1d9 100644 --- a/PHOS/AliPHOSLoader.h +++ b/PHOS/AliPHOSLoader.h @@ -61,15 +61,11 @@ class AliPHOSLoader : public AliLoader { public: AliPHOSLoader(); - AliPHOSLoader(const AliPHOSLoader & obj); AliPHOSLoader(const Char_t *detname,const Char_t *eventfoldername); AliPHOSLoader(const Char_t *detname,TFolder *topfolder); virtual ~AliPHOSLoader() ; - // assignement operator requested by coding convention, but not needed - AliPHOSLoader & operator = (const AliPHOSLoader & ) {return *this;} - Int_t GetEvent();//extends the method on PHOS RecPart posting Int_t SetEvent();//extends the method on PHOS RecPart posting @@ -189,6 +185,10 @@ protected: private: + // assignement operator requested by coding convention, but not needed + AliPHOSLoader(const AliPHOSLoader &); //Not implemented + AliPHOSLoader & operator = (const AliPHOSLoader & ); //Not implemented + Int_t ReadHits(); Int_t ReadDigits(); Int_t ReadSDigits(); diff --git a/STEER/AliBaseLoader.cxx b/STEER/AliBaseLoader.cxx index 3e64934a0c2..2abd145fbaa 100644 --- a/STEER/AliBaseLoader.cxx +++ b/STEER/AliBaseLoader.cxx @@ -63,30 +63,6 @@ AliBaseLoader::AliBaseLoader(const TString& name, AliDataLoader* dl, Bool_t sto // } -//______________________________________________________________________________ -AliBaseLoader::AliBaseLoader(const AliBaseLoader& source) : - TNamed(source), - fIsLoaded(source.fIsLoaded), - fStoreInTopOfFile(source.fStoreInTopOfFile), - fDoNotReload(source.fDoNotReload), - fDataLoader(source.fDataLoader) -{ - // - // copy constructor - // - AliFatal("Copy constructor not implemented"); -} - -//______________________________________________________________________________ -AliBaseLoader& AliBaseLoader::operator=(const AliBaseLoader& /*source*/) -{ - // - // Assignment operator - // - AliFatal("Assignment operator not implemented"); - return *this; -} - //______________________________________________________________________________ Int_t AliBaseLoader::Load(Option_t* opt) { diff --git a/STEER/AliBaseLoader.h b/STEER/AliBaseLoader.h index 929829cee0b..323dfd99501 100644 --- a/STEER/AliBaseLoader.h +++ b/STEER/AliBaseLoader.h @@ -41,8 +41,6 @@ class AliBaseLoader: public TNamed public: AliBaseLoader(); AliBaseLoader(const TString& name, AliDataLoader* dl, Bool_t storeontop = kFALSE); - AliBaseLoader(const AliBaseLoader& source); - AliBaseLoader& operator=(const AliBaseLoader& source); virtual ~AliBaseLoader(){}; @@ -73,6 +71,10 @@ class AliBaseLoader: public TNamed Bool_t fStoreInTopOfFile;// if true, data are stored in top of file ->Indicates fDoNotReload == kTRUE private: + + AliBaseLoader(const AliBaseLoader&); //Not implemented + AliBaseLoader& operator=(const AliBaseLoader&); //Not implemented + Bool_t fDoNotReload; // if this flag is on object is not reloaded while GetEvent is called. //Specially important for tasks. Task loops over events while producing data, //and has a base loader which writes it to file every processed event. diff --git a/STEER/AliDataLoader.cxx b/STEER/AliDataLoader.cxx index d9679ff5099..ccddb056abd 100644 --- a/STEER/AliDataLoader.cxx +++ b/STEER/AliDataLoader.cxx @@ -92,40 +92,6 @@ AliDataLoader::AliDataLoader(const char* filename, const char* contname, } -//______________________________________________________________________________ -AliDataLoader::AliDataLoader(const AliDataLoader& source) : - TNamed(source), - fFileName(source.fFileName), - fFile(source.fFile), - fDirectory(source.fDirectory), - fFileOption(source.fFileOption), - fCompressionLevel(source.fCompressionLevel), - fNEventsPerFile(source.fNEventsPerFile), - fBaseLoaders(source.fBaseLoaders), - fHasTask(source.fHasTask), - fTaskName(source.fTaskName), - fParentalTask(source.fParentalTask), - fEventFolder(source.fEventFolder), - fFolder(source.fFolder) -{ - // - // copy constructor - // - AliFatal("Copy constructor not implemented"); -} - - -//______________________________________________________________________________ -AliDataLoader& AliDataLoader::operator=(const AliDataLoader& /*source*/) -{ - // - // Assignment operator - // - AliFatal("Assignment operator not implemented"); - return *this; -} - - //______________________________________________________________________________ AliDataLoader::~AliDataLoader() { diff --git a/STEER/AliDataLoader.h b/STEER/AliDataLoader.h index 84b90e822df..35f2cc46482 100644 --- a/STEER/AliDataLoader.h +++ b/STEER/AliDataLoader.h @@ -41,8 +41,6 @@ class AliDataLoader: public TNamed public: AliDataLoader(); AliDataLoader(const char* filename, const char* contname, const char* name, Option_t* opt = "t"); - AliDataLoader(const AliDataLoader& source); - AliDataLoader& operator=(const AliDataLoader& source); virtual ~AliDataLoader(); virtual Int_t SetEvent(); @@ -113,6 +111,8 @@ class AliDataLoader: public TNamed AliRunLoader* GetRunLoader();//gets the run-loader from event folder private: + AliDataLoader(const AliDataLoader&); //Not implemented + AliDataLoader& operator=(const AliDataLoader&); //Not implemented TString fFileName; //name of the file TFile* fFile; //! pointer to file diff --git a/STEER/AliLoader.cxx b/STEER/AliLoader.cxx index e992699e317..0ced45aa25f 100644 --- a/STEER/AliLoader.cxx +++ b/STEER/AliLoader.cxx @@ -106,33 +106,6 @@ AliLoader::AliLoader(const Char_t * detname,TFolder* eventfolder): SetEventFolder(eventfolder); //fileoption's don't need to initialized because default TString ctor does it correctly } -/*****************************************************************************/ -AliLoader::AliLoader(const AliLoader& source) : - TNamed(source), - fDataLoaders(source.fDataLoaders), - fDetectorName(source.fDetectorName), - fEventFolder(source.fEventFolder), - fDataFolder(source.fDataFolder), - fDetectorDataFolder(source.fDetectorDataFolder), - fModuleFolder(source.fModuleFolder), - fTasksFolder(source.fTasksFolder), - fQAFolder(source.fQAFolder) -{ - // dummy copy constructor - if(&source==this)return; - - AliFatal("Copy constructor not implemented. Aborting"); - return; -} - -/*****************************************************************************/ -AliLoader& AliLoader::operator=(const AliLoader& source) { - // dummy assignment operator - if(&source==this) return *this; - - AliFatal("Assignment operator not implemented. Aborting"); - return *this; -} /*****************************************************************************/ AliLoader::~AliLoader() diff --git a/STEER/AliLoader.h b/STEER/AliLoader.h index 7ed4200eae2..d967bee6b28 100644 --- a/STEER/AliLoader.h +++ b/STEER/AliLoader.h @@ -35,8 +35,6 @@ class AliLoader: public TNamed AliLoader(); AliLoader(const Char_t *detname,const Char_t *eventfoldername); //contructor with name of the top folder of the tree AliLoader(const Char_t *detname,TFolder* eventfolder); - AliLoader(const AliLoader& source); //copy constructor - AliLoader& operator=(const AliLoader& source); //assignment operator virtual ~AliLoader();//----------------- @@ -371,6 +369,8 @@ class AliLoader: public TNamed private: //descendant classes should //use protected interface methods to access these folders + AliLoader(const AliLoader&); //Not implemented + AliLoader& operator=(const AliLoader&); //Not implemented ClassDef(AliLoader,2) }; diff --git a/STEER/AliObjectLoader.cxx b/STEER/AliObjectLoader.cxx index 33e3a07b9e2..d33f85bcc66 100644 --- a/STEER/AliObjectLoader.cxx +++ b/STEER/AliObjectLoader.cxx @@ -55,25 +55,6 @@ TFolder* AliObjectLoader::GetFolder() const return df; } -//______________________________________________________________________________ -AliObjectLoader::AliObjectLoader(const AliObjectLoader& source): - AliBaseLoader(source) { - // - // copy constructor - // - AliFatal("Copy constructor not implemented"); -} - -//______________________________________________________________________________ -AliObjectLoader& AliObjectLoader::operator=(const AliObjectLoader& /*source*/) -{ - // - // Assignment operator - // - AliFatal("Assignment operator not implemented"); - return *this; -} - //______________________________________________________________________________ void AliObjectLoader::RemoveFromBoard(TObject* obj) { diff --git a/STEER/AliObjectLoader.h b/STEER/AliObjectLoader.h index a11cf2dd59d..ca495544267 100644 --- a/STEER/AliObjectLoader.h +++ b/STEER/AliObjectLoader.h @@ -15,20 +15,23 @@ #include "AliBaseLoader.h" class AliObjectLoader: public AliBaseLoader - { - public: +{ + public: AliObjectLoader(){}; AliObjectLoader(const TString& name, AliDataLoader* dl, Bool_t storeontop = kFALSE); - AliObjectLoader(const AliObjectLoader& source); - AliObjectLoader& operator=(const AliObjectLoader& source); virtual ~AliObjectLoader(){}; TObject* Get() const; - protected: + protected: TFolder* GetFolder() const; Int_t AddToBoard(TObject* obj); void RemoveFromBoard(TObject* obj); + private: + AliObjectLoader(const AliObjectLoader&); //Not implemented + AliObjectLoader& operator=(const AliObjectLoader&); //Not implemented + + ClassDef(AliObjectLoader,1) }; diff --git a/STEER/AliRunLoader.cxx b/STEER/AliRunLoader.cxx index 127f873b069..d1b1260f346 100644 --- a/STEER/AliRunLoader.cxx +++ b/STEER/AliRunLoader.cxx @@ -122,27 +122,6 @@ AliRunLoader::AliRunLoader(const char* eventfoldername): } /**************************************************************************/ -AliRunLoader::AliRunLoader(const AliRunLoader &rl): - TNamed(rl), - fLoaders(0x0), - fEventFolder(0x0), - fCurrentEvent(0), - fGAFile(0x0), - fHeader(0x0), - fStack(0x0), - fCTrigger(0x0), - fKineDataLoader(0x0), - fTrackRefsDataLoader(0x0), - fNEventsPerFile(0), - fUnixDirName(".") -{ - // - // Copy ctor - // - rl.Copy(*this); -} -/**************************************************************************/ - AliRunLoader::~AliRunLoader() { //dtor diff --git a/STEER/AliRunLoader.h b/STEER/AliRunLoader.h index a722f41c7e1..23f4ebf3a0d 100644 --- a/STEER/AliRunLoader.h +++ b/STEER/AliRunLoader.h @@ -53,9 +53,6 @@ class AliRunLoader: public TNamed AliRunLoader(); AliRunLoader(const char* topfoldername); AliRunLoader(TFolder* topfolder); - AliRunLoader(const AliRunLoader &rl); - AliRunLoader & operator = (const AliRunLoader &rl) - {rl.Copy(*this); return *this;} virtual ~AliRunLoader(); @@ -248,6 +245,9 @@ protected: void SetDetectorAddresses(); private: + AliRunLoader(const AliRunLoader &r); //Not implemented + AliRunLoader & operator = (const AliRunLoader &); //Not implemented + void GetListOfDetectors(const char * namelist,TObjArray& pointerarray) const; void CleanHeader(){Clean(fgkHeaderContainerName);} diff --git a/STEER/AliTaskLoader.cxx b/STEER/AliTaskLoader.cxx index bda5cf997c5..3945225683e 100644 --- a/STEER/AliTaskLoader.cxx +++ b/STEER/AliTaskLoader.cxx @@ -46,27 +46,6 @@ AliTaskLoader::AliTaskLoader(const TString& name, AliDataLoader* dl, // } -//______________________________________________________________________________ -AliTaskLoader::AliTaskLoader(const AliTaskLoader& source): - AliBaseLoader(source), - fParentalTask(source.fParentalTask) -{ - // - // copy constructor - // - AliFatal("Copy constructor not implemented"); -} - -//______________________________________________________________________________ -AliTaskLoader& AliTaskLoader::operator=(const AliTaskLoader& /*source*/) -{ - // - // Assignment operator - // - AliFatal("Assignment operator not implemented"); - return *this; -} - //______________________________________________________________________________ void AliTaskLoader::Clean() { diff --git a/STEER/AliTaskLoader.h b/STEER/AliTaskLoader.h index 691d0dedc73..b671ec634f7 100644 --- a/STEER/AliTaskLoader.h +++ b/STEER/AliTaskLoader.h @@ -19,8 +19,6 @@ class AliTaskLoader: public AliBaseLoader public: AliTaskLoader():fParentalTask(0x0){}; AliTaskLoader(const TString& name, AliDataLoader* dl, TTask* parentaltask, Bool_t storeontop = kFALSE); - AliTaskLoader(const AliTaskLoader& source); - AliTaskLoader& operator=(const AliTaskLoader& source); virtual ~AliTaskLoader(){}; TObject* Get() const; @@ -33,6 +31,9 @@ class AliTaskLoader: public AliBaseLoader TTask* GetParentalTask() const; private: + AliTaskLoader(const AliTaskLoader&); //Not implemented + AliTaskLoader& operator=(const AliTaskLoader&); //Not implemented + TTask* fParentalTask; // Parental task ClassDef(AliTaskLoader,1) diff --git a/STEER/AliTreeLoader.cxx b/STEER/AliTreeLoader.cxx index 99f9dbd708f..4717b6c7c3c 100644 --- a/STEER/AliTreeLoader.cxx +++ b/STEER/AliTreeLoader.cxx @@ -45,26 +45,6 @@ AliTreeLoader::AliTreeLoader(const TString& name, AliDataLoader* dl,Bool_t store // } -//______________________________________________________________________________ -AliTreeLoader::AliTreeLoader(const AliTreeLoader& source): - AliObjectLoader(source) -{ - // - // copy constructor - // - AliFatal("Copy constructor not implemented"); -} - -//______________________________________________________________________________ -AliTreeLoader& AliTreeLoader::operator=(const AliTreeLoader& /*source*/) -{ - // - // Assignment operator - // - AliFatal("Assignment operator not implemented"); - return *this; -} - //______________________________________________________________________________ Int_t AliTreeLoader::WriteData(Option_t* opt) { diff --git a/STEER/AliTreeLoader.h b/STEER/AliTreeLoader.h index 72475ae6217..6bc8ae8d7e4 100644 --- a/STEER/AliTreeLoader.h +++ b/STEER/AliTreeLoader.h @@ -27,18 +27,20 @@ class TTree; class AliTreeLoader: public AliObjectLoader { - public: +public: AliTreeLoader(){}; AliTreeLoader(const TString& name, AliDataLoader* dl, Bool_t storeontop = kFALSE); - AliTreeLoader(const AliTreeLoader& source); - AliTreeLoader& operator=(const AliTreeLoader& source); virtual ~AliTreeLoader(){}; virtual TTree* Tree() const {return dynamic_cast(Get());} virtual void MakeTree(); virtual Int_t WriteData(Option_t* opt=""); - ClassDef(AliTreeLoader,1) +private: + AliTreeLoader(const AliTreeLoader&); //Not implemented + AliTreeLoader& operator=(const AliTreeLoader&); //Not implemented + + ClassDef(AliTreeLoader,1) }; #endif -- 2.43.0