]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - PYTHIA8/AliDecayerPythia8.cxx
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removing useless flag.
[u/mrichter/AliRoot.git] / PYTHIA8 / AliDecayerPythia8.cxx
diff --git a/PYTHIA8/AliDecayerPythia8.cxx b/PYTHIA8/AliDecayerPythia8.cxx
index 81950d2c4ccd6fb504a3beac80be10e1944962e7..7fb2265a4bcdd29304058e0643ef10c5bd522d42 100644 (file)
--- a/PYTHIA8/AliDecayerPythia8.cxx
+++ b/PYTHIA8/AliDecayerPythia8.cxx
@@ -20,6 +20,8 @@
 #include <TMath.h>
 #include <TPDGCode.h>
 #include <TLorentzVector.h>
+#include <TClonesArray.h>
+#include <TParticle.h>
 #include "AliTPythia8.h"
 #include "AliDecayerPythia8.h"
 #include "ParticleData.h"
@@ -30,7 +32,7 @@ Bool_t AliDecayerPythia8::fgInit = kFALSE;
 
 AliDecayerPythia8::AliDecayerPythia8():
   TVirtualMCDecayer(),
-  fPythia8(new AliTPythia8()),
+  fPythia8(AliTPythia8::Instance()),
   fDebug(0),
   fDecay(kAll),
   fHeavyFlavour(kTRUE)
@@ -55,8 +57,17 @@ void AliDecayerPythia8::Decay(Int_t pdg, TLorentzVector* p)
 //___________________________________________________________________________
 Int_t AliDecayerPythia8::ImportParticles(TClonesArray *particles)
 {
-   //import the decay products into particles array
-   return (fPythia8->ImportParticles(particles, "All"));
+  //import the decay products into particles array
+  const Float_t kconvT=0.001/2.999792458e8; // mm/c to seconds conversion
+  const Float_t kconvL=1./10; // mm to cm conversion
+  int np = fPythia8->ImportParticles(particles, "All");
+  // pythia assigns decay time in mm/c, convert to seconds
+  for (int ip=1;ip<np;ip++) {
+    TParticle* prod = (TParticle*)particles->At(ip);
+    if (!prod) continue;
+    prod->SetProductionVertex(prod->Vx()*kconvL,prod->Vy()*kconvL,prod->Vz()*kconvL,kconvT*prod->T());
+  }
+  return np;
 }
 
 
@@ -76,9 +87,9 @@ void AliDecayerPythia8::Init()
 //    fPythia->ResetDecayTable();
     for (j=0; j < 14; j++) {
        if (fDecay == kNoDecayHeavy) {
-           AliTPythia8::Instance()->ReadString(Form("%d:onMode = off", heavy[j]));
+           fPythia8->ReadString(Form("%d:onMode = off", heavy[j]));
        } else {
-           AliTPythia8::Instance()->ReadString(Form("%d:onMode = on", heavy[j]));
+           fPythia8->ReadString(Form("%d:onMode = on", heavy[j]));
        }
     }
     
@@ -86,18 +97,18 @@ void AliDecayerPythia8::Init()
 //...Switch off decay of pi0, K0S, Lambda, Sigma+-, Xi0-, Omega-.
     
     if (fDecay != kNeutralPion) {
-       AliTPythia8::Instance()->ReadString("111:onMode = off");
+       fPythia8->ReadString("111:onMode = off");
     } else {
-       AliTPythia8::Instance()->ReadString("111:onMode = on");
+       fPythia8->ReadString("111:onMode = on");
     }
 
-    AliTPythia8::Instance()->ReadString("310:onMode = off");
-    AliTPythia8::Instance()->ReadString("3112:onMode = off");
-    AliTPythia8::Instance()->ReadString("3212:onMode = off");
-    AliTPythia8::Instance()->ReadString("3222:onMode = off");
-    AliTPythia8::Instance()->ReadString("3312:onMode = off");
-    AliTPythia8::Instance()->ReadString("3322:onMode = off");
-    AliTPythia8::Instance()->ReadString("3334:onMode = off");
+    fPythia8->ReadString("310:onMode = off");
+    fPythia8->ReadString("3112:onMode = off");
+    fPythia8->ReadString("3212:onMode = off");
+    fPythia8->ReadString("3222:onMode = off");
+    fPythia8->ReadString("3312:onMode = off");
+    fPythia8->ReadString("3322:onMode = off");
+    fPythia8->ReadString("3334:onMode = off");
 // .. Force decay channels
     ForceDecay();
 }
@@ -110,7 +121,7 @@ void AliDecayerPythia8::ForceDecay()
     if (!fHeavyFlavour) SwitchOffHeavyFlavour();
 //
     Decay_t decay = fDecay;
-    AliTPythia8::Instance()->ReadString("HadronLevel:Decay = on");
+    fPythia8->ReadString("HadronLevel:Decay = on");
     
     if (decay == kNoDecayHeavy) return;
 
@@ -120,428 +131,428 @@ void AliDecayerPythia8::ForceDecay()
     {
     case kHardMuons:
 //     B0 -> mu X 
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 13 443 100443");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 13 443 100443");
 //     B+/- -> mu X 
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 13 443 100443");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 13 443 100443");
 //     Bs -> mu X 
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 13 443 100443");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 13 443 100443");
 //     Lambda_b -> mu X 
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 13 443 100443");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 13 443 100443");
 //      Sigma_b- -> mu X 
