]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - MUON/AliMUONCalibrationData.cxx
Moving of the QA checker from rec to base, as it is used also during simulation.
[u/mrichter/AliRoot.git] / MUON / AliMUONCalibrationData.cxx
index f5374ec948011befb053a464cfa9cd3efd3a92d1..b803047137eb26dd56e4f720a1fd4dd96c7f57e3 100644 (file)
 
 #include "AliCDBEntry.h"
 #include "AliCDBManager.h"
+#include "AliCodeTimer.h"
 #include "AliLog.h"
+#include "AliMUONRejectList.h"
 #include "AliMUONTriggerEfficiencyCells.h"
 #include "AliMUONTriggerLut.h"
-#include "AliMUONV1DStore.h"
-#include "AliMUONV2DStore.h"
+#include "AliMUONVStore.h"
+#include "AliMUONVStore.h"
 #include "AliMUONVCalibParam.h"
-#include "Riostream.h"
-#include "TMap.h"
+#include "AliMUONGlobalCrateConfig.h"
+#include "AliMUONRegionalTriggerConfig.h"
 
+#include <Riostream.h>
+#include <TClass.h>
+#include <TMap.h>
+
+//-----------------------------------------------------------------------------
 /// \class AliMUONCalibrationData
 ///
 /// For the moment, this class stores pedestals, gains, hv (for tracker)
 /// containers/calibration classes.
 ///
 /// \author Laurent Aphecetche
+//-----------------------------------------------------------------------------
 
 /// \cond CLASSIMP
 ClassImp(AliMUONCalibrationData)
 /// \endcond
 
+AliMUONVStore* AliMUONCalibrationData::fBypassPedestals(0x0);
+AliMUONVStore* AliMUONCalibrationData::fBypassGains(0x0);
+
 //_____________________________________________________________________________
 AliMUONCalibrationData::AliMUONCalibrationData(Int_t runNumber, 
                                                Bool_t deferredInitialization) 
@@ -55,11 +66,17 @@ fRunNumber(runNumber),
 fGains(0x0), 
 fPedestals(0x0),
 fHV(0x0),
+fTriggerDCS(0x0),
 fLocalTriggerBoardMasks(0x0),
-fRegionalTriggerBoardMasks(0x0),
-fGlobalTriggerBoardMasks(0x0),
+fRegionalTriggerConfig(0x0),
+fGlobalTriggerCrateConfig(0x0),
 fTriggerLut(0x0),
-fTriggerEfficiency(0x0)
+fTriggerEfficiency(0x0),
+fCapacitances(0x0),
+fNeighbours(0x0),
+fOccupancyMap(0x0),
+fRejectList(0x0),
+fConfig(0x0)
 {
 /// Default ctor.
 
@@ -71,74 +88,213 @@ fTriggerEfficiency(0x0)
 
   if ( deferredInitialization == kFALSE )
   {
-    OnDemandGains();
-    OnDemandPedestals();
-    OnDemandHV();
-    OnDemandLocalTriggerBoardMasks();
-    OnDemandRegionalTriggerBoardMasks();
-    OnDemandGlobalTriggerBoardMasks();
-    OnDemandTriggerLut();
-    OnDemandTriggerEfficiency();
+    Gains();
+    Pedestals();
+    OccupancyMap();
+    RejectList();
+    HV();
+    TriggerDCS();
+    LocalTriggerBoardMasks(0);
+    RegionalTriggerConfig();
+    GlobalTriggerCrateConfig();
+    TriggerLut();
+    TriggerEfficiency();
+    Capacitances();
+    Neighbours();
+    Config();
   }
 }
 
 //_____________________________________________________________________________
 AliMUONCalibrationData::~AliMUONCalibrationData()
 {
-/// Destructor. Note that we're the owner of our pointers.
+  /// Destructor. Note that we're the owner of our pointers.
+  //PH The owner of the objects is CDB, do not delete them!
+  //  Reset();
+}
 
