1) AliCaloTrackReader: Possibility to open a second input file with events, when...

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

diff --git a/TOF/AliTOFcalib.cxx b/TOF/AliTOFcalib.cxx
index 39d6d6cc07ac7083bba1ab69b5c2cba77c402113..a03a70194f4f09425fb48f088d86357d9965bc48 100644 (file)
--- a/TOF/AliTOFcalib.cxx
+++ b/TOF/AliTOFcalib.cxx
@@ -148,7 +148,7 @@ AliTOFcalib::AliTOFcalib():
 //____________________________________________________________________________ 
 
 AliTOFcalib::AliTOFcalib(const AliTOFcalib & calib):
-  TTask("AliTOFcalib",""),
+  TTask(calib),
   fNChannels(calib.fNChannels),
   fTOFCalOnline(0x0),
   fTOFCalOnlinePulser(0x0),
@@ -186,27 +186,32 @@ AliTOFcalib::AliTOFcalib(const AliTOFcalib & calib):
 AliTOFcalib& AliTOFcalib::operator=(const AliTOFcalib &calib)
 {
   //TOF Calibration Class assignment operator
-  this->fNChannels = calib.fNChannels;
-  this->fCal = calib.fCal;
-  this->fStatus = calib.fStatus;
-  this->fTOFSimToT = calib.fTOFSimToT;
-  this->fkValidity = calib.fkValidity;
-  this->fTree = calib.fTree;
-  this->fChain = calib.fChain;
-  this->fNruns = calib.fNruns;
-  this->fFirstRun = calib.fFirstRun;
-  this->fLastRun = calib.fLastRun;
+
+  if (this == &calib)
+    return *this;
+  
+  TTask::operator=(calib);
+  fNChannels = calib.fNChannels;
+  fCal = calib.fCal;
+  fStatus = calib.fStatus;
+  fTOFSimToT = calib.fTOFSimToT;
+  fkValidity = calib.fkValidity;
+  fTree = calib.fTree;
+  fChain = calib.fChain;
+  fNruns = calib.fNruns;
+  fFirstRun = calib.fFirstRun;
+  fLastRun = calib.fLastRun;
   for (Int_t iarray = 0; iarray<fNChannels; iarray++){
     AliTOFChannelOnline * calChOnline = (AliTOFChannelOnline*)calib.fTOFCalOnline->At(iarray);
     AliTOFChannelOffline * calChOffline = (AliTOFChannelOffline*)calib.fTOFCalOffline->At(iarray);
     AliTOFChannelOnlineStatus * calChOnlineStPulser = (AliTOFChannelOnlineStatus*)calib.fTOFCalOnlinePulser->At(iarray);
     AliTOFChannelOnlineStatus * calChOnlineStNoise = (AliTOFChannelOnlineStatus*)calib.fTOFCalOnlineNoise->At(iarray);
     AliTOFChannelOnlineStatus * calChOnlineStHW = (AliTOFChannelOnlineStatus*)calib.fTOFCalOnlineHW->At(iarray);
-    this->fTOFCalOnline->AddAt(calChOnline,iarray);
-    this->fTOFCalOnlinePulser->AddAt(calChOnlineStPulser,iarray);
-    this->fTOFCalOnlineNoise->AddAt(calChOnlineStNoise,iarray);
-    this->fTOFCalOnlineHW->AddAt(calChOnlineStHW,iarray);
-    this->fTOFCalOffline->AddAt(calChOffline,iarray);
+    fTOFCalOnline->AddAt(calChOnline,iarray);
+    fTOFCalOnlinePulser->AddAt(calChOnlineStPulser,iarray);
+    fTOFCalOnlineNoise->AddAt(calChOnlineStNoise,iarray);
+    fTOFCalOnlineHW->AddAt(calChOnlineStHW,iarray);
+    fTOFCalOffline->AddAt(calChOffline,iarray);
   }
   return *this;
 }
