Corrected library names and paths to macros

[u/mrichter/AliRoot.git] / EVGEN / AliGenMC.cxx

diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx
index 68bbef8ed9a4d50972d120529c7a99c839157833..157909959a79b5860e9d042a8933f176d8787e5d 100644 (file)
--- a/EVGEN/AliGenMC.cxx
+++ b/EVGEN/AliGenMC.cxx
@@ -29,8 +29,10 @@
 #include <TVector3.h>
 
 #include "AliGenMC.h"
+#include "AliGenEventHeader.h"
 #include "AliRun.h"
 #include "AliGeometry.h"
+#include "AliDecayer.h"
 
 ClassImp(AliGenMC)
 
@@ -121,12 +123,16 @@ void AliGenMC::Init()
     case kDiElectron:
     case kBJpsiDiElectron:
     case kBPsiPrimeDiElectron:
+    case kElectronEM:
+    case kDiElectronEM:
        fChildSelect[0] = kElectron;    
        break;
     case kHardMuons:   
     case kBSemiMuonic:
+    case kDSemiMuonic:
     case kSemiMuonic:
     case kDiMuon:
+    case kJpsiDiMuon:
     case kBJpsiDiMuon:
     case kBPsiPrimeDiMuon:
     case kPiToMu:
@@ -148,6 +154,7 @@ void AliGenMC::Init()
        fChildSelect[0]=kKPlus;
        break;
     case kBJpsi:
+    case kBJpsiUndecayed:
        fChildSelect[0]= 443;
        break;
    case kChiToJpsiGammaToMuonMuon:
@@ -162,6 +169,13 @@ void AliGenMC::Init()
        fChildSelect[0]= kProton;
         fChildSelect[1]= 211;
        break;
+    case kPsiPrimeJpsiDiElectron:
+        fChildSelect[0]= 211;
+        fChildSelect[1]= 11;
+       break;
+    case kGammaEM:
+        fChildSelect[0] = kGamma;      
+        break;
     case kOmega:
     case kAll:
     case kAllMuonic:
@@ -169,6 +183,7 @@ void AliGenMC::Init()
     case kNoDecayHeavy:
     case kNoDecayBeauty:
     case kNeutralPion:
+    case kBeautyUpgrade:
        break;
     }
 
@@ -200,7 +215,7 @@ Bool_t AliGenMC::ChildSelected(Int_t ip) const
     return kFALSE;
 }
 
-Bool_t AliGenMC::KinematicSelection(TParticle *particle, Int_t flag) const
+Bool_t AliGenMC::KinematicSelection(const TParticle *particle, Int_t flag) const
 {
 // Perform kinematic selection
     Double_t pz    = particle->Pz();
@@ -399,11 +414,10 @@ void AliGenMC::BeamCrossAngle()
   // Applies a boost in the y-direction in order to take into account the 
   // beam crossing angle
 
-  Double_t thetaPr0, phiPr0, pyPr2, pzPr2;
+  Double_t thetaPr0, pyPr2, pzPr2;
   TVector3 beta;
   
   thetaPr0 = fXingAngleY / 2.;
-  phiPr0 = 0;
 
   // Momentum of the CMS system
   pyPr2 = TMath::Sqrt(fEnergyCMS * fEnergyCMS/ 4 - 0.938 * 0.938) * TMath::Sin(thetaPr0); 
@@ -438,6 +452,7 @@ void AliGenMC::AddHeader(AliGenEventHeader* header)
 {
     // Passes header either to the container or to gAlice
     if (fContainer) {
+        header->SetName(fName);
        fContainer->AddHeader(header);
     } else {
        gAlice->SetGenEventHeader(header);