Deleted erroneously added simlinks

[u/mrichter/AliRoot.git] / TOF / AliTOFReconstructor.cxx

diff --git a/TOF/AliTOFReconstructor.cxx b/TOF/AliTOFReconstructor.cxx
index cb6ab047fa06bac912086730019ad085cb16861c..a1fff1d00243ec1aeed1b845185639cd50c4c934 100644 (file)
--- a/TOF/AliTOFReconstructor.cxx
+++ b/TOF/AliTOFReconstructor.cxx
@@ -21,14 +21,15 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "TFile.h"
+#include <cstdlib>
+#include "TObjArray.h"
+#include "TString.h"
 
 #include "AliLog.h"
 #include "AliRawReader.h"
 
 #include "AliTOFClusterFinder.h"
-#include "AliTOFGeometry.h"
-#include "AliTOFGeometryV5.h"
+#include "AliTOFClusterFinderV1.h"
 #include "AliTOFcalib.h"
 #include "AliTOFtrackerMI.h"
 #include "AliTOFtracker.h"
@@ -39,56 +40,33 @@ class TTree;
 
 class AliESDEvent;
 
-extern TDirectory *gDirectory;
-extern TFile *gFile;
-
 ClassImp(AliTOFReconstructor)
 
  //____________________________________________________________________
 AliTOFReconstructor::AliTOFReconstructor() 
   : AliReconstructor(),
-    fTOFGeometry(0),
     fTOFcalib(0)
 {
 //
 // ctor
 //
+  
   //Retrieving the TOF calibration info  
-  fTOFGeometry = new AliTOFGeometryV5();
-  fTOFcalib    = new AliTOFcalib(fTOFGeometry);
-  if(!fTOFcalib->ReadParFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
-}
+  fTOFcalib    = new AliTOFcalib();
+  fTOFcalib->CreateCalObjects();
 
-//------------------------------------------------------------------------
-AliTOFReconstructor::AliTOFReconstructor(const AliTOFReconstructor &source)
-  : AliReconstructor(),
-    fTOFGeometry(0),
-    fTOFcalib(0)
-{
-//
-// copy ctor
-//
-  this->fTOFGeometry=source.fTOFGeometry;
-  this->fTOFcalib=source.fTOFcalib;
-}
+  if(!fTOFcalib->ReadParOnlineDelayFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
+  if(!fTOFcalib->ReadParOnlineStatusFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
 
-//------------------------------------------------------------------------
-AliTOFReconstructor & AliTOFReconstructor::operator=(const AliTOFReconstructor &source)
-{
-//
-// assignment op.
-//
-  this->fTOFGeometry=source.fTOFGeometry;
-  this->fTOFcalib=source.fTOFcalib;
-  return *this;
+  if(!fTOFcalib->ReadParOfflineFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
 }
+
 //_____________________________________________________________________________
 AliTOFReconstructor::~AliTOFReconstructor() 
 {
 //
 // dtor
 //
-  delete fTOFGeometry;
   delete fTOFcalib;
 }
 
@@ -96,10 +74,34 @@ AliTOFReconstructor::~AliTOFReconstructor()
 void AliTOFReconstructor::Reconstruct(AliRawReader *rawReader,
                                       TTree *clustersTree) const
 {
-// reconstruct clusters from Raw Data
-
-  AliTOFClusterFinder tofClus(fTOFcalib);
-  tofClus.Digits2RecPoints(rawReader, clustersTree);
+  //
+  // reconstruct clusters from Raw Data
+  //
+
+  TString optionString = GetOption();
+  // use V1 cluster finder if selected
+  if (optionString.Contains("ClusterizerV1")) {
+    static AliTOFClusterFinderV1 tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV1"))
+      tofClus.SetDecoderVersion(1);
+    else
+      tofClus.SetDecoderVersion(0);
+    
+    tofClus.Digits2RecPoints(rawReader, clustersTree);
+  }
+  else {
+    static AliTOFClusterFinder tofClus(fTOFcalib);
+    
+    // decoder version option
+    if (optionString.Contains("DecoderV1"))
+      tofClus.SetDecoderVersion(1);
+    else
+      tofClus.SetDecoderVersion(0);
+
+    tofClus.Digits2RecPoints(rawReader, clustersTree);
+  }
 
 }
 
@@ -107,11 +109,36 @@ void AliTOFReconstructor::Reconstruct(AliRawReader *rawReader,
 void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
                                       TTree *clustersTree) const
 {
-// reconstruct clusters from Raw Data
+  //
+  // reconstruct clusters from digits
+  //
 
   AliDebug(2,Form("Global Event loop mode: Creating Recpoints from Digits Tree")); 
-  AliTOFClusterFinder tofClus(fTOFcalib);
-  tofClus.Digits2RecPoints(digitsTree, clustersTree);
+
+  TString optionString = GetOption();
+  // use V1 cluster finder if selected
+  if (optionString.Contains("ClusterizerV1")) {
+    static AliTOFClusterFinderV1 tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV1"))
+      tofClus.SetDecoderVersion(1);
+    else
+      tofClus.SetDecoderVersion(0);
+    
+    tofClus.Digits2RecPoints(digitsTree, clustersTree);
+  }
+  else {
+    static AliTOFClusterFinder tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV1"))
+      tofClus.SetDecoderVersion(1);
+    else
+      tofClus.SetDecoderVersion(0);
+    
+    tofClus.Digits2RecPoints(digitsTree, clustersTree);
+  }
 
 }
 //_____________________________________________________________________________
@@ -120,26 +147,57 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
 // reconstruct clusters from digits
 
   AliDebug(2,Form("Global Event loop mode: Converting Raw Data to a Digits Tree")); 
-  AliTOFClusterFinder tofClus(fTOFcalib);
-  tofClus.Raw2Digits(reader, digitsTree);
+
+  TString optionString = GetOption();
+  // use V1 cluster finder if selected
+  if (optionString.Contains("ClusterizerV1")) {
+    static AliTOFClusterFinderV1 tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV1"))
+      tofClus.SetDecoderVersion(1);
+    else
+      tofClus.SetDecoderVersion(0);
+    
+    tofClus.Raw2Digits(reader, digitsTree);
+  }
+  else {
+    static AliTOFClusterFinder tofClus(fTOFcalib);
+
+    // decoder version option
+    if (optionString.Contains("DecoderV1"))
+      tofClus.SetDecoderVersion(1);
+    else
+      tofClus.SetDecoderVersion(0);
+    
+    tofClus.Raw2Digits(reader, 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;
 
-//_____________________________________________________________________________
-AliTOFGeometry* AliTOFReconstructor::GetTOFGeometry() const
-{
-  // get the TOF geometry
-  return fTOFGeometry;
 }