Shadowing of variabled corrected.

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

diff --git a/TRD/AliTRDReconstructor.cxx b/TRD/AliTRDReconstructor.cxx
index b62397595b9f79b481fd04fccd0dbb8fb169afd2..4769387e31c28cb54bf91713c7235be1ff64f0f8 100644 (file)
--- a/TRD/AliTRDReconstructor.cxx
+++ b/TRD/AliTRDReconstructor.cxx
@@ -30,17 +30,28 @@
 #include "AliESDEvent.h"
 
 #include "AliTRDReconstructor.h"
-#include "AliTRDclusterizerV2.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
@@ -62,42 +73,6 @@ void AliTRDReconstructor::ConvertDigits(AliRawReader *rawReader
 
 }
 
-//_____________________________________________________________________________
-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;
-
-    // New (fast) cluster finder
-    AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
-    clusterer.Open(runLoader->GetFileName(),iEvent);
-    clusterer.Raw2ClustersChamber(rawReader);
-
-    clusterer.WriteClusters(-1);
-
-  }
-
-  loader->UnloadRecPoints();
-
-}
-
 //_____________________________________________________________________________
 void AliTRDReconstructor::Reconstruct(AliRawReader *rawReader
                                     , TTree *clusterTree) const
@@ -108,11 +83,14 @@ void AliTRDReconstructor::Reconstruct(AliRawReader *rawReader
 
   AliInfo("Reconstruct TRD clusters from RAW data [RawReader -> Cluster TTree]");
 
+       // TODO move it to rec.C. check TPC
+       if (!fgRecoParam) fgRecoParam = AliTRDrecoParam::GetLowFluxParam();
+
   rawReader->Reset();
   rawReader->Select("TRD");
 
   // New (fast) cluster finder
-  AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
+  AliTRDclusterizer clusterer("clusterer","TRD clusterizer");
   clusterer.OpenOutput(clusterTree);
   clusterer.SetAddLabels(kFALSE);
   clusterer.Raw2ClustersChamber(rawReader);
@@ -126,9 +104,13 @@ void AliTRDReconstructor::Reconstruct(TTree *digitsTree
   //
   // Reconstruct clusters
   //
+
   AliInfo("Reconstruct TRD clusters from Digits [Digit TTree -> Cluster TTree]");
 
-  AliTRDclusterizerV2 clusterer("clusterer","TRD clusterizer");
+       // TODO move it to rec.C. check TPC
+  if (!fgRecoParam) fgRecoParam = AliTRDrecoParam::GetLowFluxParam();
+
+  AliTRDclusterizer clusterer("clusterer","TRD clusterizer");
   clusterer.OpenOutput(clusterTree);
   clusterer.ReadDigits(digitsTree);
   clusterer.MakeClusters();
@@ -136,63 +118,17 @@ 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++) {
-    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
-{
-  //
-  // Fill ESD
-  //
-
-}
+  //return new AliTRDtracker(NULL);
 
-//_____________________________________________________________________________
-void AliTRDReconstructor::FillESD(AliRawReader* /*rawReader*/
-                               , TTree* /*clusterTree*/
-                               , AliESDEvent* /*esd*/) const
-{
-  //
-  // Fill ESD
-  //
+       // TODO move it to rec.C. check TPC
+       if (!fgRecoParam) fgRecoParam = AliTRDrecoParam::GetLowFluxParam();
+  return new AliTRDtrackerV1();
 
 }
 
@@ -206,13 +142,3 @@ void AliTRDReconstructor::FillESD(TTree* /*digitsTree*/
   //
 
 }
-
-//_____________________________________________________________________________
-void AliTRDReconstructor::FillESD(AliRunLoader* /*runLoader*/
-                               , AliESDEvent* /*esd*/) const
-{
-  //
-  // Fill ESD
-  //
-
-}