@@ -276,13 +281,27 @@ void AliTOFcalib::CreateCalArrays(){
   fStatus = new AliTOFChannelOnlineStatusArray(fNChannels);
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::CreateCalObjects(){
+
+  // creating arrays for online/offline calibration objs
+
+  fTOFCalOffline = new TObjArray(fNChannels);
+  fTOFCalOffline->SetOwner();
+  for (Int_t iarray = 0; iarray<fNChannels; iarray++){
+    AliTOFChannelOffline * calChOffline = new AliTOFChannelOffline();
+    fTOFCalOffline->AddAt(calChOffline,iarray);
+  }
+  fCal = new AliTOFChannelOnlineArray(fNChannels);
+  fStatus = new AliTOFChannelOnlineStatusArray(fNChannels);
+}
+//_____________________________________________________________________________
+void AliTOFcalib::WriteConfigMapOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters to the CDB
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Config" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Config" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF configuration map for online calib on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -297,11 +316,11 @@ void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel)
+void AliTOFcalib::WriteConfigMapOnCDB(const Char_t *sel)
 {
   //Write calibration parameters to the CDB with infinite validity
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Config" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Config" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -316,13 +335,13 @@ void AliTOFcalib::WriteConfigMapOnCDB(Char_t *sel)
   delete md;
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::WriteParOnlineDelayOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters to the CDB -------> new calib objs!!!!!
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOnlineDelay" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "ParOnlineDelay" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF online calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -336,13 +355,13 @@ void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel, Int_t minrun, Int_t maxr
   delete md;
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::WriteParOnlineStatusOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters to the CDB -------> new calib objs!!!!!
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Status" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Status" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF online status calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -357,11 +376,11 @@ void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel, Int_t minrun, Int_t max
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel)
+void AliTOFcalib::WriteParOnlineDelayOnCDB(const Char_t *sel)
 {
   //Write calibration parameters to the CDB with infinite validity -------> new calib objs!!!!!
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOnlineDelay" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "ParOnlineDelay" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -377,11 +396,11 @@ void AliTOFcalib::WriteParOnlineDelayOnCDB(Char_t *sel)
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel)
+void AliTOFcalib::WriteParOnlineStatusOnCDB(const Char_t *sel)
 {
   //Write calibration parameters to the CDB with infinite validity -------> new calib objs!!!!!
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Status" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Status" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -396,13 +415,13 @@ void AliTOFcalib::WriteParOnlineStatusOnCDB(Char_t *sel)
   delete md;
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::WriteParOnlineOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters to the CDB
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOnline" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "ParOnline" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF online calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -416,13 +435,13 @@ void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
   delete md;
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::WriteParOnlinePulserOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters from pulser to the CDB
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Pulser" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Pulser" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF online calib obj from pulser on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -436,13 +455,13 @@ void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel, Int_t minrun, Int_t max
   delete md;
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::WriteParOnlineNoiseOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters from noise to the CDB
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Noise" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Noise" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF online calib obj from noise on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -456,13 +475,13 @@ void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel, Int_t minrun, Int_t maxr
   delete md;
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::WriteParOnlineHWOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters from hardware to the CDB
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "HW" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "HW" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF online calib obj from hardware on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -477,11 +496,11 @@ void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun)
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel)
+void AliTOFcalib::WriteParOnlineOnCDB(const Char_t *sel)
 {
   //Write calibration parameters to the CDB with infinite validity
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOnline" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "ParOnline" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -497,11 +516,11 @@ void AliTOFcalib::WriteParOnlineOnCDB(Char_t *sel)
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel)
+void AliTOFcalib::WriteParOnlinePulserOnCDB(const Char_t *sel)
 {
   //Write calibration parameters from pulser to the CDB with infinite validity
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Pulser" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Pulser" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -517,11 +536,11 @@ void AliTOFcalib::WriteParOnlinePulserOnCDB(Char_t *sel)
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel)
+void AliTOFcalib::WriteParOnlineNoiseOnCDB(const Char_t *sel)
 {
   //Write calibration parameters from noise to the CDB with infinite validity
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Noise" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "Noise" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -537,11 +556,11 @@ void AliTOFcalib::WriteParOnlineNoiseOnCDB(Char_t *sel)
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel)
+void AliTOFcalib::WriteParOnlineHWOnCDB(const Char_t *sel)
 {
   //Write calibration parameters from hardware to the CDB with infinite validity
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "HW" ;  // to be consistent with TOFPreprocessor
+  const Char_t *sel1 = "HW" ;  // to be consistent with TOFPreprocessor
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -557,13 +576,13 @@ void AliTOFcalib::WriteParOnlineHWOnCDB(Char_t *sel)
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity, Int_t minrun, Int_t maxrun)
+void AliTOFcalib::WriteParOfflineOnCDB(const Char_t *sel, const Char_t *validity, Int_t minrun, Int_t maxrun)
 {
   //Write calibration parameters to the CDB
   SetFirstRun(minrun);
   SetLastRun(maxrun);
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOffline" ;
+  const Char_t *sel1 = "ParOffline" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliDebug(2,Form("Writing TOF offline calib obj on CDB with run range [%i, %i] ",fFirstRun,fLastRun));
@@ -576,11 +595,11 @@ void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity, Int_
 }
 //_____________________________________________________________________________
 
