Adding extra check for GPU_FORCE_64BIT_PTR env var

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

diff --git a/THerwig/AliGenHerwig.cxx b/THerwig/AliGenHerwig.cxx
index d6d2f76dcb1c3611a39eefd214861f006d3ed077..17c5c7a1abfe93beb58e2b6faaf7593d79a78b08 100644 (file)
--- a/THerwig/AliGenHerwig.cxx
+++ b/THerwig/AliGenHerwig.cxx
@@ -34,6 +34,9 @@
 #include "AliRun.h"
 #include "driver.h"
 
+using std::cerr;
+using std::endl;
+
 ClassImp(AliGenHerwig)
 
 
@@ -113,6 +116,7 @@ AliGenHerwig::AliGenHerwig(Int_t npart)
     fPhiMaxGamma(2. * TMath::Pi()),
     fHeader(0)
 {
+// Constructor
     fEnergyCMS = 14000;
     SetTarget();
     SetProjectile();
@@ -129,7 +133,7 @@ void AliGenHerwig::SetEventListRange(Int_t eventFirst, Int_t eventLast)
 {
   fEv1Pr = eventFirst;
   fEv2Pr = eventLast;
-  if ( fEv2Pr == -1 ) fEv2Pr = fEv2Pr;
+  if ( fEv2Pr == -1 ) fEv2Pr = fEv1Pr;
 }
 
 void AliGenHerwig::Init()
@@ -161,7 +165,7 @@ void AliGenHerwig::Init()
   fHerwig->SetRMASS(4,1.2);
   fHerwig->SetRMASS(5,4.75);
 
-  if ( fProcess < 0 ) strncpy(VVJIN.QQIN,fFileName.Data(),50);
+  if ( fProcess < 0 ) strncpy(VVJIN.QQIN,fFileName.Data(), 49);
 
   //fHerwig->Hwusta("PI0     ");
 
@@ -198,7 +202,7 @@ void AliGenHerwig::InitJimmy()
   fHerwig->SetRMASS(4,1.2);
   fHerwig->SetRMASS(5,4.75);
 
-  if ( fProcess < 0 ) strncpy(VVJIN.QQIN,fFileName.Data(),50);
+  if ( fProcess < 0 ) strncpy(VVJIN.QQIN,fFileName.Data(), 49);
 
   //  fHerwig->Hwusta("PI0     ");
 
@@ -208,6 +212,7 @@ void AliGenHerwig::InitJimmy()
 
 void AliGenHerwig::InitPDF()
 {
+// Initialize PDF
   switch(fStrucFunc)
     {
 // ONLY USES LHAPDF STRUCTURE FUNCTIONS
@@ -338,7 +343,7 @@ void AliGenHerwig::Generate()
                origin[1] = fVertex[1] + iparticle->Vy()/10; // [cm]
                origin[2] = fVertex[2] + iparticle->Vz()/10; // [cm]
 
-               Float_t tof = kconv*iparticle->T();
+               Float_t tof = fTime + kconv*iparticle->T();
                Int_t   iparent = (imo > -1) ? newPos[imo] : -1;
                Int_t   trackIt = (ks == 1) && fTrackIt;
                PushTrack(trackIt, iparent, kf,
@@ -372,7 +377,7 @@ void AliGenHerwig::Generate()
   //printf(">> trials << %d\n",fTrials);
 }
 
-Bool_t AliGenHerwig::CheckParton(TParticle* parton1, TParticle* parton2)
+Bool_t AliGenHerwig::CheckParton(const TParticle* parton1, const TParticle* parton2)
 {
 // Check the kinematic trigger condition
 //
@@ -435,7 +440,7 @@ void AliGenHerwig::KeepFullEvent()
     fKeep=1;
 }
 
-Bool_t AliGenHerwig::DaughtersSelection(TParticle* iparticle, TClonesArray* particles)
+Bool_t AliGenHerwig::DaughtersSelection(const TParticle* iparticle, const TClonesArray* particles)
 {
 //
 // Looks recursively if one of the daughters has been selected
@@ -465,7 +470,7 @@ Bool_t AliGenHerwig::DaughtersSelection(TParticle* iparticle, TClonesArray* part
 }
 
 
-Bool_t AliGenHerwig::SelectFlavor(Int_t pid)
+Bool_t AliGenHerwig::SelectFlavor(Int_t pid) const
 {
 // Select flavor of particle
 // 0: all
@@ -478,7 +483,7 @@ Bool_t AliGenHerwig::SelectFlavor(Int_t pid)
     return (fFlavor == ifl);
 }
 
-Bool_t AliGenHerwig::Stable(TParticle*  particle)
+Bool_t AliGenHerwig::Stable(const TParticle*  particle) const
 {
 // Return true for a stable particle
 //
@@ -520,9 +525,12 @@ void AliGenHerwig::MakeHeader()
 // Number of trials
     ((AliGenHerwigEventHeader*) fHeader)->SetTrials(fTrials);
 //
+// Event weight (cross section)
+    ((AliGenHerwigEventHeader*) fHeader)->SetWeight(fHerwig->GetEVWGT());
+//
 // Event Vertex 
     fHeader->SetPrimaryVertex(fVertex);
-    
+    fHeader->SetInteractionTime(fTime);
 //
 // Number of primaries
     fHeader->SetNProduced(fNprimaries);