X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;ds=sidebyside;f=PYTHIA6%2FAliGenPythiaJets.cxx;h=f805ab4eaf5b56446df5bbd48f6f2325d6e4a37b;hb=e59d284fa93ba984440e2662afa595ace15304ae;hp=3980c287e1ba3a08135951cb087f54fdf5cd4121;hpb=8d2cd130acaf1b61cd467d2d03ae9a9dd10c2ca8;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PYTHIA6/AliGenPythiaJets.cxx b/PYTHIA6/AliGenPythiaJets.cxx
index 3980c287e1b..f805ab4eaf5 100644
--- a/PYTHIA6/AliGenPythiaJets.cxx
+++ b/PYTHIA6/AliGenPythiaJets.cxx
@@ -13,17 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.3  2003/02/26 13:08:22  morsch
-TParticle included.
-
-Revision 1.2  2003/02/26 10:26:32  morsch
-AliGenPythiaJets: jets centered on EMCAL
-
-Revision 1.1  2003/01/17 04:10:31  morsch
-First commit.
-*/
+/* $Id$ */
 
 //
 // Generator using the TPythia interface (via AliPythia)
@@ -56,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);
@@ -142,9 +133,9 @@ void AliGenPythiaJets::Generate()
 	if(TMath::Abs(distz)>fCutVertexZ*fOsigma[2]) continue;
 //
 //
-	fEventVertex[0] = iparticle->Vx()/10.+fOrigin.At(0);
-	fEventVertex[1] = iparticle->Vy()/10.+fOrigin.At(1);
-	fEventVertex[2] = iparticle->Vz()/10.+fOrigin.At(2);
+	fVertex[0] = iparticle->Vx()/10.+fOrigin.At(0);
+	fVertex[1] = iparticle->Vy()/10.+fOrigin.At(1);
+	fVertex[2] = iparticle->Vz()/10.+fOrigin.At(2);
 
 	Int_t* pParent = new Int_t[np];
 	for (i=0; i< np; i++) pParent[i] = -1;
@@ -174,7 +165,7 @@ void AliGenPythiaJets::Generate()
 		origin[1] = fOrigin[1]+iparticle->Vy()/10.;
 		origin[2] = fOrigin[2]+iparticle->Vz()/10.;
 		Float_t tof=kconv*iparticle->T();
-		SetTrack(fTrackIt*trackIt, iparent, kf, p, origin, polar,
+		PushTrack(fTrackIt*trackIt, iparent, kf, p, origin, polar,
 			 tof, kPPrimary, nt, 1., ks);
 		KeepTrack(nt);
 		pParent[i] = nt;
@@ -228,6 +219,7 @@ Bool_t AliGenPythiaJets::CheckTrigger()
 AliGenPythiaJets& AliGenPythiaJets::operator=(const  AliGenPythiaJets& rhs)
 {
 // Assignment operator
+    rhs.Copy(*this);
     return *this;
 }