-       AliTPythia8::Instance()->ReadString("5132:onMode = off");
-       AliTPythia8::Instance()->ReadString("5132:onIfAny = 13 443 100443");
+       fPythia8->ReadString("5132:onMode = off");
+       fPythia8->ReadString("5132:onIfAny = 13 443 100443");
 //      Sigma_b0 -> mu X
-       AliTPythia8::Instance()->ReadString("5232:onMode = off");
-       AliTPythia8::Instance()->ReadString("5232:onIfAny = 13 443 100443");
+       fPythia8->ReadString("5232:onMode = off");
+       fPythia8->ReadString("5232:onIfAny = 13 443 100443");
 //      Omega_b  -> mu X
-       AliTPythia8::Instance()->ReadString("5332:onMode = off");
-       AliTPythia8::Instance()->ReadString("5332:onIfAny = 13 443 100443");
+       fPythia8->ReadString("5332:onMode = off");
+       fPythia8->ReadString("5332:onIfAny = 13 443 100443");
 //      Psi' -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("100443:onMode = off");
-       AliTPythia8::Instance()->ReadString("100443:onIfAny = 443");
+       fPythia8->ReadString("100443:onMode = off");
+       fPythia8->ReadString("100443:onIfAny = 443");
 //      Psi  -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 13 13");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 13 13");
 //      D+/- -> mu X
-       AliTPythia8::Instance()->ReadString("411:onMode = off");
-       AliTPythia8::Instance()->ReadString("411:onIfAll = 13");
+       fPythia8->ReadString("411:onMode = off");
+       fPythia8->ReadString("411:onIfAll = 13");
 //      D0   -> mu X
-       AliTPythia8::Instance()->ReadString("421:onMode = off");
-       AliTPythia8::Instance()->ReadString("421:onIfAll = 13");
+       fPythia8->ReadString("421:onMode = off");
+       fPythia8->ReadString("421:onIfAll = 13");
 //      D_s  -> mu X
-       AliTPythia8::Instance()->ReadString("431:onMode = off");
-       AliTPythia8::Instance()->ReadString("431:onIfAll = 13");
+       fPythia8->ReadString("431:onMode = off");
+       fPythia8->ReadString("431:onIfAll = 13");
 //      Lambda_c -> mu X
-       AliTPythia8::Instance()->ReadString("4122:onMode = off");
-       AliTPythia8::Instance()->ReadString("4122:onIfAll = 13");
+       fPythia8->ReadString("4122:onMode = off");
+       fPythia8->ReadString("4122:onIfAll = 13");
 //      Sigma_c  -> mu X
-       AliTPythia8::Instance()->ReadString("4132:onMode = off");
-       AliTPythia8::Instance()->ReadString("4132:onIfAll = 13");
+       fPythia8->ReadString("4132:onMode = off");
+       fPythia8->ReadString("4132:onIfAll = 13");
 //      Sigma_c+ -> mu X
-       AliTPythia8::Instance()->ReadString("4232:onMode = off");
-       AliTPythia8::Instance()->ReadString("4232:onIfAll = 13");
+       fPythia8->ReadString("4232:onMode = off");
+       fPythia8->ReadString("4232:onIfAll = 13");
 //      Omega_c  -> mu X
-       AliTPythia8::Instance()->ReadString("4332:onMode = off");
-       AliTPythia8::Instance()->ReadString("4332:onIfAll = 13");
+       fPythia8->ReadString("4332:onMode = off");
+       fPythia8->ReadString("4332:onIfAll = 13");
 
        break;
    case kChiToJpsiGammaToMuonMuon:
 // Chi_1c  -> J/Psi  Gamma
-       AliTPythia8::Instance()->ReadString("20443:onMode = off");
-       AliTPythia8::Instance()->ReadString("20443:onIfAll = 443 22");
+       fPythia8->ReadString("20443:onMode = off");
+       fPythia8->ReadString("20443:onIfAll = 443 22");
 // Chi_2c  -> J/Psi  Gamma
-       AliTPythia8::Instance()->ReadString("445:onMode = off");
-       AliTPythia8::Instance()->ReadString("445:onIfAll = 443 22");
+       fPythia8->ReadString("445:onMode = off");
+       fPythia8->ReadString("445:onIfAll = 443 22");
 // J/Psi -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 13 13");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 13 13");
        break;
     case kChiToJpsiGammaToElectronElectron:
 // Chi_1c  -> J/Psi  Gamma
-       AliTPythia8::Instance()->ReadString("20443:onMode = off");
-       AliTPythia8::Instance()->ReadString("20443:onIfAll = 443 22");
+       fPythia8->ReadString("20443:onMode = off");
+       fPythia8->ReadString("20443:onIfAll = 443 22");
 // Chi_2c  -> J/Psi  Gamma
-       AliTPythia8::Instance()->ReadString("445:onMode = off");
-       AliTPythia8::Instance()->ReadString("445:onIfAll = 443 22");
+       fPythia8->ReadString("445:onMode = off");
+       fPythia8->ReadString("445:onIfAll = 443 22");
 // J/Psi -> e+ e-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 11 11");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 11 11");
        break;
 
     case kBSemiMuonic:
 //      B0 -> mu X 
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 13");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 13");
 //     B+/- -> mu X 
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 13");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 13");
 //     B_s -> mu X 
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 13");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 13");
 //     Lambda_b -> mu X 
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 13");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 13");
 //     Sigma_b -> mu X 
