Getting AliGenHerwig in sync with rest of the framework.

diff --git a/THerwig/AliGenHerwig.cxx b/THerwig/AliGenHerwig.cxx
index 53b7f73..533b889 100644 (file)
--- a/THerwig/AliGenHerwig.cxx
+++ b/THerwig/AliGenHerwig.cxx
@@ -21,6 +21,7 @@
 // Uses the THerwig implementation of TGenerator.
 
 #include "AliGenHerwig.h"
+#include "AliHerwigRndm.h"
 #include "AliRun.h"
 
 #include <TParticle.h>
@@ -31,7 +32,6 @@
 
 ClassImp(AliGenHerwig)
 
-static TRandom * sRandom;
 
 AliGenHerwig::AliGenHerwig()
 {
@@ -50,13 +50,13 @@ AliGenHerwig::AliGenHerwig(Int_t npart)
     fDecaysOff=1;
     fSelectAll=0;
     fFlavor=0;
-    fPtHardMin=10.;
+    fPtHardMin=0.;
     fPtRMS=0.0;
     fEnSoft=1.0;
-    fMaxPr=1;
+    fMaxPr=10;
     fMaxErrors=1000;
-//  Set random number
-    if (!sRandom) sRandom=fRandom;
+    // Set random number generator   
+    AliHerwigRndm::SetHerwigRandom(GetRandom());
 }
 
 AliGenHerwig::AliGenHerwig(const AliGenHerwig & Herwig)
@@ -179,6 +179,8 @@ void AliGenHerwig::Generate()
        fTrials++;
        fHerwig->ImportParticles(particles,"All");
        Int_t np = particles->GetEntriesFast()-1;
+       printf("Particles from Herwig %d \n", np);
+       
        if (np == 0 ) continue;
        
        Int_t nc=0;
@@ -205,12 +207,12 @@ void AliGenHerwig::Generate()
                Float_t tof = kconv*iparticle->T();
                Int_t   iparent = (imo > -1) ? newPos[imo] : -1;
                Int_t   trackIt = (ks == 1) && fTrackIt;
-               gAlice->GetMCApp()->PushTrack(trackIt, iparent, kf,
-                                p[0], p[1], p[2], p[3],
-                                origin[0], origin[1], origin[2], 
-                                tof,
-                                polar[0], polar[1], polar[2],
-                                kPPrimary, nt, 1., ks);
+               PushTrack(trackIt, iparent, kf,
+                         p[0], p[1], p[2], p[3],
+                         origin[0], origin[1], origin[2], 
+                         tof,
+                         polar[0], polar[1], polar[2],
+                         kPPrimary, nt, 1., ks);
                KeepTrack(nt);
                newPos[i]=nt;
            } // end of if: selection of particle
@@ -325,6 +327,3 @@ AliGenHerwig& AliGenHerwig::operator=(const  AliGenHerwig& rhs)
 }
 
 
-extern "C" {
-  Double_t hwr_() {return sRandom->Rndm();}
-}

diff --git a/THerwig/AliGenHerwig.h b/THerwig/AliGenHerwig.h
index d93abe7..3611455 100644 (file)
--- a/THerwig/AliGenHerwig.h
+++ b/THerwig/AliGenHerwig.h
@@ -37,7 +37,7 @@ class AliGenHerwig : public AliGenMC
     // set centre of mass energy
     virtual void    SetBeamMomenta(Float_t p1=7000., Float_t p2=7000.)
        {fMomentum1 = p1; fMomentum2 = p2;}
-    virtual void    SetProcess(Int_t proc)       {fProcess = proc;}    
+    virtual void    SetProcess(Int_t proc)            {fProcess = proc;}    
     virtual void    KeepFullEvent();
     virtual void    SetDecaysOff(Int_t flag=1)        {fDecaysOff = flag;}
     virtual void    SetTrigger(Int_t flag=kNoTrigger) {fTrigger   = flag;}

diff --git a/THerwig/libTHerwig.pkg b/THerwig/libTHerwig.pkg
index 64e51f9..3d462a1 100644 (file)
--- a/THerwig/libTHerwig.pkg
+++ b/THerwig/libTHerwig.pkg
@@ -4,4 +4,6 @@ HDRS= THerwig6.h AliGenHerwig.h
 
 DHDR:=THerwigLinkDef.h
 
-EXPORT:=THerwig6.h
\ No newline at end of file
+EXPORT:=THerwig6.h
+
+EINCLUDE:=HERWIG
\ No newline at end of file