Introducing Decay_t in AliRoot decayers

diff --git a/EVGEN/AliDecayer.h b/EVGEN/AliDecayer.h
index 8ee2b80e69f1ffbea9d918e5348a1d2807ba1f44..b6c1b46416212c7951b7d46d3e0fa63f781fe2fe 100644 (file)
--- a/EVGEN/AliDecayer.h
+++ b/EVGEN/AliDecayer.h
@@ -5,8 +5,20 @@
 
 /* $Id$ */
 
 
 /* $Id$ */
 

+#include "RVersion.h"

 #include "TVirtualMCDecayer.h"
 
 typedef TVirtualMCDecayer AliDecayer;
 
 #include "TVirtualMCDecayer.h"
 
 typedef TVirtualMCDecayer AliDecayer;
 

+#if ROOT_VERSION_CODE >= ROOT_VERSION(3,04,1)
+typedef enum 
+{
+    kSemiElectronic, kDiElectron, kSemiMuonic, kDiMuon,
+    kBJpsiDiMuon, kBJpsiDiElectron, 
+    kBPsiPrimeDiMuon, kBPsiPrimeDiElectron, kPiToMu,
+    kKaToMu, kNoDecay,
+    kHadronicD, kOmega, kPhiKK, kAll, kNoDecayHeavy
+} Decay_t;
+#endif
+

 #endif //ALI_DECAYER__H
 #endif //ALI_DECAYER__H

diff --git a/EVGEN/AliDecayerPythia.h b/EVGEN/AliDecayerPythia.h
index b6e3f208de2646559928094af137b2acb56687f2..29f10d2ed22241b03c3d9e89c38c24609d44beb4 100644 (file)
--- a/EVGEN/AliDecayerPythia.h
+++ b/EVGEN/AliDecayerPythia.h
@@ -27,6 +27,8 @@ public AliDecayer
     virtual void    Decay(Int_t idpart, TLorentzVector *p);
     virtual Int_t   ImportParticles(TClonesArray *particles);
     virtual void    SetForceDecay(Decay_t decay) {fDecay=decay;}
     virtual void    Decay(Int_t idpart, TLorentzVector *p);
     virtual Int_t   ImportParticles(TClonesArray *particles);
     virtual void    SetForceDecay(Decay_t decay) {fDecay=decay;}

+    virtual void    SetForceDecay(Int_t decay)
+      {SetForceDecay((Decay_t) decay);}

     virtual void    ForceDecay();
     
     virtual Float_t GetPartialBranchingRatio(Int_t ipart);
     virtual void    ForceDecay();
     
     virtual Float_t GetPartialBranchingRatio(Int_t ipart);