Addoption of new ESDtrack (M.Ivanov)

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

diff --git a/STEER/TTreeStream.cxx b/STEER/TTreeStream.cxx
index 690164465ed256acaf6c787708ccf78fedff1ac3..a09744ecbc8ec87706d275ef458cd5cdf5a01221 100644 (file)
--- a/STEER/TTreeStream.cxx
+++ b/STEER/TTreeStream.cxx
@@ -1,7 +1,23 @@
-#include "TObjArray.h"
+//
+//  marian.ivanov@cern.ch
+//
+//  ------------------------------------------------------------------------------------------------
+//  TTreeStream
+//  Standard stream (cout) like input for the tree
+//  Run and see TTreeStreamer::Test() - to see TTreeStreamer functionality
+//  ------------------------------------------------------------------------------------------------  
+//
+//  -------------------------------------------------------------------------------------------------
+//  TTreeSRedirector
+//  Redirect file to  different TTreeStreams  
+//  Run and see   TTreeSRedirector::Test() as an example of TTreeSRedirectorer functionality 
+// 
+
+/* $Id$ */
+
 #include "TFile.h"
+#include "TObjArray.h"
 #include "TTree.h"
-#include "TBrowser.h"
 #include "TTreeStream.h"
 
 
@@ -9,21 +25,6 @@ ClassImp(TTreeDataElement)
 ClassImp(TTreeStream)
 ClassImp(TTreeSRedirector)
 
-/*
-  marian.ivanov@cern.ch
-  //
-  ------------------------------------------------------------------------------------------------
-  TTreeStream
-  Standard stream (cout) like input for the tree
-  Run and see TTreeStreamer::Test() - to see TTreeStreamer functionality
-  ------------------------------------------------------------------------------------------------  
-  //
-  -------------------------------------------------------------------------------------------------
-  TTreeSRedirector
-  Redirect file to  different TTreeStreams  
-  Run and see   TTreeSRedirector::Test() as an example of TTreeSRedirectorer functionality 
-  // 
-*/
 
 
 void TTreeStream::Test()
@@ -122,22 +123,22 @@ void TTreeSRedirector::Test()
 }
 
 
-
-
-
-
-TTreeSRedirector::TTreeSRedirector(const char *fname){
+TTreeSRedirector::TTreeSRedirector(const char *fname) :
+  fFile(new TFile(fname,"recreate")),
+  fDataLayouts(0)
+{
   //
+  // Constructor
   //
-  fFile = new TFile(fname,"recreate");
   if (!fFile){
     fFile = new TFile(fname,"new");
   }
-  fDataLayouts =0;
 }
 
-TTreeSRedirector::~TTreeSRedirector(){
+TTreeSRedirector::~TTreeSRedirector()
+{
   //
+  // Destructor
   //
   Close();       //write the tree to the selected file
   fFile->Close();
@@ -210,49 +211,69 @@ void TTreeSRedirector::Close(){
     delete fDataLayouts;
     fDataLayouts=0;
   }
-  backup->cd();
+  if (backup) backup->cd();
 }
 
 
 
 //-------------------------------------------------------------
-TTreeDataElement:: TTreeDataElement(Char_t type){
+TTreeDataElement:: TTreeDataElement(Char_t type) :
+  TNamed(),
+  fType(type),
+  fDType(0),
+  fClass(0),
+  fPointer(0)
+{
+  //
   //
   //
-  fType   = type;
-  fDType  = 0;
-  fClass  = 0;
-  fPointer= 0;
 }
-TTreeDataElement:: TTreeDataElement(TDataType* type){
+
+TTreeDataElement:: TTreeDataElement(TDataType* type) :
+  TNamed(),
+  fType(0),
+  fDType(type),
+  fClass(0),
+  fPointer(0)
+{
+  //
   //
   //
-  fType   = 0;
-  fDType  = type;
-  fClass  = 0;
-  fPointer= 0;
 }
-TTreeDataElement:: TTreeDataElement(TClass* cl){
+
+TTreeDataElement:: TTreeDataElement(TClass* cl) :
+  TNamed(),
+  fType(0),
+  fDType(0),
+  fClass(cl),
+  fPointer(0)
+{
+  //
   //
   //
-  fType   = 0;
-  fDType  = 0;
-  fClass  = cl;
-  fPointer= 0;
 }
 
 //-------------------------------------------------------------------
-TTreeStream::TTreeStream(const char *treename):TNamed(treename,treename){
-  fElements =0;
-  fTree =0;
-  fCurrentIndex =0;
-  fNextName="";
-  fNextNameCounter=0;
-  fTree = new TTree(treename, treename);
+TTreeStream::TTreeStream(const char *treename):
+  TNamed(treename,treename),
+  fElements(0),
+  fBranches(0),
+  fTree(new TTree(treename, treename)),
+  fCurrentIndex(0),
+  fNextName(),
+  fNextNameCounter(),
+  fStatus(0)
+{
+  //
+  // Standard ctor
+  //
 }
 
 TTreeStream::~TTreeStream()
 {
+  //
+  // Class dtor
+  //
   fElements->Delete();
   fBranches->Clear();
   delete fElements;
@@ -261,12 +282,17 @@ TTreeStream::~TTreeStream()
 
 void TTreeStream::Close()
 {
+  //
+  // Flush data to disk and close
   //
   fTree->Write();
 }
 
 Int_t TTreeStream::CheckIn(Char_t type, void *pointer)
 {
+  //
+  // Insert object of given type
+  //
   if (!fElements) fElements = new TObjArray(1000);
   TTreeDataElement* element = (TTreeDataElement*)fElements->At(fCurrentIndex);
   if (!element) {
@@ -302,6 +328,7 @@ Int_t TTreeStream::CheckIn(Char_t type, void *pointer)
 
 Int_t TTreeStream::CheckIn(TObject *o){
   //
+  // Insert TObject
   //
   if (!o) return 0;
   if (!fElements) fElements = new TObjArray(1000);
@@ -339,6 +366,7 @@ Int_t TTreeStream::CheckIn(TObject *o){
 
 void TTreeStream::BuildTree(){
   //
+  // Build the Tree
   //
   if (fTree->GetEntries()>0) return;
   fTree = new TTree(GetName(),GetName());
@@ -357,7 +385,7 @@ void TTreeStream::BuildTree(){
     }
     if (element->fClass){
       if (element->fClass->GetBaseClass("TClonesArray")){
-       TBranch * br = fTree->Branch(bname1,&(element->fPointer));
+       TBranch * br = fTree->Branch(bname1,element->fClass->GetName(),&(element->fPointer));
        fBranches->AddAt(br,i);
       }else
        {
@@ -376,6 +404,7 @@ void TTreeStream::BuildTree(){
 
 void TTreeStream::Fill(){
   //
+  // Fill the tree
   //
   if (fTree) { 
     Int_t entries=fElements->GetEntriesFast();
@@ -394,7 +423,11 @@ void TTreeStream::Fill(){
   }
 }
 
-TTreeStream & TTreeStream::Endl(){
+TTreeStream & TTreeStream::Endl()
+{
+  //
+  // Perform pseudo endl operation
+  //
   if (fTree->GetNbranches()==0) BuildTree();
   Fill();
   fStatus =0;
@@ -406,9 +439,8 @@ TTreeStream & TTreeStream::Endl(){
 TTreeStream  &TTreeStream::operator<<(Char_t *name)
 {
   //
+  // Endl 
   //
-  //
-  //Endl 
   if (name[0]=='\n'){
     return Endl();
   }