-  delete fPedestals;
-  delete fGains;
-  delete fHV;
-  delete fLocalTriggerBoardMasks;
-  delete fRegionalTriggerBoardMasks;
-  delete fGlobalTriggerBoardMasks;
-  delete fTriggerLut;
-  delete fTriggerEfficiency;
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::Capacitances() const
+{
+  /// Create (if needed) and return the internal store for capacitances.
+  
+  if (!fCapacitances)
+  {
+    fCapacitances = CreateCapacitances(fRunNumber);
+  }
+  return fCapacitances;
 }
 
 //_____________________________________________________________________________
-TMap*
-AliMUONCalibrationData::HV() const
+AliMUONVStore*
+AliMUONCalibrationData::CreateCapacitances(Int_t runNumber, Int_t* startOfValidity)
 {
-/// Return the calibration for a given (detElemId, manuId) pair
+  /// Create capa store from OCDB for a given run
+  
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/Capacitances",startOfValidity));
+}
 
-  return OnDemandHV();
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::CreateGains(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a new gain store from the OCDB for a given run
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/Gains",startOfValidity));
+}
+
+//_____________________________________________________________________________
+AliMUONGlobalCrateConfig*
+AliMUONCalibrationData::CreateGlobalTriggerCrateConfig(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create the internal store for GlobalTriggerCrateConfig from OCDB
+  
+  return dynamic_cast<AliMUONGlobalCrateConfig*>(CreateObject(runNumber,"MUON/Calib/GlobalTriggerCrateConfig",startOfValidity));
+}
+
+
+
+//_____________________________________________________________________________
+TMap*
+AliMUONCalibrationData::CreateHV(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a new HV map from the OCDB for a given run
+  return dynamic_cast<TMap*>(CreateObject(runNumber,"MUON/Calib/HV",startOfValidity));
 }
 
 //_____________________________________________________________________________
 TMap*
-AliMUONCalibrationData::OnDemandHV() const
+AliMUONCalibrationData::CreateTriggerDCS(Int_t runNumber, Int_t* startOfValidity)
 {
-/// Create (if needed) and return the internal store for DeadChannels.
+  /// Create a new Trigger HV and curent map from the OCDB for a given run
+  return dynamic_cast<TMap*>(CreateObject(runNumber,"MUON/Calib/TriggerDCS",startOfValidity));
+}
 
-  if (!fHV)
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::CreateLocalTriggerBoardMasks(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Get the internal store for LocalTriggerBoardMasks from OCDB
+  
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/LocalTriggerBoardMasks",startOfValidity));
+}
+
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::CreateNeighbours(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a neighbour store from the OCDB for a given run
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/Neighbours",startOfValidity));
+}
+
+//_____________________________________________________________________________
+TObject*
+AliMUONCalibrationData::CreateObject(Int_t runNumber, const char* path, Int_t* startOfValidity)
+{
+  /// Access the CDB for a given path (e.g. MUON/Calib/Pedestals),
+  /// and return the corresponding TObject.
+  
+  AliCodeTimerAutoClass(Form("%d : %s",runNumber,path),0);
+  
+  AliCDBManager* man = AliCDBManager::Instance();
+  
+  AliCDBEntry* entry =  man->Get(path,runNumber);
+  
+  if (entry)
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/HV");
-    if (entry)
-    {
-      fHV = dynamic_cast<TMap*>(entry->GetObject());
-      if (!fHV)
-      {
-        AliError("fHV not of the expected type !!!");
-      }
-    }
-    else
-    {
-      AliError("Could not get HV values !");
-    }
+               if ( startOfValidity ) *startOfValidity = entry->GetId().GetFirstRun();
+               
+    TObject* object = entry->GetObject();
+    entry->SetOwner(kFALSE);
+    if (!(man->GetCacheFlag())) delete entry;
+    return object;
   }
-  return fHV;
+       else
+       {
+               if ( startOfValidity )  *startOfValidity = AliCDBRunRange::Infinity();
+  }
+       
+  {
+    
+    AliCodeTimerAutoClass(Form("Failed to get %s for run %d",path,runNumber),1);
+
+  }
+  
+  return 0x0;
+}
+
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::CreateOccupancyMap(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a new occupancy map store from the OCDB for a given run
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/OccupancyMap",startOfValidity));
+}
+
+//_____________________________________________________________________________
+AliMUONRejectList*
+AliMUONCalibrationData::CreateRejectList(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a new rejectlist store from the OCDB for a given run
+  return dynamic_cast<AliMUONRejectList*>(CreateObject(runNumber,"MUON/Calib/RejectList",startOfValidity));
+}
+
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::CreatePedestals(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a new pedestal store from the OCDB for a given run
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/Pedestals",startOfValidity));
+}
+
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::CreateConfig(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a new config store from the OCDB for a given run
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/Config",startOfValidity));
 }
 
