Major commit related to steering of the reco parameters: AliDAQ and trigger classes...

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

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index 58ea95564b65d281f7911694564d04a58bb3df22..d08cd08fd6e643b672f6139399d2f129266aa4c1 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -30,19 +30,22 @@
 #include "AliESDEvent.h"
 
 #include "AliTRDReconstructor.h"
-#include "AliTRDclusterizerV1.h"
-#include "AliTRDclusterizerV2.h"
-//#include "AliTRDclusterizerV2xMP.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
+//_____________________________________________________________________________
+AliTRDReconstructor::~AliTRDReconstructor()                  { 
+}
+
+
 
 //_____________________________________________________________________________
 void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
@@ -60,48 +63,7 @@ void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
   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 [RunLoader, RawReader]");
-
-  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;
-
-    // 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.Raw2ClustersChamber(rawReader);
-
-    clusterer.WriteClusters(-1);
-
-  }
-
-  loader->UnloadRecPoints();
+  delete manager;
 
 }
 
@@ -115,17 +77,12 @@ void AliTRDReconstructor::Reconstruct(AliRawReader *rawReader
 
   AliInfo("Reconstruct TRD clusters from RAW data [RawReader -> Cluster TTree]");
 
+
   rawReader->Reset();
   rawReader->Select("TRD");
 
-  // 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");
+  AliTRDclusterizer clusterer("clusterer","TRD clusterizer");
   clusterer.OpenOutput(clusterTree);
   clusterer.SetAddLabels(kFALSE);
   clusterer.Raw2ClustersChamber(rawReader);
@@ -139,10 +96,10 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
   //
   // Reconstruct clusters
   //
+
   AliInfo("Reconstruct TRD clusters from Digits [Digit TTree -> Cluster TTree]");
 
-  AliTRDclusterizerV1 clusterer("clusterer","TRD clusterizer");
-  //AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
+  AliTRDclusterizer clusterer("clusterer","TRD clusterizer");
   clusterer.OpenOutput(clusterTree);
   clusterer.ReadDigits(digitsTree);
   clusterer.MakeClusters();
@@ -150,70 +107,15 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
 }
 
 //_____________________________________________________________________________
-void AliTRDReconstructor::Reconstruct(AliRunLoader *runLoader) const
-{
-  //
-  // Reconstruct clusters
-  //
-
-  AliInfo("Reconstruct TRD clusters [AliRunLoader]");
-  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");
-    //AliTRDclusterizerV2 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
-  //
-
-  //AliTRDpidESD trdPID;
-  //trdPID.MakePID(esd);
-
-}
-
-//_____________________________________________________________________________
-void AliTRDReconstructor::FillESD(AliRawReader* /*rawReader*/
-                               , TTree* /*clusterTree*/
-                               , AliESDEvent* /*esd*/) const
-{
-  //
-  // Make PID
-  //
+  //return new AliTRDtracker(NULL);
 
-  //AliTRDpidESD trdPID;
-  //trdPID.MakePID(esd);
+  return new AliTRDtrackerV1();
 
 }
 
@@ -223,23 +125,7 @@ void AliTRDReconstructor::FillESD(TTree* /*digitsTree*/
                                , 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);
-
 }