Setting default CDB storage

[u/mrichter/AliRoot.git] / PHOS / AliPHOSGetter.cxx

diff --git a/PHOS/AliPHOSGetter.cxx b/PHOS/AliPHOSGetter.cxx
index a6f3ba3e998825cf8ffb5f70b465feb1f3b58533..1badb748a1e4fbf16b23b7ee73c7827cb36dcee8 100644 (file)
--- a/PHOS/AliPHOSGetter.cxx
+++ b/PHOS/AliPHOSGetter.cxx
@@ -74,6 +74,7 @@ AliPHOSGetter * AliPHOSGetter::fgObjGetter = 0 ;
 AliPHOSLoader * AliPHOSGetter::fgPhosLoader = 0;
 Int_t AliPHOSGetter::fgDebug = 0;
 AliPHOSCalibData* AliPHOSGetter::fCalibData = 0;
+AliPHOSAlignData* AliPHOSGetter::fAlignData = 0;
 
 //  TFile * AliPHOSGetter::fgFile = 0 ; 
 
@@ -697,7 +698,8 @@ Int_t AliPHOSGetter::ReadRaw(AliRawReader *rawReader)
       PHOSGeometry()->RelToAbsNumbering(relId, id) ;
       if (!first) {
        FitRaw(lowGainFlag, gLowGain, gHighGain, signalF, energy, time) ; 
-       amp = CalibrateRaw(energy,relId);
+//     amp = CalibrateRaw(energy,relId);
+       amp = (Int_t)energy;
        if (amp > 0) {
          new((*digits)[idigit]) AliPHOSDigit( -1, id, amp, time) ;     
          idigit++ ; 
@@ -722,7 +724,8 @@ Int_t AliPHOSGetter::ReadRaw(AliRawReader *rawReader)
   } // PHOS entries loop
 
   FitRaw(lowGainFlag, gLowGain, gHighGain, signalF, energy, time) ; 
-  amp = CalibrateRaw(energy,relId);
+//   amp = CalibrateRaw(energy,relId);
+  amp = (Int_t)energy;
   if (amp > 0 ) {
     new((*digits)[idigit]) AliPHOSDigit( -1, id, amp, time) ;
     idigit++ ; 
@@ -1088,14 +1091,19 @@ Float_t AliPHOSGetter::BeamEnergy(void) const
 
 AliPHOSCalibData* AliPHOSGetter::CalibData()
 { 
+  // Check if the instance of AliPHOSCalibData exists, and return it
 
-  if( !(AliCDBManager::Instance()->IsDefaultStorageSet()) ) {
+  if( !(AliCDBManager::Instance()->IsDefaultStorageSet()) )
     fCalibData=0x0;
-    Warning("CalibData","Calibration DB is not initiated!");
-    return fCalibData;
-  }
-
   return fCalibData;
+}
+//____________________________________________________________________________ 
 
-  
+AliPHOSAlignData* AliPHOSGetter::AlignData()
+{ 
+  // Check if the instance of AliPHOSAlignData exists, and return it
+
+  if( !(AliCDBManager::Instance()->IsDefaultStorageSet()) )
+    fAlignData=0x0;
+  return fAlignData;
 }