+
 //_____________________________________________________________________________
-AliCDBEntry*
-AliMUONCalibrationData::GetEntry(const char* path) const
+AliMUONRegionalTriggerConfig*
+AliMUONCalibrationData::CreateRegionalTriggerConfig(Int_t runNumber, Int_t* startOfValidity)
 {
-/// Access the CDB for a given path (e.g. MUON/Calib/Pedestals),
-/// and return the corresponding CDBEntry.
+  /// Create the internal store for RegionalTriggerConfig from OCDB
+  
+  return dynamic_cast<AliMUONRegionalTriggerConfig*>(CreateObject(runNumber,"MUON/Calib/RegionalTriggerConfig",startOfValidity));
+}
 
-  return AliCDBManager::Instance()->Get(path,fRunNumber);
+//_____________________________________________________________________________
+AliMUONTriggerEfficiencyCells* 
+AliMUONCalibrationData::CreateTriggerEfficiency(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create trigger efficiency object from OCBD
+  
+  return dynamic_cast<AliMUONTriggerEfficiencyCells*>(CreateObject(runNumber,"MUON/Calib/TriggerEfficiency",startOfValidity));
+}
+
+//_____________________________________________________________________________
+AliMUONTriggerLut* 
+AliMUONCalibrationData::CreateTriggerLut(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create trigger LUT from OCDB
+  
+  return dynamic_cast<AliMUONTriggerLut*>(CreateObject(runNumber,"MUON/Calib/TriggerLut",startOfValidity));
+}
+
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::Gains() const
+{
+  /// Create (if needed) and return the internal store for gains.
+  if (fBypassGains) return fBypassGains;
+  
+  if (!fGains)
+  {
+    fGains = CreateGains(fRunNumber);
+  }
+  return fGains;
 }
 
 //_____________________________________________________________________________
@@ -149,80 +305,65 @@ AliMUONCalibrationData::Gains(Int_t detElemId, Int_t manuId) const
 /// Note that, unlike the DeadChannel case, if the result is 0x0, that's an
 /// error (meaning that we should get gains for all channels).
 
-  AliMUONV2DStore* gains = Gains();
+  AliMUONVStore* gains = Gains();
   if (!gains)
   {
     return 0x0;
   }
   
-  return static_cast<AliMUONVCalibParam*>(gains->Get(detElemId,manuId));
+  return static_cast<AliMUONVCalibParam*>(gains->FindObject(detElemId,manuId));
 }
 
 //_____________________________________________________________________________
-AliMUONV2DStore*
-AliMUONCalibrationData::Gains() const
+AliMUONGlobalCrateConfig* 
+AliMUONCalibrationData::GlobalTriggerCrateConfig() const
 {
-  /// Create (if needed) and return the internal store for gains.
-  return OnDemandGains();
+  /// Return the config for the global trigger board.
+  
+  if (!fGlobalTriggerCrateConfig)
+  {
+    fGlobalTriggerCrateConfig = CreateGlobalTriggerCrateConfig(fRunNumber);
+  }
+  return fGlobalTriggerCrateConfig;
 }
 
+
 //_____________________________________________________________________________
-AliMUONV2DStore*
-AliMUONCalibrationData::OnDemandGains() const
+TMap*
+AliMUONCalibrationData::HV() const
 {
-/// Create (if needed) and return the internal store for gains.
-
-  if (!fGains)
+  /// Return the calibration for a given (detElemId, manuId) pair
+  
+  if (!fHV)
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/Gains");
-    if (entry)
-    {
-      fGains = dynamic_cast<AliMUONV2DStore*>(entry->GetObject());
-      if (!fGains)
-      {
-        AliError("Gains not of the expected type !!!");
-      }
-    }
-    else
-    {
-      AliError("Could not get gains !");
-    }
+    fHV = CreateHV(fRunNumber);
   }
