Removal of memory small leaks.

[u/mrichter/AliRoot.git] / PYTHIA6 / AliGenPythiaPlus.cxx

diff --git a/PYTHIA6/AliGenPythiaPlus.cxx b/PYTHIA6/AliGenPythiaPlus.cxx
index 5579ebd84f138816b35bc03238936a36beacb28e..a254520a4ab9bc91253a697d99bd4141c048b5e4 100644 (file)
--- a/PYTHIA6/AliGenPythiaPlus.cxx
+++ b/PYTHIA6/AliGenPythiaPlus.cxx
@@ -399,6 +399,7 @@ void AliGenPythiaPlus::Init()
        fFlavorSelect    =   4; 
        break;
     case kPyBeauty:
+    case kPyBeautyJets:
     case kPyBeautyPbPbMNR:
     case kPyBeautypPbMNR:
     case kPyBeautyppMNR:
@@ -426,6 +427,7 @@ void AliGenPythiaPlus::Init()
     case kPyJpsi:
        fParentSelect[0] = 443;
        break;
+    case kPyMbAtlasTuneMC09:
     case kPyMbDefault:
     case kPyMb:
     case kPyMbWithDirectPhoton:
@@ -529,8 +531,8 @@ void AliGenPythiaPlus::Generate()
            }
            fNpartons = fPythia->GetNumberOfParticles();
        } else {
-           printf("Loading Event %d\n",AliRunLoader::GetRunLoader()->GetEventNumber());
-           fRL->GetEvent(AliRunLoader::GetRunLoader()->GetEventNumber());
+           printf("Loading Event %d\n",AliRunLoader::Instance()->GetEventNumber());
+           fRL->GetEvent(AliRunLoader::Instance()->GetEventNumber());
            fPythia->SetNumberOfParticles(0);
            fPythia->LoadEvent(fRL->Stack(), 0 , 1);
            fPythia->EditEventList(21);
@@ -931,7 +933,7 @@ Int_t  AliGenPythiaPlus::GenerateMB()
          if(mi<0) continue;
          mother = (TParticle*)fParticles.At(mi);
          mpdg=TMath::Abs(mother->GetPdgCode());
-         mpdgUpperFamily=(mpdg>1000 ? mpdg-1000 : mpdg-100); // keep e from c from b
+         mpdgUpperFamily=(mpdg>1000 ? mpdg+1000 : mpdg+100); // keep e from c from b
          if ( ParentSelected(mpdg) || 
              (fFlavorSelect==5 && ParentSelected(mpdgUpperFamily))) {
            if (KinematicSelection(partCheck,1)) {
@@ -1012,7 +1014,7 @@ Int_t  AliGenPythiaPlus::GenerateMB()
                if (fStack) {
                    particle = fStack->Particle(nt);
                } else {
-                   particle = gAlice->Stack()->Particle(nt);
+                   particle = AliRunLoader::Instance()->Stack()->Particle(nt);
                }
 //             particle->SetFirstDaughter(fPythia->GetK(2, i));
 //             particle->SetLastDaughter(fPythia->GetK(3, i));