QA update by Sylwester

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

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index b0bbeed285b8566cbbf7d35ab75d1b5a1f3ca80a..fb506015059e20ac5b397203e0976cffc4697982 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -30,17 +30,25 @@
 #include "AliESDEvent.h"
 
 #include "AliTRDReconstructor.h"
-#include "AliTRDclusterizerV1.h"
+#include "AliTRDclusterizer.h"
 #include "AliTRDtracker.h"
 #include "AliTRDpidESD.h"
 #include "AliTRDgtuTrack.h"
 #include "AliTRDrawData.h"
 #include "AliTRDdigitsManager.h"
+#include "AliTRDtrackerV1.h"
+#include "AliTRDrecoParam.h"
 
 ClassImp(AliTRDReconstructor)
 
-Bool_t AliTRDReconstructor::fgkSeedingOn  = kFALSE;
-Int_t  AliTRDReconstructor::fgStreamLevel = 0;      // Stream (debug) level
+AliTRDrecoParam* AliTRDReconstructor::fgRecoParam = 0x0; 
+
+//_____________________________________________________________________________
+AliTRDReconstructor::~AliTRDReconstructor()                  { 
+       if(fgRecoParam) delete fgRecoParam;
+}
+
+
 
 //_____________________________________________________________________________
 void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
@@ -50,44 +58,15 @@ void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
   // Convert raw data digits into digit objects in a root tree
   //
 
+  AliInfo("Convert raw data digits into digit objects [RawReader -> Digit TTree]");
+
   AliTRDrawData rawData;
   rawReader->Reset();
   rawReader->Select("TRD");
   AliTRDdigitsManager *manager = rawData.Raw2Digits(rawReader);
   manager->MakeBranch(digitsTree);
   manager->WriteDigits();
-
-}
-
-//_____________________________________________________________________________
-void AliTRDReconstructor::Reconstruct(AliRunLoader *runLoader
-                                    , AliRawReader *rawReader) const
-{
-  //
-  // Reconstruct clusters
-  //
-
-  AliInfo("Reconstruct TRD clusters from RAW data");
-
-  AliLoader *loader = runLoader->GetLoader("TRDLoader");
-  loader->LoadRecPoints("recreate");
-
-  runLoader->CdGAFile();
-  Int_t nEvents = runLoader->GetNumberOfEvents();
-
-  rawReader->Reset();
-  rawReader->Select("TRD");
-
-  for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
-    if (!rawReader->NextEvent()) break;
-    AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
-    clusterer.Open(runLoader->GetFileName(),iEvent);
-    clusterer.ReadDigits(rawReader);
-    clusterer.MakeClusters();
-    clusterer.WriteClusters(-1);
-  }
-
-  loader->UnloadRecPoints();
+  delete manager;
 
 }
 
@@ -99,15 +78,17 @@ void AliTRDReconstructor::Reconstruct(AliRawReader *rawReader
   // Reconstruct clusters
   //
 
-  AliInfo("Reconstruct TRD clusters from RAW data");
+  AliInfo("Reconstruct TRD clusters from RAW data [RawReader -> Cluster TTree]");
+
 
   rawReader->Reset();
   rawReader->Select("TRD");
 
-  AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+  // New (fast) cluster finder
+  AliTRDclusterizer clusterer("clusterer","TRD clusterizer");
   clusterer.OpenOutput(clusterTree);
-  clusterer.ReadDigits(rawReader);
-  clusterer.MakeClusters();
+  clusterer.SetAddLabels(kFALSE);
+  clusterer.Raw2ClustersChamber(rawReader);
 
 }
 
@@ -119,7 +100,9 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
   // Reconstruct clusters
   //
 
-  AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+  AliInfo("Reconstruct TRD clusters from Digits [Digit TTree -> Cluster TTree]");
+
+  AliTRDclusterizer clusterer("clusterer","TRD clusterizer");
   clusterer.OpenOutput(clusterTree);
   clusterer.ReadDigits(digitsTree);
   clusterer.MakeClusters();
@@ -127,94 +110,25 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
 }
 
 //_____________________________________________________________________________
-void AliTRDReconstructor::Reconstruct(AliRunLoader *runLoader) const
-{
-  //
-  // Reconstruct clusters
-  //
-
-  AliLoader *loader = runLoader->GetLoader("TRDLoader");
-  loader->LoadRecPoints("recreate");
-
-  runLoader->CdGAFile();
-  Int_t nEvents = runLoader->GetNumberOfEvents();
-
-  for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
-    AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
-    clusterer.Open(runLoader->GetFileName(),iEvent);
-    clusterer.ReadDigits();
-    clusterer.MakeClusters();
-    clusterer.WriteClusters(-1);
-  }
-
-  loader->UnloadRecPoints();
-
-}
-
-//_____________________________________________________________________________
-AliTracker *AliTRDReconstructor::CreateTracker(AliRunLoader *runLoader) const
+AliTracker *AliTRDReconstructor::CreateTracker() const
 {
   //
   // Create a TRD tracker
   //
 
-  runLoader->CdGAFile();
-
-  return new AliTRDtracker(gFile);
-
-}
-
-//_____________________________________________________________________________
-void AliTRDReconstructor::FillESD(AliRunLoader* /*runLoader*/
-                               , AliRawReader* /*rawReader*/
-                               , AliESDEvent *esd) const
-{
-  //
-  // Make PID
-  //
+  //return new AliTRDtracker(NULL);
 
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
-
-}
-
-//_____________________________________________________________________________
-void AliTRDReconstructor::FillESD(AliRawReader* /*rawReader*/
-                               , TTree* /*clusterTree*/
-                               , AliESDEvent *esd) const
-{
-  //
-  // Make PID
-  //
-
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
+  return new AliTRDtrackerV1();
 
 }
 
 //_____________________________________________________________________________
 void AliTRDReconstructor::FillESD(TTree* /*digitsTree*/
                                , TTree* /*clusterTree*/
-                               , AliESDEvent *esd) const
+                               , AliESDEvent* /*esd*/) const
 {
   //
-  // Make PID
+  // Fill ESD
   //
 
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
-
-}
-
-//_____________________________________________________________________________
-void AliTRDReconstructor::FillESD(AliRunLoader* /*runLoader*/
-                               , AliESDEvent *esd) const
-{
-  //
-  // Make PID
-  //
-
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
-
 }