From 93a2041b6acdbf31d3a3eb48708a2a54a759543d Mon Sep 17 00:00:00 2001 From: hristov Date: Wed, 31 Jan 2007 09:18:26 +0000 Subject: [PATCH] Removing the fake copy constructors and assignment operator, moving their declarations to the private part of the classes (praparation for creation of real constructors/operator when needed). Removing of fake Copy method --- ACORDE/AliGenACORDE.cxx | 20 -- ACORDE/AliGenACORDE.h | 6 +- EVGEN/AliGenBeamGas.cxx | 18 -- EVGEN/AliGenBeamGas.h | 4 +- EVGEN/AliGenCocktail.cxx | 26 -- EVGEN/AliGenCocktail.h | 6 +- EVGEN/AliGenCocktailAfterBurner.cxx | 30 --- EVGEN/AliGenCocktailAfterBurner.h | 5 +- EVGEN/AliGenCorrHF.cxx | 22 -- EVGEN/AliGenCorrHF.h | 6 +- EVGEN/AliGenExtFile.cxx | 27 -- EVGEN/AliGenExtFile.h | 9 +- EVGEN/AliGenFLUKAsource.cxx | 47 ---- EVGEN/AliGenFLUKAsource.h | 7 +- EVGEN/AliGenGeVSim.cxx | 16 -- EVGEN/AliGenGeVSim.h | 4 +- EVGEN/AliGenHIJINGpara.cxx | 23 -- EVGEN/AliGenHIJINGpara.h | 10 +- EVGEN/AliGenHIJINGparaBa.cxx | 9 - EVGEN/AliGenHIJINGparaBa.h | 7 +- EVGEN/AliGenHalo.cxx | 27 -- EVGEN/AliGenHalo.h | 6 +- EVGEN/AliGenHaloProtvino.cxx | 380 ---------------------------- EVGEN/AliGenHaloProtvino.h | 6 +- EVGEN/AliGenMC.cxx | 54 ---- EVGEN/AliGenMC.h | 10 +- EVGEN/AliGenMUONCocktail.cxx | 40 --- EVGEN/AliGenMUONCocktail.h | 6 +- EVGEN/AliGenMUONCocktailpp.cxx | 21 +- EVGEN/AliGenMUONCocktailpp.h | 4 +- EVGEN/AliGenParam.cxx | 27 -- EVGEN/AliGenParam.h | 9 +- EVGEN/AliGenSlowNucleons.cxx | 54 ---- EVGEN/AliGenSlowNucleons.h | 8 +- PYTHIA6/AliGenPythia.cxx | 89 ------- PYTHIA6/AliGenPythia.h | 7 +- PYTHIA6/AliGenPythiaJets.cxx | 14 - PYTHIA6/AliGenPythiaJets.h | 8 +- STEER/AliGenerator.cxx | 59 ----- STEER/AliGenerator.h | 8 +- TEPEMGEN/AliGenEpEmv1.cxx | 8 - TEPEMGEN/AliGenEpEmv1.h | 4 +- THbtp/AliGenHBTprocessor.cxx | 9 - THbtp/AliGenHBTprocessor.h | 5 +- THerwig/AliGenHerwig.cxx | 40 --- THerwig/AliGenHerwig.h | 5 +- THijing/AliGenHijing.cxx | 56 ---- THijing/AliGenHijing.h | 6 +- TPHIC/AliGenTPHIC.cxx | 17 -- TPHIC/AliGenTPHIC.h | 10 +- 50 files changed, 96 insertions(+), 1203 deletions(-) diff --git a/ACORDE/AliGenACORDE.cxx b/ACORDE/AliGenACORDE.cxx index 9ac2ea1797b..f7a67bd5e78 100644 --- a/ACORDE/AliGenACORDE.cxx +++ b/ACORDE/AliGenACORDE.cxx @@ -111,26 +111,6 @@ AliGenACORDE::AliGenACORDE(Int_t npart) fOrigin[2] = 0.; } -//_____________________________________________________________________________ -AliGenACORDE::AliGenACORDE(const AliGenACORDE& gen) - : AliGenerator(gen) -{ - // - // Copy constructor - // - gen.Copy(*this); -} - -//_____________________________________________________________________________ -AliGenACORDE& AliGenACORDE::operator=(const AliGenACORDE& gen) -{ - // - // Asingment operator - // - gen.Copy(*this); - return *this; -} - //_____________________________________________________________________________ AliGenACORDE::~AliGenACORDE() { diff --git a/ACORDE/AliGenACORDE.h b/ACORDE/AliGenACORDE.h index 78e2502c46f..1fa21abc623 100644 --- a/ACORDE/AliGenACORDE.h +++ b/ACORDE/AliGenACORDE.h @@ -15,11 +15,8 @@ class AliGenACORDE : public AliGenerator { public: AliGenACORDE(); AliGenACORDE(Int_t npart); - AliGenACORDE(const AliGenACORDE& gen); virtual ~AliGenACORDE(); - AliGenACORDE& operator= (const AliGenACORDE& gen); - virtual void Init(); virtual void Generate(); virtual void SetPart(Int_t part) {fIpart = part;} @@ -54,6 +51,9 @@ class AliGenACORDE : public AliGenerator { void GenerateOneSingleMuon(Bool_t withFlatMomentum=kFALSE); private: + AliGenACORDE(const AliGenACORDE& gen); + AliGenACORDE& operator= (const AliGenACORDE& gen); + Int_t fIpart; //! Particle type. ECRMode fCRMode; //! Cosmic muons generation method flag TString* fCRModeName; //! Cosmic muons generation mode name diff --git a/EVGEN/AliGenBeamGas.cxx b/EVGEN/AliGenBeamGas.cxx index 1c14dba8c49..bfb4f5c9a5c 100644 --- a/EVGEN/AliGenBeamGas.cxx +++ b/EVGEN/AliGenBeamGas.cxx @@ -40,13 +40,6 @@ AliGenBeamGas::AliGenBeamGas() fOsigma[2] = 2000.; } -AliGenBeamGas::AliGenBeamGas(const AliGenBeamGas & beamgas): - AliGenExtFile(beamgas), - fInteractions(1) -{ -// Copy constructor - beamgas.Copy(*this); -} //____________________________________________________________ AliGenBeamGas::~AliGenBeamGas() @@ -122,16 +115,5 @@ void AliGenBeamGas::Generate() -void AliGenBeamGas::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); -} - - - - diff --git a/EVGEN/AliGenBeamGas.h b/EVGEN/AliGenBeamGas.h index 6d896fe5b6b..2e1293d7b5d 100644 --- a/EVGEN/AliGenBeamGas.h +++ b/EVGEN/AliGenBeamGas.h @@ -16,7 +16,6 @@ class AliGenBeamGas : public AliGenExtFile { public: AliGenBeamGas(); - AliGenBeamGas(const AliGenBeamGas &beamgas); virtual ~AliGenBeamGas(); // virtual void SetNumberOfInteractions(Int_t n) @@ -28,7 +27,8 @@ class AliGenBeamGas : public AliGenExtFile protected: Int_t fInteractions; // Number of interactions private: - void Copy(TObject&) const; + AliGenBeamGas(const AliGenBeamGas &beamgas); + AliGenBeamGas & operator=(const AliGenBeamGas &beamgas); ClassDef(AliGenBeamGas,1) //Generator for beam gas interactions diff --git a/EVGEN/AliGenCocktail.cxx b/EVGEN/AliGenCocktail.cxx index 1b570312cea..7b9bef2dfb7 100644 --- a/EVGEN/AliGenCocktail.cxx +++ b/EVGEN/AliGenCocktail.cxx @@ -51,21 +51,6 @@ AliGenCocktail::AliGenCocktail() fTitle= "Particle Generator using cocktail of generators"; } -AliGenCocktail::AliGenCocktail(const AliGenCocktail & cocktail): - AliGenerator(cocktail), - fNGenerators(0), - fRandom(kFALSE), - fUsePerEventRate(kFALSE), - fProb(0), - fEntries(0), - flnk1(0), - flnk2(0), - fHeader(0) -{ -// Copy constructor - cocktail.Copy(*this); -} - AliGenCocktail::~AliGenCocktail() { // Destructor @@ -319,18 +304,7 @@ void AliGenCocktail::AddHeader(AliGenEventHeader* header) // Add a header to the list if (fHeader) fHeader->AddHeader(header); } - -AliGenCocktail& AliGenCocktail::operator=(const AliGenCocktail& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return (*this); -} -void AliGenCocktail::Copy(TObject &) const -{ - Fatal("Copy","Not implemented!\n"); -} diff --git a/EVGEN/AliGenCocktail.h b/EVGEN/AliGenCocktail.h index 4015e778918..b9339ade09f 100644 --- a/EVGEN/AliGenCocktail.h +++ b/EVGEN/AliGenCocktail.h @@ -22,7 +22,6 @@ class AliGenCocktail : public AliGenerator { public: AliGenCocktail(); - AliGenCocktail(const AliGenCocktail &cocktail); virtual ~AliGenCocktail(); virtual void Init(); @@ -42,7 +41,6 @@ class AliGenCocktail : public AliGenerator AliGenCocktailEntry* NextGenerator(); void FirstGeneratorPair(AliGenCocktailEntry*&e1, AliGenCocktailEntry*&e2); void NextGeneratorPair (AliGenCocktailEntry*&e1, AliGenCocktailEntry*&e2); - AliGenCocktail & operator=(const AliGenCocktail & rhs); virtual void AddHeader(AliGenEventHeader* header); protected: @@ -57,7 +55,9 @@ class AliGenCocktail : public AliGenerator // private: - void Copy(TObject &arun) const; + AliGenCocktail(const AliGenCocktail &cocktail); + AliGenCocktail & operator=(const AliGenCocktail & rhs); + ClassDef(AliGenCocktail,1) // Particle cocktail generator a la SHAKER }; diff --git a/EVGEN/AliGenCocktailAfterBurner.cxx b/EVGEN/AliGenCocktailAfterBurner.cxx index e8157b6bd34..25948e2b423 100644 --- a/EVGEN/AliGenCocktailAfterBurner.cxx +++ b/EVGEN/AliGenCocktailAfterBurner.cxx @@ -66,23 +66,6 @@ ClassImp(AliGenCocktailAfterBurner) SetName("AliGenCocktailAfterBurner"); SetTitle("AliGenCocktailAfterBurner"); } -/*********************************************************************/ -AliGenCocktailAfterBurner::AliGenCocktailAfterBurner(const AliGenCocktailAfterBurner& cocktail): - AliGenCocktail(cocktail), - fNAfterBurners(0), - fAfterBurnerEntries(new TList()), - fGenerationDone(kFALSE), - fInternalStacks(0), - fCollisionGeometries(0), - fCurrentEvent(0), - fActiveStack(0), - fActiveEvent(-1), - fCurrentGenerator(0), - fNBgEvents(0) -{ - //Copy constructor - cocktail.Copy(*this); -} /*********************************************************************/ @@ -289,15 +272,6 @@ void AliGenCocktailAfterBurner::Generate() /*********************************************************************/ /*********************************************************************/ -AliGenCocktailAfterBurner& AliGenCocktailAfterBurner::operator=(const AliGenCocktailAfterBurner& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return (*this); -} -/*********************************************************************/ -/*********************************************************************/ - AliStack* AliGenCocktailAfterBurner::GetStack(Int_t n) const { //Returns the pointer to the N'th stack (event) @@ -419,7 +393,3 @@ TMCProcess AliGenCocktailAfterBurner::IntToMCProcess(Int_t no) return kPNoProcess; } -void AliGenCocktailAfterBurner::Copy(TObject &) const -{ - Fatal("Copy","Not implemented!\n"); -} diff --git a/EVGEN/AliGenCocktailAfterBurner.h b/EVGEN/AliGenCocktailAfterBurner.h index c9868516fa5..1df0de3bdae 100644 --- a/EVGEN/AliGenCocktailAfterBurner.h +++ b/EVGEN/AliGenCocktailAfterBurner.h @@ -30,9 +30,7 @@ class AliGenCocktailAfterBurner : public AliGenCocktail public: AliGenCocktailAfterBurner(); - AliGenCocktailAfterBurner(const AliGenCocktailAfterBurner& in); virtual ~AliGenCocktailAfterBurner(); - AliGenCocktailAfterBurner & operator=(const AliGenCocktailAfterBurner & rhs); virtual void Init(); virtual void Generate(); @@ -85,7 +83,8 @@ class AliGenCocktailAfterBurner : public AliGenCocktail //needed by some afterburners that works better with higher statistics //this generates such a artificial one private: - void Copy(TObject &arun) const; + AliGenCocktailAfterBurner(const AliGenCocktailAfterBurner& in); + AliGenCocktailAfterBurner & operator=(const AliGenCocktailAfterBurner & rhs); ClassDef(AliGenCocktailAfterBurner,2) // Particle cocktail generator a la SHAKER //background events added diff --git a/EVGEN/AliGenCorrHF.cxx b/EVGEN/AliGenCorrHF.cxx index 626b3f9cc9f..a871c3eb1a8 100644 --- a/EVGEN/AliGenCorrHF.cxx +++ b/EVGEN/AliGenCorrHF.cxx @@ -186,20 +186,6 @@ AliGenCorrHF::AliGenCorrHF(char* tname, Int_t npart, Int_t param): SetChildThetaRange(); } -//____________________________________________________________ -AliGenCorrHF::AliGenCorrHF(const AliGenCorrHF & CorrHF) - :AliGenMC(CorrHF), - fFileName(0), - fFile(0), - fQuark(0), - fBias(0.), - fTrials(0), - fDecayer(0) -{ -// Copy constructor - CorrHF.Copy(*this); -} - //____________________________________________________________ AliGenCorrHF::~AliGenCorrHF() { @@ -531,14 +517,6 @@ void AliGenCorrHF::Generate() SetHighWaterMark(nt); } -//____________________________________________________________________________________ -AliGenCorrHF& AliGenCorrHF::operator=(const AliGenCorrHF& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - //____________________________________________________________________________________ Int_t AliGenCorrHF::IpCharm(TRandom* ran) { diff --git a/EVGEN/AliGenCorrHF.h b/EVGEN/AliGenCorrHF.h index e3fec0e9536..8fe6be07125 100644 --- a/EVGEN/AliGenCorrHF.h +++ b/EVGEN/AliGenCorrHF.h @@ -27,7 +27,6 @@ class AliGenCorrHF : public AliGenMC AliGenCorrHF(); AliGenCorrHF(Int_t npart, Int_t param); AliGenCorrHF(char* tname, Int_t npart, Int_t param); - AliGenCorrHF(const AliGenCorrHF &CorrHF); virtual ~AliGenCorrHF(); virtual void Generate(); @@ -35,8 +34,6 @@ class AliGenCorrHF : public AliGenMC // force decay type virtual void SetDecayer(AliDecayer* decayer) {fDecayer = decayer;} - AliGenCorrHF & operator=(const AliGenCorrHF & rhs); - // Particle type parametrisation functions, needed by GetHadronPair static Int_t IpCharm(TRandom* ran); static Int_t IpBeauty(TRandom* ran); @@ -57,6 +54,9 @@ class AliGenCorrHF : public AliGenMC AliDecayer* fDecayer; //! Pointer to pythia object for decays private: + AliGenCorrHF(const AliGenCorrHF &CorrHF); + AliGenCorrHF & operator=(const AliGenCorrHF & rhs); + static Double_t* fgIntegral; //! Pointer to array of cumulative sums of wght-s static Int_t fgnptbins; // =12 Number of bins for the fragm. // function dependence on quark pt diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx index 6f8bceab278..a123e7e1f83 100644 --- a/EVGEN/AliGenExtFile.cxx +++ b/EVGEN/AliGenExtFile.cxx @@ -64,14 +64,6 @@ AliGenExtFile::AliGenExtFile(Int_t npart) fTitle = "Primaries from ext. File"; } -AliGenExtFile::AliGenExtFile(const AliGenExtFile & ExtFile): - AliGenMC(ExtFile), - fFileName(0), - fReader(0) -{ -// Copy constructor - ExtFile.Copy(*this); -} //____________________________________________________________ AliGenExtFile::~AliGenExtFile() { @@ -193,25 +185,6 @@ void AliGenExtFile::CdEventFile() } -AliGenExtFile& AliGenExtFile::operator=(const AliGenExtFile& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - - -void AliGenExtFile::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); -} - - - - diff --git a/EVGEN/AliGenExtFile.h b/EVGEN/AliGenExtFile.h index 9e4e96be013..b39a8d824e1 100644 --- a/EVGEN/AliGenExtFile.h +++ b/EVGEN/AliGenExtFile.h @@ -20,19 +20,20 @@ class AliGenExtFile : public AliGenMC public: AliGenExtFile(); AliGenExtFile(Int_t npart); - AliGenExtFile(const AliGenExtFile &ext); - virtual ~AliGenExtFile(); + virtual ~AliGenExtFile(); // Initialise virtual void Init(); // generate event virtual void Generate(); - AliGenExtFile & operator=(const AliGenExtFile & rhs); void SetReader(AliGenReader* reader) {fReader = reader;} protected: void CdEventFile(); - void Copy(TObject&) const; const Text_t *fFileName; //! File to read from AliGenReader *fReader; //! Reader to read the file + + private: + AliGenExtFile(const AliGenExtFile &ext); + AliGenExtFile & operator=(const AliGenExtFile & rhs); ClassDef(AliGenExtFile,1) //Generate particles from external file }; diff --git a/EVGEN/AliGenFLUKAsource.cxx b/EVGEN/AliGenFLUKAsource.cxx index d1565b97dcb..eba987cff82 100644 --- a/EVGEN/AliGenFLUKAsource.cxx +++ b/EVGEN/AliGenFLUKAsource.cxx @@ -117,40 +117,6 @@ AliGenFLUKAsource::AliGenFLUKAsource(Int_t npart) fTitle = "FLUKA Boundary Source"; } -AliGenFLUKAsource::AliGenFLUKAsource(const AliGenFLUKAsource & FLUKAsource): - AliGenerator(FLUKAsource), - fIkine(6), - fAgeMax(1.e-5), - fAddWeight(1.), - fZshift(0.), - fFrac(0.), - fSourceId(-1), - fFileName(0), - fTreeChain(0), - fTreeFluka(0), - fIp(0.), - fIpp(0.), - fXi(0.), - fYi(0.), - fZi(0.), - fPx(0.), - fPy(0.), - fPz(0.), - fEkin(0.), - fZv(0.), - fRv(0.), - fItra(0.), - fIgas(0.), - fWgt(0.), - fEtag(0.), - fPtg(0.), - fAge(0.) -{ -// Copy constructor - FLUKAsource.Copy(*this); -} - - //____________________________________________________________ AliGenFLUKAsource::~AliGenFLUKAsource() { @@ -335,19 +301,6 @@ void AliGenFLUKAsource::Generate() } -AliGenFLUKAsource& AliGenFLUKAsource::operator=(const AliGenFLUKAsource& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return (*this); -} - - -void AliGenFLUKAsource::Copy(TObject &) const -{ - Fatal("Copy","Not implemented!\n"); -} - diff --git a/EVGEN/AliGenFLUKAsource.h b/EVGEN/AliGenFLUKAsource.h index c6924ca552e..bc04dd7eba7 100644 --- a/EVGEN/AliGenFLUKAsource.h +++ b/EVGEN/AliGenFLUKAsource.h @@ -21,8 +21,7 @@ public: AliGenFLUKAsource(); AliGenFLUKAsource(Int_t npart); - AliGenFLUKAsource(const AliGenFLUKAsource &FLUKAsource); - virtual ~AliGenFLUKAsource(); + virtual ~AliGenFLUKAsource(); // Initialise virtual void Init() {} // Initialise fluka data @@ -45,7 +44,6 @@ public: virtual void SetFraction(Float_t frac=1.){fFrac=frac;} // generate event virtual void Generate(); - AliGenFLUKAsource & operator=(const AliGenFLUKAsource & rhs); protected: @@ -80,7 +78,8 @@ public: Float_t fAge; // Time of flight private: - void Copy(TObject &arun) const; + AliGenFLUKAsource(const AliGenFLUKAsource &FLUKAsource); + AliGenFLUKAsource & operator=(const AliGenFLUKAsource & rhs); ClassDef(AliGenFLUKAsource,1) //Boundary source }; diff --git a/EVGEN/AliGenGeVSim.cxx b/EVGEN/AliGenGeVSim.cxx index 038d60ef0e9..ff744da6bb8 100644 --- a/EVGEN/AliGenGeVSim.cxx +++ b/EVGEN/AliGenGeVSim.cxx @@ -154,22 +154,6 @@ AliGenGeVSim::AliGenGeVSim(Float_t psi, Bool_t isMultTotal) InitFormula(); } -AliGenGeVSim::AliGenGeVSim(const AliGenGeVSim & ggs) - : AliGenerator(ggs), - fModel(0), - fPsi(0), - fIsMultTotal(0), - fPtFormula(0), - fYFormula(0), - fPhiFormula(0), - fCurrentForm(0), - fPtYHist(0), - fPartTypes(0) -{ - Fatal("copy ctor","Not implemented\n"); -} - - ////////////////////////////////////////////////////////////////////////////////// AliGenGeVSim::~AliGenGeVSim() { diff --git a/EVGEN/AliGenGeVSim.h b/EVGEN/AliGenGeVSim.h index b7a909ff477..47bc15f3cbc 100644 --- a/EVGEN/AliGenGeVSim.h +++ b/EVGEN/AliGenGeVSim.h @@ -88,8 +88,8 @@ class AliGenGeVSim : public AliGenerator { private: AliGenGeVSim(const AliGenGeVSim & ggs); - AliGenGeVSim & operator=(const AliGenGeVSim & /*ggs*/) - {Fatal("= operator","Not implemented\n"); return *this;} + AliGenGeVSim & operator=(const AliGenGeVSim & /*ggs*/); + Int_t fModel; // Selected model (1-7) Float_t fPsi; // Reaction Plane angle (0-2pi) diff --git a/EVGEN/AliGenHIJINGpara.cxx b/EVGEN/AliGenHIJINGpara.cxx index 22115af47fb..061b2a6b909 100644 --- a/EVGEN/AliGenHIJINGpara.cxx +++ b/EVGEN/AliGenHIJINGpara.cxx @@ -200,23 +200,6 @@ AliGenHIJINGpara::AliGenHIJINGpara(Int_t npart) SetPtRange(); } -AliGenHIJINGpara::AliGenHIJINGpara(const AliGenHIJINGpara & para): - AliGenerator(para), - fNt(-1), - fNpartProd(0), - fPi0Decays(kFALSE), - fPtWgtPi(0.), - fPtWgtKa(0.), - fPtpi(0), - fPtka(0), - fETApic(0), - fETAkac(0), - fDecayer(0) -{ -// Copy constructor - para.Copy(*this); -} - //_____________________________________________________________________________ AliGenHIJINGpara::~AliGenHIJINGpara() { @@ -453,12 +436,6 @@ void AliGenHIJINGpara::DecayPi0(Float_t* orig, Float_t * p) fNt = nt; } -void AliGenHIJINGpara::Copy(TObject &) const -{ - Fatal("Copy","Not implemented!\n"); -} - - void AliGenHIJINGpara::Draw( const char * /*opt*/) { // diff --git a/EVGEN/AliGenHIJINGpara.h b/EVGEN/AliGenHIJINGpara.h index 67763a6883d..c60c2ff2721 100644 --- a/EVGEN/AliGenHIJINGpara.h +++ b/EVGEN/AliGenHIJINGpara.h @@ -20,9 +20,6 @@ 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(); @@ -45,7 +42,12 @@ class AliGenHIJINGpara : public AliGenerator AliDecayer* fDecayer; // ! Pointer to pythia object for decays void DecayPi0(Float_t* orig, Float_t * p); - void Copy(TObject ¶) const; + + private: + AliGenHIJINGpara(const AliGenHIJINGpara &HIJINGpara); + AliGenHIJINGpara& operator = (const AliGenHIJINGpara ¶) ; + + ClassDef(AliGenHIJINGpara,3) // Hijing parametrisation generator }; #endif diff --git a/EVGEN/AliGenHIJINGparaBa.cxx b/EVGEN/AliGenHIJINGparaBa.cxx index 5d584a688ae..1079a65dddb 100644 --- a/EVGEN/AliGenHIJINGparaBa.cxx +++ b/EVGEN/AliGenHIJINGparaBa.cxx @@ -177,15 +177,6 @@ AliGenHIJINGparaBa::AliGenHIJINGparaBa(Int_t npart) fTitle="HIJING Parametrisation Particle Generator with Baryons"; } -AliGenHIJINGparaBa::AliGenHIJINGparaBa(const AliGenHIJINGparaBa& para) : - AliGenHIJINGpara(para), - fPtba(0), - fETAba(0) -{ -// Copy constructor - para.Copy(*this); -} - //_____________________________________________________________________________ AliGenHIJINGparaBa::~AliGenHIJINGparaBa() { diff --git a/EVGEN/AliGenHIJINGparaBa.h b/EVGEN/AliGenHIJINGparaBa.h index a159629a964..d75f6a7d0ad 100644 --- a/EVGEN/AliGenHIJINGparaBa.h +++ b/EVGEN/AliGenHIJINGparaBa.h @@ -18,9 +18,6 @@ class AliGenHIJINGparaBa : public AliGenHIJINGpara public: AliGenHIJINGparaBa(); AliGenHIJINGparaBa(Int_t npart); - AliGenHIJINGparaBa(const AliGenHIJINGparaBa &HIJINGpara); - AliGenHIJINGparaBa& operator = (const AliGenHIJINGparaBa ¶) - {para.Copy(*this); return (*this);} virtual ~AliGenHIJINGparaBa(); virtual void Generate(); virtual void Init(); @@ -28,6 +25,10 @@ class AliGenHIJINGparaBa : public AliGenHIJINGpara TF1* fPtba; //! Parametrised pt distribution for baryons TF1* fETAba; //! Parametrised eta distribution for baryons + private: + AliGenHIJINGparaBa(const AliGenHIJINGparaBa &HIJINGpara); + AliGenHIJINGparaBa& operator = (const AliGenHIJINGparaBa ¶); + ClassDef(AliGenHIJINGparaBa,1) // Hijing parametrisation generator with baryons }; #endif diff --git a/EVGEN/AliGenHalo.cxx b/EVGEN/AliGenHalo.cxx index f69483c5658..8fb4b372aa9 100644 --- a/EVGEN/AliGenHalo.cxx +++ b/EVGEN/AliGenHalo.cxx @@ -57,16 +57,6 @@ AliGenHalo::AliGenHalo(Int_t npart) fNpart=-1; } -AliGenHalo::AliGenHalo(const AliGenHalo & Halo) - :AliGenerator(Halo), - fp(0), - fFileName(0) -{ -// Copy constructor - Halo.Copy(*this); -} - - //____________________________________________________________ AliGenHalo::~AliGenHalo() { @@ -139,23 +129,6 @@ void AliGenHalo::Generate() } -AliGenHalo& AliGenHalo::operator=(const AliGenHalo& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - - -void AliGenHalo::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); -} - - diff --git a/EVGEN/AliGenHalo.h b/EVGEN/AliGenHalo.h index 1df5c596b55..94c190b7d06 100644 --- a/EVGEN/AliGenHalo.h +++ b/EVGEN/AliGenHalo.h @@ -18,17 +18,17 @@ class AliGenHalo : public AliGenerator public: AliGenHalo(); AliGenHalo(Int_t npart); - AliGenHalo(const AliGenHalo &Halo); virtual ~AliGenHalo(); virtual void Init(); 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 private: - void Copy(TObject &Halo) const; + AliGenHalo(const AliGenHalo &Halo); + AliGenHalo & operator=(const AliGenHalo & rhs); + ClassDef(AliGenHalo,1) // LHC background boundary source (MARS input) }; #endif diff --git a/EVGEN/AliGenHaloProtvino.cxx b/EVGEN/AliGenHaloProtvino.cxx index 900ddda3ec7..1d78652b3d3 100644 --- a/EVGEN/AliGenHaloProtvino.cxx +++ b/EVGEN/AliGenHaloProtvino.cxx @@ -81,386 +81,6 @@ AliGenHaloProtvino::AliGenHaloProtvino(Int_t npart) SetAnalog(0); } -AliGenHaloProtvino::AliGenHaloProtvino(const AliGenHaloProtvino & HaloProtvino): - AliGenerator(HaloProtvino), - fFile(0), - fFileName(0), - fSide(1), - fRunPeriod(kY3D90), - fTimePerEvent(1.e-4), - fNskip(0), - fZ1(0), - fZ2(0), - fG1(0), - fG2(0), - fGPASize(0) -{ -// Copy constructor - HaloProtvino.Copy(*this); -} - - -//____________________________________________________________ -AliGenHaloProtvino::~AliGenHaloProtvino() -{ -// Destructor -} - -//____________________________________________________________ -void AliGenHaloProtvino::Init() -{ -// Initialisation - fFile = fopen(fFileName,"r"); - if (fFile) { - printf("\n File %s opened for reading, %p ! \n ", fFileName.Data(), (void*)fFile); - } else { - printf("\n Opening of file %s failed, %p ! \n ", fFileName.Data(), (void*)fFile); - } -// -// -// -// Read file with gas pressure values - char *name = 0; - if (fRunPeriod < 5) { - name = gSystem->ExpandPathName("$(ALICE_ROOT)/LHC/gasPressure.dat" ); - fGPASize = 21; - fG1 = new Float_t[fGPASize]; - fG2 = new Float_t[fGPASize]; - fZ1 = new Float_t[fGPASize]; - fZ2 = new Float_t[fGPASize]; - } else if (fRunPeriod == 5) { - name = gSystem->ExpandPathName("$(ALICE_ROOT)/LHC/pressure_2003_startup.dat"); - fGPASize = 18853; - fG1 = new Float_t[fGPASize]; - fZ1 = new Float_t[fGPASize]; - } else if (fRunPeriod ==6) { - name = gSystem->ExpandPathName("$(ALICE_ROOT)/LHC/pressure_2003_conditioned.dat"); - fGPASize = 12719; - fG1 = new Float_t[fGPASize]; - fZ1 = new Float_t[fGPASize]; - } else { - Fatal("Init()", "No gas pressure file for given run period !"); - } - - - FILE* file = fopen(name, "r"); - Float_t z; - Int_t i; - Float_t p[5]; - - const Float_t kCrossSection = 0.094e-28; // m^2 - const Float_t kFlux = 1.e11 / 25.e-9; // protons/s - Float_t pFlux[5] = {0.2, 0.2, 0.3, 0.3, 1.0}; - - if (fRunPeriod < 5) { -// -// Ring 1 -// - - for (i = 0; i < fGPASize; i++) - { - fscanf(file, "%f %f %f %f %f %f", &z, &p[0], &p[1], &p[2] , &p[3], &p[4]); - fG1[i] = p[fRunPeriod]; - - if (i > 0) { - fZ1[i] = fZ1[i-1] + z; - } else { - fZ1[i] = 20.; - } - } -// -// Ring 2 -// - for (i = 0; i < fGPASize; i++) - { - fscanf(file, "%f %f %f %f %f %f", &z, &p[0], &p[1], &p[2] , &p[3], &p[4]); - fG2[i] = p[fRunPeriod]; - if (i > 0) { - fZ2[i] = fZ2[i-1] + z; - } else { - fZ2[i] = 20.; - } - } -// -// Interaction rates -// - for (i = 0; i < fGPASize; i++) - { - fG1[i] = fG1[i] * kCrossSection * pFlux[fRunPeriod] * kFlux; // 1/m/s - fG2[i] = fG2[i] * kCrossSection * pFlux[fRunPeriod] * kFlux; // 1/m/s - } - - } else { - for (i = 0; i < fGPASize; i++) - { - fscanf(file, "%f %e %e %e %e %e", &z, &p[0], &p[1], &p[2], &p[3], &p[4]); - z /= 1000.; - fG1[i] = p[4] * kCrossSection * kFlux; // 1/m/s - // 1/3 of nominal intensity at startup - if (fRunPeriod == kLHCPR674Startup) fG1[i] /= 3.; - fZ1[i] = z; - } - } - - - - -// -// Transform into interaction rates -// - - - - - Float_t sum1 = 0.; - Float_t sum2 = 0.; - - for (Int_t i = 0; i < 300; i++) { - Float_t z = 20.+i*1.; - z*=100; - Float_t wgt1 = GasPressureWeight(z); - Float_t wgt2 = GasPressureWeight(-z); -// printf("weight: %f %f %f %f %f \n", z, wgt1, wgt2, fZ1[20], fZ2[20]); - sum1 += wgt1; - sum2 += wgt2; - } - sum1/=250.; - sum2/=250.; - printf("\n %f %f \n \n", sum1, sum2); -} - -//____________________________________________________________ -void AliGenHaloProtvino::Generate() -{ -// Generate from input file - - Float_t polar[3]= {0,0,0}; - Float_t origin[3]; - Float_t p[3], p0; - Float_t tz, txy; - Float_t amass; - // - Int_t ncols, nt; - static Int_t nskip = 0; - Int_t nread = 0; - - Float_t* zPrimary = new Float_t [fNpart]; - Int_t * inuc = new Int_t [fNpart]; - Int_t * ipart = new Int_t [fNpart]; - Float_t* wgt = new Float_t [fNpart]; - Float_t* ekin = new Float_t [fNpart]; - Float_t* vx = new Float_t [fNpart]; - Float_t* vy = new Float_t [fNpart]; - Float_t* tx = new Float_t [fNpart]; - Float_t* ty = new Float_t [fNpart]; - - Float_t zVertexOld = -1.e10; - Int_t nInt = 0; // Counts number of interactions - Float_t wwgt = 0.; - - while(1) { -// -// Load event into array -// - ncols = fscanf(fFile,"%f %d %d %f %f %f %f %f %f", - &zPrimary[nread], &inuc[nread], &ipart[nread], &wgt[nread], - &ekin[nread], &vx[nread], &vy[nread], - &tx[nread], &ty[nread]); - - if (ncols < 0) break; -// Skip fNskip events - nskip++; - if (fNpart !=-1 && nskip <= fNskip) continue; -// Count interactions - if (zPrimary[nread] != zVertexOld) { - nInt++; - zVertexOld = zPrimary[nread]; - } -// Count tracks - nread++; - if (fNpart !=-1 && nread > fNpart) break; - } -// -// Mean time between interactions -// - Float_t dT = fTimePerEvent/nInt; // sec - Float_t t = 0; // sec - -// -// Loop over primaries -// - zVertexOld = -1.e10; - Double_t arg = 0.; - - for (Int_t nprim = 0; nprim < fNpart; nprim++) - { - amass = TDatabasePDG::Instance()->GetParticle(ipart[nprim])->Mass(); - - // - // Momentum vector - // - p0=sqrt(ekin[nprim]*ekin[nprim] + 2.*amass*ekin[nprim]); - - txy=TMath::Sqrt(tx[nprim]*tx[nprim]+ty[nprim]*ty[nprim]); - if (txy == 1.) { - tz=0; - } else { - tz=-TMath::Sqrt(1.-txy); - } - - p[0] = p0*tx[nprim]; - p[1] = p0*ty[nprim]; - p[2] =-p0*tz; - - origin[0] = vx[nprim]; - origin[1] = vy[nprim]; - origin[2] = -2196.5; - - // - // - // Particle weight - - Float_t originP[3] = {0., 0., 0.}; - originP[2] = zPrimary[nprim]; - - Float_t pP[3] = {0., 0., 0.}; - Int_t ntP; - - if (fSide == -1) { - originP[2] = -zPrimary[nprim]; - origin[2] = -origin[2]; - p[2] = -p[2]; - } - - // - // Time - // - if (zPrimary[nprim] != zVertexOld) { - while(arg==0.) arg = gRandom->Rndm(); - t -= dT*TMath::Log(arg); // (sec) - zVertexOld = zPrimary[nprim]; - } - -// Get statistical weight according to local gas-pressure -// - fParentWeight=wgt[nprim]*GasPressureWeight(zPrimary[nprim]); - - if (!fAnalog || gRandom->Rndm() < fParentWeight) { -// Pass parent particle -// - PushTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight); - KeepTrack(ntP); - PushTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight); - } - // - // Both sides are considered - // - - if (fSide > 1) { - fParentWeight=wgt[nprim]*GasPressureWeight(-zPrimary[nprim]); - if (!fAnalog || gRandom->Rndm() < fParentWeight) { - origin[2] = -origin[2]; - originP[2] = -originP[2]; - p[2]=-p[2]; - PushTrack(0,-1,kProton,pP,originP,polar,t,kPNoProcess,ntP, fParentWeight); - KeepTrack(ntP); - PushTrack(fTrackIt,ntP,ipart[nprim],p,origin,polar,t,kPNoProcess,nt,fParentWeight); - } - } - wwgt += fParentWeight; - - SetHighWaterMark(nt); - } - delete [] zPrimary; - delete [] inuc; - delete [] ipart; - delete [] wgt; - delete [] ekin; - delete [] vx; - delete [] vy; - delete [] tx; - delete [] ty; - printf("Total weight %f\n\n", wwgt); - -} - - -AliGenHaloProtvino& AliGenHaloProtvino::operator=(const AliGenHaloProtvino& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - - - -Float_t AliGenHaloProtvino::GasPressureWeight(Float_t zPrimary) -{ -// -// Return z-dependent gasspressure weight = interaction rate [1/m/s]. -// - Float_t weight = 0.; - zPrimary /= 100.; // m - if (fRunPeriod < 5) { - Float_t zAbs = TMath::Abs(zPrimary); - if (zPrimary > 0.) - { - if (zAbs > fZ1[20]) { - weight = 2.e4; - } else { - for (Int_t i = 1; i < 21; i++) { - if (zAbs < fZ1[i]) { - weight = fG1[i]; - break; - } - } - } - } else { - if (zAbs > fZ2[20]) { - weight = 2.e4; - } else { - for (Int_t i = 1; i < 21; i++) { - if (zAbs < fZ2[i]) { - weight = fG2[i]; - break; - } - } - } - } - } else { - Int_t index = TMath::BinarySearch(fGPASize, fZ1, zPrimary); - weight = fG1[index]; - } - return weight; -} - -void AliGenHaloProtvino::Draw(Option_t *) -{ -// Draws the gas pressure distribution - Float_t z[400]; - Float_t p[400]; - - for (Int_t i = 0; i < 400; i++) - { - z[i] = -20000. + Float_t(i) * 100; - p[i] = GasPressureWeight(z[i]); - } - - TGraph* gr = new TGraph(400, z, p); - TCanvas* c1 = new TCanvas("c1","Canvas 1",400,10,600,700); - c1->cd(); - gr->Draw("AL"); -} - - -void AliGenHaloProtvino::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); -} - /* # Title: README file for the sources of IR8 machine induced background diff --git a/EVGEN/AliGenHaloProtvino.h b/EVGEN/AliGenHaloProtvino.h index bed0d49d2c1..9507ee96c1e 100644 --- a/EVGEN/AliGenHaloProtvino.h +++ b/EVGEN/AliGenHaloProtvino.h @@ -19,7 +19,6 @@ public: enum constants{kY1Day0, kY1Day70, kY2D0, kY2D10, kY3D90, kLHCPR674Startup, kLHCPR674Conditioned}; AliGenHaloProtvino(); AliGenHaloProtvino(Int_t npart); - AliGenHaloProtvino(const AliGenHaloProtvino &HaloProtvino); virtual ~AliGenHaloProtvino(); virtual void Init(); virtual void SetFileName(TString filename) {fFileName=TString(filename);} @@ -30,7 +29,6 @@ public: virtual void SetRunPeriod(Int_t t = kY3D90) {fRunPeriod = t;} virtual void SetTimePerEvent(Float_t t = 1.e-4) {fTimePerEvent = t;} virtual void Draw(Option_t * opt=""); - AliGenHaloProtvino & operator=(const AliGenHaloProtvino & rhs); protected: FILE* fFile; // ! Pointer to file @@ -45,7 +43,9 @@ protected: Float_t* fG2; // ! gas pressures Int_t fGPASize; // ! Size of arrays private: - void Copy(TObject&) const; + AliGenHaloProtvino(const AliGenHaloProtvino &HaloProtvino); + AliGenHaloProtvino & operator=(const AliGenHaloProtvino & rhs); + ClassDef(AliGenHaloProtvino,1) // LHC background boundary source (Protvino Group results) diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx index 63872c8f7e4..677b8aaa9a2 100644 --- a/EVGEN/AliGenMC.cxx +++ b/EVGEN/AliGenMC.cxx @@ -101,41 +101,6 @@ AliGenMC::AliGenMC(Int_t npart) for (Int_t i=0; i<8; i++) fParentSelect[i]=fChildSelect[i]=0; } -AliGenMC::AliGenMC(const AliGenMC & mc): - AliGenerator(mc), - fParticles(0), - fParentSelect(8), - fChildSelect(8), - fCutOnChild(0), - fChildPtMin(0.), - fChildPtMax(1.e10), - fChildPMin(0.), - fChildPMax(1.e10), - fChildPhiMin(0.), - fChildPhiMax(2. * TMath::Pi()), - fChildThetaMin(0.), - fChildThetaMax(TMath::Pi()), - fChildYMin(-12.), - fChildYMax(12.), - fXingAngleX(0.), - fXingAngleY(0.), - fForceDecay(kAll), - fMaxLifeTime(1.e-15), - fAProjectile(1), - fZProjectile(1), - fATarget(1), - fZTarget(1), - fProjectile("P"), - fTarget("P"), - fDyBoost(0.), - fGeometryAcceptance(0), - fPdgCodeParticleforAcceptanceCut(0), - fNumberOfAcceptedParticles(2) -{ -// Copy constructor - mc.Copy(*this); -} - AliGenMC::~AliGenMC() { // Destructor @@ -400,22 +365,3 @@ void AliGenMC::Boost() iparticle->SetMomentum(px, py, pzb, eb); } } - - - -AliGenMC& AliGenMC::operator=(const AliGenMC& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - -void AliGenMC::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); -} - - diff --git a/EVGEN/AliGenMC.h b/EVGEN/AliGenMC.h index 623c79ce55a..b9a621be146 100644 --- a/EVGEN/AliGenMC.h +++ b/EVGEN/AliGenMC.h @@ -26,12 +26,10 @@ class AliGenMC : public AliGenerator public: AliGenMC(); AliGenMC(Int_t npart); - AliGenMC(const AliGenMC &MC); virtual ~AliGenMC(); virtual void Init(); virtual void SetForceDecay(Decay_t decay = kAll) {fForceDecay = decay;} - AliGenMC & operator=(const AliGenMC & rhs); - virtual void SetCutOnChild(Int_t flag = 0) {fCutOnChild = flag;} + virtual void SetCutOnChild(Int_t flag = 0) {fCutOnChild = flag;} virtual void SetChildMomentumRange(Float_t pmin = 0, Float_t pmax = 1.e10) {fChildPMin = pmin; fChildPMax = pmax;} virtual void SetChildPtRange(Float_t ptmin = 0, Float_t ptmax = 20.) @@ -69,7 +67,7 @@ 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; - void Copy(TObject&) const; + protected: TClonesArray* fParticles; //!Particle List TArrayI fParentSelect; //!Parent particles to be selected @@ -99,6 +97,10 @@ class AliGenMC : public AliGenerator AliGeometry * fGeometryAcceptance; // Geometry to which particles must be simulated Int_t fPdgCodeParticleforAcceptanceCut; // Abs(PDG Code) of the particle to which the GeometryAcceptance must be applied Int_t fNumberOfAcceptedParticles; // Number of accepted particles in GeometryAcceptance with the right Abs(PdgCode) + + private: + AliGenMC(const AliGenMC &MC); + AliGenMC & operator=(const AliGenMC & rhs); ClassDef(AliGenMC,5) // AliGenerator implementation for generators using MC methods }; diff --git a/EVGEN/AliGenMUONCocktail.cxx b/EVGEN/AliGenMUONCocktail.cxx index 5968c647c4d..b4370fd4249 100644 --- a/EVGEN/AliGenMUONCocktail.cxx +++ b/EVGEN/AliGenMUONCocktail.cxx @@ -68,30 +68,6 @@ AliGenMUONCocktail::AliGenMUONCocktail() { // Constructor } -//_________________________________________________________________________ -AliGenMUONCocktail::AliGenMUONCocktail(const AliGenMUONCocktail & cocktail): - AliGenCocktail(cocktail), - fFastGlauber(0x0), - fTotalRate(0), - fMuonMultiplicity(1), - fMuonPtCut(1.), - fMuonThetaMinCut(171.), - fMuonThetaMaxCut(178.), - fNSucceded(0), - fNGenerated(0), - fLowImpactParameter(0.), - fHighImpactParameter(5.), - fAverageImpactParameter(0.), - fNumberOfCollisions(0.), - fNumberOfParticipants(0.), - fHadronicMuons(kTRUE), - fInvMassCut (kFALSE), - fInvMassMinCut (0.), - fInvMassMaxCut (100.) -{ -// Copy constructor -} - //_________________________________________________________________________ AliGenMUONCocktail::~AliGenMUONCocktail() { @@ -474,19 +450,3 @@ void AliGenMUONCocktail::Generate() AliDebug(5,Form("Generated Events are %d and Succeeded Events are %d",fNGenerated,fNSucceded)); } - - -AliGenMUONCocktail& AliGenMUONCocktail::operator=(const AliGenMUONCocktail& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - -void AliGenMUONCocktail::Copy(TObject &) const -{ - Fatal("Copy","Not implemented!\n"); -} - - - diff --git a/EVGEN/AliGenMUONCocktail.h b/EVGEN/AliGenMUONCocktail.h index 05b203d9c78..0778b8dff96 100644 --- a/EVGEN/AliGenMUONCocktail.h +++ b/EVGEN/AliGenMUONCocktail.h @@ -32,8 +32,7 @@ class AliGenMUONCocktail : public AliGenCocktail { public: AliGenMUONCocktail(); - AliGenMUONCocktail(const AliGenMUONCocktail &cocktail); - virtual ~AliGenMUONCocktail(); + virtual ~AliGenMUONCocktail(); virtual void Init(); virtual void Generate(); Int_t GetMuonMultiplicity() const {return fMuonMultiplicity;} @@ -57,8 +56,9 @@ class AliGenMUONCocktail : public AliGenCocktail fInvMassMaxCut=MassMax; fInvMassCut = kTRUE; } private: + AliGenMUONCocktail(const AliGenMUONCocktail &cocktail); AliGenMUONCocktail& operator=(const AliGenMUONCocktail & rhs); - void Copy(TObject &cocktail) const; + // private: AliFastGlauber * fFastGlauber; //! Fast glauber calculations diff --git a/EVGEN/AliGenMUONCocktailpp.cxx b/EVGEN/AliGenMUONCocktailpp.cxx index c159b60d908..b3aef2c4397 100644 --- a/EVGEN/AliGenMUONCocktailpp.cxx +++ b/EVGEN/AliGenMUONCocktailpp.cxx @@ -56,26 +56,7 @@ AliGenMUONCocktailpp::AliGenMUONCocktailpp() { // Constructor } -//_________________________________________________________________________ -AliGenMUONCocktailpp::AliGenMUONCocktailpp(const AliGenMUONCocktailpp & cocktail): - AliGenCocktail(cocktail), - fTotalRate(0), - fMuonMultiplicity(0), - fMuonPtCut(0.), - fMuonThetaMinCut(0.), - fMuonThetaMaxCut(0.), - fNSucceded(0), - fNGenerated(0) -{ -// Copy constructor - fTotalRate =0; - fNSucceded=0; - fNGenerated=0; - fMuonMultiplicity=0; - fMuonPtCut=0.; - fMuonThetaMinCut=0.; - fMuonThetaMaxCut=0.; -} + //_________________________________________________________________________ AliGenMUONCocktailpp::~AliGenMUONCocktailpp() // Destructor diff --git a/EVGEN/AliGenMUONCocktailpp.h b/EVGEN/AliGenMUONCocktailpp.h index cc545f31ba0..02c269a3451 100644 --- a/EVGEN/AliGenMUONCocktailpp.h +++ b/EVGEN/AliGenMUONCocktailpp.h @@ -12,7 +12,6 @@ class AliGenMUONCocktailpp : public AliGenCocktail public: AliGenMUONCocktailpp(); - AliGenMUONCocktailpp(const AliGenMUONCocktailpp &cocktail); virtual ~AliGenMUONCocktailpp(); virtual void Init(); virtual void Generate(); @@ -33,6 +32,9 @@ class AliGenMUONCocktailpp : public AliGenCocktail // private: + AliGenMUONCocktailpp(const AliGenMUONCocktailpp &cocktail); + AliGenMUONCocktailpp & operator=(const AliGenMUONCocktailpp &cocktail); + Float_t fTotalRate;// Total rate of the full cocktail processes Int_t fMuonMultiplicity; // Muon multiplicity for the primordial trigger Float_t fMuonPtCut;// Transverse momentum cut for muons diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx index 289e2d25393..2893051f14b 100644 --- a/EVGEN/AliGenParam.cxx +++ b/EVGEN/AliGenParam.cxx @@ -164,27 +164,6 @@ AliGenParam::AliGenParam(Int_t npart, Int_t param, SetChildThetaRange(); } - -AliGenParam::AliGenParam(const AliGenParam & Param) - :AliGenMC(Param), - fPtParaFunc(0), - fYParaFunc(0), - fIpParaFunc(0), - fPtPara(0), - fYPara(0), - fParam(0), - fdNdy0(0.), - fYWgt(0.), - fPtWgt(0.), - fBias(0.), - fTrials(0), - fDeltaPt(0.01), - fDecayer(0) -{ -// Copy constructor - Param.Copy(*this); -} - //____________________________________________________________ AliGenParam::~AliGenParam() { @@ -534,12 +513,6 @@ void AliGenParam::Draw( const char * /*opt*/) fYPara->GetHistogram()->SetXTitle("y"); } -AliGenParam& AliGenParam::operator=(const AliGenParam& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} diff --git a/EVGEN/AliGenParam.h b/EVGEN/AliGenParam.h index 8dea777a4a0..4b978ba8bb7 100644 --- a/EVGEN/AliGenParam.h +++ b/EVGEN/AliGenParam.h @@ -32,7 +32,6 @@ class AliGenParam : public AliGenMC Double_t (*PtPara)(Double_t*, Double_t*), Double_t (*YPara )(Double_t*, Double_t*), Int_t (*IpPara)(TRandom*) ); - AliGenParam(const AliGenParam &Param); virtual ~AliGenParam(); virtual void Generate(); @@ -48,7 +47,6 @@ class AliGenParam : public AliGenMC TF1 * GetY() {return fYPara;} Float_t GetRelativeArea(Float_t ptMin, Float_t ptMax, Float_t yMin, Float_t yMax, Float_t phiMin, Float_t phiMax); - AliGenParam & operator=(const AliGenParam & rhs); 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 @@ -63,7 +61,12 @@ class AliGenParam : public AliGenMC Int_t fTrials; // Number of trials Float_t fDeltaPt; // pT sampling in steps of fDeltaPt AliDecayer *fDecayer; // ! Pointer to pythia object for decays - ClassDef(AliGenParam,1) // Generator using parameterised pt- and y-distribution + + private: + AliGenParam(const AliGenParam &Param); + AliGenParam & operator=(const AliGenParam & rhs); + + ClassDef(AliGenParam,1) // Generator using parameterised pt- and y-distribution }; #endif diff --git a/EVGEN/AliGenSlowNucleons.cxx b/EVGEN/AliGenSlowNucleons.cxx index a5b41b95fd1..16cb40b0a71 100644 --- a/EVGEN/AliGenSlowNucleons.cxx +++ b/EVGEN/AliGenSlowNucleons.cxx @@ -100,37 +100,6 @@ AliGenSlowNucleons::AliGenSlowNucleons(Int_t npart) fCollisionGeometry = 0; } -//____________________________________________________________ -AliGenSlowNucleons::AliGenSlowNucleons(const AliGenSlowNucleons & sn): - AliGenerator(sn), - fCMS(0.), - fMomentum(0.), - fBeta(0.), - fPmax (0.), - fATarget (0.), - fZTarget (0.), - fCharge(0), - fProtonDirection(0.), - fTemperatureG(0.), - fBetaSourceG(0.), - fTemperatureB(0.), - fBetaSourceB(0.), - fNgp(0), - fNgn(0), - fNbp(0), - fNbn(0), - fDebug(0), - fDebugHist1(0), - fDebugHist2(0), - fThetaDistribution(), - fCosThetaGrayHist(), - fCosTheta(), - fSlowNucleonModel(0) -{ -// Copy constructor - sn.Copy(*this); -} - //____________________________________________________________ AliGenSlowNucleons::~AliGenSlowNucleons() { @@ -345,26 +314,3 @@ void AliGenSlowNucleons::Lorentz(Double_t m, Double_t beta, Float_t* q) Double_t energy = sqrt(m*m + q[0]*q[0] + q[1]*q[1] + q[2]*q[2]); q[2] = gamma * (q[2] + beta*energy); } - - -AliGenSlowNucleons& AliGenSlowNucleons::operator=(const AliGenSlowNucleons& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - -void AliGenSlowNucleons::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); -} - - - - - - - diff --git a/EVGEN/AliGenSlowNucleons.h b/EVGEN/AliGenSlowNucleons.h index cdd281d3b84..399ba1794ae 100644 --- a/EVGEN/AliGenSlowNucleons.h +++ b/EVGEN/AliGenSlowNucleons.h @@ -21,7 +21,6 @@ class AliGenSlowNucleons : public AliGenerator public: AliGenSlowNucleons(); AliGenSlowNucleons(Int_t npart); - AliGenSlowNucleons(const AliGenSlowNucleons &sn); virtual ~AliGenSlowNucleons(); virtual void Init(); virtual void FinishRun(); @@ -52,8 +51,6 @@ public: void GenerateSlow(Int_t charge, Double_t T, Double_t beta, Float_t* q, Float_t &theta); Double_t Maxwell(Double_t m, Double_t p, Double_t t); void Lorentz(Double_t m, Double_t beta, Float_t* q); - void Copy(TObject&) const; - AliGenSlowNucleons & operator=(const AliGenSlowNucleons & rhs); protected: Float_t fCMS; // Center of mass energy Float_t fMomentum; // Target nucleus momentum @@ -81,6 +78,11 @@ public: // AliSlowNucleonModel* fSlowNucleonModel; // The slow nucleon model + + private: + AliGenSlowNucleons(const AliGenSlowNucleons &sn); + AliGenSlowNucleons & operator=(const AliGenSlowNucleons & rhs); + ClassDef(AliGenSlowNucleons,2) // Slow Nucleon Generator }; #endif diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx index 3dedee21870..1844a3d3a8a 100644 --- a/PYTHIA6/AliGenPythia.cxx +++ b/PYTHIA6/AliGenPythia.cxx @@ -221,87 +221,6 @@ AliGenPythia::AliGenPythia(Int_t npart) SetNuclei(0,0); } -AliGenPythia::AliGenPythia(const AliGenPythia & Pythia) - :AliGenMC(Pythia), - fProcess(kPyCharm), - fStrucFunc(kCTEQ5L), - fEnergyCMS(5500.), - fKineBias(0.), - fTrials(0), - fTrialsRun(0), - fQ(0.), - fX1(0.), - fX2(0.), - fEventTime(0.), - fInteractionRate(0.), - fTimeWindow(0.), - fCurSubEvent(0), - fEventsTime(0), - fNev(0), - fFlavorSelect(0), - fXsection(0.), - fPythia(0), - fPtHardMin(0.), - fPtHardMax(1.e4), - fYHardMin(-1.e10), - fYHardMax(1.e10), - fGinit(kTRUE), - fGfinal(kTRUE), - fHadronisation(kTRUE), - fNpartons(0), - fReadFromFile(kFALSE), - fQuench(kFALSE), - fPtKick(1.), - fFullEvent(kTRUE), - fDecayer(new AliDecayerPythia()), - fDebugEventFirst(-1), - fDebugEventLast(-1), - fEtMinJet(0.), - fEtMaxJet(1.e4), - fEtaMinJet(-20.), - fEtaMaxJet(20.), - fPhiMinJet(0.), - fPhiMaxJet(2.* TMath::Pi()), - fJetReconstruction(kCell), - fEtaMinGamma(-20.), - fEtaMaxGamma(20.), - fPhiMinGamma(0.), - fPhiMaxGamma(2. * TMath::Pi()), - fPycellEtaMax(2.), - fPycellNEta(274), - fPycellNPhi(432), - fPycellThreshold(0.), - fPycellEtSeed(4.), - fPycellMinEtJet(10.), - fPycellMaxRadius(1.), - fStackFillOpt(kFlavorSelection), - fFeedDownOpt(kTRUE), - fFragmentation(kTRUE), - fSetNuclei(kFALSE), - fNewMIS(kFALSE), - fHFoff(kFALSE), - fTriggerParticle(0), - fTriggerEta(0.9), - fCountMode(kCountAll), - fHeader(0), - fRL(0), - fFileName(0), - fFragPhotonInCalo(kFALSE), - fPi0InCalo(kFALSE) , - fCheckEMCAL(kFALSE), - fCheckPHOS(kFALSE), - fFragPhotonOrPi0MinPt(0), - fPHOSMinPhi(219.), - fPHOSMaxPhi(321.), - fPHOSEta(0.13), - fEMCALMinPhi(79.), - fEMCALMaxPhi(191.), - fEMCALEta(0.71) -{ -// copy constructor - Pythia.Copy(*this); -} - AliGenPythia::~AliGenPythia() { // Destructor @@ -1261,14 +1180,6 @@ Bool_t AliGenPythia::CheckKinematicsOnChild(){ return checking; } - -AliGenPythia& AliGenPythia::operator=(const AliGenPythia& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} - void AliGenPythia::LoadEvent(AliStack* stack, Int_t flag, Int_t reHadr) { // diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h index d650974b323..91bb5c30e8e 100644 --- a/PYTHIA6/AliGenPythia.h +++ b/PYTHIA6/AliGenPythia.h @@ -36,7 +36,6 @@ class AliGenPythia : public AliGenMC AliGenPythia(); AliGenPythia(Int_t npart); - AliGenPythia(const AliGenPythia &Pythia); virtual ~AliGenPythia(); virtual void Generate(); virtual void Init(); @@ -160,8 +159,6 @@ class AliGenPythia : public AliGenMC Bool_t CheckKinematicsOnChild(); - // Assignment Operator - AliGenPythia & operator=(const AliGenPythia & rhs); void GetSubEventTime(); void AddHeader(AliGenEventHeader* header); @@ -259,6 +256,10 @@ class AliGenPythia : public AliGenMC Float_t fEMCALMaxPhi ; Float_t fEMCALEta ; + private: + AliGenPythia(const AliGenPythia &Pythia); + AliGenPythia & operator=(const AliGenPythia & rhs); + ClassDef(AliGenPythia,5) // AliGenerator interface to Pythia }; #endif diff --git a/PYTHIA6/AliGenPythiaJets.cxx b/PYTHIA6/AliGenPythiaJets.cxx index f805ab4eaf5..37237687774 100644 --- a/PYTHIA6/AliGenPythiaJets.cxx +++ b/PYTHIA6/AliGenPythiaJets.cxx @@ -46,13 +46,6 @@ AliGenPythiaJets::AliGenPythiaJets(Int_t npart) fTitle= "Jet Generator using PYTHIA"; } -AliGenPythiaJets::AliGenPythiaJets(const AliGenPythiaJets & Pythia): - AliGenPythia(Pythia) -{ -// copy constructor - Pythia.Copy(*this); -} - AliGenPythiaJets::~AliGenPythiaJets() { // Destructor @@ -215,13 +208,6 @@ Bool_t AliGenPythiaJets::CheckTrigger() } return triggered; } - -AliGenPythiaJets& AliGenPythiaJets::operator=(const AliGenPythiaJets& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return *this; -} void AliGenPythiaJets::TransformEvent(Float_t beta, Float_t phi) { diff --git a/PYTHIA6/AliGenPythiaJets.h b/PYTHIA6/AliGenPythiaJets.h index 189bf4ca71d..f3e2c623fc2 100644 --- a/PYTHIA6/AliGenPythiaJets.h +++ b/PYTHIA6/AliGenPythiaJets.h @@ -22,7 +22,6 @@ class AliGenPythiaJets : public AliGenPythia public: AliGenPythiaJets(); AliGenPythiaJets(Int_t npart); - AliGenPythiaJets(const AliGenPythiaJets &Pythia); virtual ~AliGenPythiaJets(); virtual void Init(); virtual void Generate(); @@ -30,13 +29,16 @@ class AliGenPythiaJets : public AliGenPythia virtual Bool_t CheckTrigger(); virtual void SetQuenchingFactor(Int_t quench = -1) {fQuench = quench;} - // Assignment Operator - AliGenPythiaJets & operator=(const AliGenPythiaJets & rhs); protected: Float_t fEtMinJetQ[2]; // Minimum et of triggered Jet Float_t fEtMaxJetQ[2]; // Maximum et of triggered Jet Float_t fPtHardMinQ[2]; // Lower pT-hard cut Float_t fPtHardMaxQ[2]; // Higher pT-hard cut + + private: + AliGenPythiaJets(const AliGenPythiaJets &Pythia); + AliGenPythiaJets & operator=(const AliGenPythiaJets & rhs); + ClassDef(AliGenPythiaJets,1) // AliGenerator Interface to Pythia Jet Production }; #endif diff --git a/STEER/AliGenerator.cxx b/STEER/AliGenerator.cxx index 8bae37d8181..207db954456 100644 --- a/STEER/AliGenerator.cxx +++ b/STEER/AliGenerator.cxx @@ -173,65 +173,6 @@ AliGenerator::AliGenerator(Int_t npart): AliConfig::Instance()->Add(this); } -//_______________________________________________________________________ -AliGenerator::AliGenerator(const AliGenerator &gen): - TNamed(gen), - AliRndm(gen), - fMCEvGen(0), - fThetaMin(0), - fThetaMax(0), - fPhiMin(0), - fPhiMax(0), - fPMin(0), - fPMax(0), - fPtMin(0), - fPtMax(0), - fYMin(0), - fYMax(0), - fVMin(3), - fVMax(3), - fNpart(0), - fParentWeight(0), - fChildWeight(0), - fAnalog(0), - fVertexSmear(kNoSmear), - fVertexSource(kInternal), - fCutVertexZ(0), - fPileUpTimeWindow(-1.), - fTrackIt(0), - fVertexGenerator(0), - fOrigin(3), - fOsigma(3), - fVertex(3), - fStack(0), - fContainer(0), - fCollisionGeometry(0) -{ - // - // Copy constructor - // - gen.Copy(*this); -} - -//_______________________________________________________________________ -AliGenerator & AliGenerator::operator=(const AliGenerator &gen) -{ - // - // Assignment operator - // - gen.Copy(*this); - return (*this); -} - -//_______________________________________________________________________ -void AliGenerator::Copy(TObject &/* gen */) const -{ - // - // Copy *this onto gen - // - AliFatal("Not implemented!"); -} - //_______________________________________________________________________ AliGenerator::~AliGenerator() { diff --git a/STEER/AliGenerator.h b/STEER/AliGenerator.h index 3ccaee7bf2d..7a84c6d5936 100644 --- a/STEER/AliGenerator.h +++ b/STEER/AliGenerator.h @@ -36,10 +36,8 @@ class AliGenerator : public TNamed, public AliRndm public: AliGenerator(); AliGenerator(Int_t npart); - AliGenerator(const AliGenerator &gen); virtual ~AliGenerator(); virtual void Init(); - void Copy(TObject &gen) const; virtual void SetOrigin(Float_t ox, Float_t oy, Float_t oz); virtual void SetOrigin(const TLorentzVector &o); virtual void SetSigma(Float_t sx, Float_t sy, Float_t sz); @@ -74,7 +72,6 @@ class AliGenerator : public TNamed, public AliRndm virtual void SetMC(TGenerator *theMC) {fMCEvGen =theMC;} virtual void AddHeader(AliGenEventHeader* /*header*/) {;} virtual void SetContainer(AliGenerator* container) {fContainer = container;} - AliGenerator & operator=(const AliGenerator &gen); // Getters @@ -144,6 +141,11 @@ class AliGenerator : public TNamed, public AliRndm kYRange = BIT(18), kMomentumRange = BIT(19) }; + + private: + AliGenerator(const AliGenerator &gen); + AliGenerator & operator=(const AliGenerator &gen); + ClassDef(AliGenerator,3) // Base class for event generators }; diff --git a/TEPEMGEN/AliGenEpEmv1.cxx b/TEPEMGEN/AliGenEpEmv1.cxx index 467c3a1b4bf..450e3d2d96c 100644 --- a/TEPEMGEN/AliGenEpEmv1.cxx +++ b/TEPEMGEN/AliGenEpEmv1.cxx @@ -86,14 +86,6 @@ AliGenEpEmv1::AliGenEpEmv1() if (fPtMin == 0) fPtMin = 1.E-04; } -//____________________________________________________________ -AliGenEpEmv1::AliGenEpEmv1(const AliGenEpEmv1 & gen) - :AliGenMC(gen) -{ - // copy constructor - gen.Copy(*this); -} - //____________________________________________________________ AliGenEpEmv1::~AliGenEpEmv1() { diff --git a/TEPEMGEN/AliGenEpEmv1.h b/TEPEMGEN/AliGenEpEmv1.h index 89da21e6003..26c6047db0b 100644 --- a/TEPEMGEN/AliGenEpEmv1.h +++ b/TEPEMGEN/AliGenEpEmv1.h @@ -25,8 +25,10 @@ public: void Init(); void SetDebug(Int_t debug) {fDebug=debug;} - AliGenEpEmv1(const AliGenEpEmv1 & gen); protected: + AliGenEpEmv1(const AliGenEpEmv1 & gen); + AliGenEpEmv1 & operator=(const AliGenEpEmv1 & gen); + Float_t fMass; // electron mass TEpEmGen * fEpEmGen; // e+e- generator Int_t fDebug; // debug level diff --git a/THbtp/AliGenHBTprocessor.cxx b/THbtp/AliGenHBTprocessor.cxx index f631310bd4d..d04dcffcb52 100644 --- a/THbtp/AliGenHBTprocessor.cxx +++ b/THbtp/AliGenHBTprocessor.cxx @@ -88,16 +88,7 @@ static TRandom* gAliRandom;//RNG to be used by the fortran code AliGenCocktailAfterBurner* GetGenerator(); /*******************************************************************/ -AliGenHBTprocessor::AliGenHBTprocessor(const AliGenHBTprocessor& in): - AliGenerator(in), - fHBTprocessor(0x0), - fHbtPStatCodes(0x0), - fEventMerge(1) -{ -//copy contructor - // AliGenHBTprocessor::AliGenHBTprocessor(); -} AliGenHBTprocessor::AliGenHBTprocessor(): AliGenerator(), fHBTprocessor(0x0), diff --git a/THbtp/AliGenHBTprocessor.h b/THbtp/AliGenHBTprocessor.h index 2ab39eab6cd..cace1765b9f 100644 --- a/THbtp/AliGenHBTprocessor.h +++ b/THbtp/AliGenHBTprocessor.h @@ -30,7 +30,6 @@ class AliGenHBTprocessor : public AliGenerator public: AliGenHBTprocessor(); - AliGenHBTprocessor(const AliGenHBTprocessor& in); virtual ~AliGenHBTprocessor(); virtual void Init(); @@ -257,6 +256,10 @@ class AliGenHBTprocessor : public AliGenerator /******* P R O T E C T E D M E T H O D S *****/ void GetTrackEventIndex(Int_t n, Int_t &evno, Int_t &index) const; //returns event(stack) number and + private: + AliGenHBTprocessor(const AliGenHBTprocessor& in); + AliGenHBTprocessor & operator=(const AliGenHBTprocessor& in); + ClassDef(AliGenHBTprocessor,1) // Interface class for AliMevsim }; diff --git a/THerwig/AliGenHerwig.cxx b/THerwig/AliGenHerwig.cxx index 83ea10b8ffa..4a75ccd6ddb 100644 --- a/THerwig/AliGenHerwig.cxx +++ b/THerwig/AliGenHerwig.cxx @@ -98,38 +98,6 @@ AliGenHerwig::AliGenHerwig(Int_t npart) AliHerwigRndm::SetHerwigRandom(GetRandom()); } -AliGenHerwig::AliGenHerwig(const AliGenHerwig & Herwig) - :AliGenMC(Herwig), - fAutPDF("LHAPDF"), - fModPDF(19070), - fStrucFunc(kCTEQ5L), - fKeep(0), - fDecaysOff(1), - fTrigger(0), - fSelectAll(0), - fFlavor(0), - fEnergyCMS(14000), - fMomentum1(7000), - fMomentum2(7000), - fKineBias(1), - fTrials(0), - fXsection(0), - fHerwig(0x0), - fProcess(0), - fPtHardMin(0.), - fPtRMS(0.), - fMaxPr(10), - fMaxErrors(1000), - fEnSoft(1), - fEv1Pr(0), - fEv2Pr(0), - fFileName(0) -{ -// Copy constructor - Herwig.Copy(*this); -} - - AliGenHerwig::~AliGenHerwig() { // Destructor @@ -451,14 +419,6 @@ void AliGenHerwig::FinishRun() fHerwig->Hwefin(); } - -AliGenHerwig& AliGenHerwig::operator=(const AliGenHerwig& rhs) -{ -// Assignment operator - rhs.Copy(*this); - return (*this); -} - void AliGenHerwig::FinishRunJimmy() { fHerwig->Hwefin(); diff --git a/THerwig/AliGenHerwig.h b/THerwig/AliGenHerwig.h index e15a9e7ca76..829a7e2d594 100644 --- a/THerwig/AliGenHerwig.h +++ b/THerwig/AliGenHerwig.h @@ -30,7 +30,6 @@ class AliGenHerwig : public AliGenMC public: AliGenHerwig(); AliGenHerwig(Int_t npart); - AliGenHerwig(const AliGenHerwig &Herwig); virtual ~AliGenHerwig(); virtual void Generate(); virtual void Init(); @@ -44,7 +43,6 @@ class AliGenHerwig : public AliGenMC virtual void SetTrigger(Int_t flag=kNoTrigger) {fTrigger = flag;} virtual void SetFlavor(Int_t flag=0) {fFlavor = flag;} virtual void SetSelectAll(Int_t flag=0) {fSelectAll = flag;} - AliGenHerwig & operator=(const AliGenHerwig & rhs); virtual void SetStrucFunc(StrucFunc_t func = kCTEQ5L) {fStrucFunc = func;} virtual void SetPtHardMin(Double_t pt) {fPtHardMin=pt;} @@ -88,6 +86,9 @@ class AliGenHerwig : public AliGenMC TString fFileName; //!Name of file to read from hard scattering private: + AliGenHerwig(const AliGenHerwig &Herwig); + AliGenHerwig & operator=(const AliGenHerwig & rhs); + // check if particle is selected as parent particle Bool_t ParentSelected(Int_t ip); // check if particle is selected as child particle diff --git a/THijing/AliGenHijing.cxx b/THijing/AliGenHijing.cxx index cc6f00e9dc9..fde3856fd11 100644 --- a/THijing/AliGenHijing.cxx +++ b/THijing/AliGenHijing.cxx @@ -129,49 +129,6 @@ AliGenHijing::AliGenHijing(Int_t npart) AliHijingRndm::SetHijingRandom(GetRandom()); } -AliGenHijing::AliGenHijing(const AliGenHijing & hijing): - AliGenMC(hijing), - fFrame("CMS"), - fMinImpactParam(0.), - fMaxImpactParam(5.), - fKeep(0), - fQuench(1), - fShadowing(1), - fDecaysOff(1), - fTrigger(0), - fEvaluate(0), - fSelectAll(0), - fFlavor(0), - fEnergyCMS(5500.), - fKineBias(0.), - fTrials(0), - fXsection(0.), - fHijing(0), - fPtHardMin(0.), - fPtHardMax(1.e4), - fSpectators(1), - fDsigmaDb(0), - fDnDb(0), - fPtMinJet(-2.5), - fEtaMinJet(-20.), - fEtaMaxJet(+20.), - fPhiMinJet(0.), - fPhiMaxJet(2. * TMath::Pi()), - fRadiation(3), - fSimpleJet(kFALSE), - fNoGammas(kFALSE), - fProjectileSpecn(0), - fProjectileSpecp(0), - fTargetSpecn(0), - fTargetSpecp(0), - fLHC(kFALSE), - fRandomPz(kFALSE), - fNoHeavyQuarks(kFALSE) -{ -// copy constructor -} - - AliGenHijing::~AliGenHijing() { // Destructor @@ -700,16 +657,3 @@ Bool_t AliGenHijing::CheckTrigger() } // fTrigger == 2 return triggered; } - - -void AliGenHijing::Copy(TObject &) const -{ - Fatal("Copy","Not implemented!\n"); -} - -AliGenHijing& AliGenHijing::operator=(const AliGenHijing& rhs) -{ - rhs.Copy(*this); - return (*this); -} - diff --git a/THijing/AliGenHijing.h b/THijing/AliGenHijing.h index e9bd34b52c7..c03bf5b7416 100644 --- a/THijing/AliGenHijing.h +++ b/THijing/AliGenHijing.h @@ -24,7 +24,6 @@ class AliGenHijing : public AliGenMC public: AliGenHijing(); AliGenHijing(Int_t npart); - AliGenHijing(const AliGenHijing &Hijing); virtual ~AliGenHijing(); virtual void Generate(); virtual void Init(); @@ -88,7 +87,6 @@ class AliGenHijing : public AliGenMC virtual TGraph* BinaryCollisions() {return fDnDb;} virtual Bool_t CheckTrigger(); // - AliGenHijing & operator=(const AliGenHijing & rhs); protected: Bool_t SelectFlavor(Int_t pid); void MakeHeader(); @@ -133,7 +131,9 @@ class AliGenHijing : public AliGenMC Bool_t fNoHeavyQuarks; // If true no heavy quarks are produced private: - void Copy(TObject &rhs) const; + AliGenHijing(const AliGenHijing &Hijing); + AliGenHijing & operator=(const AliGenHijing & rhs); + // adjust the weight from kinematic cuts void AdjustWeights(); // check seleted daughters diff --git a/TPHIC/AliGenTPHIC.cxx b/TPHIC/AliGenTPHIC.cxx index 055885c9297..5264b2b4b81 100644 --- a/TPHIC/AliGenTPHIC.cxx +++ b/TPHIC/AliGenTPHIC.cxx @@ -90,14 +90,6 @@ AliGenTPHIC::AliGenTPHIC() SetKfOnium (); } -//____________________________________________________________ -AliGenTPHIC::AliGenTPHIC(const AliGenTPHIC & gen): - AliGenMC(gen) -{ - // copy constructor - gen.Copy(*this); -} - //____________________________________________________________ AliGenTPHIC::~AliGenTPHIC() { @@ -395,12 +387,3 @@ void AliGenTPHIC::SetProcess (Int_t proc ) // calculated so far return fTPHICgen->GetXSTOTE(); } - -void AliGenTPHIC::Copy(TObject&) const -{ - // - // Copy - // - Fatal("Copy","Not implemented!\n"); -} - diff --git a/TPHIC/AliGenTPHIC.h b/TPHIC/AliGenTPHIC.h index b32359e9aeb..df9ba6db40a 100644 --- a/TPHIC/AliGenTPHIC.h +++ b/TPHIC/AliGenTPHIC.h @@ -18,7 +18,6 @@ class AliGenTPHIC : public AliGenMC { public: AliGenTPHIC(); - AliGenTPHIC(const AliGenTPHIC & gen); virtual ~AliGenTPHIC(); void Generate(); void Init(); @@ -55,8 +54,6 @@ public: Float_t GetXSectionCurrent (); Float_t GetXSection (); Float_t GetXSectionError (); - private: - void Copy(TObject&) const; protected: TPHICgen *fTPHICgen; //!generator TPHIC17 AliPythia *fPythia; //!generator PYTHIA6 @@ -65,6 +62,11 @@ public: Int_t fDebug; //!debug level Int_t fDebugEventFirst; //!First event to debug Int_t fDebugEventLast; //!Last event to debug -ClassDef(AliGenTPHIC,1) // Generator of 2-photon processes in ultra-peripheral collisions + + private: + AliGenTPHIC(const AliGenTPHIC & gen); + AliGenTPHIC & operator=(const AliGenTPHIC & gen); + + ClassDef(AliGenTPHIC,1) // Generator of 2-photon processes in ultra-peripheral collisions }; #endif -- 2.39.3