X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFReconstructor.cxx;h=bdbf7e1898b55721855372b4f86ab4f67d362b76;hb=06688fb6214e724149bb06567f6e5cbe5ca32866;hp=560b13452c2f14a11424c24188e0ec07a700065b;hpb=e3bd5504b51dc00636549553dbd3587a42ac2fb1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFReconstructor.cxx b/TOF/AliTOFReconstructor.cxx
index 560b13452c2..bdbf7e1898b 100644
--- a/TOF/AliTOFReconstructor.cxx
+++ b/TOF/AliTOFReconstructor.cxx
@@ -61,26 +61,6 @@ AliTOFReconstructor::AliTOFReconstructor()
   if(!fTOFcalib->ReadParOfflineFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
 }
 
-//------------------------------------------------------------------------
-AliTOFReconstructor::AliTOFReconstructor(const AliTOFReconstructor &source)
-  : AliReconstructor(),
-    fTOFcalib(0)
-{
-//
-// copy ctor
-//
-  this->fTOFcalib=source.fTOFcalib;
-}
-
-//------------------------------------------------------------------------
-AliTOFReconstructor & AliTOFReconstructor::operator=(const AliTOFReconstructor &source)
-{
-//
-// assignment op.
-//
-  this->fTOFcalib=source.fTOFcalib;
-  return *this;
-}
 //_____________________________________________________________________________
 AliTOFReconstructor::~AliTOFReconstructor() 
 {
@@ -98,14 +78,28 @@ void AliTOFReconstructor::Reconstruct(AliRawReader *rawReader,
   // reconstruct clusters from Raw Data
   //
 
-  TString selectedClusterFinder = GetOption();
+  TString optionString = GetOption();
   // use V1 cluster finder if selected
-  if (selectedClusterFinder.Contains("NCF")) {
+  if (optionString.Contains("ClusterizerV1")) {
     static AliTOFClusterFinderV1 tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV0"))
+      tofClus.SetDecoderVersion(0);
+    else
+      tofClus.SetDecoderVersion(1);
+    
     tofClus.Digits2RecPoints(rawReader, clustersTree);
   }
   else {
     static AliTOFClusterFinder tofClus(fTOFcalib);
+    
+    // decoder version option
+    if (optionString.Contains("DecoderV0"))
+      tofClus.SetDecoderVersion(0);
+    else
+      tofClus.SetDecoderVersion(1);
+
     tofClus.Digits2RecPoints(rawReader, clustersTree);
   }
 
@@ -121,14 +115,28 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
 
   AliDebug(2,Form("Global Event loop mode: Creating Recpoints from Digits Tree")); 
 
-  TString selectedClusterFinder = GetOption();
+  TString optionString = GetOption();
   // use V1 cluster finder if selected
-  if (selectedClusterFinder.Contains("NCF")) {
+  if (optionString.Contains("ClusterizerV1")) {
     static AliTOFClusterFinderV1 tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV0"))
+      tofClus.SetDecoderVersion(0);
+    else
+      tofClus.SetDecoderVersion(1);
+    
     tofClus.Digits2RecPoints(digitsTree, clustersTree);
   }
   else {
     static AliTOFClusterFinder tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV0"))
+      tofClus.SetDecoderVersion(0);
+    else
+      tofClus.SetDecoderVersion(1);
+    
     tofClus.Digits2RecPoints(digitsTree, clustersTree);
   }
 
@@ -140,14 +148,28 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
 
   AliDebug(2,Form("Global Event loop mode: Converting Raw Data to a Digits Tree")); 
 
-  TString selectedClusterFinder = GetOption();
+  TString optionString = GetOption();
   // use V1 cluster finder if selected
-  if (selectedClusterFinder.Contains("NCF")) {
+  if (optionString.Contains("ClusterizerV1")) {
     static AliTOFClusterFinderV1 tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV0"))
+      tofClus.SetDecoderVersion(0);
+    else
+      tofClus.SetDecoderVersion(1);
+    
     tofClus.Raw2Digits(reader, digitsTree);
   }
   else {
     static AliTOFClusterFinder tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV0"))
+      tofClus.SetDecoderVersion(0);
+    else
+      tofClus.SetDecoderVersion(1);
+    
     tofClus.Raw2Digits(reader, digitsTree);
   }
 
@@ -156,12 +178,26 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
 //_____________________________________________________________________________
 AliTracker* AliTOFReconstructor::CreateTracker() const
 {
-// create a TOF tracker
+
+  // 
+  // create a TOF tracker using 
+  // TOF Reco Param collected by STEER
+  //
 
   TString selectedTracker = GetOption();
+ 
+  AliTracker *tracker;
   // use MI tracker if selected
-  if (selectedTracker.Contains("MI")) return new AliTOFtrackerMI();
-  if (selectedTracker.Contains("V1")) return new AliTOFtrackerV1();
-  return new AliTOFtracker();
+  if (selectedTracker.Contains("TrackerMI")) {
+    tracker = new AliTOFtrackerMI();
+  }
+  // use V1 tracker if selected
+  else if (selectedTracker.Contains("TrackerV1")) {
+    tracker =  new AliTOFtrackerV1();
+  }
+  else {
+    tracker = new AliTOFtracker();
+  }
+  return tracker;
 
 }