Obsolete - removed

[u/mrichter/AliRoot.git] / THerwig / AliGenHerwig.cxx

diff --git a/THerwig/AliGenHerwig.cxx b/THerwig/AliGenHerwig.cxx
index 3ace77fef9033676c83b125f537d067247b4c5c5..53b7f73921a4badf7f849dd0fb161c3aed5922f6 100644 (file)
--- a/THerwig/AliGenHerwig.cxx
+++ b/THerwig/AliGenHerwig.cxx
@@ -27,8 +27,9 @@
 #include "THerwig6.h"
 
 #include "Riostream.h"
+#include "AliMC.h"
 
- ClassImp(AliGenHerwig)
+ClassImp(AliGenHerwig)
 
 static TRandom * sRandom;
 
@@ -59,8 +60,10 @@ AliGenHerwig::AliGenHerwig(Int_t npart)
 }
 
 AliGenHerwig::AliGenHerwig(const AliGenHerwig & Herwig)
+    :AliGenMC(Herwig)
 {
-// copy constructor
+// Copy constructor
+    Herwig.Copy(*this);
 }
 
 
@@ -75,7 +78,7 @@ void AliGenHerwig::Init()
   fTarget.Resize(8);
   fProjectile.Resize(8);
   SetMC(new THerwig6());
-  fHerwig=(THerwig6*) fgMCEvGen;
+  fHerwig=(THerwig6*) fMCEvGen;
   // initialize common blocks
   fHerwig->Initialize(fProjectile, fTarget, fMomentum1, fMomentum2, fProcess);
   // reset parameters according to user needs
@@ -202,7 +205,7 @@ void AliGenHerwig::Generate()
                Float_t tof = kconv*iparticle->T();
                Int_t   iparent = (imo > -1) ? newPos[imo] : -1;
                Int_t   trackIt = (ks == 1) && fTrackIt;
-               gAlice->SetTrack(trackIt, iparent, kf,
+               gAlice->GetMCApp()->PushTrack(trackIt, iparent, kf,
                                 p[0], p[1], p[2], p[3],
                                 origin[0], origin[1], origin[2], 
                                 tof,
@@ -237,9 +240,9 @@ void AliGenHerwig::AdjustWeights()
 {
 // Adjust the weights after generation of all events
     TParticle *part;
-    Int_t ntrack=gAlice->GetNtrack();
+    Int_t ntrack=gAlice->GetMCApp()->GetNtrack();
     for (Int_t i=0; i<ntrack; i++) {
-        part= gAlice->Particle(i);
+        part= gAlice->GetMCApp()->Particle(i);
         part->SetWeight(part->GetWeight()*fKineBias);
     }
 }
@@ -317,7 +320,8 @@ void AliGenHerwig::FinishRun()
 AliGenHerwig& AliGenHerwig::operator=(const  AliGenHerwig& rhs)
 {
 // Assignment operator
-    return *this;
+    rhs.Copy(*this);
+    return (*this);
 }