Fixing trunk compilation

[u/mrichter/AliRoot.git] / PWG1 / AliGenInfoMaker.cxx

diff --git a/PWG1/AliGenInfoMaker.cxx b/PWG1/AliGenInfoMaker.cxx
index 884e433b175e749deeb1b9a76c3869215f709228..1ba1572c7e14e58ee8c58f34ee1e9378012a2b22 100644 (file)
--- a/PWG1/AliGenInfoMaker.cxx
+++ b/PWG1/AliGenInfoMaker.cxx
@@ -42,6 +42,7 @@ t->Exec();
 #include "TTree.h"
 #include "TStopwatch.h"
 #include "TParticle.h"
+#include "TDatabasePDG.h"
 
 //ALIROOT includes
 #include "AliMCEvent.h"
@@ -146,7 +147,7 @@ AliGenInfoMaker::AliGenInfoMaker(const char * fnGalice, const char* fnRes,
   //
   fLoader = AliRunLoader::Open(fnGalice);
   if (gAlice){
-    delete gAlice->GetRunLoader();
+    delete AliRunLoader::Instance();
     delete gAlice;
     gAlice = 0x0;
   }
@@ -692,7 +693,8 @@ Int_t AliGenInfoMaker::TreeTRLoop()
     if (part->R()>250.) continue;
     if (TMath::Abs(part->Vz())>250.) continue;
     if (TMath::Abs(part->Pz()/part->Pt())>2.5) continue;     
-    AliMCInfo * info = MakeInfo(ipart); 
+    //AliMCInfo * info = ;
+    MakeInfo(ipart); 
   }
   //
   //
@@ -713,11 +715,11 @@ Int_t AliGenInfoMaker::TreeTRLoop()
       //
       if (trackRef->DetectorId()== AliTrackReference::kTPC){
        //
-       Int_t label = trackRef->GetTrack();      
-       AliMCInfo * info = GetInfo(label);
+       Int_t label1 = trackRef->GetTrack();      
+       AliMCInfo * info = GetInfo(label1);
        if (!info && trackRef->Pt()<fTPCPtCut) continue;
        if (!info) {
-         info = MakeInfo(label);
+         info = MakeInfo(label1);
        }
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
@@ -729,10 +731,10 @@ Int_t AliGenInfoMaker::TreeTRLoop()
       //
       if (trackRef->DetectorId()== AliTrackReference::kITS){
        //
-       Int_t label = trackRef->GetTrack();      
-       AliMCInfo * info = GetInfo(label);
+       Int_t label1 = trackRef->GetTrack();      
+       AliMCInfo * info = GetInfo(label1);
        if (!info && trackRef->Pt()<fITSPtCut) continue;
-       if (!info) info = MakeInfo(label);
+       if (!info) info = MakeInfo(label1);
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
        TClonesArray & arr = *(info->fITSReferences);
@@ -743,10 +745,10 @@ Int_t AliGenInfoMaker::TreeTRLoop()
       //
       if (trackRef->DetectorId()== AliTrackReference::kTRD){
        //
-       Int_t label = trackRef->GetTrack();      
-       AliMCInfo * info = GetInfo(label);
+       Int_t label1 = trackRef->GetTrack();      
+       AliMCInfo * info = GetInfo(label1);
        if (!info&&trackRef->P()<fTRDPtCut) continue;
-       if (!info) info = MakeInfo(label);
+       if (!info) info = MakeInfo(label1);
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
        TClonesArray & arr = *(info->fTRDReferences);
@@ -757,10 +759,10 @@ Int_t AliGenInfoMaker::TreeTRLoop()
       //
       if (trackRef->DetectorId()== AliTrackReference::kTOF){
        //
-       Int_t label = trackRef->GetTrack();      
-       AliMCInfo * info = GetInfo(label);
+       Int_t label1 = trackRef->GetTrack();      
+       AliMCInfo * info = GetInfo(label1);
        if (!info&&trackRef->P()<fTOFPtCut) continue;
-       if (!info) info = MakeInfo(label);
+       if (!info) info = MakeInfo(label1);
        if (!info) continue;
        info->fPrimPart =  iPrimPart;
        TClonesArray & arr = *(info->fTOFReferences);