-  return fGains;
+  return fHV;
 }
 
 //_____________________________________________________________________________
-AliMUONVCalibParam* 
-AliMUONCalibrationData::GlobalTriggerBoardMasks() const
+TMap*
+AliMUONCalibrationData::TriggerDCS() const
 {
-/// Return the masks for the global trigger board.
-
-  return OnDemandGlobalTriggerBoardMasks();
+  /// Return the calibration for a given (detElemId, manuId) pair
+  
+  if (!fTriggerDCS)
+  {
+    fTriggerDCS = CreateTriggerDCS(fRunNumber);
+  }
+  return fTriggerDCS;
 }
 
 //_____________________________________________________________________________
-AliMUONVCalibParam*
-AliMUONCalibrationData::OnDemandGlobalTriggerBoardMasks() const
+AliMUONVStore*
+AliMUONCalibrationData::Neighbours() const
 {
-/// Create (if needed) and return the internal store for GlobalTriggerBoardMasks.
-
-  if (!fGlobalTriggerBoardMasks)
+  /// Create (if needed) and return the internal store for neighbours.
+  if (!fNeighbours)
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/GlobalTriggerBoardMasks");
-    if (entry)
-    {
-      fGlobalTriggerBoardMasks = dynamic_cast<AliMUONVCalibParam*>(entry->GetObject());
-      if (!fGlobalTriggerBoardMasks)
-      {
-        AliError("fGlobalTriggerBoardMasks not of the expected type !!!");
-      }
-    }
-    else
-    {
-      AliError("Could not get global trigger board masks !");
-    }
+    fNeighbours = CreateNeighbours(fRunNumber);
   }
-  return fGlobalTriggerBoardMasks;
+  return fNeighbours;
 }
 
 //_____________________________________________________________________________
@@ -231,229 +372,311 @@ AliMUONCalibrationData::LocalTriggerBoardMasks(Int_t localBoardNumber) const
 {
 /// Return the masks for a given trigger local board.
 
-  AliMUONV1DStore* store = OnDemandLocalTriggerBoardMasks();
-  if (!store)
+  if (!fLocalTriggerBoardMasks)
   {
-    AliError("Could not get LocalTriggerBoardMasks");
-    return 0x0;
+    fLocalTriggerBoardMasks = CreateLocalTriggerBoardMasks(fRunNumber);
   }
-  
-  AliMUONVCalibParam* ltbm = 
-    static_cast<AliMUONVCalibParam*>(store->Get(localBoardNumber));
-  if (!ltbm)
+
+  if ( fLocalTriggerBoardMasks ) 
   {
-    AliError(Form("Could not get mask for localBoardNumber=%d",localBoardNumber));
+    AliMUONVCalibParam* ltbm = 
+      static_cast<AliMUONVCalibParam*>(fLocalTriggerBoardMasks->FindObject(localBoardNumber));
+    if (!ltbm)
+    {
+      AliError(Form("Could not get mask for localBoardNumber=%d",localBoardNumber));
+    }
+    return ltbm;  
   }
-  return ltbm;  
+  return 0x0;
 }
 
 //_____________________________________________________________________________
-AliMUONV1DStore*
-AliMUONCalibrationData::OnDemandLocalTriggerBoardMasks() const
+AliMUONVStore*
+AliMUONCalibrationData::OccupancyMap() const
 {
-/// Create (if needed) and return the internal store for LocalTriggerBoardMasks.
-
-  if (!fLocalTriggerBoardMasks)
+  /// Get occupancy map
+  if (!fOccupancyMap)
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/LocalTriggerBoardMasks");
-    if (entry)
-    {
-      fLocalTriggerBoardMasks = dynamic_cast<AliMUONV1DStore*>(entry->GetObject());
-      if (!fLocalTriggerBoardMasks)
-      {
-        AliError("fLocalTriggerBoardMasks not of the expected type !!!");
-      }
-    }
-    else
-    {
-      AliError("Could not get local trigger board masks !");
-    }
+    fOccupancyMap = CreateOccupancyMap(fRunNumber);
   }
