Updated to new CDB

diff --git a/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C b/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C
index 302d56848b844add588971ebf3d22f06e9edca0d..c69338c657290c721b6e6d89a3a6adff281aad1f 100644 (file)
--- a/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C
+++ b/PHOS/macros/CalibrationDB/AliPHOSDecalibrate.C
@@ -3,19 +3,21 @@
 // Digitize and decalibrate events assuming that SDigits 
 // have been already produced.
 // Decalibration coefficients are located in the local file
-// DeCalibDB/PHOS/Calib/GainFactors_and_Pedestals/Run0-10_v0.root
+// deCalibDB/PHOS/Calib/GainFactors_and_Pedestals/Run_xxx.root
+// Author: Boris Polichtchouk (Boris.Polichtchouk@cern.ch)
 
 void AliPHOSDecalibrate(Int_t nevents=1)
 {
-  //Load calibration database into aliroot session
+
+  //Load (de)calibration database into aliroot session
   //and set it to AliPHOSGetter.
-  AliCDBLocal *loc = new AliCDBLocal("DeCalibDB");
- 
-  AliPHOSCalibData* clb = (AliPHOSCalibData*)AliCDBStorage::Instance()
-    ->Get("PHOS/Calib/GainFactors_and_Pedestals",gAlice->GetRunNumber());
+  
+  AliPHOSCalibData* deCal  = (AliPHOSCalibData*)(AliCDBManager::Instance()
+    ->GetStorage("local://deCalibDB")->Get("PHOS/Calib/GainFactors_and_Pedestals",1)
+    ->GetObject());
   
   AliPHOSGetter* gime = AliPHOSGetter::Instance("galice.root");
-  gime->SetCalibData(clb);
+  gime->SetCalibData(deCal);
 
 
   AliSimulation sim ; 

diff --git a/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C b/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C
index 298a1a2f890bb2be9dca2db371042680d77fa992..5840af5c5e254e273cda2a7b454cfae71ae9a75b 100644 (file)
--- a/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C
+++ b/PHOS/macros/CalibrationDB/AliPHOSLocalReconstruction.C
@@ -1,9 +1,10 @@
 AliPHOSLocalReconstruction()
 {
   //Run PHOS clusterization using information from calibration database.
+  // Author: Boris Polishchuk (Boris.Polichtchouk at cern.ch)
 
   // Open local calibration data base
-  AliCDBLocal *loc = new AliCDBLocal("CalibDB");
+  AliCDBStorage* storage = AliCDBManager::Instance()->GetStorage("local://CalibDB");
  
   // Make clusterization, calibration parameters will be taken from CDB
   AliPHOSClusterizerv1 *clu = new AliPHOSClusterizerv1("galice.root");

diff --git a/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C b/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C
index 416036f855b55785b00ee9c62e909afad74d834f..855a366ba4dc699e9fa0d7f7c49cf176d797205d 100644 (file)
--- a/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C
+++ b/PHOS/macros/CalibrationDB/AliPHOSSetCDB.C
@@ -47,33 +47,25 @@ SetCC(Int_t flag=0)
   char* objFormat;
 
   if      (flag == 0) {
-    DBFolder  ="InitCalibDB";
+    DBFolder  ="local://InitCalibDB";
     firstRun  =  0;
     lastRun   =  0;
     objFormat = "PHOS initial gain factors and pedestals";
   }
   else if (flag == 1) {
-    DBFolder  ="DeCalibDB";
+    DBFolder  ="local://deCalibDB";
     firstRun  =  0;
     lastRun   = 10;
     objFormat = "PHOS random pedestals and ADC gain factors (5x64x56)";
   }
-
-  // create DB directory
-  if(!gSystem->OpenDirectory(DBFolder)){
-    printf("Warning: folder %s does not exist, I will create it!",
-          DBFolder.Data());
-    TString command = "mkdir "+ DBFolder;
-    gSystem->Exec(command.Data());
-  }
-
+  
   AliPHOSCalibData *calibda=new AliPHOSCalibData("PHOS");
   
   Float_t fADCpedestalEmc = 0.005;
   Float_t fADCchanelEmc   = 0.0015;
-
+  
   TRandom rn;
-
+  
   for(Int_t module=1; module<6; module++) {
     for(Int_t column=1; column<57; column++) {
       for(Int_t row=1; row<65; row++) {
@@ -92,16 +84,18 @@ SetCC(Int_t flag=0)
   }
 
   //Store calibration data into database
+  
+  AliCDBMetaData md;
+  md.SetComment(objFormat);
+  md.SetBeamPeriod(beamPeriod);
+  md.SetResponsible("Boris Polichtchouk");
+  
+  AliCDBId id("PHOS/Calib/GainFactors_and_Pedestals",firstRun,lastRun);
 
-  AliCDBMetaData md("PHOS/Calib/GainFactors_and_Pedestals",
-                   firstRun,lastRun,beamPeriod,
-                   objFormat,
-                   "B. Polishchuk", 
-                   "PHOS calibration");
+  AliCDBManager* man = AliCDBManager::Instance();  
+  AliCDBStorage* loc = man->GetStorage(DBFolder.Data());
+  loc->Put(calibda, id, &md);
 
-  AliCDBLocal *loc = new AliCDBLocal(DBFolder.Data());
-  AliCDBStorage::Instance()->Put(calibda, md);
-  AliCDBStorage::Instance()->Delete();
 }
 
 //------------------------------------------------------------------------
@@ -120,14 +114,15 @@ GetCC(Int_t flag=0)
   char* objFormat;
 
   if      (flag == 0) {
-    DBFolder  ="InitCalibDB";
+    DBFolder  ="local://InitCalibDB";
   }
   else if (flag == 1) {
-    DBFolder  ="DeCalibDB";
+    DBFolder  ="local://deCalibDB";
   }
-  AliCDBLocal *loc = new AliCDBLocal(DBFolder.Data());
-  AliPHOSCalibData* clb = (AliPHOSCalibData*)AliCDBStorage::Instance()
-    ->Get("PHOS/Calib/GainFactors_and_Pedestals",gAlice->GetRunNumber());
+
+  AliPHOSCalibData* clb  = (AliPHOSCalibData*)(AliCDBManager::Instance()
+    ->GetStorage(DBFolder.Data())->Get("PHOS/Calib/GainFactors_and_Pedestals",
+    gAlice->GetRunNumber())->GetObject());
 
   static const Int_t nMod =  5;
   static const Int_t nCol = 56;