From 198bb1c7ab5437cd36dc37692d7ad850220b43fd Mon Sep 17 00:00:00 2001 From: morsch Date: Mon, 4 Aug 2003 09:03:23 +0000 Subject: [PATCH] Code causing warning messages corrected. --- EVGEN/AliDimuCombinator.cxx | 7 ++- EVGEN/AliGenBeamGas.cxx | 23 +++++---- EVGEN/AliGenBeamGas.h | 4 +- EVGEN/AliGenCocktail.cxx | 15 ++++-- EVGEN/AliGenCocktail.h | 3 +- EVGEN/AliGenCocktailAfterBurner.cxx | 15 ++++-- EVGEN/AliGenCocktailAfterBurner.h | 6 ++- EVGEN/AliGenCocktailEntry.cxx | 18 +++++-- EVGEN/AliGenCocktailEntry.h | 2 + EVGEN/AliGenExtFile.cxx | 17 +++++-- EVGEN/AliGenExtFile.h | 2 + EVGEN/AliGenFLUKAsource.cxx | 19 ++++++-- EVGEN/AliGenFLUKAsource.h | 2 + EVGEN/AliGenFixed.cxx | 2 +- EVGEN/AliGenGSIlib.cxx | 76 ++++++++++++++--------------- EVGEN/AliGenGeVSimEventHeader.h | 2 +- EVGEN/AliGenHIJINGpara.cxx | 18 ++++--- EVGEN/AliGenHIJINGpara.h | 5 +- EVGEN/AliGenHalo.cxx | 21 ++++++-- EVGEN/AliGenHalo.h | 12 +++-- EVGEN/AliGenHaloProtvino.cxx | 23 +++++++-- EVGEN/AliGenHaloProtvino.h | 3 +- EVGEN/AliGenMC.cxx | 22 +++++++-- EVGEN/AliGenMC.h | 3 +- EVGEN/AliGenMUONlib.cxx | 54 ++++++++++---------- EVGEN/AliGenPHOSlib.cxx | 14 +++--- EVGEN/AliGenPMDlib.cxx | 14 +++--- EVGEN/AliGenParam.cxx | 4 +- EVGEN/AliGenParam.h | 2 + EVGEN/AliGenReader.cxx | 12 +++++ EVGEN/AliGenReader.h | 7 +-- EVGEN/AliGenReaderCwn.cxx | 10 ++++ EVGEN/AliGenReaderCwn.h | 6 ++- EVGEN/AliGenReaderEcalHijing.cxx | 11 ++++- EVGEN/AliGenReaderEcalHijing.h | 5 +- EVGEN/AliGenReaderEcalJets.cxx | 12 ++++- EVGEN/AliGenReaderEcalJets.h | 5 +- EVGEN/AliGenReaderTreeK.cxx | 50 +++++++++++-------- EVGEN/AliGenReaderTreeK.h | 2 + EVGEN/AliGenSTRANGElib.cxx | 6 +-- EVGEN/AliSlowNucleonModel.h | 6 +-- 41 files changed, 360 insertions(+), 180 deletions(-) diff --git a/EVGEN/AliDimuCombinator.cxx b/EVGEN/AliDimuCombinator.cxx index f08225f2920..96010dba29c 100644 --- a/EVGEN/AliDimuCombinator.cxx +++ b/EVGEN/AliDimuCombinator.cxx @@ -54,8 +54,10 @@ ClassImp(AliDimuCombinator) } AliDimuCombinator::AliDimuCombinator(const AliDimuCombinator & combinator) + :TObject(combinator) { // Dummy copy constructor + combinator.Copy(*this); } @@ -488,14 +490,15 @@ return part->GetPdgCode(); AliDimuCombinator& AliDimuCombinator::operator=(const AliDimuCombinator& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } -void AliDimuCombinator::Copy(AliDimuCombinator &combi) const +void AliDimuCombinator::Copy(AliDimuCombinator&) const { // - // Copy *this onto lego -- not implemented + // Copy // Fatal("Copy","Not implemented!\n"); } diff --git a/EVGEN/AliGenBeamGas.cxx b/EVGEN/AliGenBeamGas.cxx index e91e3135708..7591626fadb 100644 --- a/EVGEN/AliGenBeamGas.cxx +++ b/EVGEN/AliGenBeamGas.cxx @@ -29,10 +29,10 @@ #include - ClassImp(AliGenBeamGas) +ClassImp(AliGenBeamGas) AliGenBeamGas::AliGenBeamGas() - :AliGenExtFile() + :AliGenExtFile() { // Constructor // @@ -42,9 +42,11 @@ AliGenBeamGas::AliGenBeamGas() fOsigma[2] = 2000.; } -AliGenBeamGas::AliGenBeamGas(const AliGenBeamGas & ExtFile) +AliGenBeamGas::AliGenBeamGas(const AliGenBeamGas & beamgas): + AliGenExtFile(beamgas) { -// copy constructor +// Copy constructor + beamgas.Copy(*this); } //____________________________________________________________ @@ -120,13 +122,14 @@ void AliGenBeamGas::Generate() } -//AliGenBeamGas& AliGenBeamGas::operator=(const AliGenBeamGas& rhs) -//{ -// Assignment operator -// return *this; -//} - +void AliGenBeamGas::Copy(AliGenBeamGas&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} diff --git a/EVGEN/AliGenBeamGas.h b/EVGEN/AliGenBeamGas.h index 071f03e865a..98a79855e11 100644 --- a/EVGEN/AliGenBeamGas.h +++ b/EVGEN/AliGenBeamGas.h @@ -15,7 +15,7 @@ class AliGenBeamGas : public AliGenExtFile { public: AliGenBeamGas(); - AliGenBeamGas(const AliGenBeamGas &ext); + AliGenBeamGas(const AliGenBeamGas &beamgas); virtual ~AliGenBeamGas(); // virtual void SetNumberOfInteractions(Int_t n) @@ -24,6 +24,8 @@ class AliGenBeamGas : public AliGenExtFile virtual void Init(); // generate event virtual void Generate(); + private: + void Copy(AliGenBeamGas&) const; protected: Int_t fInteractions; diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx index c20ab0f05a5..a0d3e9a78b5 100644 --- a/EVGEN/AliGenCocktail.cxx +++ b/EVGEN/AliGenCocktail.cxx @@ -45,9 +45,11 @@ AliGenCocktail::AliGenCocktail() fNGenerators=0; } -AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail) +AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail): + AliGenerator(cocktail) { -// copy constructor +// Copy constructor + cocktail.Copy(*this); } AliGenCocktail::~AliGenCocktail() @@ -218,7 +220,14 @@ NextGeneratorPair(AliGenCocktailEntry*& e1, AliGenCocktailEntry*& e2) AliGenCocktail& AliGenCocktail::operator=(const AliGenCocktail& rhs) { // Assignment operator - return *this; + rhs.Copy(*this); + return (*this); } +void AliGenCocktail::Copy(AliGenCocktail &) const +{ + Fatal("Copy","Not implemented!\n"); +} + + diff --git a/EVGEN/AliGenCocktail.h b/EVGEN/AliGenCocktail.h index efde3b8bc02..eb53bd95b8e 100644 --- a/EVGEN/AliGenCocktail.h +++ b/EVGEN/AliGenCocktail.h @@ -36,7 +36,8 @@ class AliGenCocktail : public AliGenerator void FirstGeneratorPair(AliGenCocktailEntry*&e1, AliGenCocktailEntry*&e2); void NextGeneratorPair (AliGenCocktailEntry*&e1, AliGenCocktailEntry*&e2); AliGenCocktail & operator=(const AliGenCocktail & rhs); - + private: + void Copy(AliGenCocktail &arun) const; protected: Int_t fNGenerators; // Number of generators booked TList *fEntries; // List of Generators diff --git a/EVGEN/AliGenCocktailAfterBurner.cxx b/EVGEN/AliGenCocktailAfterBurner.cxx index 0eed269f4e2..3cd04970960 100644 --- a/EVGEN/AliGenCocktailAfterBurner.cxx +++ b/EVGEN/AliGenCocktailAfterBurner.cxx @@ -65,9 +65,12 @@ AliGenCocktailAfterBurner::AliGenCocktailAfterBurner() fNBgEvents = 0; } /*********************************************************************/ -AliGenCocktailAfterBurner::AliGenCocktailAfterBurner(const AliGenCocktailAfterBurner& in) +AliGenCocktailAfterBurner::AliGenCocktailAfterBurner(const AliGenCocktailAfterBurner& cocktail): + AliGenCocktail(cocktail) + { - //cpy ctor + //Copy constructor + cocktail.Copy(*this); } /*********************************************************************/ @@ -267,7 +270,8 @@ void AliGenCocktailAfterBurner::Generate() AliGenCocktailAfterBurner& AliGenCocktailAfterBurner::operator=(const AliGenCocktailAfterBurner& rhs) { // Assignment operator - return *this; + rhs.Copy(*this); + return (*this); } /*********************************************************************/ /*********************************************************************/ @@ -369,3 +373,8 @@ TMCProcess AliGenCocktailAfterBurner::IntToMCProcess(Int_t no) } return kPNoProcess; } + +void AliGenCocktailAfterBurner::Copy(AliGenCocktailAfterBurner &) const +{ + Fatal("Copy","Not implemented!\n"); +} diff --git a/EVGEN/AliGenCocktailAfterBurner.h b/EVGEN/AliGenCocktailAfterBurner.h index 4771c046ee3..0628df7875c 100644 --- a/EVGEN/AliGenCocktailAfterBurner.h +++ b/EVGEN/AliGenCocktailAfterBurner.h @@ -48,7 +48,8 @@ class AliGenCocktailAfterBurner : public AliGenCocktail void SetNBgEvents(Int_t nbg=0){fNBgEvents = nbg;} static TMCProcess IntToMCProcess(Int_t no); - + private: + void Copy(AliGenCocktailAfterBurner &arun) const; protected: Int_t fNAfterBurners; // Number of afterburners TList *fAfterBurnerEntries;// List of afterburners @@ -71,7 +72,8 @@ class AliGenCocktailAfterBurner : public AliGenCocktail //(events that are generated only temporarly) //needed by some afterburners that works better with higher statistics //this generates such a artificial one - private: + private: + ClassDef(AliGenCocktailAfterBurner,2) // Particle cocktail generator a la SHAKER //background events added }; diff --git a/EVGEN/AliGenCocktailEntry.cxx b/EVGEN/AliGenCocktailEntry.cxx index 741ee20ef8e..7a5fecf89b5 100644 --- a/EVGEN/AliGenCocktailEntry.cxx +++ b/EVGEN/AliGenCocktailEntry.cxx @@ -29,7 +29,8 @@ ClassImp(AliGenCocktailEntry) - AliGenCocktailEntry::AliGenCocktailEntry() + +AliGenCocktailEntry::AliGenCocktailEntry() { // Default constructor fGenerator =0; @@ -55,9 +56,11 @@ AliGenCocktailEntry:: AliGenCocktailEntry fBias=1; } -AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry) +AliGenCocktailEntry::AliGenCocktailEntry(const AliGenCocktailEntry &entry): + TNamed(entry) { // Dummy copy constructor + entry.Copy(*this); } @@ -72,5 +75,14 @@ AliGenCocktailEntry& AliGenCocktailEntry::operator =(const AliGenCocktailEntry& rhs) { // Assignment operator - return *this; + rhs.Copy(*this); + return (*this); +} + +void AliGenCocktailEntry::Copy(AliGenCocktailEntry&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); } diff --git a/EVGEN/AliGenCocktailEntry.h b/EVGEN/AliGenCocktailEntry.h index 9809ce7c64f..f9423ab2584 100644 --- a/EVGEN/AliGenCocktailEntry.h +++ b/EVGEN/AliGenCocktailEntry.h @@ -31,6 +31,8 @@ class AliGenCocktailEntry : public TNamed Float_t Rate(){return fRate;} void PrintInfo(); AliGenCocktailEntry & operator =(const AliGenCocktailEntry & rhs); + private: + void Copy(AliGenCocktailEntry&) const; protected: AliGenerator *fGenerator; // Pointer to generator Int_t fNGenerated; // Number of primaries generated diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx index aec99b7d0a4..5024c7f499d 100644 --- a/EVGEN/AliGenExtFile.cxx +++ b/EVGEN/AliGenExtFile.cxx @@ -39,7 +39,7 @@ #include - ClassImp(AliGenExtFile) +ClassImp(AliGenExtFile) AliGenExtFile::AliGenExtFile() :AliGenMC() @@ -60,9 +60,11 @@ AliGenExtFile::AliGenExtFile(Int_t npart) fReader = 0; } -AliGenExtFile::AliGenExtFile(const AliGenExtFile & ExtFile) +AliGenExtFile::AliGenExtFile(const AliGenExtFile & ExtFile): + AliGenMC(ExtFile) { -// copy constructor +// Copy constructor + ExtFile.Copy(*this); } //____________________________________________________________ AliGenExtFile::~AliGenExtFile() @@ -214,9 +216,18 @@ void AliGenExtFile::CdEventFile() AliGenExtFile& AliGenExtFile::operator=(const AliGenExtFile& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } + +void AliGenExtFile::Copy(AliGenExtFile&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} diff --git a/EVGEN/AliGenExtFile.h b/EVGEN/AliGenExtFile.h index 47b0e0626f4..dac7ebc476b 100644 --- a/EVGEN/AliGenExtFile.h +++ b/EVGEN/AliGenExtFile.h @@ -30,6 +30,8 @@ class AliGenExtFile : public AliGenMC void SetReader(AliGenReader* reader) {fReader = reader;} protected: void CdEventFile(); + private: + void Copy(AliGenExtFile&) const; protected: const Text_t *fFileName; //! File to read from AliGenReader *fReader; //! Reader to read the file diff --git a/EVGEN/AliGenFLUKAsource.cxx b/EVGEN/AliGenFLUKAsource.cxx index 46bff067db4..266312a03cf 100644 --- a/EVGEN/AliGenFLUKAsource.cxx +++ b/EVGEN/AliGenFLUKAsource.cxx @@ -31,8 +31,9 @@ #include #include #include - ClassImp(AliGenFLUKAsource) - AliGenFLUKAsource::AliGenFLUKAsource() +ClassImp(AliGenFLUKAsource) + +AliGenFLUKAsource::AliGenFLUKAsource() :AliGenerator(-1) { // Constructor @@ -86,9 +87,11 @@ AliGenFLUKAsource::AliGenFLUKAsource(Int_t npart) fSourceId=-1; } -AliGenFLUKAsource::AliGenFLUKAsource(const AliGenFLUKAsource & FLUKAsource) +AliGenFLUKAsource::AliGenFLUKAsource(const AliGenFLUKAsource & FLUKAsource): + AliGenerator(FLUKAsource) { -// copy constructor +// Copy constructor + FLUKAsource.Copy(*this); } @@ -278,10 +281,16 @@ void AliGenFLUKAsource::Generate() AliGenFLUKAsource& AliGenFLUKAsource::operator=(const AliGenFLUKAsource& rhs) { // Assignment operator - return *this; + rhs.Copy(*this); + return (*this); } +void AliGenFLUKAsource::Copy(AliGenFLUKAsource &) const +{ + Fatal("Copy","Not implemented!\n"); +} + diff --git a/EVGEN/AliGenFLUKAsource.h b/EVGEN/AliGenFLUKAsource.h index 482ecf6b4e7..a885a59f886 100644 --- a/EVGEN/AliGenFLUKAsource.h +++ b/EVGEN/AliGenFLUKAsource.h @@ -46,6 +46,8 @@ public: // generate event virtual void Generate(); AliGenFLUKAsource & operator=(const AliGenFLUKAsource & rhs); + private: + void Copy(AliGenFLUKAsource &arun) const; protected: Int_t fIkine; // Flag to choose type of particles to be read diff --git a/EVGEN/AliGenFixed.cxx b/EVGEN/AliGenFixed.cxx index 37e57cbb1a0..22d7c713b2f 100644 --- a/EVGEN/AliGenFixed.cxx +++ b/EVGEN/AliGenFixed.cxx @@ -84,7 +84,7 @@ void AliGenFixed::Generate() } //_____________________________________________________________________________ -void AliGenFixed::SetSigma(Float_t sx, Float_t sy, Float_t sz) +void AliGenFixed::SetSigma(Float_t /*sx*/, Float_t /*sy*/, Float_t /*sz*/) { // // Set the interaction point sigma diff --git a/EVGEN/AliGenGSIlib.cxx b/EVGEN/AliGenGSIlib.cxx index 4cd1d47f6e6..799e1fb3cc3 100644 --- a/EVGEN/AliGenGSIlib.cxx +++ b/EVGEN/AliGenGSIlib.cxx @@ -54,7 +54,7 @@ Int_t AliGenGSIlib::IpUpsilon(TRandom *) return 553; } -Double_t AliGenGSIlib::PtUpsilonFlat( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtUpsilonFlat( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -72,7 +72,7 @@ Double_t AliGenGSIlib::PtUpsilonFlat( Double_t *px, Double_t *dummy ) return weight; } -Double_t AliGenGSIlib::YUpsilonFlat(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YUpsilonFlat(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -93,7 +93,7 @@ Double_t AliGenGSIlib::YUpsilonFlat(Double_t *py, Double_t *dummy) return yu; } -Double_t AliGenGSIlib::PtUpsilonRitman( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtUpsilonRitman( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -110,7 +110,7 @@ Double_t AliGenGSIlib::PtUpsilonRitman( Double_t *px, Double_t *dummy ) return x/TMath::Power(pass1,kxn); } -Double_t AliGenGSIlib::YUpsilonRitman(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YUpsilonRitman(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -131,7 +131,7 @@ Double_t AliGenGSIlib::YUpsilonRitman(Double_t *py, Double_t *dummy) return yu; } -Double_t AliGenGSIlib::PtUpsilonKarel( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtUpsilonKarel( Double_t */*px*/, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -143,7 +143,7 @@ Double_t AliGenGSIlib::PtUpsilonKarel( Double_t *px, Double_t *dummy ) return 0.1; } -Double_t AliGenGSIlib::YUpsilonKarel(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YUpsilonKarel(Double_t */*py*/, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -156,7 +156,7 @@ Double_t AliGenGSIlib::YUpsilonKarel(Double_t *py, Double_t *dummy) return 0.2; } -Double_t AliGenGSIlib::PtUpsilonMUON( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtUpsilonMUON( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -173,7 +173,7 @@ Double_t AliGenGSIlib::PtUpsilonMUON( Double_t *px, Double_t *dummy ) return x/TMath::Power(pass1,kxn); } -Double_t AliGenGSIlib::YUpsilonMUON(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YUpsilonMUON(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -209,7 +209,7 @@ Int_t AliGenGSIlib::IpJpsi(TRandom *) return 443; } -Double_t AliGenGSIlib::PtJpsiFlat( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtJpsiFlat( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -227,7 +227,7 @@ Double_t AliGenGSIlib::PtJpsiFlat( Double_t *px, Double_t *dummy ) return weight; } -Double_t AliGenGSIlib::YJpsiFlat(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YJpsiFlat(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -248,7 +248,7 @@ Double_t AliGenGSIlib::YJpsiFlat(Double_t *py, Double_t *dummy) return yu; } -Double_t AliGenGSIlib::PtJpsiMUON( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtJpsiMUON( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -264,7 +264,7 @@ Double_t AliGenGSIlib::PtJpsiMUON( Double_t *px, Double_t *dummy ) return x/TMath::Power(pass1,kxn); } -Double_t AliGenGSIlib::PtJpsiRitman( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtJpsiRitman( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -281,7 +281,7 @@ Double_t AliGenGSIlib::PtJpsiRitman( Double_t *px, Double_t *dummy ) return x/TMath::Power(pass1,kxn); } -Double_t AliGenGSIlib::YJpsiMUON(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YJpsiMUON(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -306,7 +306,7 @@ Double_t AliGenGSIlib::YJpsiMUON(Double_t *py, Double_t *dummy) // J/Psi pt-distribution by Sergei // //-------------------------------------------------------------------------- -//Double_t AliGenGSIlib::PtJpsi( Double_t *px, Double_t *dummy ) +//Double_t AliGenGSIlib::PtJpsi( Double_t *px, Double_t */*dummy*/ ) //{ // return x = gRandom->Rndm()*10.; @@ -363,7 +363,7 @@ Int_t AliGenGSIlib::IpCharm(TRandom *ran) return ip; } -Double_t AliGenGSIlib::PtCharmFlat( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::PtCharmFlat( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -378,7 +378,7 @@ Double_t AliGenGSIlib::PtCharmFlat( Double_t *px, Double_t *dummy) return x ; } -Double_t AliGenGSIlib::PtCharmGSI( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::PtCharmGSI( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -398,7 +398,7 @@ Double_t AliGenGSIlib::PtCharmGSI( Double_t *px, Double_t *dummy) return TMath::Power(x,kp1) * (pass1 + kp3 * pass2); } -Double_t AliGenGSIlib::PtCharmMUON( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::PtCharmMUON( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -415,7 +415,7 @@ Double_t AliGenGSIlib::PtCharmMUON( Double_t *px, Double_t *dummy) return x/TMath::Power(pass1,kxn); } -Double_t AliGenGSIlib::YCharm( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::YCharm( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -456,7 +456,7 @@ Int_t AliGenGSIlib::IpBeauty(TRandom *ran) return ip; } -Double_t AliGenGSIlib::PtBeautyFlat( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::PtBeautyFlat( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -471,7 +471,7 @@ Double_t AliGenGSIlib::PtBeautyFlat( Double_t *px, Double_t *dummy) return x ; } -Double_t AliGenGSIlib::PtBeautyGSI( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::PtBeautyGSI( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -493,7 +493,7 @@ Double_t AliGenGSIlib::PtBeautyGSI( Double_t *px, Double_t *dummy) return TMath::Power(x,kp1) * (pass1 + kp3 * pass2); } -Double_t AliGenGSIlib::PtBeautyMUON( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::PtBeautyMUON( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -510,7 +510,7 @@ Double_t AliGenGSIlib::PtBeautyMUON( Double_t *px, Double_t *dummy) return x/TMath::Power(pass1,kxn); } -Double_t AliGenGSIlib::YBeauty( Double_t *px, Double_t *dummy) +Double_t AliGenGSIlib::YBeauty( Double_t *px, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -538,7 +538,7 @@ Int_t AliGenGSIlib::IpEta(TRandom *) return 221; } -Double_t AliGenGSIlib::PtEtaPHOS( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtEtaPHOS( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -549,7 +549,7 @@ Double_t AliGenGSIlib::PtEtaPHOS( Double_t *px, Double_t *dummy ) return PtScal(*px,3); // 3==> Eta in the PtScal function } -Double_t AliGenGSIlib::YEtaPHOS(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YEtaPHOS(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -582,7 +582,7 @@ Int_t AliGenGSIlib::IpEtaprime(TRandom *) return 331; } -Double_t AliGenGSIlib::PtEtaprimePHOS( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtEtaprimePHOS( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -593,7 +593,7 @@ Double_t AliGenGSIlib::PtEtaprimePHOS( Double_t *px, Double_t *dummy ) return PtScal(*px,5); // 5==> Etaprime in the PtScal function } -Double_t AliGenGSIlib::YEtaprimePHOS(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YEtaprimePHOS(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -626,7 +626,7 @@ Int_t AliGenGSIlib::IpOmega(TRandom *) return 223; } -Double_t AliGenGSIlib::PtOmega( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtOmega( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -637,7 +637,7 @@ Double_t AliGenGSIlib::PtOmega( Double_t *px, Double_t *dummy ) return PtScal(*px,4); // 4==> Omega in the PtScal function } -Double_t AliGenGSIlib::YOmega(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YOmega(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -672,7 +672,7 @@ Int_t AliGenGSIlib::IpRho(TRandom *) return 113; } -Double_t AliGenGSIlib::PtRho( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtRho( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -683,7 +683,7 @@ Double_t AliGenGSIlib::PtRho( Double_t *px, Double_t *dummy ) return PtScal(*px,11); // 11==> Rho in the PtScal function } -Double_t AliGenGSIlib::YRho(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YRho(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -732,7 +732,7 @@ Int_t AliGenGSIlib::IpPionPHOS(TRandom *ran) } } } -Double_t AliGenGSIlib::PtPion( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtPion( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -766,7 +766,7 @@ Double_t AliGenGSIlib::PtPion( Double_t *px, Double_t *dummy ) return y*x; } -Double_t AliGenGSIlib::YPion(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YPion(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -815,7 +815,7 @@ Int_t AliGenGSIlib::IpKaonPHOS(TRandom *ran) } } } -Double_t AliGenGSIlib::PtKaonPHOS( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtKaonPHOS( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -826,7 +826,7 @@ Double_t AliGenGSIlib::PtKaonPHOS( Double_t *px, Double_t *dummy ) return PtScal(*px,2); // 2==> Kaon in the PtScal function } -Double_t AliGenGSIlib::YKaonPHOS(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YKaonPHOS(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -859,7 +859,7 @@ Int_t AliGenGSIlib::IpPhi(TRandom *) return 333; } -Double_t AliGenGSIlib::PtPhiPHOS( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtPhiPHOS( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -870,7 +870,7 @@ Double_t AliGenGSIlib::PtPhiPHOS( Double_t *px, Double_t *dummy ) return PtScal(*px,6); // 6==> Phi in the PtScal function } -Double_t AliGenGSIlib::YPhiPHOS(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YPhiPHOS(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // @@ -920,7 +920,7 @@ Int_t AliGenGSIlib::IpBaryons(TRandom *ran) } } } -Double_t AliGenGSIlib::PtBaryons( Double_t *px, Double_t *dummy ) +Double_t AliGenGSIlib::PtBaryons( Double_t *px, Double_t */*dummy*/ ) { //-------------------------------------------------------------------------- // @@ -931,7 +931,7 @@ Double_t AliGenGSIlib::PtBaryons( Double_t *px, Double_t *dummy ) return PtScal(*px,7); // 7==> Baryon in the PtScal function } -Double_t AliGenGSIlib::YBaryons(Double_t *py, Double_t *dummy) +Double_t AliGenGSIlib::YBaryons(Double_t *py, Double_t */*dummy*/) { //-------------------------------------------------------------------------- // diff --git a/EVGEN/AliGenGeVSimEventHeader.h b/EVGEN/AliGenGeVSimEventHeader.h index a5db286fb25..4dc7e963b7b 100644 --- a/EVGEN/AliGenGeVSimEventHeader.h +++ b/EVGEN/AliGenGeVSimEventHeader.h @@ -26,7 +26,7 @@ class AliGenGeVSimEventHeader: public AliGenEventHeader { //Getters Float_t GetEventPlane() const {return fEventPlane;} - Float_t GetEllipticFlow(Int_t pdg) const {return fEllipticFlow;} + Float_t GetEllipticFlow() const {return fEllipticFlow;} //Setters void SetEventPlane(Float_t psi); diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx index 8ea81231689..76174048c90 100644 --- a/EVGEN/AliGenHIJINGpara.cxx +++ b/EVGEN/AliGenHIJINGpara.cxx @@ -52,9 +52,12 @@ ClassImp(AliGenHIJINGpara) -AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para) + +AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para): + AliGenerator(para) { -// copy constructor +// Copy constructor + para.Copy(*this); } //_____________________________________________________________________________ @@ -353,12 +356,6 @@ void AliGenHIJINGpara::Generate() gAlice->SetGenEventHeader(header); } -AliGenHIJINGpara& AliGenHIJINGpara::operator=(const AliGenHIJINGpara& rhs) -{ -// Assignment operator - return *this; -} - void AliGenHIJINGpara::SetPtRange(Float_t ptmin, Float_t ptmax) { AliGenerator::SetPtRange(ptmin, ptmax); } @@ -398,3 +395,8 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p) } fNt = nt; } + +void AliGenHIJINGpara::Copy(AliGenHIJINGpara &) const +{ + Fatal("Copy","Not implemented!\n"); +} diff --git a/EVGEN/AliGenHIJINGpara.h b/EVGEN/AliGenHIJINGpara.h index 9ca6dc3b7ba..53dcae11d2e 100644 --- a/EVGEN/AliGenHIJINGpara.h +++ b/EVGEN/AliGenHIJINGpara.h @@ -20,16 +20,17 @@ class AliGenHIJINGpara : public AliGenerator AliGenHIJINGpara(); AliGenHIJINGpara(Int_t npart); AliGenHIJINGpara(const AliGenHIJINGpara &HIJINGpara); - + AliGenHIJINGpara& operator = (const AliGenHIJINGpara ¶) + {para.Copy(*this); return (*this);} virtual ~AliGenHIJINGpara(); virtual void SetCutVertexZ(Float_t cut=999999.) {fCutVertexZ = cut;} virtual void Generate(); virtual void Init(); - AliGenHIJINGpara & operator=(const AliGenHIJINGpara & rhs); virtual void SetPtRange(Float_t ptmin = 0., Float_t ptmax=15.); virtual void SetPi0Decays(Bool_t flag = kFALSE) {fPi0Decays = flag;} private: void DecayPi0(Float_t* orig, Float_t * p); + void Copy(AliGenHIJINGpara ¶) const; protected: Int_t fNt; // CurrentTrack; Float_t fCutVertexZ; // Vertex truncation diff --git a/EVGEN/AliGenHalo.cxx b/EVGEN/AliGenHalo.cxx index 352ce7819eb..9a900856df4 100644 --- a/EVGEN/AliGenHalo.cxx +++ b/EVGEN/AliGenHalo.cxx @@ -29,9 +29,10 @@ #include "AliGenHalo.h" #include "AliRun.h" - ClassImp(AliGenHalo) - AliGenHalo::AliGenHalo() - :AliGenerator(-1) +ClassImp(AliGenHalo) + +AliGenHalo::AliGenHalo() + :AliGenerator(-1) { // Constructor fName="Halo"; @@ -55,8 +56,10 @@ AliGenHalo::AliGenHalo(Int_t npart) } AliGenHalo::AliGenHalo(const AliGenHalo & Halo) + :AliGenerator(Halo) { -// copy constructor +// Copy constructor + Halo.Copy(*this); } @@ -135,10 +138,20 @@ void AliGenHalo::Generate() AliGenHalo& AliGenHalo::operator=(const AliGenHalo& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } +void AliGenHalo::Copy(AliGenHalo&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} + + diff --git a/EVGEN/AliGenHalo.h b/EVGEN/AliGenHalo.h index e61d49e4e19..4b9a3a056f2 100644 --- a/EVGEN/AliGenHalo.h +++ b/EVGEN/AliGenHalo.h @@ -15,7 +15,7 @@ class AliGenHalo : public AliGenerator { -public: + public: AliGenHalo(); AliGenHalo(Int_t npart); AliGenHalo(const AliGenHalo &Halo); @@ -24,10 +24,12 @@ public: virtual void SetFileName(TString filename) {fFileName=TString(filename);} virtual void Generate(); AliGenHalo & operator=(const AliGenHalo & rhs); -protected: - FILE *fp; // ! Pointer to file - TString fFileName; // Choose the file - ClassDef(AliGenHalo,1) // LHC background boundary source (MARS input) + private: + void Copy(AliGenHalo &Halo) const; + protected: + FILE *fp; // ! Pointer to file + TString fFileName; // Choose the file + ClassDef(AliGenHalo,1) // LHC background boundary source (MARS input) }; #endif diff --git a/EVGEN/AliGenHaloProtvino.cxx b/EVGEN/AliGenHaloProtvino.cxx index 99b1f2e8371..843865e5d0c 100644 --- a/EVGEN/AliGenHaloProtvino.cxx +++ b/EVGEN/AliGenHaloProtvino.cxx @@ -30,9 +30,10 @@ #include "AliGenHaloProtvino.h" #include "AliRun.h" - ClassImp(AliGenHaloProtvino) - AliGenHaloProtvino::AliGenHaloProtvino() - :AliGenerator(-1) +ClassImp(AliGenHaloProtvino) + +AliGenHaloProtvino::AliGenHaloProtvino() + :AliGenerator(-1) { // Constructor @@ -65,9 +66,11 @@ AliGenHaloProtvino::AliGenHaloProtvino(Int_t npart) SetAnalog(0); } -AliGenHaloProtvino::AliGenHaloProtvino(const AliGenHaloProtvino & HaloProtvino) +AliGenHaloProtvino::AliGenHaloProtvino(const AliGenHaloProtvino & HaloProtvino): + AliGenerator(HaloProtvino) { -// copy constructor +// Copy constructor + HaloProtvino.Copy(*this); } @@ -312,6 +315,7 @@ void AliGenHaloProtvino::Generate() AliGenHaloProtvino& AliGenHaloProtvino::operator=(const AliGenHaloProtvino& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } @@ -352,6 +356,15 @@ Float_t AliGenHaloProtvino::GassPressureWeight(Float_t zPrimary) return weight; } +void AliGenHaloProtvino::Copy(AliGenHaloProtvino&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} + + /* # Title: README file for the sources of IR8 machine induced background # Author: Vadim Talanov diff --git a/EVGEN/AliGenHaloProtvino.h b/EVGEN/AliGenHaloProtvino.h index f0812d1e9eb..36e56336b92 100644 --- a/EVGEN/AliGenHaloProtvino.h +++ b/EVGEN/AliGenHaloProtvino.h @@ -32,7 +32,8 @@ public: AliGenHaloProtvino & operator=(const AliGenHaloProtvino & rhs); - + private: + void Copy(AliGenHaloProtvino&) const; protected: FILE* fFile; // ! Pointer to file TString fFileName; // Choose the file diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx index ce15a232008..04ebde22a23 100644 --- a/EVGEN/AliGenMC.cxx +++ b/EVGEN/AliGenMC.cxx @@ -27,10 +27,10 @@ #include "AliGenMC.h" - ClassImp(AliGenMC) +ClassImp(AliGenMC) AliGenMC::AliGenMC() - :AliGenerator() + :AliGenerator() { // Default Constructor SetCutOnChild(); @@ -48,7 +48,7 @@ AliGenMC::AliGenMC() } AliGenMC::AliGenMC(Int_t npart) - :AliGenerator(npart) + :AliGenerator(npart) { // Constructor SetCutOnChild(); @@ -69,9 +69,11 @@ AliGenMC::AliGenMC(Int_t npart) SetProjectile(); } -AliGenMC::AliGenMC(const AliGenMC & mc) +AliGenMC::AliGenMC(const AliGenMC & mc): + AliGenerator(mc) { -// copy constructor +// Copy constructor + mc.Copy(*this); } AliGenMC::~AliGenMC() @@ -332,6 +334,16 @@ void AliGenMC::Boost() AliGenMC& AliGenMC::operator=(const AliGenMC& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } +void AliGenMC::Copy(AliGenMC&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} + + diff --git a/EVGEN/AliGenMC.h b/EVGEN/AliGenMC.h index b7beacaebaf..415ce7a8ec8 100644 --- a/EVGEN/AliGenMC.h +++ b/EVGEN/AliGenMC.h @@ -68,7 +68,8 @@ class AliGenMC : public AliGenerator // all kinematic selection cuts go here Bool_t KinematicSelection(TParticle *particle, Int_t flag) const; Int_t CheckPDGCode(Int_t pdgcode) const; - + private: + void Copy(AliGenMC&) const; protected: TClonesArray* fParticles; //!Particle List TArrayI fParentSelect; //!Parent particles to be selected diff --git a/EVGEN/AliGenMUONlib.cxx b/EVGEN/AliGenMUONlib.cxx index 32a62077a0d..031235e4a28 100644 --- a/EVGEN/AliGenMUONlib.cxx +++ b/EVGEN/AliGenMUONlib.cxx @@ -32,7 +32,7 @@ ClassImp(AliGenMUONlib) // // Pions -Double_t AliGenMUONlib::PtPion(Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtPion(Double_t *px, Double_t* /*dummy*/) { // // PT-PARAMETERIZATION CDF, PRL 61(88) 1819 @@ -61,7 +61,7 @@ Double_t AliGenMUONlib::PtPion(Double_t *px, Double_t *dummy) // // y-distribution // -Double_t AliGenMUONlib::YPion( Double_t *py, Double_t *dummy) +Double_t AliGenMUONlib::YPion( Double_t *py, Double_t */*dummy*/) { // Pion y Double_t y=TMath::Abs(*py); @@ -111,7 +111,7 @@ Double_t AliGenMUONlib::PtScal(Double_t pt, Int_t np) // // pt-distribution //____________________________________________________________ -Double_t AliGenMUONlib::PtKaon( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtKaon( Double_t *px, Double_t */*dummy*/) { // Kaon pT return PtScal(*px,2); @@ -119,7 +119,7 @@ Double_t AliGenMUONlib::PtKaon( Double_t *px, Double_t *dummy) // y-distribution //____________________________________________________________ -Double_t AliGenMUONlib::YKaon( Double_t *py, Double_t *dummy) +Double_t AliGenMUONlib::YKaon( Double_t *py, Double_t */*dummy*/) { // Kaon y Double_t y=TMath::Abs(*py); @@ -151,7 +151,7 @@ Int_t AliGenMUONlib::IpKaon(TRandom *ran) // // pt-distribution //____________________________________________________________ -Double_t AliGenMUONlib::PtJpsi( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtJpsi( Double_t *px, Double_t */*dummy*/) { // J/Psi pT const Double_t kpt0 = 4.; @@ -162,7 +162,7 @@ Double_t AliGenMUONlib::PtJpsi( Double_t *px, Double_t *dummy) return x/TMath::Power(pass1,kxn); } -Double_t AliGenMUONlib::PtJpsiPbPb( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtJpsiPbPb( Double_t *px, Double_t */*dummy*/) { // J/Psi pT spectrum // @@ -188,7 +188,7 @@ Double_t AliGenMUONlib::PtJpsiPbPb( Double_t *px, Double_t *dummy) } return y; } -Double_t AliGenMUONlib::PtJpsiPP( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtJpsiPP( Double_t *px, Double_t */*dummy*/) { // J/Psi pT spectrum // @@ -215,7 +215,7 @@ Double_t AliGenMUONlib::PtJpsiPP( Double_t *px, Double_t *dummy) // // y-distribution //____________________________________________________________ -Double_t AliGenMUONlib::YJpsi(Double_t *py, Double_t *dummy) +Double_t AliGenMUONlib::YJpsi(Double_t *py, Double_t */*dummy*/) { // J/psi y const Double_t ky0 = 4.; @@ -231,7 +231,7 @@ Double_t AliGenMUONlib::YJpsi(Double_t *py, Double_t *dummy) } -Double_t AliGenMUONlib::YJpsiPbPb( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YJpsiPbPb( Double_t *px, Double_t */*dummy*/) { // @@ -260,7 +260,7 @@ Double_t AliGenMUONlib::YJpsiPbPb( Double_t *px, Double_t *dummy) return y; } -Double_t AliGenMUONlib::YJpsiPP( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YJpsiPP( Double_t *px, Double_t */*dummy*/) { // @@ -303,7 +303,7 @@ Int_t AliGenMUONlib::IpJpsi(TRandom *) // // pt-distribution //____________________________________________________________ -Double_t AliGenMUONlib::PtUpsilon( Double_t *px, Double_t *dummy ) +Double_t AliGenMUONlib::PtUpsilon( Double_t *px, Double_t */*dummy*/ ) { // Upsilon pT const Double_t kpt0 = 5.3; @@ -314,7 +314,7 @@ Double_t AliGenMUONlib::PtUpsilon( Double_t *px, Double_t *dummy ) return x/TMath::Power(pass1,kxn); } -Double_t AliGenMUONlib::PtUpsilonPbPb( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtUpsilonPbPb( Double_t *px, Double_t */*dummy*/) { // @@ -343,7 +343,7 @@ Double_t AliGenMUONlib::PtUpsilonPbPb( Double_t *px, Double_t *dummy) return y; } -Double_t AliGenMUONlib::PtUpsilonPP( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtUpsilonPP( Double_t *px, Double_t */*dummy*/) { // @@ -375,7 +375,7 @@ Double_t AliGenMUONlib::PtUpsilonPP( Double_t *px, Double_t *dummy) // y-distribution // //____________________________________________________________ -Double_t AliGenMUONlib::YUpsilon(Double_t *py, Double_t *dummy) +Double_t AliGenMUONlib::YUpsilon(Double_t *py, Double_t */*dummy*/) { // Upsilon y const Double_t ky0 = 3.; @@ -391,7 +391,7 @@ Double_t AliGenMUONlib::YUpsilon(Double_t *py, Double_t *dummy) } -Double_t AliGenMUONlib::YUpsilonPbPb( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YUpsilonPbPb( Double_t *px, Double_t */*dummy*/) { // @@ -415,7 +415,7 @@ Double_t AliGenMUONlib::YUpsilonPbPb( Double_t *px, Double_t *dummy) return y; } -Double_t AliGenMUONlib::YUpsilonPP( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YUpsilonPP( Double_t *px, Double_t */*dummy*/) { // @@ -452,13 +452,13 @@ Int_t AliGenMUONlib::IpUpsilon(TRandom *) // // pt-distribution (by scaling of pion distribution) //____________________________________________________________ -Double_t AliGenMUONlib::PtPhi( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtPhi( Double_t *px, Double_t */*dummy*/) { // Phi pT return PtScal(*px,7); } // y-distribution -Double_t AliGenMUONlib::YPhi( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YPhi( Double_t *px, Double_t */*dummy*/) { // Phi y Double_t *dum=0; @@ -478,13 +478,13 @@ Int_t AliGenMUONlib::IpPhi(TRandom *) // // pt-distribution (by scaling of pion distribution) //____________________________________________________________ -Double_t AliGenMUONlib::PtOmega( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtOmega( Double_t *px, Double_t */*dummy*/) { // Omega pT return PtScal(*px,5); } // y-distribution -Double_t AliGenMUONlib::YOmega( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YOmega( Double_t *px, Double_t */*dummy*/) { // Omega y Double_t *dum=0; @@ -505,13 +505,13 @@ Int_t AliGenMUONlib::IpOmega(TRandom *) // // pt-distribution (by scaling of pion distribution) //____________________________________________________________ -Double_t AliGenMUONlib::PtEta( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtEta( Double_t *px, Double_t */*dummy*/) { // Eta pT return PtScal(*px,3); } // y-distribution -Double_t AliGenMUONlib::YEta( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YEta( Double_t *px, Double_t */*dummy*/) { // Eta y Double_t *dum=0; @@ -531,7 +531,7 @@ Int_t AliGenMUONlib::IpEta(TRandom *) // // pt-distribution //____________________________________________________________ -Double_t AliGenMUONlib::PtCharm( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtCharm( Double_t *px, Double_t */*dummy*/) { // Charm pT const Double_t kpt0 = 4.08; @@ -543,7 +543,7 @@ Double_t AliGenMUONlib::PtCharm( Double_t *px, Double_t *dummy) return x/TMath::Power(pass1,kxn); } // y-distribution -Double_t AliGenMUONlib::YCharm( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YCharm( Double_t *px, Double_t */*dummy*/) { // Charm y Double_t *dum=0; @@ -578,7 +578,7 @@ Int_t AliGenMUONlib::IpCharm(TRandom *ran) // // pt-distribution //____________________________________________________________ -Double_t AliGenMUONlib::PtBeauty( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::PtBeauty( Double_t *px, Double_t */*dummy*/) { // Beauty pT const Double_t kpt0 = 4.; @@ -589,7 +589,7 @@ Double_t AliGenMUONlib::PtBeauty( Double_t *px, Double_t *dummy) return x/TMath::Power(pass1,kxn); } // y-distribution -Double_t AliGenMUONlib::YBeauty( Double_t *px, Double_t *dummy) +Double_t AliGenMUONlib::YBeauty( Double_t *px, Double_t */*dummy*/) { // Beauty y Double_t *dum=0; @@ -725,7 +725,7 @@ GenFunc AliGenMUONlib::GetY(Int_t param, const char* tname) const return func; } typedef Int_t (*GenFuncIp) (TRandom *); -GenFuncIp AliGenMUONlib::GetIp(Int_t param, const char* tname) const +GenFuncIp AliGenMUONlib::GetIp(Int_t param, const char* /*tname*/) const { // Return pointer to particle type parameterisation GenFuncIp func; diff --git a/EVGEN/AliGenPHOSlib.cxx b/EVGEN/AliGenPHOSlib.cxx index 516bd7a0b33..359bb647106 100644 --- a/EVGEN/AliGenPHOSlib.cxx +++ b/EVGEN/AliGenPHOSlib.cxx @@ -126,7 +126,7 @@ ClassImp(AliGenPHOSlib) // Particle distribution IdPi0Flat 111 (pi0) // -Double_t AliGenPHOSlib::PtPi0Flat(Double_t *px, Double_t *) +Double_t AliGenPHOSlib::PtPi0Flat(Double_t */*px*/, Double_t *) { // Pion transverse momentum flat distribution @@ -134,7 +134,7 @@ return 1; } -Double_t AliGenPHOSlib::YPi0Flat( Double_t *py, Double_t *) +Double_t AliGenPHOSlib::YPi0Flat( Double_t */*py*/, Double_t *) { // pion y-distribution @@ -274,7 +274,7 @@ Double_t AliGenPHOSlib::YPi0Flat( Double_t *py, Double_t *) // Particle distribution IdEtaFlat 111 (pi0) // -Double_t AliGenPHOSlib::PtEtaFlat(Double_t *px, Double_t *) +Double_t AliGenPHOSlib::PtEtaFlat(Double_t */*px*/, Double_t *) { // Eta transverse momentum flat distribution @@ -282,7 +282,7 @@ Double_t AliGenPHOSlib::PtEtaFlat(Double_t *px, Double_t *) } -Double_t AliGenPHOSlib::YEtaFlat( Double_t *py, Double_t *) +Double_t AliGenPHOSlib::YEtaFlat( Double_t */*py*/, Double_t *) { // // pion y-distribution @@ -459,7 +459,7 @@ Double_t AliGenPHOSlib::YEtaFlat( Double_t *py, Double_t *) typedef Double_t (*GenFunc) (Double_t*, Double_t*); - GenFunc AliGenPHOSlib::GetPt(Int_t param, const char* tname) const +GenFunc AliGenPHOSlib::GetPt(Int_t param, const char* /*tname*/) const { // Return pinter to pT parameterisation GenFunc func; @@ -497,7 +497,7 @@ typedef Double_t (*GenFunc) (Double_t*, Double_t*); return func; } - GenFunc AliGenPHOSlib::GetY(Int_t param, const char* tname) const +GenFunc AliGenPHOSlib::GetY(Int_t param, const char* /*tname*/) const { // Return pointer to Y parameterisation GenFunc func; @@ -537,7 +537,7 @@ typedef Double_t (*GenFunc) (Double_t*, Double_t*); return func; } typedef Int_t (*GenFuncIp) (TRandom *); - GenFuncIp AliGenPHOSlib::GetIp(Int_t param, const char* tname) const +GenFuncIp AliGenPHOSlib::GetIp(Int_t param, const char* /*tname*/) const { // Return pointer to particle composition GenFuncIp func; diff --git a/EVGEN/AliGenPMDlib.cxx b/EVGEN/AliGenPMDlib.cxx index 03a25f9b452..48030a27c22 100644 --- a/EVGEN/AliGenPMDlib.cxx +++ b/EVGEN/AliGenPMDlib.cxx @@ -24,7 +24,7 @@ ClassImp(AliGenPMDlib) // // Neutral Pions -Double_t AliGenPMDlib::PtPi0(Double_t *px, Double_t *dummy) +Double_t AliGenPMDlib::PtPi0(Double_t *px, Double_t */*dummy*/) { // // PT-PARAMETERIZATION CDF, PRL 61(88) 1819 @@ -54,7 +54,7 @@ Double_t AliGenPMDlib::PtPi0(Double_t *px, Double_t *dummy) // // y-distribution // -Double_t AliGenPMDlib::YPi0( Double_t *py, Double_t *dummy) +Double_t AliGenPMDlib::YPi0( Double_t *py, Double_t */*dummy*/) { // // y parametrisation for pi0 @@ -106,7 +106,7 @@ Double_t AliGenPMDlib::PtScal(Double_t pt, Int_t np) // pt-distribution //____________________________________________________________ -Double_t AliGenPMDlib::PtEta( Double_t *px, Double_t *dummy) +Double_t AliGenPMDlib::PtEta( Double_t *px, Double_t */*dummy*/) { // Kaon pT return PtScal(*px,3); @@ -114,7 +114,7 @@ Double_t AliGenPMDlib::PtEta( Double_t *px, Double_t *dummy) // y-distribution //____________________________________________________________ -Double_t AliGenPMDlib::YEta( Double_t *py, Double_t *dummy) +Double_t AliGenPMDlib::YEta( Double_t *py, Double_t */*dummy*/) { // // y parametrisation for etas @@ -141,7 +141,7 @@ Int_t AliGenPMDlib::IpEta(TRandom *) typedef Double_t (*GenFunc) (Double_t*, Double_t*); -GenFunc AliGenPMDlib::GetPt(Int_t param, const char* tname) const +GenFunc AliGenPMDlib::GetPt(Int_t param, const char* /*tname*/) const { // Return pointer to pT parameterisation GenFunc func=NULL; @@ -160,7 +160,7 @@ GenFunc AliGenPMDlib::GetPt(Int_t param, const char* tname) const return func; } -GenFunc AliGenPMDlib::GetY(Int_t param, const char* tname) const +GenFunc AliGenPMDlib::GetY(Int_t param, const char* /*tname*/) const { // Return pointer to y- parameterisation GenFunc func=NULL; @@ -180,7 +180,7 @@ GenFunc AliGenPMDlib::GetY(Int_t param, const char* tname) const } typedef Int_t (*GenFuncIp) (TRandom *); -GenFuncIp AliGenPMDlib::GetIp(Int_t param, const char* tname) const +GenFuncIp AliGenPMDlib::GetIp(Int_t param, const char* /*tname*/) const { // Return pointer to particle type parameterisation GenFuncIp func=NULL; diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx index 963e58d562c..32191ad8695 100644 --- a/EVGEN/AliGenParam.cxx +++ b/EVGEN/AliGenParam.cxx @@ -139,8 +139,9 @@ AliGenParam::AliGenParam(Int_t npart, Int_t param, AliGenParam::AliGenParam(const AliGenParam & Param) + :AliGenMC(Param) { -// copy constructor +// Copy constructor Param.Copy(*this); } @@ -469,6 +470,7 @@ void AliGenParam::Draw() AliGenParam& AliGenParam::operator=(const AliGenParam& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } diff --git a/EVGEN/AliGenParam.h b/EVGEN/AliGenParam.h index bc9a35a891d..228c47d041b 100644 --- a/EVGEN/AliGenParam.h +++ b/EVGEN/AliGenParam.h @@ -45,6 +45,8 @@ class AliGenParam : public AliGenMC virtual void SetDecayer(AliDecayer* decayer) {fDecayer = decayer;} virtual void Draw(); AliGenParam & operator=(const AliGenParam & rhs); + private: + void Copy(AliGenParam&) const; protected: Double_t (*fPtParaFunc)(Double_t*, Double_t*); //! Pointer to Pt parametrisation function Double_t (*fYParaFunc )(Double_t*, Double_t*); //! Pointer to Y parametrisation function diff --git a/EVGEN/AliGenReader.cxx b/EVGEN/AliGenReader.cxx index 4c881061744..f1be717c361 100644 --- a/EVGEN/AliGenReader.cxx +++ b/EVGEN/AliGenReader.cxx @@ -22,6 +22,7 @@ ClassImp(AliGenReader) AliGenReader& AliGenReader::operator=(const AliGenReader& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } @@ -31,3 +32,14 @@ void AliGenReader::RewindEvent() // Need to be implemented in the implementation classes. Interface dies. Fatal("AliGenReader::RewindEvent","\nMethod RewindEvent not present in the implementation class.\n"); } + +void AliGenReader::Copy(AliGenReader&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} + + + diff --git a/EVGEN/AliGenReader.h b/EVGEN/AliGenReader.h index 8d923f025a4..b5f7ba4781e 100644 --- a/EVGEN/AliGenReader.h +++ b/EVGEN/AliGenReader.h @@ -13,8 +13,8 @@ class AliGenReader : public TObject { public: AliGenReader():fFileName(NULL),fCode(kPDG){;} - AliGenReader(const AliGenReader &reader):fFileName(NULL),fCode(kPDG){;} - + AliGenReader(const AliGenReader &reader) + :TObject(reader), fFileName(NULL), fCode(kPDG){reader.Copy(*this);} virtual ~AliGenReader(){;} // Initialise virtual void Init() {} @@ -26,8 +26,9 @@ class AliGenReader : public TObject void SetParticleCode(Code_t code) {fCode = code;} virtual TParticle* NextParticle(){return NULL;} virtual void RewindEvent(); - AliGenReader & operator=(const AliGenReader & rhs); + private: + void Copy(AliGenReader&) const; protected: const Text_t *fFileName; // Name of file to read from Code_t fCode; // Particle code type diff --git a/EVGEN/AliGenReaderCwn.cxx b/EVGEN/AliGenReaderCwn.cxx index 0e25d0e8844..61e2c76e898 100644 --- a/EVGEN/AliGenReaderCwn.cxx +++ b/EVGEN/AliGenReaderCwn.cxx @@ -134,8 +134,18 @@ TParticle* AliGenReaderCwn::NextParticle() AliGenReaderCwn& AliGenReaderCwn::operator=(const AliGenReaderCwn& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } +void AliGenReaderCwn::Copy(AliGenReaderCwn&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} + + diff --git a/EVGEN/AliGenReaderCwn.h b/EVGEN/AliGenReaderCwn.h index 50ebd7da359..a064488b0f0 100644 --- a/EVGEN/AliGenReaderCwn.h +++ b/EVGEN/AliGenReaderCwn.h @@ -13,7 +13,8 @@ class AliGenReaderCwn : public AliGenReader public: AliGenReaderCwn(); - AliGenReaderCwn(const AliGenReaderCwn &reader){;} + AliGenReaderCwn(const AliGenReaderCwn &reader):AliGenReader(reader) + {reader.Copy(*this);} virtual ~AliGenReaderCwn(); // Initialise virtual void Init(); @@ -21,6 +22,9 @@ class AliGenReaderCwn : public AliGenReader virtual Int_t NextEvent(); virtual TParticle* NextParticle(); AliGenReaderCwn & operator=(const AliGenReaderCwn & rhs); + private: + void Copy(AliGenReaderCwn&) const; + protected: Int_t fNcurrent; // points to the next entry Int_t fNparticle; // particle number in event diff --git a/EVGEN/AliGenReaderEcalHijing.cxx b/EVGEN/AliGenReaderEcalHijing.cxx index 9fcc01ed722..7864818fb52 100644 --- a/EVGEN/AliGenReaderEcalHijing.cxx +++ b/EVGEN/AliGenReaderEcalHijing.cxx @@ -108,7 +108,16 @@ TParticle* AliGenReaderEcalHijing::NextParticle() AliGenReaderEcalHijing& AliGenReaderEcalHijing::operator=(const AliGenReaderEcalHijing& rhs) { // Assignment operator - return *this; + rhs.Copy(*this); + return (*this); +} + +void AliGenReaderEcalHijing::Copy(AliGenReaderEcalHijing&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); } diff --git a/EVGEN/AliGenReaderEcalHijing.h b/EVGEN/AliGenReaderEcalHijing.h index e6802231698..a4382a4a90a 100644 --- a/EVGEN/AliGenReaderEcalHijing.h +++ b/EVGEN/AliGenReaderEcalHijing.h @@ -13,7 +13,8 @@ class AliGenReaderEcalHijing : public AliGenReader public: AliGenReaderEcalHijing(); - AliGenReaderEcalHijing(const AliGenReaderEcalHijing &reader){;} + AliGenReaderEcalHijing(const AliGenReaderEcalHijing &reader):AliGenReader(reader) + {reader.Copy(*this);} virtual ~AliGenReaderEcalHijing(){;} // Initialise virtual void Init(); @@ -21,6 +22,8 @@ class AliGenReaderEcalHijing : public AliGenReader virtual Int_t NextEvent(); virtual TParticle* NextParticle(); AliGenReaderEcalHijing & operator=(const AliGenReaderEcalHijing & rhs); + private: + void Copy(AliGenReaderEcalHijing&) const; protected: Int_t fNcurrent; // points to the next entry Int_t fNparticle; // diff --git a/EVGEN/AliGenReaderEcalJets.cxx b/EVGEN/AliGenReaderEcalJets.cxx index 9ae491b0b33..4d70bddf834 100644 --- a/EVGEN/AliGenReaderEcalJets.cxx +++ b/EVGEN/AliGenReaderEcalJets.cxx @@ -121,9 +121,19 @@ TParticle* AliGenReaderEcalJets::NextParticle() AliGenReaderEcalJets& AliGenReaderEcalJets::operator=(const AliGenReaderEcalJets& rhs) { // Assignment operator - return *this; + rhs.Copy(*this); + return (*this); } +void AliGenReaderEcalJets::Copy(AliGenReaderEcalJets&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} + + diff --git a/EVGEN/AliGenReaderEcalJets.h b/EVGEN/AliGenReaderEcalJets.h index fe60a76c7d3..2289b3756d8 100644 --- a/EVGEN/AliGenReaderEcalJets.h +++ b/EVGEN/AliGenReaderEcalJets.h @@ -13,7 +13,8 @@ class AliGenReaderEcalJets : public AliGenReader public: AliGenReaderEcalJets(); - AliGenReaderEcalJets(const AliGenReaderEcalJets &reader){;} + AliGenReaderEcalJets(const AliGenReaderEcalJets &reader):AliGenReader(reader) + {reader.Copy(*this);} virtual ~AliGenReaderEcalJets(){;} // Initialise virtual void Init(); @@ -21,6 +22,8 @@ class AliGenReaderEcalJets : public AliGenReader virtual Int_t NextEvent(); virtual TParticle* NextParticle(); AliGenReaderEcalJets & operator=(const AliGenReaderEcalJets & rhs); + private: + void Copy(AliGenReaderEcalJets&) const; protected: Int_t fNcurrent; // points to the next event Int_t fNparticle; // points to the next particle diff --git a/EVGEN/AliGenReaderTreeK.cxx b/EVGEN/AliGenReaderTreeK.cxx index 461c156a25e..241139fa81c 100644 --- a/EVGEN/AliGenReaderTreeK.cxx +++ b/EVGEN/AliGenReaderTreeK.cxx @@ -31,32 +31,33 @@ ClassImp(AliGenReaderTreeK); const TString AliGenReaderTreeK::fgkEventFolderName("GenReaderTreeK"); AliGenReaderTreeK::AliGenReaderTreeK(): - AliGenReader(), - fNcurrent(0), - fNparticle(0), - fNp(0), - fInRunLoader(0), - fBaseFile(0), - fStack(0), - fOnlyPrimaries(kFALSE), - fDirs(0x0), - fCurrentDir(0) + AliGenReader(), + fNcurrent(0), + fNparticle(0), + fNp(0), + fInRunLoader(0), + fBaseFile(0), + fStack(0), + fOnlyPrimaries(kFALSE), + fDirs(0x0), + fCurrentDir(0) { // Default constructor } AliGenReaderTreeK::AliGenReaderTreeK(const AliGenReaderTreeK &reader): - fNcurrent(0), - fNparticle(0), - fNp(0), - fInRunLoader(0), - fBaseFile(0), - fStack(0), - fOnlyPrimaries(kFALSE), - fDirs(0x0), - fCurrentDir(0) + AliGenReader(reader), + fNcurrent(0), + fNparticle(0), + fNp(0), + fInRunLoader(0), + fBaseFile(0), + fStack(0), + fOnlyPrimaries(kFALSE), + fDirs(0x0), + fCurrentDir(0) { - ; + reader.Copy(*this); } @@ -148,9 +149,18 @@ void AliGenReaderTreeK::RewindEvent() AliGenReaderTreeK& AliGenReaderTreeK::operator=(const AliGenReaderTreeK& rhs) { // Assignment operator + rhs.Copy(*this); return *this; } +void AliGenReaderTreeK::Copy(AliGenReaderTreeK&) const +{ + // + // Copy + // + Fatal("Copy","Not implemented!\n"); +} + TString& AliGenReaderTreeK::GetDirName(Int_t entry) diff --git a/EVGEN/AliGenReaderTreeK.h b/EVGEN/AliGenReaderTreeK.h index 487d2f4fa8f..9dda69c51ab 100644 --- a/EVGEN/AliGenReaderTreeK.h +++ b/EVGEN/AliGenReaderTreeK.h @@ -30,6 +30,8 @@ class AliGenReaderTreeK : public AliGenReader AliGenReaderTreeK & operator=(const AliGenReaderTreeK & rhs); void SetDirs(TObjArray* dirs){fDirs = dirs;} //sets array directories names void AddDir(const char* dirname); + private: + void Copy(AliGenReaderTreeK&) const; protected: Int_t fNcurrent; // points to the next entry Int_t fNparticle; // Next particle in list diff --git a/EVGEN/AliGenSTRANGElib.cxx b/EVGEN/AliGenSTRANGElib.cxx index 9c58a778f42..25f8773b2dd 100644 --- a/EVGEN/AliGenSTRANGElib.cxx +++ b/EVGEN/AliGenSTRANGElib.cxx @@ -307,7 +307,7 @@ ClassImp(AliGenSTRANGElib) typedef Double_t (*GenFunc) (Double_t*, Double_t*); - GenFunc AliGenSTRANGElib::GetPt(Int_t param, const char* tname) const + GenFunc AliGenSTRANGElib::GetPt(Int_t param, const char* /*tname*/) const { // Return pinter to pT parameterisation GenFunc func; @@ -336,7 +336,7 @@ typedef Double_t (*GenFunc) (Double_t*, Double_t*); return func; } - GenFunc AliGenSTRANGElib::GetY(Int_t param, const char* tname) const + GenFunc AliGenSTRANGElib::GetY(Int_t param, const char* /*tname*/) const { // Return pointer to Y parameterisation GenFunc func; @@ -364,7 +364,7 @@ typedef Double_t (*GenFunc) (Double_t*, Double_t*); return func; } typedef Int_t (*GenFuncIp) (TRandom *); - GenFuncIp AliGenSTRANGElib::GetIp(Int_t param, const char* tname) const + GenFuncIp AliGenSTRANGElib::GetIp(Int_t param, const char* /*tname*/) const { // Return pointer to particle composition GenFuncIp func; diff --git a/EVGEN/AliSlowNucleonModel.h b/EVGEN/AliSlowNucleonModel.h index 0fc4997880e..ef2ca531535 100644 --- a/EVGEN/AliSlowNucleonModel.h +++ b/EVGEN/AliSlowNucleonModel.h @@ -13,9 +13,9 @@ class AliSlowNucleonModel : public TObject public: AliSlowNucleonModel() {;} virtual ~AliSlowNucleonModel(){;} - virtual void GetNumberOfSlowNucleons(AliCollisionGeometry* geo, - Int_t& ngp, Int_t& ngn, - Int_t& nbp, Int_t& nbn) {;} + virtual void GetNumberOfSlowNucleons(AliCollisionGeometry* /*geo*/, + Int_t& /*ngp*/, Int_t& /*ngn*/, + Int_t& /*nbp*/, Int_t& /*nbn*/) {;} protected: ClassDef(AliSlowNucleonModel,1) // Gray Particle Model -- 2.43.0