From 014a9521cd7be73bd0d63a47f01342da8144d904 Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 4 Aug 2003 09:51:20 +0000
Subject: [PATCH] Code causing warning messages corrected.

---
 PYTHIA6/AliDecayerPythia.cxx | 2 +-
 PYTHIA6/AliDecayerPythia.h   | 8 +++-----
 PYTHIA6/AliGenPythia.cxx     | 7 ++++---
 PYTHIA6/AliGenPythia.h       | 3 +--
 PYTHIA6/AliGenPythiaJets.cxx | 4 +++-
 THerwig/AliGenHerwig.cxx     | 9 ++++++---
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/PYTHIA6/AliDecayerPythia.cxx b/PYTHIA6/AliDecayerPythia.cxx
index 28a3c03b4f2..491f93a08c7 100644
--- a/PYTHIA6/AliDecayerPythia.cxx
+++ b/PYTHIA6/AliDecayerPythia.cxx
@@ -445,7 +445,7 @@ void AliDecayerPythia::Streamer(TBuffer &R__b)
 }
 #endif
 
-void AliDecayerPythia::Copy(AliDecayerPythia &decayer) const
+void AliDecayerPythia::Copy(AliDecayerPythia &) const
 {
   //
   // Copy *this onto AliDecayerPythia -- not implemented
diff --git a/PYTHIA6/AliDecayerPythia.h b/PYTHIA6/AliDecayerPythia.h
index 29f10d2ed22..14f9d865f7f 100644
--- a/PYTHIA6/AliDecayerPythia.h
+++ b/PYTHIA6/AliDecayerPythia.h
@@ -18,11 +18,8 @@ public AliDecayer
 {
  public:
     AliDecayerPythia();
-    void  Copy(AliDecayerPythia &decayer) const;
-    
 //    
     virtual         ~AliDecayerPythia(){;}
-    
     virtual void    Init();
     virtual void    Decay(Int_t idpart, TLorentzVector *p);
     virtual Int_t   ImportParticles(TClonesArray *particles);
@@ -45,8 +42,9 @@ public AliDecayer
     void     ForceHadronicD();
     void     ForceOmega();    
     Float_t  GetBraPart(Int_t kf);
-
-    AliDecayerPythia(const AliDecayerPythia &decayer) {;}
+    void  Copy(AliDecayerPythia &decayer) const;
+    AliDecayerPythia(const AliDecayerPythia &decayer):AliDecayer(decayer)
+	{decayer.Copy(*this);}
     virtual AliDecayerPythia &operator=(const AliDecayerPythia &decayer) 
     {decayer.Copy(*this);return(*this);}
     
diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index d6cd9945009..318b6de23ba 100644
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -39,7 +39,7 @@
 #include "AliPythiaRndm.h"
 #include "AliRun.h"
 
- ClassImp(AliGenPythia)
+ClassImp(AliGenPythia)
 
 AliGenPythia::AliGenPythia()
                  :AliGenMC()
@@ -106,6 +106,7 @@ AliGenPythia::AliGenPythia(Int_t npart)
 }
 
 AliGenPythia::AliGenPythia(const AliGenPythia & Pythia)
+    :AliGenMC(Pythia);
 {
 // copy constructor
     Pythia.Copy(*this);
@@ -696,6 +697,7 @@ Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2)
 AliGenPythia& AliGenPythia::operator=(const  AliGenPythia& rhs)
 {
 // Assignment operator
+    rhs.Copy(*this);
     return *this;
 }
 
@@ -732,8 +734,7 @@ void  AliGenPythia::LoadEvent()
     }
 }
 
-void AliGenPythia::RecJetsUA1(Float_t eCellMin, Float_t eCellSeed, Float_t eMin, Float_t rMax, 
-			      Int_t& njets, Float_t jets [4][50])
+void AliGenPythia::RecJetsUA1(Int_t& njets, Float_t jets [4][50])
 {
 //
 //  Calls the Pythia jet finding algorithm to find jets in the current event
diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h
index 272cb03b172..075b88ffdad 100644
--- a/PYTHIA6/AliGenPythia.h
+++ b/PYTHIA6/AliGenPythia.h
@@ -90,8 +90,7 @@ class AliGenPythia : public AliGenMC
     virtual Float_t GetXsection() const {return fXsection;}
     // get triggered jets
     void GetJets(Int_t& njets, Int_t& ntrig, Float_t[4][10]);
-    void RecJetsUA1(Float_t eCellMin, Float_t eCellSeed, Float_t eMin, Float_t rMin, 
-		    Int_t& njets, Float_t jets[4][50]);
+    void RecJetsUA1(Int_t& njets, Float_t jets[4][50]);
     void SetPycellParameters(Float_t etamax = 2., Int_t neta = 274, Int_t nphi = 432,
 			     Float_t thresh = 0., Float_t etseed = 4.,
 			     Float_t minet = 10., Float_t r = 1.);
diff --git a/PYTHIA6/AliGenPythiaJets.cxx b/PYTHIA6/AliGenPythiaJets.cxx
index ead7d309cda..f805ab4eaf5 100644
--- a/PYTHIA6/AliGenPythiaJets.cxx
+++ b/PYTHIA6/AliGenPythiaJets.cxx
@@ -46,7 +46,8 @@ AliGenPythiaJets::AliGenPythiaJets(Int_t npart)
     fTitle= "Jet Generator using PYTHIA";
 }
 
-AliGenPythiaJets::AliGenPythiaJets(const AliGenPythiaJets & Pythia)
+AliGenPythiaJets::AliGenPythiaJets(const AliGenPythiaJets & Pythia):
+    AliGenPythia(Pythia)
 {
 // copy constructor
     Pythia.Copy(*this);
@@ -218,6 +219,7 @@ Bool_t AliGenPythiaJets::CheckTrigger()
 AliGenPythiaJets& AliGenPythiaJets::operator=(const  AliGenPythiaJets& rhs)
 {
 // Assignment operator
+    rhs.Copy(*this);
     return *this;
 }
 
diff --git a/THerwig/AliGenHerwig.cxx b/THerwig/AliGenHerwig.cxx
index af949f43e79..6f15f6ee2e0 100644
--- a/THerwig/AliGenHerwig.cxx
+++ b/THerwig/AliGenHerwig.cxx
@@ -28,7 +28,7 @@
 
 #include "Riostream.h"
 
- ClassImp(AliGenHerwig)
+ClassImp(AliGenHerwig)
 
 static TRandom * sRandom;
 
@@ -59,8 +59,10 @@ AliGenHerwig::AliGenHerwig(Int_t npart)
 }
 
 AliGenHerwig::AliGenHerwig(const AliGenHerwig & Herwig)
+    :AliGenMC(Herwig)
 {
-// copy constructor
+// Copy constructor
+    Herwig.Copy(*this);
 }
 
 
@@ -317,7 +319,8 @@ void AliGenHerwig::FinishRun()
 AliGenHerwig& AliGenHerwig::operator=(const  AliGenHerwig& rhs)
 {
 // Assignment operator
-    return *this;
+    rhs.Copy(*this);
+    return (*this);
 }
 
 
-- 
2.39.3