Changed AliRunLoader::GetRunLoader() into AliRunLoader::Instance()

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

diff --git a/STEER/AliRunLoader.cxx b/STEER/AliRunLoader.cxx
index 5250242ac36d62647d7238512f6c3c9caa2e9379..a5d8a4d8275aa5a14ba8929390af0e2ea8da8f96 100644 (file)
--- a/STEER/AliRunLoader.cxx
+++ b/STEER/AliRunLoader.cxx
@@ -49,7 +49,6 @@
 #include <TBranch.h>
 #include <TFile.h>
 #include <TFolder.h>
-#include <TGeometry.h>
 #include <TObjArray.h>
 #include <TString.h>
 class TTask;
@@ -87,6 +86,7 @@ const TString AliRunLoader::fgkDefaultTriggerFileName("Trigger.root");
 AliRunLoader::AliRunLoader():
  fLoaders(0x0),
  fEventFolder(0x0),
+ fRun(-1),
  fCurrentEvent(0),
  fGAFile(0x0),
  fHeader(0x0),
@@ -106,6 +106,7 @@ AliRunLoader::AliRunLoader(const char* eventfoldername):
  TNamed(fgkRunLoaderName,fgkRunLoaderName),
  fLoaders(new TObjArray()),
  fEventFolder(0x0),
+ fRun(-1),
  fCurrentEvent(0),
  fGAFile(0x0),
  fHeader(0x0),
@@ -122,27 +123,6 @@ AliRunLoader::AliRunLoader(const char* eventfoldername):
 }
 /**************************************************************************/
 
-AliRunLoader::AliRunLoader(const AliRunLoader &rl):
- TNamed(rl),
- fLoaders(0x0),
- fEventFolder(0x0),
- fCurrentEvent(0),
- fGAFile(0x0),
- fHeader(0x0),
- fStack(0x0),
- fCTrigger(0x0),
- fKineDataLoader(0x0),
- fTrackRefsDataLoader(0x0),
- fNEventsPerFile(0),
- fUnixDirName(".")
-{
-  //
-  // Copy ctor
-  //
-  rl.Copy(*this);
-}
-/**************************************************************************/
-
 AliRunLoader::~AliRunLoader()
 {
 //dtor
@@ -210,12 +190,7 @@ AliRunLoader::AliRunLoader(TFolder* topfolder):
  fEventFolder->Add(this);//put myself to the folder to accessible for all
   
 }
-/**************************************************************************/
 
-void AliRunLoader::Copy(TObject &) const 
-{
-  AliFatal("Not implemented");
-}
 /**************************************************************************/
 
 Int_t AliRunLoader::GetEvent(Int_t evno)
@@ -261,15 +236,6 @@ Int_t AliRunLoader::GetEvent(Int_t evno)
   //Reload stack (If header was loaded)
   if (TreeE()) fStack = GetHeader()->Stack();
   //Set event folder in stack (it does not mean that we read kinematics from file)
-  if (fStack) 
-   { 
-     fStack->SetEventFolderName(fEventFolder->GetName());
-   }
-  else
-   {
-     AliWarning("Stack not found in header");
-   }
-
    if( GetTrigger() && TreeCT() ) {
       retval = TreeCT()->GetEvent(fCurrentEvent);
       if ( retval < 0 )      {
@@ -303,6 +269,8 @@ Int_t AliRunLoader::GetEvent(Int_t evno)
 
   if (fStack && fKineDataLoader->GetBaseLoader(0)->IsLoaded())
     {
+       fStack->ConnectTree(TreeK());
+       
       if (fStack->GetEvent() == kFALSE)
        {
          AliError(Form("Error occured while GetEvent for Stack. Event %d",evno));
@@ -568,8 +536,10 @@ void AliRunLoader::MakeHeader()
         fStack = fHeader->Stack(); //should be safe - if we created Stack, header returns pointer to the same object
         if (fStack)
          {
-           fStack->SetEventFolderName(fEventFolder->GetName());
-           if (TreeK()) fStack->GetEvent();
+           if (TreeK()) {
+              fStack->ConnectTree(TreeK());
+              fStack->GetEvent();
+          }
          }
         else
         {
@@ -587,7 +557,6 @@ void AliRunLoader::MakeStack()
   if(fStack == 0x0)
    { 
      fStack = new AliStack(10000);
-     fStack->SetEventFolderName(fEventFolder->GetName());
    }
 }
 /**************************************************************************/
@@ -616,21 +585,23 @@ void AliRunLoader::MakeTree(Option_t *option)
   const char *oK  = strstr(option,"K");  //Kine
   const char *oE  = strstr(option,"E");  //Header
   const char *oGG = strstr(option,"GG"); //Central TriGGer
-
-  if(oK && !TreeK())
-   { 
-     if (fKineDataLoader->GetBaseLoader(0)->IsLoaded() == kFALSE)
+  
+  if(oK)
+  { 
+      if (fKineDataLoader->GetBaseLoader(0)->IsLoaded() == kFALSE)
       {
-        AliError("Load Kinematics first");
+         AliError("Load Kinematics first");
       }
-     else
+      else
       {
-        fKineDataLoader->MakeTree();
-        MakeStack();
-        fStack->ConnectTree();
-        WriteKinematics("OVERWRITE");
-     }
-   }
+         if (!TreeK()) {
+             fKineDataLoader->MakeTree();
+             MakeStack();
+         } 
+         fStack->ConnectTree(TreeK());
+         WriteKinematics("OVERWRITE");
+      }
+  } // TreeK
   
   if(oE && !TreeE())
    { 
@@ -795,7 +766,8 @@ Int_t AliRunLoader::LoadKinematics(Option_t* option)
   }
  if (fStack) 
   {
-    retval = fStack->GetEvent();
+      fStack->ConnectTree(TreeK());
+      retval = fStack->GetEvent();
     if ( retval == kFALSE)
      {
        AliError("Error occured while loading kinamatics tree.");
@@ -917,21 +889,6 @@ AliRun* AliRunLoader::GetAliRun() const
 }
 /**************************************************************************/
 
-Int_t AliRunLoader::WriteGeometry(Option_t* /*opt*/)
-{
-//writes geometry to the file
-  fGAFile->cd();
-  TGeometry* geo = GetAliRun()->GetGeometry();
-  if (geo == 0x0)
-   {
-     AliError("Can not get geometry from gAlice");
-     return 1;
-   }
-  geo->Write();
-  return 0;
-}
-/**************************************************************************/
-
 Int_t AliRunLoader::WriteHeader(Option_t* opt)
 {
 //writes treeE
@@ -1189,7 +1146,6 @@ Int_t AliRunLoader::SetEventFolderName(const TString& name)
   fEventFolder = AliConfig::Instance()->BuildEventFolder(name,"Event Folder");
   fEventFolder->Add(this);//put myself to the folder to accessible for all
   
-  if (Stack()) Stack()->SetEventFolderName(fEventFolder->GetName());
   TIter next(fLoaders);
   AliLoader *loader;
   while((loader = (AliLoader*)next()))