-void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity)
+void AliTOFcalib::WriteParOfflineOnCDB(const Char_t *sel, const Char_t *validity)
 {
   //Write calibration parameters to the CDB with infinite validity
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOffline" ;
+  const Char_t *sel1 = "ParOffline" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBRunRange runrange(fFirstRun,fLastRun);
@@ -594,11 +613,11 @@ void AliTOFcalib::WriteParOfflineOnCDB(Char_t *sel, const Char_t *validity)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadConfigMapFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadConfigMapFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Config" ;
+  const Char_t *sel1 = "Config" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -618,11 +637,11 @@ Bool_t AliTOFcalib::ReadConfigMapFromCDB(Char_t *sel, Int_t nrun)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadParOnlineDelayFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadParOnlineDelayFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from the CDB -------> new calib objs!!!!!
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOnlineDelay" ;
+  const Char_t *sel1 = "ParOnlineDelay" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -642,11 +661,11 @@ Bool_t AliTOFcalib::ReadParOnlineDelayFromCDB(Char_t *sel, Int_t nrun)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadParOnlineStatusFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadParOnlineStatusFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from the CDB -------> new calib objs!!!!!
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Status" ;
+  const Char_t *sel1 = "Status" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -666,11 +685,11 @@ Bool_t AliTOFcalib::ReadParOnlineStatusFromCDB(Char_t *sel, Int_t nrun)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadParOnlineFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadParOnlineFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOnline" ;
+  const Char_t *sel1 = "ParOnline" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -690,11 +709,11 @@ Bool_t AliTOFcalib::ReadParOnlineFromCDB(Char_t *sel, Int_t nrun)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadParOnlinePulserFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadParOnlinePulserFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from pulser from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Pulser" ;
+  const Char_t *sel1 = "Pulser" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -714,11 +733,11 @@ Bool_t AliTOFcalib::ReadParOnlinePulserFromCDB(Char_t *sel, Int_t nrun)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadParOnlineNoiseFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadParOnlineNoiseFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from noise from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "Noise" ;
+  const Char_t *sel1 = "Noise" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -738,11 +757,11 @@ Bool_t AliTOFcalib::ReadParOnlineNoiseFromCDB(Char_t *sel, Int_t nrun)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadParOnlineHWFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadParOnlineHWFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from hardware from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "HW" ;
+  const Char_t *sel1 = "HW" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -762,11 +781,11 @@ Bool_t AliTOFcalib::ReadParOnlineHWFromCDB(Char_t *sel, Int_t nrun)
 }
 //_____________________________________________________________________________
 
