Fix for Savannah bug report 59287

[u/mrichter/AliRoot.git] / STEER / AliRun.cxx

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 45c039a072153f3ea0694274391d3710c3b2fc7f..fd87811d87027fd68498789897e5c376684858f3 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -65,8 +65,7 @@ ClassImp(AliRun)
 
 //_______________________________________________________________________
 AliRun::AliRun():
-  fRun(-1),
-  fEvent(0),
+//  fRun(-1),
   fEventNrInRun(-1),
   fModules(0),
   fMCApp(0),
@@ -91,8 +90,6 @@ AliRun::AliRun():
 //_____________________________________________________________________________
 AliRun::AliRun(const char *name, const char *title):
   TNamed(name,title),
-  fRun(-1),
-  fEvent(0),
   fEventNrInRun(-1),
   fModules(new TObjArray(77)), // Support list for the Detectors
   fMCApp(new AliMC(GetName(),GetTitle())),
@@ -279,7 +276,7 @@ Int_t AliRun::GetEvent(Int_t event)
 /****       R  E  L  O  A  D          ****/
 /*****************************************/
 
-  AliRunLoader::GetRunLoader()->GetEvent(event);
+  AliRunLoader::Instance()->GetEvent(event);
 
 /*****************************************/ 
 /****  P O S T    R E L O A D I N G   ****/
@@ -293,7 +290,7 @@ Int_t AliRun::GetEvent(Int_t event)
      detector->SetTreeAddress();
    }
  
-  return AliRunLoader::GetRunLoader()->GetHeader()->GetNtrack();
+  return AliRunLoader::Instance()->GetHeader()->GetNtrack();
 }
 
 //_______________________________________________________________________
@@ -309,7 +306,7 @@ void AliRun::Hits2Digits(const char *selected)
 
    // Convert Hits to sumable digits
    // 
-   for (Int_t nevent=0; nevent<AliRunLoader::GetRunLoader()->TreeE()->GetEntries(); nevent++) {
+   for (Int_t nevent=0; nevent<AliRunLoader::Instance()->TreeE()->GetEntries(); nevent++) {
      GetEvent(nevent);
      Hits2SDigits(selected);
      SDigits2Digits(selected);
@@ -410,7 +407,7 @@ void AliRun::Streamer(TBuffer &R__b)
 
 void AliRun::SetGenEventHeader(AliGenEventHeader* header)
 {
-  AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(header);
+  AliRunLoader::Instance()->GetHeader()->SetGenEventHeader(header);
 }