-       AliTPythia8::Instance()->ReadString("5132:onMode = off");
-       AliTPythia8::Instance()->ReadString("5132:onIfAny = 13");
+       fPythia8->ReadString("5132:onMode = off");
+       fPythia8->ReadString("5132:onIfAny = 13");
 //     Sigma_b0 -> mu X 
-       AliTPythia8::Instance()->ReadString("5232:onMode = off");
-       AliTPythia8::Instance()->ReadString("5232:onIfAny = 13");
+       fPythia8->ReadString("5232:onMode = off");
+       fPythia8->ReadString("5232:onIfAny = 13");
 //     Omega_b  -> mu X 
-       AliTPythia8::Instance()->ReadString("5332:onMode = off");
-       AliTPythia8::Instance()->ReadString("5332:onIfAny = 13");
+       fPythia8->ReadString("5332:onMode = off");
+       fPythia8->ReadString("5332:onIfAny = 13");
        break;
     case kSemiMuonic:
 //      D+- -> mu X
-       AliTPythia8::Instance()->ReadString("411:onMode = off");
-       AliTPythia8::Instance()->ReadString("411:onIfAll = 13");
+       fPythia8->ReadString("411:onMode = off");
+       fPythia8->ReadString("411:onIfAll = 13");
 //      D0  -> mu X
-       AliTPythia8::Instance()->ReadString("421:onMode = off");
-       AliTPythia8::Instance()->ReadString("421:onIfAll = 13");
+       fPythia8->ReadString("421:onMode = off");
+       fPythia8->ReadString("421:onIfAll = 13");
 //      D_s  -> mu X
-       AliTPythia8::Instance()->ReadString("431:onMode = off");
-       AliTPythia8::Instance()->ReadString("431:onIfAll = 13");
+       fPythia8->ReadString("431:onMode = off");
+       fPythia8->ReadString("431:onIfAll = 13");
 //      Lambda_c -> mu X
-       AliTPythia8::Instance()->ReadString("4122:onMode = off");
-       AliTPythia8::Instance()->ReadString("4122:onIfAll = 13");
+       fPythia8->ReadString("4122:onMode = off");
+       fPythia8->ReadString("4122:onIfAll = 13");
 //      Sigma_c  -> mu X
-       AliTPythia8::Instance()->ReadString("4132:onMode = off");
-       AliTPythia8::Instance()->ReadString("4132:onIfAll = 13");
+       fPythia8->ReadString("4132:onMode = off");
+       fPythia8->ReadString("4132:onIfAll = 13");
 //      Sigma  -> mu X
-       AliTPythia8::Instance()->ReadString("4232:onMode = off");
-       AliTPythia8::Instance()->ReadString("4232:onIfAll = 13");
+       fPythia8->ReadString("4232:onMode = off");
+       fPythia8->ReadString("4232:onIfAll = 13");
 //      Omega_c  -> mu X
-       AliTPythia8::Instance()->ReadString("4332:onMode = off");
-       AliTPythia8::Instance()->ReadString("4332:onIfAll = 13");
+       fPythia8->ReadString("4332:onMode = off");
+       fPythia8->ReadString("4332:onIfAll = 13");
 //      B0       -> mu X
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 13");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 13");
 //      B+/-     -> mu X
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 13");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 13");
 //      B_s      -> mu X
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 13");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 13");
 //      Lambda_c -> mu X
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 13");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 13");
 //      Sigma_c  -> mu X
-       AliTPythia8::Instance()->ReadString("5132:onMode = off");
-       AliTPythia8::Instance()->ReadString("5132:onIfAny = 13");
+       fPythia8->ReadString("5132:onMode = off");
+       fPythia8->ReadString("5132:onIfAny = 13");
 //      Sigma_c  -> mu X
-       AliTPythia8::Instance()->ReadString("5232:onMode = off");
-       AliTPythia8::Instance()->ReadString("5232:onIfAny = 13");
+       fPythia8->ReadString("5232:onMode = off");
+       fPythia8->ReadString("5232:onIfAny = 13");
 //      Omega_c  -> mu X
-       AliTPythia8::Instance()->ReadString("5332:onMode = off");
-       AliTPythia8::Instance()->ReadString("5332:onIfAny = 13");
+       fPythia8->ReadString("5332:onMode = off");
+       fPythia8->ReadString("5332:onIfAny = 13");
 
        break;
     case kJpsiDiMuon:
 //      J/Psi-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 13 13");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 13 13");
        break;
     case kDiMuon:
 //      Rho -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("113:onMode = off");
-       AliTPythia8::Instance()->ReadString("113:onIfAll = 13 13");
+       fPythia8->ReadString("113:onMode = off");
+       fPythia8->ReadString("113:onIfAll = 13 13");
 //      Eta-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("221:onMode = off");
-       AliTPythia8::Instance()->ReadString("221:onIfAll = 13 13");
+       fPythia8->ReadString("221:onMode = off");
+       fPythia8->ReadString("221:onIfAll = 13 13");
 //      omega-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("223:onMode = off");
-       AliTPythia8::Instance()->ReadString("223:onIfAll = 13 13");
+       fPythia8->ReadString("223:onMode = off");
+       fPythia8->ReadString("223:onIfAll = 13 13");
 //      phi-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("333:onMode = off");
