Reverting previous commit and going back to rev.64119Subversion Repositories:

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

diff --git a/EVGEN/AliGenMC.cxx b/EVGEN/AliGenMC.cxx
index 6660454fcf0547232208b4c27aa84c53595b759f..115736974493104cdb40900fb1efe1bb4204cdf8 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,15 @@ void AliGenMC::Init()
     case kDiElectron:
     case kBJpsiDiElectron:
     case kBPsiPrimeDiElectron:
+    case kElectronEM:
+    case kDiElectronEM:
        fChildSelect[0] = kElectron;    
        break;
     case kHardMuons:   
     case kBSemiMuonic:
     case kSemiMuonic:
     case kDiMuon:
+    case kJpsiDiMuon:
     case kBJpsiDiMuon:
     case kBPsiPrimeDiMuon:
     case kPiToMu:
@@ -148,6 +153,7 @@ void AliGenMC::Init()
        fChildSelect[0]=kKPlus;
        break;
     case kBJpsi:
+    case kBJpsiUndecayed:
        fChildSelect[0]= 443;
        break;
    case kChiToJpsiGammaToMuonMuon:
@@ -163,9 +169,12 @@ void AliGenMC::Init()
         fChildSelect[1]= 211;
        break;
     case kPsiPrimeJpsiDiElectron:
-      fChildSelect[0]= 211;
-      fChildSelect[1]= 11;
-      break;
+        fChildSelect[0]= 211;
+        fChildSelect[1]= 11;
+       break;
+    case kGammaEM:
+        fChildSelect[0] = kGamma;      
+        break;
     case kOmega:
     case kAll:
     case kAllMuonic:
@@ -173,6 +182,7 @@ void AliGenMC::Init()
     case kNoDecayHeavy:
     case kNoDecayBeauty:
     case kNeutralPion:
+    case kBeautyUpgrade:
        break;
     }
 
@@ -204,7 +214,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();
@@ -442,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);