Added methods to list available reports and detectors. Changed Fill(..) method to...

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

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index 85a9c8ed84f9f98d3a0dbabfa068061455d7d826..d39b371c4ef6c94fb3362a9096cd203c4bcf9b51 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -27,10 +27,11 @@
 #include "AliRawReader.h"
 #include "AliLog.h"
 #include "AliESDTrdTrack.h"
-#include "AliESD.h"
+#include "AliESDEvent.h"
 
 #include "AliTRDReconstructor.h"
 #include "AliTRDclusterizerV1.h"
+#include "AliTRDclusterizerV2.h"
 #include "AliTRDtracker.h"
 #include "AliTRDpidESD.h"
 #include "AliTRDgtuTrack.h"
@@ -50,6 +51,8 @@ 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");
@@ -67,7 +70,7 @@ void AliTRDReconstructor::Reconstruct(AliRunLoader *runLoader
   // Reconstruct clusters
   //
 
-  AliInfo("Reconstruct TRD clusters from RAW data");
+  AliInfo("Reconstruct TRD clusters from RAW data [RunLoader, RawReader]");
 
   AliLoader *loader = runLoader->GetLoader("TRDLoader");
   loader->LoadRecPoints("recreate");
@@ -79,12 +82,22 @@ void AliTRDReconstructor::Reconstruct(AliRunLoader *runLoader
   rawReader->Select("TRD");
 
   for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
+
     if (!rawReader->NextEvent()) break;
-    AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+
+    // Old (slow) cluster finder
+    //AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+    //clusterer.Open(runLoader->GetFileName(),iEvent);
+    //clusterer.ReadDigits(rawReader);
+    //clusterer.MakeClusters();
+
+    // New (fast) cluster finder
+    AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
     clusterer.Open(runLoader->GetFileName(),iEvent);
-    clusterer.ReadDigits(rawReader);
-    clusterer.MakeClusters();
+    clusterer.Raw2ClustersChamber(rawReader);
+
     clusterer.WriteClusters(-1);
+
   }
 
   loader->UnloadRecPoints();
@@ -99,16 +112,22 @@ 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");
-  clusterer.OpenOutput(clusterTree);
-  clusterer.ReadDigits(rawReader);
-  clusterer.MakeClusters();
+  // Old (slow) cluster finder
+  //AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+  //clusterer.OpenOutput(clusterTree);
+  //clusterer.ReadDigits(rawReader);
+  //clusterer.MakeClusters();
 
+  // New (fast) cluster finder
+  AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
+  clusterer.OpenOutput(clusterTree);
+  clusterer.SetAddLabels(kFALSE);
+  clusterer.Raw2ClustersChamber(rawReader);
 }
 
 //_____________________________________________________________________________
@@ -118,12 +137,13 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
   //
   // Reconstruct clusters
   //
+  AliInfo("Reconstruct TRD clusters from Digits [Digit TTree -> Cluster TTree]");
 
-  AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+  //AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+  AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
   clusterer.OpenOutput(clusterTree);
   clusterer.ReadDigits(digitsTree);
   clusterer.MakeClusters();
-
 }
 
 //_____________________________________________________________________________
@@ -133,6 +153,7 @@ void AliTRDReconstructor::Reconstruct(AliRunLoader *runLoader) const
   // Reconstruct clusters
   //
 
+  AliInfo("Reconstruct TRD clusters [AliRunLoader]");
   AliLoader *loader = runLoader->GetLoader("TRDLoader");
   loader->LoadRecPoints("recreate");
 
@@ -141,6 +162,7 @@ void AliTRDReconstructor::Reconstruct(AliRunLoader *runLoader) const
 
   for (Int_t iEvent = 0; iEvent < nEvents; iEvent++) {
     AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
+    //AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
     clusterer.Open(runLoader->GetFileName(),iEvent);
     clusterer.ReadDigits();
     clusterer.MakeClusters();
@@ -167,54 +189,54 @@ AliTracker *AliTRDReconstructor::CreateTracker(AliRunLoader *runLoader) const
 //_____________________________________________________________________________
 void AliTRDReconstructor::FillESD(AliRunLoader* /*runLoader*/
                                , AliRawReader* /*rawReader*/
-                               , AliESD *esd) const
+                               , AliESDEvent* /*esd*/) const
 {
   //
   // Make PID
   //
 
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
+  //AliTRDpidESD trdPID;
+  //trdPID.MakePID(esd);
 
 }
 
 //_____________________________________________________________________________
 void AliTRDReconstructor::FillESD(AliRawReader* /*rawReader*/
                                , TTree* /*clusterTree*/
-                               , AliESD *esd) const
+                               , AliESDEvent* /*esd*/) const
 {
   //
   // Make PID
   //
 
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
+  //AliTRDpidESD trdPID;
+  //trdPID.MakePID(esd);
 
 }
 
 //_____________________________________________________________________________
 void AliTRDReconstructor::FillESD(TTree* /*digitsTree*/
                                , TTree* /*clusterTree*/
-                               , AliESD *esd) const
+                               , AliESDEvent* /*esd*/) const
 {
   //
   // Make PID
   //
 
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
+  //AliTRDpidESD trdPID;
+  //trdPID.MakePID(esd);
 
 }
 
 //_____________________________________________________________________________
 void AliTRDReconstructor::FillESD(AliRunLoader* /*runLoader*/
-                               , AliESD *esd) const
+                               , AliESDEvent* /*esd*/) const
 {
   //
   // Make PID
   //
 
-  AliTRDpidESD trdPID;
-  trdPID.MakePID(esd);
+  //AliTRDpidESD trdPID;
+  //trdPID.MakePID(esd);
 
 }