X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFReconstructor.cxx;h=8812438e5506ebf5d5754470acf1b953a129922b;hb=8029fef94ae1809b1e138c841830abd10af79323;hp=5a17ed0ffc6376c968110fbf47ec47a606d8469f;hpb=d76c31f4f41294d7ae5a31c2c56a682abef0b827;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TOF/AliTOFReconstructor.cxx b/TOF/AliTOFReconstructor.cxx
index 5a17ed0ffc6..8812438e550 100644
--- a/TOF/AliTOFReconstructor.cxx
+++ b/TOF/AliTOFReconstructor.cxx
@@ -22,17 +22,21 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "TFile.h"
+#include "TObjArray.h"
+#include "TString.h"
 
 #include "AliLog.h"
 #include "AliRawReader.h"
+#include "AliCDBManager.h"
+#include "AliCDBEntry.h"
 
 #include "AliTOFClusterFinder.h"
-#include "AliTOFGeometry.h"
-#include "AliTOFGeometryV5.h"
 #include "AliTOFcalib.h"
 #include "AliTOFtrackerMI.h"
 #include "AliTOFtracker.h"
+#include "AliTOFtrackerV1.h"
 #include "AliTOFReconstructor.h"
+#include "AliTOFFormatDCS.h"
 
 class TTree;
 
@@ -46,28 +50,60 @@ ClassImp(AliTOFReconstructor)
  //____________________________________________________________________
 AliTOFReconstructor::AliTOFReconstructor() 
   : AliReconstructor(),
-    fTOFGeometry(0),
     fTOFcalib(0)
 {
 //
 // ctor
 //
+
+//reading DCS DP processing result
+
+  AliCDBManager *man = AliCDBManager::Instance();
+  Char_t *sel = "TOF/Calib/DCSData" ;
+  Char_t  out[100];
+  sprintf(out,"%s",sel); 
+  if (!man->Get(out,-1)) { 
+    AliInfo("No DCS data found in CDB");
+  }
+  else{
+    AliCDBEntry *entry = man->Get(out,-1);
+    if(!entry->GetObject()){
+      AliInfo("No DCS array found in CDB entry");
+    }
+     
+   else {
+      TObjArray *array = (TObjArray*)entry->GetObject();
+      TString alias[4]={"tof_lv_i48","tof_lv_v48","tof_lv_i33","tof_lv_v33"};
+      for (Int_t jj=0;jj<4;jj++){
+	AliInfo(Form("Alias = %s",alias[jj].Data()));
+	
+	AliTOFFormatDCS *dcs = (AliTOFFormatDCS*)array->At(jj);
+	for (Int_t i=0;i<3;i++){
+	  AliInfo(Form("set value %i to %f at %f",i,dcs->GetFloat(i),dcs->GetTimeStampFloat(i)));
+	}
+	for (Int_t i=0;i<2;i++){
+	  AliInfo(Form("set variation %i to %f at %f",i,dcs->GetDelta(i),dcs->GetTimeStampDelta(i)));
+	}
+	
+      }
+    }
+  }
+  
   //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->CreateCalArrays();
+  if(!fTOFcalib->ReadParOnlineFromCDB("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);}  
 }
 
 //------------------------------------------------------------------------
 AliTOFReconstructor::AliTOFReconstructor(const AliTOFReconstructor &source)
   : AliReconstructor(),
-    fTOFGeometry(0),
     fTOFcalib(0)
 {
 //
 // copy ctor
 //
-  this->fTOFGeometry=source.fTOFGeometry;
   this->fTOFcalib=source.fTOFcalib;
 }
 
@@ -77,7 +113,6 @@ AliTOFReconstructor & AliTOFReconstructor::operator=(const AliTOFReconstructor &
 //
 // assignment op.
 //
-  this->fTOFGeometry=source.fTOFGeometry;
   this->fTOFcalib=source.fTOFcalib;
   return *this;
 }
@@ -87,7 +122,6 @@ AliTOFReconstructor::~AliTOFReconstructor()
 //
 // dtor
 //
-  delete fTOFGeometry;
   delete fTOFcalib;
 }
 
@@ -132,12 +166,7 @@ AliTracker* AliTOFReconstructor::CreateTracker() const
   TString selectedTracker = GetOption();
   // use MI tracker if selected
   if (selectedTracker.Contains("MI")) return new AliTOFtrackerMI();
+  if (selectedTracker.Contains("V1")) return new AliTOFtrackerV1();
   return new AliTOFtracker();
 }
 
-//_____________________________________________________________________________
-AliTOFGeometry* AliTOFReconstructor::GetTOFGeometry() const
-{
-  // get the TOF geometry
-  return fTOFGeometry;
-}