X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFReconstructor.cxx;h=16fccb14a5d3ee0dbfef1434164788601b5df87a;hb=7d85e147d49b2a30bb8b93514ef30e0798088207;hp=a1fff1d00243ec1aeed1b845185639cd50c4c934;hpb=3abc001d8af67e548bced17a48ef3ae293708f49;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFReconstructor.cxx b/TOF/AliTOFReconstructor.cxx
index a1fff1d0024..16fccb14a5d 100644
--- a/TOF/AliTOFReconstructor.cxx
+++ b/TOF/AliTOFReconstructor.cxx
@@ -52,13 +52,24 @@ AliTOFReconstructor::AliTOFReconstructor()
 //
   
   //Retrieving the TOF calibration info  
-  fTOFcalib    = new AliTOFcalib();
+  fTOFcalib = new AliTOFcalib();
+  fTOFcalib->Init();
+
+#if 0
   fTOFcalib->CreateCalObjects();
 
   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);}  
 
   if(!fTOFcalib->ReadParOfflineFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
+
+
+  if(!fTOFcalib->ReadDeltaBCOffsetFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
+  if(!fTOFcalib->ReadCTPLatencyFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
+  if(!fTOFcalib->ReadT0FillFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
+  if(!fTOFcalib->ReadRunParamsFromCDB("TOF/Calib",-1)) {AliFatal("Exiting, no CDB object found!!!");exit(0);}  
+#endif
+
 }
 
 //_____________________________________________________________________________
@@ -79,15 +90,21 @@ void AliTOFReconstructor::Reconstruct(AliRawReader *rawReader,
   //
 
   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
+    if (optionString.Contains("DecoderV0")) {
       tofClus.SetDecoderVersion(0);
+    }
+    else if (optionString.Contains("DecoderV1")) {
+      tofClus.SetDecoderVersion(1);
+    }
+    else {
+      tofClus.SetDecoderVersion(2);
+    }
     
     tofClus.Digits2RecPoints(rawReader, clustersTree);
   }
@@ -95,10 +112,15 @@ void AliTOFReconstructor::Reconstruct(AliRawReader *rawReader,
     static AliTOFClusterFinder tofClus(fTOFcalib);
     
     // decoder version option
-    if (optionString.Contains("DecoderV1"))
-      tofClus.SetDecoderVersion(1);
-    else
+    if (optionString.Contains("DecoderV0")) {
       tofClus.SetDecoderVersion(0);
+    }
+    else if (optionString.Contains("DecoderV1")) {
+      tofClus.SetDecoderVersion(1);
+    }
+    else {
+      tofClus.SetDecoderVersion(2);
+    }
 
     tofClus.Digits2RecPoints(rawReader, clustersTree);
   }
@@ -121,10 +143,15 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
     static AliTOFClusterFinderV1 tofClus(fTOFcalib);
 
     // decoder version option
-    if (optionString.Contains("DecoderV1"))
-      tofClus.SetDecoderVersion(1);
-    else
+    if (optionString.Contains("DecoderV0")) {
       tofClus.SetDecoderVersion(0);
+    }
+    else if (optionString.Contains("DecoderV1")) {
+      tofClus.SetDecoderVersion(1);
+    }
+    else {
+      tofClus.SetDecoderVersion(2);
+    }
     
     tofClus.Digits2RecPoints(digitsTree, clustersTree);
   }
@@ -132,10 +159,15 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
     static AliTOFClusterFinder tofClus(fTOFcalib);
 
     // decoder version option
-    if (optionString.Contains("DecoderV1"))
-      tofClus.SetDecoderVersion(1);
-    else
+    if (optionString.Contains("DecoderV0")) {
       tofClus.SetDecoderVersion(0);
+    }
+    else if (optionString.Contains("DecoderV1")) {
+      tofClus.SetDecoderVersion(1);
+    }
+    else {
+      tofClus.SetDecoderVersion(2);
+    }
     
     tofClus.Digits2RecPoints(digitsTree, clustersTree);
   }
@@ -154,10 +186,15 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
     static AliTOFClusterFinderV1 tofClus(fTOFcalib);
 
     // decoder version option
-    if (optionString.Contains("DecoderV1"))
-      tofClus.SetDecoderVersion(1);
-    else
+    if (optionString.Contains("DecoderV0")) {
       tofClus.SetDecoderVersion(0);
+    }
+    else if (optionString.Contains("DecoderV1")) {
+      tofClus.SetDecoderVersion(1);
+    }
+    else {
+      tofClus.SetDecoderVersion(2);
+    }
     
     tofClus.Raw2Digits(reader, digitsTree);
   }
@@ -165,10 +202,15 @@ void AliTOFReconstructor::Reconstruct(TTree *digitsTree,
     static AliTOFClusterFinder tofClus(fTOFcalib);
 
     // decoder version option
-    if (optionString.Contains("DecoderV1"))
-      tofClus.SetDecoderVersion(1);
-    else
+    if (optionString.Contains("DecoderV0")) {
       tofClus.SetDecoderVersion(0);
+    }
+    else if (optionString.Contains("DecoderV1")) {
+      tofClus.SetDecoderVersion(1);
+    }
+    else {
+      tofClus.SetDecoderVersion(2);
+    }
     
     tofClus.Raw2Digits(reader, digitsTree);
   }