Changes to enable merging of ITS fast rec points. Although this class should be respo...

diff --git a/STEER/AliRunDigitizer.cxx b/STEER/AliRunDigitizer.cxx
index 15c292a95b934f0da2edc81de3359d8a308430b0..32eace15eaaa099cd7238955e8d3202c2a95508a 100644 (file)
--- a/STEER/AliRunDigitizer.cxx
+++ b/STEER/AliRunDigitizer.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.15  2002/04/09 13:38:47  jchudoba
+Add const to the filename argument
+
 Revision 1.14  2002/04/04 09:28:04  jchudoba
 Change default names of TPC trees. Use update instead of recreate for the output file. Overwrite the AliRunDigitizer object in the output if it exists.
 
@@ -157,6 +160,7 @@ AliRunDigitizer::AliRunDigitizer()
 // just set all pointers - data members to 0
   fOutput = 0;
   fTreeD = 0;
+  fTreeR = 0;
   fTreeDTPC = 0;
   fTreeDTRD = 0;
   fInputStreams = 0;
@@ -205,6 +209,7 @@ AliRunDigitizer::AliRunDigitizer(Int_t nInputStreams, Int_t sperb) : TTask("AliR
   fCombi = new AliMergeCombi(nInputStreams,sperb);
   fDebug = 0;
   fTreeD = 0;
+  fTreeR = 0;
   fTreeDTPC = 0;
   fTreeDTRD = 0;
   fTreeDTPCBaseName = "TreeD_75x40_100x60_150x60_";
@@ -391,6 +396,14 @@ void AliRunDigitizer::InitEvent()
     fTreeD->Write(0,TObject::kOverwrite);
   }
 
+// tree for ITS fast points
+  sprintf(treeName,"TreeR%d",fEvent);
+  fTreeR = static_cast<TTree*>(fOutput->Get(treeName));
+  if (!fTreeR) {
+    fTreeR = new TTree(treeName,"Reconstruction");
+    fTreeR->Write(0,TObject::kOverwrite);
+  }
+
 // special tree for TPC
   sprintf(treeName,"%s%d",fTreeDTPCBaseName,fEvent);
   fTreeDTPC = static_cast<TTree*>(fOutput->Get(treeName));
@@ -430,6 +443,10 @@ void AliRunDigitizer::FinishEvent()
     delete fTreeD;
     fTreeD = 0;
   }
+  if (fTreeR) {
+    delete fTreeR;
+    fTreeR = 0;
+  }
   if (fTreeDTPC) {
     delete fTreeDTPC;
     fTreeDTPC = 0;

diff --git a/STEER/AliRunDigitizer.h b/STEER/AliRunDigitizer.h
index 27792eec9da00c5f0df59b4805902dad14c01d3a..862d57b854b39fd8d217cfabd9f58aed67facd6f 100644 (file)
--- a/STEER/AliRunDigitizer.h
+++ b/STEER/AliRunDigitizer.h
@@ -61,6 +61,7 @@ public:
     fTreeDTPCBaseName = name;}
   TTree*    GetTreeDTPC() const {return fTreeDTPC;} 
   TTree*    GetTreeDTRD() const {return fTreeDTRD;} 
+  TTree*    GetTreeR() const {return fTreeR;} 
   void      Digitize(Option_t* option = 0);
   void      Exec(Option_t *option) {this->Digitize(option);}
   void      ExecuteTask(Option_t* option = 0);
@@ -109,6 +110,7 @@ private:
   TTree *           fTreeD;               //! output TreeD
   TTree *           fTreeDTPC;            //! output TreeD for TPC
   TTree *           fTreeDTRD;            //! output TreeD for TRD
+  TTree *           fTreeR;               //! output TreeR for ITS fast points
   Int_t             fNinputs;             // nr of input streams - can be taken from the TClonesArray dimension
   Int_t             fNinputsGiven;        // nr of input streams given by user
   TClonesArray *    fInputStreams;        // input streams