Calibration stops if PHOS CDB objects do not exist

diff --git a/PHOS/AliPHOSCalibData.cxx b/PHOS/AliPHOSCalibData.cxx
index cbf0fc30438155bd316ef0de9fe4834096a939e6..ac42bd13a6099a7132763475955b24bfdf638152 100644 (file)
--- a/PHOS/AliPHOSCalibData.cxx
+++ b/PHOS/AliPHOSCalibData.cxx
@@ -22,6 +22,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "TRandom.h"
+#include "AliLog.h"
 #include "AliPHOSCalibData.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
@@ -44,16 +45,24 @@ ClassImp(AliPHOSCalibData)
     fCpvDataPath("PHOS/Calib/CpvGainPedestals"),
     fEmcBadChannelsMapPath("PHOS/Calib/EmcBadChannels")
 {
-  // Default constructor
+  // Default constructor.
+  // Open CDB entry, get EMC and CPV calibration data and bad channel map.
+  // If EMC or CPV calibration data does not exist, stop the run
   
    AliCDBEntry* entryEmc = AliCDBManager::Instance()->Get(fEmcDataPath.Data());
   if(entryEmc)
     fCalibDataEmc = (AliPHOSEmcCalibData*)entryEmc->GetObject();
-  
+
+  if(!fCalibDataEmc)
+    AliFatal("Calibration parameters for PHOS EMC not found. Stop reconstruction!\n");
+    
   AliCDBEntry* entryCpv = AliCDBManager::Instance()->Get(fCpvDataPath.Data());
   if(entryCpv)
     fCalibDataCpv = (AliPHOSCpvCalibData*)entryCpv->GetObject();
 
+  if(!fCalibDataCpv)
+    AliFatal("Calibration parameters for PHOS CPV not found. Stop reconstruction!\n");
+
   AliCDBEntry* entryEmcBadMap = AliCDBManager::Instance()->Get(fEmcBadChannelsMapPath.Data());
   if(entryEmcBadMap)
     fEmcBadChannelsMap = (AliPHOSEmcBadChannelsMap*)entryEmcBadMap->GetObject(); 
@@ -69,14 +78,23 @@ AliPHOSCalibData::AliPHOSCalibData(Int_t runNumber) :
   fEmcBadChannelsMapPath("PHOS/Calib/EmcBadChannels")
 {
   // Constructor
+  // Open CDB entry, get EMC and CPV calibration data and bad channel map.
+  // If EMC or CPV calibration data does not exist, stop the run
+
   AliCDBEntry* entryEmc = AliCDBManager::Instance()->Get(fEmcDataPath.Data(),runNumber);
   if(entryEmc)
     fCalibDataEmc = (AliPHOSEmcCalibData*)entryEmc->GetObject();
+
+  if(!fCalibDataEmc)
+    AliFatal("Calibration parameters for PHOS EMC not found. Stop reconstruction!\n");
   
   AliCDBEntry* entryCpv = AliCDBManager::Instance()->Get(fCpvDataPath.Data(),runNumber);
   if(entryCpv)
     fCalibDataCpv = (AliPHOSCpvCalibData*)entryCpv->GetObject();
 
+  if(!fCalibDataCpv)
+    AliFatal("Calibration parameters for PHOS CPV not found. Stop reconstruction!\n");
+  
   AliCDBEntry* entryEmcBadMap = AliCDBManager::Instance()->
     Get(fEmcBadChannelsMapPath.Data(),runNumber);
   if(entryEmcBadMap)

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index 589f4594e8b738b297390eac987237b4abb88381..1bff0e02cbd0d608ab177de092b62a8f5958a311 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.103  2007/04/11 11:55:45  policheh
+ * SetDistancesToBadChannels() added.
+ *
  * Revision 1.102  2007/03/28 19:18:15  kharlov
  * RecPoints recalculation in TSM removed
  *
@@ -433,27 +436,12 @@ void AliPHOSClusterizerv1::GetCalibrationParameters()
 {
   // Set calibration parameters:
   // if calibration database exists, they are read from database,
-  // otherwise, they are taken from digitizer.
+  // otherwise, reconstruction stops in the constructor of AliPHOSCalibData
   //
   // It is a user responsilibity to open CDB before reconstruction, for example: 
   // AliCDBStorage* storage = AliCDBManager::Instance()->GetStorage("local://CalibDB");
 
-  AliPHOSGetter * gime = AliPHOSGetter::Instance();
-  // fCalibData = new AliPHOSCalibData(gAlice->GetRunNumber()); //original
- 
   fCalibData = new AliPHOSCalibData(-1); //use AliCDBManager's run number
-  
-  if(!fCalibData)
-    {
-      if ( !gime->Digitizer() ) 
-       gime->LoadDigitizer();
-      AliPHOSDigitizer * dig = gime->Digitizer(); 
-      fADCchanelEmc   = dig->GetEMCchannel() ;
-      fADCpedestalEmc = dig->GetEMCpedestal();
-    
-      fADCchanelCpv   = dig->GetCPVchannel() ;
-      fADCpedestalCpv = dig->GetCPVpedestal() ; 
-    }
 }
 
 //____________________________________________________________________________