-       AliTPythia8::Instance()->ReadString("333:onIfAll = 13 13");
+       fPythia8->ReadString("333:onMode = off");
+       fPythia8->ReadString("333:onIfAll = 13 13");
 //      J/Psi-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 13 13");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 13 13");
 //      Psi'-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("100443:onMode = off");
-       AliTPythia8::Instance()->ReadString("100443:onIfAll = 13 13");
+       fPythia8->ReadString("100443:onMode = off");
+       fPythia8->ReadString("100443:onIfAll = 13 13");
 //      Ups-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("553:onMode = off");
-       AliTPythia8::Instance()->ReadString("553:onIfAll = 13 13");
+       fPythia8->ReadString("553:onMode = off");
+       fPythia8->ReadString("553:onIfAll = 13 13");
 //      Ups'-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("100553:onMode = off");
-       AliTPythia8::Instance()->ReadString("100553:onIfAll = 13 13"); 
+       fPythia8->ReadString("100553:onMode = off");
+       fPythia8->ReadString("100553:onIfAll = 13 13"); 
 //      Ups''-> mu+ mu-
-       AliTPythia8::Instance()->ReadString("200553:onMode = off");
-       AliTPythia8::Instance()->ReadString("200553:onIfAll = 13 13");
+       fPythia8->ReadString("200553:onMode = off");
+       fPythia8->ReadString("200553:onIfAll = 13 13");
        break;
     case kBSemiElectronic:
 //      B0 - > e+ e-
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 11");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 11");
 //      B+- -> e+ e-
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 11");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 11");
 //      B_s -> e+ e-
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 11");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 11");
 //      Lambda_b -> e+ e-
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 11");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 11");
 //      Sigma_b -> e+ e-
-       AliTPythia8::Instance()->ReadString("5132:onMode = off");
-       AliTPythia8::Instance()->ReadString("5132:onIfAny = 11");
+       fPythia8->ReadString("5132:onMode = off");
+       fPythia8->ReadString("5132:onIfAny = 11");
 //      Sigma_b -> e+ e-
-       AliTPythia8::Instance()->ReadString("5232:onMode = off");
-       AliTPythia8::Instance()->ReadString("5232:onIfAny = 11");
+       fPythia8->ReadString("5232:onMode = off");
+       fPythia8->ReadString("5232:onIfAny = 11");
 //      Omega_b ->e+ e-
-       AliTPythia8::Instance()->ReadString("5332:onMode = off");
-       AliTPythia8::Instance()->ReadString("5332:onIfAny = 11");
+       fPythia8->ReadString("5332:onMode = off");
+       fPythia8->ReadString("5332:onIfAny = 11");
        break;
     case kSemiElectronic:
 //      D+/- -> e X
-       AliTPythia8::Instance()->ReadString("411:onMode = off");
-       AliTPythia8::Instance()->ReadString("411:onIfAll = 11");
+       fPythia8->ReadString("411:onMode = off");
+       fPythia8->ReadString("411:onIfAll = 11");
 //      D0 -> e X
-       AliTPythia8::Instance()->ReadString("421:onMode = off");
-       AliTPythia8::Instance()->ReadString("421:onIfAll = 11");
+       fPythia8->ReadString("421:onMode = off");
+       fPythia8->ReadString("421:onIfAll = 11");
 //      D_s ->e X
-       AliTPythia8::Instance()->ReadString("431:onMode = off");
-       AliTPythia8::Instance()->ReadString("431:onIfAll = 11");
+       fPythia8->ReadString("431:onMode = off");
+       fPythia8->ReadString("431:onIfAll = 11");
 //      Lambda_c -> e X
-       AliTPythia8::Instance()->ReadString("4122:onMode = off");
-       AliTPythia8::Instance()->ReadString("4122:onIfAll = 11");
+       fPythia8->ReadString("4122:onMode = off");
+       fPythia8->ReadString("4122:onIfAll = 11");
 //      Sigma_c -> e X
-       AliTPythia8::Instance()->ReadString("4132:onMode = off");
-       AliTPythia8::Instance()->ReadString("4132:onIfAll = 11");
+       fPythia8->ReadString("4132:onMode = off");
+       fPythia8->ReadString("4132:onIfAll = 11");
 //      Sigma_c -> e X
-       AliTPythia8::Instance()->ReadString("4232:onMode = off");
-       AliTPythia8::Instance()->ReadString("4232:onIfAll = 11");
+       fPythia8->ReadString("4232:onMode = off");
+       fPythia8->ReadString("4232:onIfAll = 11");
 //      Omega_c -> e X
-       AliTPythia8::Instance()->ReadString("4332:onMode = off");
-       AliTPythia8::Instance()->ReadString("4332:onIfAll = 11");
+       fPythia8->ReadString("4332:onMode = off");
+       fPythia8->ReadString("4332:onIfAll = 11");
 //      B0 -> e X
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 11");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 11");
 //      B+/- -> e X
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 11");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 11");
 //      B_s -> e X
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 11");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 11");
 //      Lambda_b -> e X
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 11");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 11");
 //      Sigma_b -> e X
-       AliTPythia8::Instance()->ReadString("5132:onMode = off");
-       AliTPythia8::Instance()->ReadString("5132:onIfAny = 11");
+       fPythia8->ReadString("5132:onMode = off");
+       fPythia8->ReadString("5132:onIfAny = 11");
 //      Sigma_b -> e X