-Bool_t AliTOFcalib::ReadParOfflineFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadParOfflineFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read calibration parameters from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "ParOffline" ;
+  const Char_t *sel1 = "ParOffline" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -786,12 +805,12 @@ Bool_t AliTOFcalib::ReadParOfflineFromCDB(Char_t *sel, Int_t nrun)
    
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteSimHistoOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, TH1F *histo){
+void AliTOFcalib::WriteSimHistoOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun, TH1F *histo){
   //Write Sim miscalibration parameters to the CDB
 
   fTOFSimToT=histo;
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "SimHisto" ;
+  const Char_t *sel1 = "SimHisto" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBMetaData *mdhisto = new AliCDBMetaData();
@@ -801,14 +820,14 @@ void AliTOFcalib::WriteSimHistoOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, TH
   delete mdhisto;
 }
 //_____________________________________________________________________________
-Bool_t AliTOFcalib::ReadSimHistoFromCDB(Char_t *sel, Int_t nrun)
+Bool_t AliTOFcalib::ReadSimHistoFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read miscalibration parameters from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
 
   // The Tot Histo
 
-  Char_t *sel1 = "SimHisto" ;
+  const Char_t *sel1 = "SimHisto" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
@@ -825,13 +844,13 @@ Bool_t AliTOFcalib::ReadSimHistoFromCDB(Char_t *sel, Int_t nrun)
   return kTRUE;
 }
 //_____________________________________________________________________________
-void AliTOFcalib::WriteRecParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFRecoParam *param){
+void AliTOFcalib::WriteRecParOnCDB(const Char_t *sel, Int_t minrun, Int_t maxrun, AliTOFRecoParam *param){
   //Write reconstruction parameters to the CDB
 
   AliCDBManager *man = AliCDBManager::Instance();
   AliCDBMetaData *md = new AliCDBMetaData();
   md->SetResponsible("Silvia Arcelli");
-  Char_t *sel1 = "RecPar" ;
+  const Char_t *sel1 = "RecoParam" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBId id(out,minrun,maxrun);
@@ -839,20 +858,20 @@ void AliTOFcalib::WriteRecParOnCDB(Char_t *sel, Int_t minrun, Int_t maxrun, AliT
   delete md;
 }
 //_____________________________________________________________________________
-AliTOFRecoParam * AliTOFcalib::ReadRecParFromCDB(Char_t *sel, Int_t nrun)
+AliTOFRecoParam * AliTOFcalib::ReadRecParFromCDB(const Char_t *sel, Int_t nrun)
 {
   //Read reconstruction parameters from the CDB
   AliCDBManager *man = AliCDBManager::Instance();
-  Char_t *sel1 = "RecPar" ;
+  const Char_t *sel1 = "RecoParam" ;
   Char_t  out[100];
   sprintf(out,"%s/%s",sel,sel1); 
   AliCDBEntry *entry = man->Get(out,nrun);
   if (!entry) { 
-    AliFatal("Exiting, no CDB object (RecPar) found!!!");
+    AliFatal("Exiting, no CDB object (RecoParam) found!!!");
     exit(0);  
   }  
   if(!entry->GetObject()){
-    AliFatal("Exiting, no CDB object (RecPar) found!!!");
+    AliFatal("Exiting, no CDB object (RecoParam) found!!!");
     exit(0);  
   }  
 
@@ -874,7 +893,7 @@ void AliTOFcalib::CreateTreeFromCDB(Int_t minrun, Int_t maxrun){
   fTree->Branch("nentries",&nentries,"nentries/I");
   fTree->Branch("TOFentries",p,"TOFentries[nentries]/F");
   AliCDBManager *man = AliCDBManager::Instance();
-  AliCDBStorage *aStorage = man->GetStorage("local://$ALICE_ROOT");
+  AliCDBStorage *aStorage = man->GetStorage("local://$ALICE_ROOT/OCDB");
   for (Int_t irun = minrun;irun<=maxrun;irun++){
     AliCDBEntry *entry = aStorage->Get("TOF/RefData/TreeForCalib",irun);
     if (!entry){