ConsistencyCheck() rewritten.

[u/mrichter/AliRoot.git] / MUON / AliMUONCalibrationData.cxx

diff --git a/MUON/AliMUONCalibrationData.cxx b/MUON/AliMUONCalibrationData.cxx
index 5ea0b40d8930c6aebf98aa6b30cb08b9e707c2e0..b0306eb433fc4fd1502bc092df1c519bdee3207c 100644 (file)
--- a/MUON/AliMUONCalibrationData.cxx
+++ b/MUON/AliMUONCalibrationData.cxx
@@ -62,13 +62,15 @@ fRunNumber(runNumber),
 fGains(0x0), 
 fPedestals(0x0),
 fHV(0x0),
+fTriggerDCS(0x0),
 fLocalTriggerBoardMasks(0x0),
 fRegionalTriggerConfig(0x0),
 fGlobalTriggerCrateConfig(0x0),
 fTriggerLut(0x0),
 fTriggerEfficiency(0x0),
 fCapacitances(0x0),
-fNeighbours(0x0)
+fNeighbours(0x0),
+fKillMap(0x0)
 {
 /// Default ctor.
 
@@ -82,7 +84,9 @@ fNeighbours(0x0)
   {
     Gains();
     Pedestals();
+    KillMap();
     HV();
+    TriggerDCS();
     LocalTriggerBoardMasks(0);
     RegionalTriggerConfig();
     GlobalTriggerCrateConfig();
@@ -97,7 +101,8 @@ fNeighbours(0x0)
 AliMUONCalibrationData::~AliMUONCalibrationData()
 {
   /// Destructor. Note that we're the owner of our pointers.
-  Reset();
+  //PH The owner of the objects is CDB, do not delete them!
+  //  Reset();
 }
 
 //_____________________________________________________________________________
@@ -149,6 +154,14 @@ AliMUONCalibrationData::CreateHV(Int_t runNumber, Int_t* startOfValidity)
   return dynamic_cast<TMap*>(CreateObject(runNumber,"MUON/Calib/HV",startOfValidity));
 }
 
+//_____________________________________________________________________________
+TMap*
+AliMUONCalibrationData::CreateTriggerDCS(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// 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));
+}
+
 //_____________________________________________________________________________
 AliMUONVStore*
 AliMUONCalibrationData::CreateLocalTriggerBoardMasks(Int_t runNumber, Int_t* startOfValidity)
@@ -196,6 +209,14 @@ AliMUONCalibrationData::CreateObject(Int_t runNumber, const char* path, Int_t* s
   return 0x0;
 }
 
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::CreateKillMap(Int_t runNumber, Int_t* startOfValidity)
+{
+  /// Create a new killmap store from the OCDB for a given run
+  return dynamic_cast<AliMUONVStore*>(CreateObject(runNumber,"MUON/Calib/KillMap",startOfValidity));
+}
+
 //_____________________________________________________________________________
 AliMUONVStore*
 AliMUONCalibrationData::CreatePedestals(Int_t runNumber, Int_t* startOfValidity)
@@ -288,6 +309,19 @@ AliMUONCalibrationData::HV() const
   return fHV;
 }
 
+//_____________________________________________________________________________
+TMap*
+AliMUONCalibrationData::TriggerDCS() const
+{
+  /// Return the calibration for a given (detElemId, manuId) pair
+  
+  if (!fTriggerDCS)
+  {
+    fTriggerDCS = CreateTriggerDCS(fRunNumber);
+  }
+  return fTriggerDCS;
+}
+
 //_____________________________________________________________________________
 AliMUONVStore*
 AliMUONCalibrationData::Neighbours() const
@@ -324,6 +358,36 @@ AliMUONCalibrationData::LocalTriggerBoardMasks(Int_t localBoardNumber) const
   return 0x0;
 }
 
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::KillMap() const
+{
+  /// Get kill map
+  if (!fKillMap)
+  {
+    fKillMap = CreateKillMap(fRunNumber);
+  }
+  return fKillMap;
+}
+
+//_____________________________________________________________________________
+AliMUONVCalibParam*
+AliMUONCalibrationData::KillMap(Int_t detElemId, Int_t manuId) const
+{
+  /// Return the killmap for a given (detElemId, manuId) pair.
+  /// A return value of 0x0 is quite possible, meaning the manu should
+  /// not be killed ;-)
+  
+  AliMUONVStore* killMap = KillMap();
+  if (!killMap) 
+  {
+    return 0x0;
+  }
+  
+  return static_cast<AliMUONVCalibParam*>(killMap->FindObject(detElemId,manuId));
+}
+
+
 //_____________________________________________________________________________
 AliMUONVStore*
 AliMUONCalibrationData::Pedestals() const
@@ -363,6 +427,7 @@ AliMUONCalibrationData::Print(Option_t*) const
   << " fGains=" << fGains
   << " fPedestals=" << fPedestals
   << " fHV=" << fHV
+  << " fTriggerDCS=" << fTriggerDCS
   << " fLocalTriggerBoardMasks=" << fLocalTriggerBoardMasks
   << " fRegionalTriggerConfig=" << fRegionalTriggerConfig
   << " fGlobalTriggerCrateConfig=" << fGlobalTriggerCrateConfig
@@ -424,6 +489,8 @@ AliMUONCalibrationData::Reset()
   fGains = 0x0;
   delete fHV;
   fHV = 0x0;
+  delete fTriggerDCS;
+  fTriggerDCS = 0x0;
   delete fLocalTriggerBoardMasks;
   fLocalTriggerBoardMasks = 0x0;
   delete fRegionalTriggerConfig;
@@ -484,6 +551,15 @@ AliMUONCalibrationData::Check(Int_t runNumber)
     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");