-       AliTPythia8::Instance()->ReadString("5232:onMode = off");
-       AliTPythia8::Instance()->ReadString("5232:onIfAny = 11");
+       fPythia8->ReadString("5232:onMode = off");
+       fPythia8->ReadString("5232:onIfAny = 11");
 //      Omega_b -> e X
-       AliTPythia8::Instance()->ReadString("5332:onMode = off");
-       AliTPythia8::Instance()->ReadString("5332:onIfAny = 11");
+       fPythia8->ReadString("5332:onMode = off");
+       fPythia8->ReadString("5332:onIfAny = 11");
        break;
     case kDiElectron:
 //      Rho -> e+e-
-       AliTPythia8::Instance()->ReadString("113:onMode = off");
-       AliTPythia8::Instance()->ReadString("113:onIfAll = 11 11");
+       fPythia8->ReadString("113:onMode = off");
+       fPythia8->ReadString("113:onIfAll = 11 11");
 //      Eta -> e+e-
-       AliTPythia8::Instance()->ReadString("221:onMode = off");
-       AliTPythia8::Instance()->ReadString("221:onIfAll = 11 11");
+       fPythia8->ReadString("221:onMode = off");
+       fPythia8->ReadString("221:onIfAll = 11 11");
 //      omega -> e+e-
-       AliTPythia8::Instance()->ReadString("223:onMode = off");
-       AliTPythia8::Instance()->ReadString("223:onIfAll = 11 11");
+       fPythia8->ReadString("223:onMode = off");
+       fPythia8->ReadString("223:onIfAll = 11 11");
 //      phi -> e+e-
-       AliTPythia8::Instance()->ReadString("333:onMode = off");
-       AliTPythia8::Instance()->ReadString("333:onIfAll = 11 11");
+       fPythia8->ReadString("333:onMode = off");
+       fPythia8->ReadString("333:onIfAll = 11 11");
 //      J/Psi -> e+e-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 11 11");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 11 11");
 //      Psi' -> e+e-
-       AliTPythia8::Instance()->ReadString("100443:onMode = off");
-       AliTPythia8::Instance()->ReadString("100443:onIfAll = 11 11");
+       fPythia8->ReadString("100443:onMode = off");
+       fPythia8->ReadString("100443:onIfAll = 11 11");
 //      Ups -> e+e-
-       AliTPythia8::Instance()->ReadString("553:onMode = off");
-       AliTPythia8::Instance()->ReadString("553:onIfAll = 11 11");
+       fPythia8->ReadString("553:onMode = off");
+       fPythia8->ReadString("553:onIfAll = 11 11");
 //      Ups' -> e+e-
-       AliTPythia8::Instance()->ReadString("100553:onMode = off");
-       AliTPythia8::Instance()->ReadString("100553:onIfAll = 11 11");
+       fPythia8->ReadString("100553:onMode = off");
+       fPythia8->ReadString("100553:onIfAll = 11 11");
 //      Ups'' -> e+e-
-       AliTPythia8::Instance()->ReadString("200553:onMode = off");
-       AliTPythia8::Instance()->ReadString("200553:onIfAll = 11 11");
+       fPythia8->ReadString("200553:onMode = off");
+       fPythia8->ReadString("200553:onIfAll = 11 11");
        break;
     case kBJpsiDiMuon:
 //      B0   -> J/Psi (Psi') X   
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 443 100443");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 443 100443");
 //      B+/-   -> J/Psi (Psi') X   
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 443 100443");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 443 100443");
 //      B_s   -> J/Psi (Psi') X   
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 443 100443");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 443 100443");
 //      Lambda_b -> J/Psi (Psi') X   
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 443 100443");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 443 100443");
 //
 //      J/Psi -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 13 13");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 13 13");
 //      Psi' -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("100443:onMode = off");
-       AliTPythia8::Instance()->ReadString("100443:onIfAll = 13 13");
+       fPythia8->ReadString("100443:onMode = off");
+       fPythia8->ReadString("100443:onIfAll = 13 13");
        break;
     case kBPsiPrimeDiMuon:
 //      B0   -> Psi' X   
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 100443");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 100443");
 //      B+/-   -> Psi' X   
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 100443");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 100443");
 //      B_s   -> Psi'  X   
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 100443");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 100443");
 //      Lambda_b -> Psi' X   
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 100443");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 100443");
 //
 //      Psi' -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("100443:onMode = off");
-       AliTPythia8::Instance()->ReadString("100443:onIfAll = 13 13");
+       fPythia8->ReadString("100443:onMode = off");
+       fPythia8->ReadString("100443:onIfAll = 13 13");
        break;
     case kBJpsiDiElectron:
 //      B0   -> Psi X   
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 443");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 443");
 //      B+/-   -> Psi X   
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 443");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 443");
 //      B_s   -> Psi  X   
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 443");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 443");
 //      Lambda_b -> Psi X   
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 443");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 443");
 //
 //      Psi -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("443:onMode = off");
-       AliTPythia8::Instance()->ReadString("443:onIfAll = 11 11");
+       fPythia8->ReadString("443:onMode = off");
+       fPythia8->ReadString("443:onIfAll = 11 11");
 
        break;
     case kBJpsi:
 //      B0   -> Psi X   
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 443");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 443");
 //      B+/-   -> Psi X   
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 443");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 443");
 //      B_s   -> Psi  X   
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 443");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 443");
 //      Lambda_b -> Psi X   
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 443");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 443");
        break;
     case kBPsiPrimeDiElectron:
 //      B0   -> Psi' X   
