Check we get everything from OCDB even before starting, and correctly deleting calibr...

diff --git a/MUON/AliMUONReconstructor.cxx b/MUON/AliMUONReconstructor.cxx
index 146c49fe743fa12b99078f4bd0c6c5c9e667a6cb..6c01d109252edca75399a868c52190bb5aff119f 100644 (file)
--- a/MUON/AliMUONReconstructor.cxx
+++ b/MUON/AliMUONReconstructor.cxx
@@ -136,6 +136,13 @@ AliMUONReconstructor::GetCalibrationTask() const
       fCalibrationData = 0x0;
       return 0x0;
     }    
+  // Check that we get all the calibrations we'll need
+  if ( !fCalibrationData->Pedestals() ||
+       !fCalibrationData->Gains() ||
+       !fCalibrationData->HV() )
+  {
+    AliFatal("Could not access all required calibration data");
+  }
   TTask* calibration = new TTask("MUONCalibrator","MUON Digit calibrator");
   
   TString opt(GetOption());
@@ -440,6 +447,7 @@ void AliMUONReconstructor::Reconstruct(AliRunLoader* runLoader,
   loader->UnloadDigits();
   
   delete recoCluster;
+  delete calibration;
   
   AliInfo(Form("Execution time for converting RAW data to digits in MUON : R:%.2fs C:%.2fs",
                rawTimer.RealTime(),rawTimer.CpuTime()));