-  return fLocalTriggerBoardMasks;
+  return fOccupancyMap;
 }
 
 //_____________________________________________________________________________
-AliMUONV2DStore*
-AliMUONCalibrationData::OnDemandPedestals() const
+AliMUONRejectList*
+AliMUONCalibrationData::RejectList() const
 {
-/// Create (if needed) and return the internal storage for pedestals.
-
-  if (!fPedestals)
+  /// Get reject list
+  if (!fRejectList)
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/Pedestals");
-    if (entry)
-    {
-      fPedestals = dynamic_cast<AliMUONV2DStore*>(entry->GetObject());
-      if (!fPedestals)
-      {
-        AliError("fPedestals not of the expected type !!!");
-      }
-    }
-    else
-    {
-      AliError("Could not get pedestals !");
-    }
+    fRejectList = CreateRejectList(fRunNumber);
   }
-  return fPedestals;
+  return fRejectList;
 }
 
 //_____________________________________________________________________________
 void
-AliMUONCalibrationData::Print(Option_t*) const
+AliMUONCalibrationData::BypassStores(AliMUONVStore* ped, AliMUONVStore* gain)
 {
-/// A very basic dump of our guts.
-
-  cout << "RunNumber " << RunNumber()
-  << " fGains=" << fGains
-  << " fPedestals=" << fPedestals
-  << " fHV=" << fHV
-  << " fLocalTriggerBoardMasks=" << fLocalTriggerBoardMasks
-  << " fRegionalTriggerBoardMasks=" << fRegionalTriggerBoardMasks
-  << " fGlobalTriggerBoardMasks=" << fGlobalTriggerBoardMasks
-  << " fTriggerLut=" << fTriggerLut
-  << endl;
+  /// Force the use of those pedestals and gains
+  fBypassPedestals = ped;
+  fBypassGains = gain;
+  
 }
 
 //_____________________________________________________________________________
-AliMUONV2DStore*
+AliMUONVStore*
 AliMUONCalibrationData::Pedestals() const
 {
   /// Return pedestals
-  return OnDemandPedestals();
+  
+  if (fBypassPedestals) return fBypassPedestals;
+  
+  if (!fPedestals)
+  {
+    fPedestals = CreatePedestals(fRunNumber);
+  }
+  return fPedestals;
 }
 
 //_____________________________________________________________________________
-AliMUONVCalibParam*
-AliMUONCalibrationData::Pedestals(Int_t detElemId, Int_t manuId) const
+AliMUONVStore*
+AliMUONCalibrationData::Config() const
 {
-/// Return the pedestals for a given (detElemId, manuId) pair.
-/// A return value of 0x0 is considered an error, meaning we should get
-/// pedestals for all channels.
-
-  AliMUONV2DStore* pedestals = OnDemandPedestals();
-  if (!pedestals) 
+  /// Return config
+  
+  if (!fConfig)
   {
-    return 0x0;
+    fConfig = CreateConfig(fRunNumber);
   }
-  
-  return static_cast<AliMUONVCalibParam*>(pedestals->Get(detElemId,manuId));
+  return fConfig;
 }
 
 //_____________________________________________________________________________
-AliMUONVCalibParam* 
-AliMUONCalibrationData::RegionalTriggerBoardMasks(Int_t index) const
+AliMUONVCalibParam*
+AliMUONCalibrationData::Pedestals(Int_t detElemId, Int_t manuId) const
 {
-/// Return the masks for a given trigger regional board.
-
-  AliMUONV1DStore* store = OnDemandRegionalTriggerBoardMasks();
+  /// Return the pedestals for a given (detElemId, manuId) pair.
+  /// A return value of 0x0 is considered an error, meaning we should get
+  /// pedestals for all channels.
   
-  if (!store)
+  AliMUONVStore* pedestals = Pedestals();
+  if (!pedestals) 
   {
-    AliError("Could not get RegionalTriggerBoardMasks");
     return 0x0;
   }
   
-  AliMUONVCalibParam* rtbm = 
-    static_cast<AliMUONVCalibParam*>(store->Get(index));
-  if (!rtbm)
-  {
-    AliError(Form("Could not get mask for regionalBoard index=%d",index));
-  }
-  return rtbm;  
+  return static_cast<AliMUONVCalibParam*>(pedestals->FindObject(detElemId,manuId));
 }
 
 //_____________________________________________________________________________