-       AliTPythia8::Instance()->ReadString("511:onMode = off");
-       AliTPythia8::Instance()->ReadString("511:onIfAny = 100443");
+       fPythia8->ReadString("511:onMode = off");
+       fPythia8->ReadString("511:onIfAny = 100443");
 //      B+/-   -> Psi' X   
-       AliTPythia8::Instance()->ReadString("521:onMode = off");
-       AliTPythia8::Instance()->ReadString("521:onIfAny = 100443");
+       fPythia8->ReadString("521:onMode = off");
+       fPythia8->ReadString("521:onIfAny = 100443");
 //      B_s   -> Psi'  X   
-       AliTPythia8::Instance()->ReadString("531:onMode = off");
-       AliTPythia8::Instance()->ReadString("531:onIfAny = 100443");
+       fPythia8->ReadString("531:onMode = off");
+       fPythia8->ReadString("531:onIfAny = 100443");
 //      Lambda_b -> Psi' X   
-       AliTPythia8::Instance()->ReadString("5122:onMode = off");
-       AliTPythia8::Instance()->ReadString("5122:onIfAny = 100443");
+       fPythia8->ReadString("5122:onMode = off");
+       fPythia8->ReadString("5122:onIfAny = 100443");
 //
 //      Psi' -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("100443:onMode = off");
-       AliTPythia8::Instance()->ReadString("100443:onIfAll = 11 11");
+       fPythia8->ReadString("100443:onMode = off");
+       fPythia8->ReadString("100443:onIfAll = 11 11");
        break;
     case kPiToMu:
 //      pi -> mu nu
-       AliTPythia8::Instance()->ReadString("211:onMode = off");
-       AliTPythia8::Instance()->ReadString("211:onIfAny = 13");
+       fPythia8->ReadString("211:onMode = off");
+       fPythia8->ReadString("211:onIfAny = 13");
        break;
     case kKaToMu:
 //      K -> mu nu
-       AliTPythia8::Instance()->ReadString("321:onMode = off");
-       AliTPythia8::Instance()->ReadString("321:onIfAny = 13");
+       fPythia8->ReadString("321:onMode = off");
+       fPythia8->ReadString("321:onIfAny = 13");
        break;
     case kAllMuonic:
 //      pi/K -> mu
-       AliTPythia8::Instance()->ReadString("211:onMode = off");
-       AliTPythia8::Instance()->ReadString("211:onIfAny = 13");
-       AliTPythia8::Instance()->ReadString("321:onMode = off");
-       AliTPythia8::Instance()->ReadString("321:onIfAny = 13");
+       fPythia8->ReadString("211:onMode = off");
+       fPythia8->ReadString("211:onIfAny = 13");
+       fPythia8->ReadString("321:onMode = off");
+       fPythia8->ReadString("321:onIfAny = 13");
        break;
     case kWToMuon:
 //      W -> mu X
-       AliTPythia8::Instance()->ReadString("24:onMode = off");
-       AliTPythia8::Instance()->ReadString("24:onIfAny = 13");
+       fPythia8->ReadString("24:onMode = off");
+       fPythia8->ReadString("24:onIfAny = 13");
        break;
     case kWToCharm:
 //      W -> c X
-       AliTPythia8::Instance()->ReadString("24:onMode = off");
-       AliTPythia8::Instance()->ReadString("24:onIfAny = 4");
+       fPythia8->ReadString("24:onMode = off");
+       fPythia8->ReadString("24:onIfAny = 4");
        break;
     case kWToCharmToMuon:
 //      W -> c X
-       AliTPythia8::Instance()->ReadString("24:onMode = off");
-       AliTPythia8::Instance()->ReadString("24:onIfAny = 4");
+       fPythia8->ReadString("24:onMode = off");
+       fPythia8->ReadString("24:onIfAny = 4");
 //      D+- -> mu X
-       AliTPythia8::Instance()->ReadString("411:onMode = off");
-       AliTPythia8::Instance()->ReadString("411:onIfAll = 13");
+       fPythia8->ReadString("411:onMode = off");
+       fPythia8->ReadString("411:onIfAll = 13");
 //      D0 -> mu X
-       AliTPythia8::Instance()->ReadString("421:onMode = off");
-       AliTPythia8::Instance()->ReadString("421:onIfAll = 13");
+       fPythia8->ReadString("421:onMode = off");
+       fPythia8->ReadString("421:onIfAll = 13");
 //      D_s -> mu X
-       AliTPythia8::Instance()->ReadString("431:onMode = off");
-       AliTPythia8::Instance()->ReadString("431:onIfAll = 13");
+       fPythia8->ReadString("431:onMode = off");
+       fPythia8->ReadString("431:onIfAll = 13");
 //      Lambda_c -> mu X
-       AliTPythia8::Instance()->ReadString("4122:onMode = off");
-       AliTPythia8::Instance()->ReadString("4122:onIfAll = 13");
+       fPythia8->ReadString("4122:onMode = off");
+       fPythia8->ReadString("4122:onIfAll = 13");
 //      Sigma_c -> mu X
