Add(const ) function for Theo (Raphaelle)

[u/mrichter/AliRoot.git] / TRD / AliTRDReconstructor.cxx

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index 139b05b27ac2f3d5ce019186a2515e093d7b468e..1150ed46cb7bc6a052cbeab395b8a4a49563d7a0 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -40,9 +40,9 @@
 
 ClassImp(AliTRDReconstructor)
 
-TClonesArray *AliTRDReconstructor::fgClusters = 0x0;
-TClonesArray *AliTRDReconstructor::fgTracklets = 0x0;
-Char_t* AliTRDReconstructor::fgSteerNames[kNsteer] = {
+TClonesArray *AliTRDReconstructor::fgClusters = NULL;
+TClonesArray *AliTRDReconstructor::fgTracklets = NULL;
+Char_t const * AliTRDReconstructor::fgSteerNames[kNsteer] = {
   "DigitsConversion       "
  ,"Write Clusters         "
  ,"Write Online Tracklets "
@@ -51,7 +51,7 @@ Char_t* AliTRDReconstructor::fgSteerNames[kNsteer] = {
  ,"Process Online Tracklets"
  ,"Debug Streaming        "
 };
-Char_t* AliTRDReconstructor::fgSteerFlags[kNsteer] = {
+Char_t const * AliTRDReconstructor::fgSteerFlags[kNsteer] = {
   "dc"// digits conversion [false]
  ,"cw"// write clusters [true]
  ,"tw"// write online tracklets [false]
@@ -60,21 +60,23 @@ Char_t* AliTRDReconstructor::fgSteerFlags[kNsteer] = {
  ,"tp"// also use online tracklets for reconstruction [false]
  ,"deb"// Write debug stream [false]
 };
-Char_t* AliTRDReconstructor::fgTaskNames[AliTRDrecoParam::kTRDreconstructionTasks] = {
+Char_t const * AliTRDReconstructor::fgTaskNames[AliTRDrecoParam::kTRDreconstructionTasks] = {
   "Clusterizer"
  ,"Tracker"
  ,"PID"
 };
-Char_t* AliTRDReconstructor::fgTaskFlags[AliTRDrecoParam::kTRDreconstructionTasks] = {
+Char_t const * AliTRDReconstructor::fgTaskFlags[AliTRDrecoParam::kTRDreconstructionTasks] = {
   "cl"
  ,"tr"
  ,"pd"
 };
+Int_t AliTRDReconstructor::fgNTimeBins = -1;
 
 //_____________________________________________________________________________
 AliTRDReconstructor::AliTRDReconstructor()
   :AliReconstructor()
   ,fSteerParam(0)
+  ,fClusterizer(NULL)
 {
   // setting default "ON" steering parameters
   // owner of debug streamers 
@@ -87,20 +89,6 @@ AliTRDReconstructor::AliTRDReconstructor()
   memset(fDebugStream, 0, sizeof(TTreeSRedirector *) * AliTRDrecoParam::kTRDreconstructionTasks);
 }
 
-//_____________________________________________________________________________
-AliTRDReconstructor::AliTRDReconstructor(const AliTRDReconstructor &r)
-  :AliReconstructor(r)
-  ,fSteerParam(r.fSteerParam)
-{
-  //
-  // Copy constructor
-  //
-
-  memcpy(fDebugStream, r.fDebugStream, sizeof(TTreeSRedirector *) *AliTRDrecoParam::kTRDreconstructionTasks);
-  // ownership of debug streamers is not taken
-  CLRFLG(fSteerParam, kOwner);
-}
-
 //_____________________________________________________________________________
 AliTRDReconstructor::~AliTRDReconstructor()
 {
@@ -109,15 +97,23 @@ AliTRDReconstructor::~AliTRDReconstructor()
   //
 
   if(fgClusters) {
-    fgClusters->Delete(); delete fgClusters;
+    fgClusters->Delete();
+    delete fgClusters;
+    fgClusters = NULL;
   }
   if(fgTracklets) {
-    fgTracklets->Delete(); delete fgTracklets;
+    fgTracklets->Delete();
+    delete fgTracklets;
+    fgTracklets = NULL;
   }
   if(fSteerParam&kOwner){
     for(Int_t itask = 0; itask < AliTRDrecoParam::kTRDreconstructionTasks; itask++)
       if(fDebugStream[itask]) delete fDebugStream[itask];
   }
+  if(fClusterizer){
+    delete fClusterizer;
+    fClusterizer = NULL;
+  }
 }
 
 
@@ -129,6 +125,11 @@ void AliTRDReconstructor::Init(){
   SetOption(GetOption());
   Options(fSteerParam);
 
+  if(!fClusterizer){
+    fClusterizer = new AliTRDclusterizer(fgTaskNames[AliTRDrecoParam::kClusterizer], fgTaskNames[AliTRDrecoParam::kClusterizer]);
+    fClusterizer->SetReconstructor(this);
+  }
+  
   // Make Debug Streams when Debug Streaming
   if(IsDebugStreaming()){
     for(Int_t task = 0; task < AliTRDrecoParam::kTRDreconstructionTasks; task++){
@@ -153,7 +154,6 @@ void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
   AliTRDrawData rawData;
   rawReader->Reset();
   rawReader->Select("TRD");
-  rawData.OpenOutput();
   AliTRDrawStreamBase::SetRawStreamVersion(GetRecoParam()->GetRawStreamVersion()->Data());
   AliTRDdigitsManager *manager = rawData.Raw2Digits(rawReader);
   manager->MakeBranch(digitsTree);
@@ -177,23 +177,28 @@ void AliTRDReconstructor::Reconstruct(AliRawReader *rawReader
   rawReader->Select("TRD");
   AliTRDrawStreamBase::SetRawStreamVersion(GetRecoParam()->GetRawStreamVersion()->Data());
 
-  // New (fast) cluster finder
-  AliTRDclusterizer clusterer(fgTaskNames[AliTRDrecoParam::kClusterizer], fgTaskNames[AliTRDrecoParam::kClusterizer]);
-  clusterer.SetReconstructor(this);
-  clusterer.OpenOutput(clusterTree);
-  clusterer.OpenTrackletOutput();
-  clusterer.SetUseLabels(kFALSE);
-  clusterer.Raw2ClustersChamber(rawReader);
+  if(!fClusterizer){
+    AliFatal("Clusterizer not available!");
+    return;
+  }
+
+  fClusterizer->ResetRecPoints();
+
+  fClusterizer->OpenOutput(clusterTree);
+  fClusterizer->SetUseLabels(kFALSE);
+  fClusterizer->Raw2ClustersChamber(rawReader);
+  
+  fgNTimeBins = fClusterizer->GetNTimeBins();
   
   if(IsWritingClusters()) return;
 
   // take over ownership of clusters
-  fgClusters = clusterer.RecPoints();
-  clusterer.SetClustersOwner(kFALSE);
+  fgClusters = fClusterizer->RecPoints();
+  fClusterizer->SetClustersOwner(kFALSE);
 
   // take over ownership of online tracklets
-  fgTracklets = clusterer.TrackletsArray();
-  clusterer.SetTrackletsOwner(kFALSE);
+  fgTracklets = fClusterizer->TrackletsArray();
+  fClusterizer->SetTrackletsOwner(kFALSE);
 }
 
 //_____________________________________________________________________________
@@ -212,6 +217,8 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
   clusterer.ReadDigits(digitsTree);
   clusterer.MakeClusters();
 
+  fgNTimeBins = clusterer.GetNTimeBins();
+
   if(IsWritingClusters()) return;
 
   // take over ownership of clusters
@@ -221,6 +228,7 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
   // take over ownership of online tracklets
   fgTracklets = clusterer.TrackletsArray();
   clusterer.SetTrackletsOwner(kFALSE);
+
 }
 
 //_____________________________________________________________________________
@@ -248,7 +256,6 @@ void AliTRDReconstructor::FillESD(TTree* /*digitsTree*/
 
 }
 
-
 //_____________________________________________________________________________
 void AliTRDReconstructor::SetOption(Option_t *opt)
 {