-AliMUONV1DStore*
-AliMUONCalibrationData::OnDemandRegionalTriggerBoardMasks() const
+void
+AliMUONCalibrationData::Print(Option_t*) const
 {
-/// Create (if needed) and return the internal store for RegionalTriggerBoardMasks.
+  /// A very basic dump of our guts.
 
-  if (!fRegionalTriggerBoardMasks)
+  cout << "RunNumber " << RunNumber()
+  << " fGains=" << fGains
+  << " fPedestals=" << fPedestals
+  << " fConfig=" << fConfig
+  << " fHV=" << fHV
+  << " fTriggerDCS=" << fTriggerDCS
+  << " fLocalTriggerBoardMasks=" << fLocalTriggerBoardMasks
+  << " fRegionalTriggerConfig=" << fRegionalTriggerConfig
+  << " fGlobalTriggerCrateConfig=" << fGlobalTriggerCrateConfig
+  << " fTriggerLut=" << fTriggerLut
+  << endl;
+}
+
+
+//_____________________________________________________________________________
+AliMUONRegionalTriggerConfig* 
+AliMUONCalibrationData::RegionalTriggerConfig() const
+{
+  /// Return the config for the regional trigger board.
+  
+  if (!fRegionalTriggerConfig)
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/RegionalTriggerBoardMasks");
-    if (entry)
-    {
-      fRegionalTriggerBoardMasks = dynamic_cast<AliMUONV1DStore*>(entry->GetObject());
-      if (!fRegionalTriggerBoardMasks)
-      {
-        AliError("fRegionalTriggerBoardMasks not of the expected type !!!");
-      }
+    fRegionalTriggerConfig = CreateRegionalTriggerConfig(fRunNumber);
     }
-    else
-    {
-      AliError("Could not get regional trigger board masks !");
-    }
-  }
-  return fRegionalTriggerBoardMasks;
+  return fRegionalTriggerConfig;
 }
 
+
 //_____________________________________________________________________________
 AliMUONTriggerEfficiencyCells*
 AliMUONCalibrationData::TriggerEfficiency() const
 {
 /// Return the trigger efficiency.
 
-  return OnDemandTriggerEfficiency();
-}
-
-//_____________________________________________________________________________
-AliMUONTriggerEfficiencyCells* 
-AliMUONCalibrationData::OnDemandTriggerEfficiency() const
-{
-/// \todo: add comment
-
   if (!fTriggerEfficiency)
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/TriggerEfficiency");
-    if (entry)
-    {
-      fTriggerEfficiency = dynamic_cast<AliMUONTriggerEfficiencyCells*>(entry->GetObject());
-      if (!fTriggerEfficiency)
-      {
-        AliError("fTriggerEfficiency not of the expected type !!!");
-      }
-    }
-    else
-    {
-      AliError("Could not get trigger efficiency !");
-    }
+    fTriggerEfficiency = CreateTriggerEfficiency(fRunNumber);
   }
   return fTriggerEfficiency;
 }
 
+
 //_____________________________________________________________________________
 AliMUONTriggerLut*
 AliMUONCalibrationData::TriggerLut() const
 {
 /// Return the trigger look up table.
 
-  return OnDemandTriggerLut();
+  if (!fTriggerLut)
+  {
+    fTriggerLut = CreateTriggerLut(fRunNumber);
+  }
+  return fTriggerLut;
 }
 
 //_____________________________________________________________________________