-       AliTPythia8::Instance()->ReadString("4132:onMode = off");
-       AliTPythia8::Instance()->ReadString("4132:onIfAll = 13");
+       fPythia8->ReadString("4132:onMode = off");
+       fPythia8->ReadString("4132:onIfAll = 13");
 //      Sigma_c -> mu X
-       AliTPythia8::Instance()->ReadString("4232:onMode = off");
-       AliTPythia8::Instance()->ReadString("4232:onIfAll = 13");
+       fPythia8->ReadString("4232:onMode = off");
+       fPythia8->ReadString("4232:onIfAll = 13");
 //      Omega_c -> mu X
-       AliTPythia8::Instance()->ReadString("4332:onMode = off");
-       AliTPythia8::Instance()->ReadString("4332:onIfAll = 13");
+       fPythia8->ReadString("4332:onMode = off");
+       fPythia8->ReadString("4332:onIfAll = 13");
        break;
     case kZDiMuon:
 //      Z -> mu+ mu-
-       AliTPythia8::Instance()->ReadString("23:onMode = off");
-       AliTPythia8::Instance()->ReadString("23:onIfAll = 13 13");
+       fPythia8->ReadString("23:onMode = off");
+       fPythia8->ReadString("23:onIfAll = 13 13");
        break;
     case kZDiElectron:
 //      Z -> e+ e-
-       AliTPythia8::Instance()->ReadString("23:onMode = off");
-       AliTPythia8::Instance()->ReadString("23:onIfAll = 11 11");
+       fPythia8->ReadString("23:onMode = off");
+       fPythia8->ReadString("23:onIfAll = 11 11");
        break;
     case kHadronicD:
        ForceHadronicD(1);
@@ -551,21 +562,29 @@ void AliDecayerPythia8::ForceDecay()
        break;
     case kPhiKK:
        // Phi-> K+ K-
-       AliTPythia8::Instance()->ReadString("333:onMode = off");
-       AliTPythia8::Instance()->ReadString("333:onIfAll = 321 321");
+       fPythia8->ReadString("333:onMode = off");
+       fPythia8->ReadString("333:onIfAll = 321 321");
        break;
     case kOmega:
        // Omega -> Lambda K
-       AliTPythia8::Instance()->ReadString("3334:onMode = off");
-       AliTPythia8::Instance()->ReadString("3334:onIfAll = 3122 321 ");
+       fPythia8->ReadString("3334:onMode = off");
+       fPythia8->ReadString("3334:onIfAll = 3122 321 ");
+       break;
     case kLambda:
        // Lambda -> p pi-
-       AliTPythia8::Instance()->ReadString("3122:onMode = off");
-       AliTPythia8::Instance()->ReadString("3122:onIfAll = 2212 211 ");
+       fPythia8->ReadString("3122:onMode = off");
+       fPythia8->ReadString("3122:onIfAll = 2212 211 ");
+       break;
+    case kBeautyUpgrade:
+        fPythia8->ReadString("5122:onMode = off");
+        fPythia8->ReadString("4122:onMode = off");
+       fPythia8->ReadString("5122:onIfAll = 4122");
+       fPythia8->ReadString("4122:onIfAll = 3122");
+       break;
     case kAll:
        break;
     case kNoDecay:
-       AliTPythia8::Instance()->ReadString("HadronLevel:Decay = off");
+       fPythia8->ReadString("HadronLevel:Decay = off");
        break;
     case kNoDecayHeavy:
     case kNoDecayBeauty:
