OCDB entries updated where needed

diff --git a/ZDC/AliZDCDigitizer.cxx b/ZDC/AliZDCDigitizer.cxx
index e132a69ea40527188243330133f9114dbdbbd311..8c6c62cb3722f1ebcdaf5781bd4139fabc9b662b 100644 (file)
--- a/ZDC/AliZDCDigitizer.cxx
+++ b/ZDC/AliZDCDigitizer.cxx
@@ -556,7 +556,7 @@ AliZDCEnCalib* AliZDCDigitizer::GetEnCalibData() const
 
   // Getting calibration object for ZDC set
 
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/EnCalib");
+  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/EnergyCalib");
   if(!entry) AliFatal("No calibration data loaded!");  
 
   AliZDCEnCalib *calibdata = dynamic_cast<AliZDCEnCalib*>  (entry->GetObject());
@@ -571,7 +571,7 @@ AliZDCTowerCalib* AliZDCDigitizer::GetTowCalibData() const
 
   // Getting calibration object for ZDC set
 
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/TowCalib");
+  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/TowerCalib");
   if(!entry) AliFatal("No calibration data loaded!");  
 
   AliZDCTowerCalib *calibdata = dynamic_cast<AliZDCTowerCalib*>  (entry->GetObject());

diff --git a/ZDC/AliZDCPreprocessor.cxx b/ZDC/AliZDCPreprocessor.cxx
index 27bfb5462093796cbe3b8cac412873472c7fcaf3..20b86fe84065649cb1d384647b6b4d4727b45761 100644 (file)
--- a/ZDC/AliZDCPreprocessor.cxx
+++ b/ZDC/AliZDCPreprocessor.cxx
@@ -252,7 +252,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
    // --- Cheking if there is already the entry in the OCDB
    AliCDBEntry *cdbEnEntry = GetFromOCDB("Calib", "EnCalib");
    if(!cdbEnEntry){   
-     Log(Form(" ZDC/Calib/EnCalib entry will be created"));
+     Log(Form(" ZDC/Calib/EnergyCalib entry will be created"));
      // --- Initializing calibration object
      // 
      AliCDBMetaData metaData;
@@ -267,7 +267,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
    }
    else{ 
      // if entry exists it is still valid (=1 for all runs!)
-     Log(Form(" Valid ZDC/Calib/EnCalib object already existing in OCDB!!!"));
+     Log(Form(" Valid ZDC/Calib/EnergyCalib object already existing in OCDB!!!"));
      resEnCal = kTRUE;
    }
    //
@@ -293,7 +293,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
    }
    else{ 
      // if entry exists it is still valid (=1 for all runs!)
-     Log(Form(" Valid ZDC/Calib/TowCalib object already existing in OCDB!!!"));
+     Log(Form(" Valid ZDC/Calib/TowerCalib object already existing in OCDB!!!"));
      resTowCal = kTRUE;
    }
    
@@ -301,7 +301,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
    // --- Cheking if there is already the entry in the OCDB
    AliCDBEntry *cdbSEntry = GetFromOCDB("Calib", "TowCalib");
    if(!cdbSEntry){   
-     Log(Form(" ZDC/Calib/TOwCalib entry will be created"));
+     Log(Form(" ZDC/Calib/TowerCalib entry will be created"));
      // --- Initializing calibration object
      AliZDCTowerCalib *towCalib = new AliZDCTowerCalib("ZDC");
      //
@@ -322,7 +322,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
    }
    else{ 
      // if entry exists it is still valid (=1 for all runs!)
-     Log(Form(" Valid ZDC/Calib/TowCalib object already existing in OCDB!!!"));
+     Log(Form(" Valid ZDC/Calib/TowerCalib object already existing in OCDB!!!"));
      resEnCal = kTRUE;
    }
  }

diff --git a/ZDC/AliZDCReconstructor.cxx b/ZDC/AliZDCReconstructor.cxx
index 270b838c1493f23622c2d1085b77e25f86b00793..49fbc724a61c85488c96c0eba108438af915fcc5 100644 (file)
--- a/ZDC/AliZDCReconstructor.cxx
+++ b/ZDC/AliZDCReconstructor.cxx
@@ -1185,7 +1185,7 @@ AliZDCEnCalib* AliZDCReconstructor::GetEnCalibData() const
 
   // Getting energy and equalization calibration object for ZDC set
 
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/EnCalib");
+  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/EnergyCalib");
   if(!entry) AliFatal("No calibration data loaded!");  
 
   AliZDCEnCalib *calibdata = dynamic_cast<AliZDCEnCalib*> (entry->GetObject());
@@ -1200,7 +1200,7 @@ AliZDCTowerCalib* AliZDCReconstructor::GetTowCalibData() const
 
   // Getting energy and equalization calibration object for ZDC set
 
-  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/TowCalib");
+  AliCDBEntry  *entry = AliCDBManager::Instance()->Get("ZDC/Calib/TowerCalib");
   if(!entry) AliFatal("No calibration data loaded!");  
 
   AliZDCTowerCalib *calibdata = dynamic_cast<AliZDCTowerCalib*> (entry->GetObject());

diff --git a/ZDC/TestZDCPreprocessor.C b/ZDC/TestZDCPreprocessor.C
index fe4ddb503331a7c0754b1655fd7b50e7d2f58707..3b3337ce5e3ad2799bed8702e7d4b36ca6b06441 100644 (file)
--- a/ZDC/TestZDCPreprocessor.C
+++ b/ZDC/TestZDCPreprocessor.C
@@ -142,7 +142,7 @@ void TestZDCPreprocessor(Int_t obj=0)
   else if(obj==2) chkEntry1 = AliCDBManager::Instance()->GetStorage(AliShuttleInterface::GetMainCDB())
                        ->Get("ZDC/Calib/LaserCalib", 0);
   else if(obj==3) chkEntry1 = AliCDBManager::Instance()->GetStorage(AliShuttleInterface::GetMainCDB())
-                       ->Get("ZDC/Calib/EnCalib", 0);
+                       ->Get("ZDC/Calib/EnergyCalib", 0);
   
   
   if(!chkEntry0){
@@ -152,7 +152,7 @@ void TestZDCPreprocessor(Int_t obj=0)
   if(!chkEntry1){
     if(obj==1) printf("No file in ZDC/Calib/Pedestal\n");
     else if(obj==2) printf("No file in ZDC/Calib/LaserCalib\n");
-    else if(obj==3) printf("No file in ZDC/Calib/EnCalib\n");
+    else if(obj==3) printf("No file in ZDC/Calib/EnergyCalib\n");
     return;
   }