-AliMUONTriggerLut* 
-AliMUONCalibrationData::OnDemandTriggerLut() const
+void
+AliMUONCalibrationData::Reset()
 {
-/// \todo: add comment
+/// Reset all data
 
-  if (!fTriggerLut)
+  delete fConfig;
+  fConfig = 0x0;
+  delete fPedestals;
+  fPedestals = 0x0;
+  delete fGains;
+  fGains = 0x0;
+  delete fHV;
+  fHV = 0x0;
+  delete fTriggerDCS;
+  fTriggerDCS = 0x0;
+  delete fLocalTriggerBoardMasks;
+  fLocalTriggerBoardMasks = 0x0;
+  delete fRegionalTriggerConfig;
+  fRegionalTriggerConfig = 0x0;
+  delete fGlobalTriggerCrateConfig;
+  fGlobalTriggerCrateConfig = 0x0;
+  
+  delete fTriggerLut;
+  fTriggerLut = 0x0;
+  delete fTriggerEfficiency;
+  fTriggerEfficiency = 0x0;
+  delete fCapacitances;
+  fCapacitances = 0x0;
+  delete fNeighbours;
+  fNeighbours = 0x0;
+}
+
+//_____________________________________________________________________________
+void
+AliMUONCalibrationData::Check(Int_t runNumber)
+{
+  /// Self-check to see if we can read all data for a given run 
+  /// from the current OCDB...
+  
+  if ( ! CreateCapacitances(runNumber) )
   {
-    AliCDBEntry* entry = GetEntry("MUON/Calib/TriggerLut");
-    if (entry)
-    {
-      fTriggerLut = dynamic_cast<AliMUONTriggerLut*>(entry->GetObject());
-      if (!fTriggerLut)
-      {
-        AliError("fTriggerLut not of the expected type !!!");
-      }
-    }
-    else
-    {
-      AliError("Could not get trigger lut !");
-    }
+    AliErrorClass("Could not read capacitances");
+  }
+  else
+  {
+    AliInfoClass("Capacitances read OK");
   }
-  return fTriggerLut;
-}
 
+  if ( ! CreateGains(runNumber) ) 
+  {
+    AliErrorClass("Could not read gains");
+  }
+  else
+  {
+    AliInfoClass("Gains read OK");
+  }
+
+  if ( ! CreateGlobalTriggerCrateConfig(runNumber) ) 
+  {
+    AliErrorClass("Could not read Trigger Crate Config");
+  }
+  else
+  {
+    AliInfoClass("TriggerBoardMasks read OK");
+  }
+
+  if ( !  CreateHV(runNumber) )
+  {
+    AliErrorClass("Could not read HV");
+  }
+  else
+  {
+    AliInfoClass("HV read OK");
+  }
+
+  if ( !  CreateTriggerDCS(runNumber) )
+  {
+    AliErrorClass("Could not read Trigger HV and Currents");
+  }
+  else
+  {
+    AliInfoClass("Trigger HV and Currents read OK");
+  }
+
+  if ( ! CreateNeighbours(runNumber) )
+  {
+    AliErrorClass("Could not read Neighbours");
+  }
+  else
+  {
+    AliInfoClass("Neighbours read OK");
+  }
+
+  if ( !  CreateLocalTriggerBoardMasks(runNumber) )
+  {
+    AliErrorClass("Could not read LocalTriggerBoardMasks");
+  }
+  else
+  {
+    AliInfoClass("LocalTriggerBoardMasks read OK");
+  }
+  
+  if ( ! CreatePedestals(runNumber) )
+  {
+    AliErrorClass("Could not read pedestals");
+  }
+  else
+  {
+    AliInfoClass("Pedestals read OK");
+  }
+
+  if ( ! CreateConfig(runNumber) )
+  {
+    AliErrorClass("Could not read config");
+  }
+  else
+  {
+    AliInfoClass("Config read OK");
+  }
+  
+  if ( ! CreateRegionalTriggerConfig(runNumber) )
+  {
+    AliErrorClass("Could not read RegionalTriggerConfig");
+  }
+  else
+  {
+    AliInfoClass("RegionalTriggerBoardMasks read OK");
+  }
+  
+  if ( ! CreateTriggerLut(runNumber) )
+  {
+    AliErrorClass("Could not read TriggerLut");
+  }
+  else
+  {
+    AliInfoClass("TriggerLut read OK");
+  }
+
+  if ( ! CreateTriggerEfficiency(runNumber) )
+  {
+    AliErrorClass("Could not read TriggerEfficiency");
+  }
+  else    
+  {
+    AliInfoClass("TriggerEfficiency read OK");
+  }
+}