@@ -582,7 +601,7 @@ Float_t AliDecayerPythia8::GetPartialBranchingRatio(Int_t ipart)
 {
     // Get the partial branching ration for the forced decay channels
     
-    Pythia8::Pythia* thePythia       = AliTPythia8::Instance()->Pythia8();
+    Pythia8::Pythia* thePythia       = fPythia8->Pythia8();
     Pythia8::ParticleData & table    = thePythia->particleData;
     Pythia8::ParticleDataEntry* pd   = table.particleDataEntryPtr(ipart);
 
@@ -603,7 +622,7 @@ Float_t AliDecayerPythia8::GetPartialBranchingRatio(Int_t ipart)
 Float_t AliDecayerPythia8::GetLifetime(Int_t kf)
 {
     // Return lifetime of particle
-    Pythia8::Pythia* thePythia       = AliTPythia8::Instance()->Pythia8();
+    Pythia8::Pythia* thePythia       = fPythia8->Pythia8();
     Pythia8::ParticleData& table     = thePythia->particleData;
     Float_t tau = table.tau0(kf);
     return (tau);
@@ -614,11 +633,11 @@ void  AliDecayerPythia8::SwitchOffHeavyFlavour()
     // Switch off heavy flavour production
     //
 // Maximum number of quark flavours used in pdf 
-    AliTPythia8::Instance()->ReadString("PDFinProcess:nQuarkIn = 3");
+    fPythia8->ReadString("PDFinProcess:nQuarkIn = 3");
 // Maximum number of flavors that can be used in showers
-    AliTPythia8::Instance()->ReadString("SpaceShower:nQuarkIn = 3");
-    AliTPythia8::Instance()->ReadString("TimeShower:nGammaToQuark = 3");
-    AliTPythia8::Instance()->ReadString("TimeShower:nGluonToQuark = 3");
+    fPythia8->ReadString("SpaceShower:nQuarkIn = 3");
+    fPythia8->ReadString("TimeShower:nGammaToQuark = 3");
+    fPythia8->ReadString("TimeShower:nGluonToQuark = 3");
 }
 
 
@@ -628,59 +647,59 @@ void AliDecayerPythia8::ForceHadronicD(Int_t optUse4Bodies)
 // Force golden D decay modes
 //
     // K* -> K pi
-    AliTPythia8::Instance()->ReadString("313:onMode = off");
-    AliTPythia8::Instance()->ReadString("313:onIfAll = 321 211");
+    fPythia8->ReadString("313:onMode = off");
+    fPythia8->ReadString("313:onIfAll = 321 211");
     // for Ds -> Phi pi+
-    AliTPythia8::Instance()->ReadString("333:onMode = off");
-    AliTPythia8::Instance()->ReadString("333:onIfAll = 321 321");
+    fPythia8->ReadString("333:onMode = off");
+    fPythia8->ReadString("333:onIfAll = 321 321");
     // for D0 -> rho0 pi+ k-
-    AliTPythia8::Instance()->ReadString("113:onMode = off");
-    AliTPythia8::Instance()->ReadString("113:onIfAll = 211 211");
+    fPythia8->ReadString("113:onMode = off");
+    fPythia8->ReadString("113:onIfAll = 211 211");
     // for Lambda_c -> Delta++ K-
-    AliTPythia8::Instance()->ReadString("2224:onMode = off");
-    AliTPythia8::Instance()->ReadString("2224:onIfAll = 2212 211");
+    fPythia8->ReadString("2224:onMode = off");
+    fPythia8->ReadString("2224:onIfAll = 2212 211");
     // for Lambda_c -> Lambda(1520) K-
-    AliTPythia8::Instance()->ReadString("3124:onMode = off");
-    AliTPythia8::Instance()->ReadString("3124:onIfAll = 2212 321");
+    fPythia8->ReadString("3124:onMode = off");
+    fPythia8->ReadString("3124:onIfAll = 2212 321");
 
 
-    AliTPythia8::Instance()->ReadString("411:onMode = off");
-    AliTPythia8::Instance()->ReadString("421:onMode = off");
-    AliTPythia8::Instance()->ReadString("431:onMode = off");
-    AliTPythia8::Instance()->ReadString("4112:onMode = off");
-    AliTPythia8::Instance()->ReadString("4122:onMode = off");
+    fPythia8->ReadString("411:onMode = off");
+    fPythia8->ReadString("421:onMode = off");
+    fPythia8->ReadString("431:onMode = off");
+    fPythia8->ReadString("4112:onMode = off");
+    fPythia8->ReadString("4122:onMode = off");
 
     // D+/- -> K pi pi 
-    AliTPythia8::Instance()->ReadString("411:onIfMatch = 321 211 211");
+    fPythia8->ReadString("411:onIfMatch = 321 211 211");
     // D+/- -> K* pi
-    AliTPythia8::Instance()->ReadString("411:onIfMatch = 313 211");
+    fPythia8->ReadString("411:onIfMatch = 313 211");
     // D0 -> K pi
-    AliTPythia8::Instance()->ReadString("421:onIfMatch = 321 211");
+    fPythia8->ReadString("421:onIfMatch = 321 211");
 
     if (optUse4Bodies) {
        // D0 -> K pi pi pi
-       AliTPythia8::Instance()->ReadString("421:onIfMatch = 321 211 211 211");
+       fPythia8->ReadString("421:onIfMatch = 321 211 211 211");
        // D0 -> K pi rho
-       AliTPythia8::Instance()->ReadString("421:onIfMatch = 321 211 113");
+       fPythia8->ReadString("421:onIfMatch = 321 211 113");
        // D0 -> K*0 pi pi
-       AliTPythia8::Instance()->ReadString("421:onIfMatch = 313 211 211");
+       fPythia8->ReadString("421:onIfMatch = 313 211 211");
     }
     
     // D_s -> K K*
-    AliTPythia8::Instance()->ReadString("431:onIfMatch = 321 313");
+    fPythia8->ReadString("431:onIfMatch = 321 313");
     // D_s -> Phi pi
-    AliTPythia8::Instance()->ReadString("431:onIfMatch = 333 211");
+    fPythia8->ReadString("431:onIfMatch = 333 211");
 
     // Lambda_c -> p K*
-    AliTPythia8::Instance()->ReadString("4122:onIfMatch = 2212 313");
+    fPythia8->ReadString("4122:onIfMatch = 2212 313");
     // Lambda_c -> Delta K
-    AliTPythia8::Instance()->ReadString("4122:onIfMatch = 2224 321");
+    fPythia8->ReadString("4122:onIfMatch = 2224 321");
     // Lambda_c -> Lambda(1520) pi
-    AliTPythia8::Instance()->ReadString("4122:onIfMatch = 3124 211");
+    fPythia8->ReadString("4122:onIfMatch = 3124 211");
     // Lambda_c -> p K pi
-    AliTPythia8::Instance()->ReadString("4122:onIfMatch = 2212 321 211");
+    fPythia8->ReadString("4122:onIfMatch = 2212 321 211");
     // Lambda_c -> Lambda pi 
-    AliTPythia8::Instance()->ReadString("4122:onIfMatch = 3122 211");
+    fPythia8->ReadString("4122:onIfMatch = 3122 211");
 
 }