EMD DA updated

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

diff --git a/MUON/AliMUONCalibrationData.cxx b/MUON/AliMUONCalibrationData.cxx
index b0306eb433fc4fd1502bc092df1c519bdee3207c..b803047137eb26dd56e4f720a1fd4dd96c7f57e3 100644 (file)
--- a/MUON/AliMUONCalibrationData.cxx
+++ b/MUON/AliMUONCalibrationData.cxx
@@ -21,6 +21,7 @@
 #include "AliCDBManager.h"
 #include "AliCodeTimer.h"
 #include "AliLog.h"
+#include "AliMUONRejectList.h"
 #include "AliMUONTriggerEfficiencyCells.h"
 #include "AliMUONTriggerLut.h"
 #include "AliMUONVStore.h"
@@ -53,6 +54,9 @@
 ClassImp(AliMUONCalibrationData)
 /// \endcond
 
+AliMUONVStore* AliMUONCalibrationData::fBypassPedestals(0x0);
+AliMUONVStore* AliMUONCalibrationData::fBypassGains(0x0);
+
 //_____________________________________________________________________________
 AliMUONCalibrationData::AliMUONCalibrationData(Int_t runNumber, 
                                                Bool_t deferredInitialization) 
@@ -70,7 +74,9 @@ fTriggerLut(0x0),
 fTriggerEfficiency(0x0),
 fCapacitances(0x0),
 fNeighbours(0x0),
-fKillMap(0x0)
+fOccupancyMap(0x0),
+fRejectList(0x0),
+fConfig(0x0)
 {
 /// Default ctor.
 
@@ -84,7 +90,8 @@ fKillMap(0x0)
   {
     Gains();
     Pedestals();
-    KillMap();
+    OccupancyMap();
+    RejectList();
     HV();
     TriggerDCS();
     LocalTriggerBoardMasks(0);
@@ -94,6 +101,7 @@ fKillMap(0x0)
     TriggerEfficiency();
     Capacitances();
     Neighbours();
+    Config();
   }
 }
 
@@ -186,7 +194,7 @@ AliMUONCalibrationData::CreateObject(Int_t runNumber, const char* path, Int_t* s
   /// Access the CDB for a given path (e.g. MUON/Calib/Pedestals),
   /// and return the corresponding TObject.
   
-  AliCodeTimerAutoClass(Form("%d : %s",runNumber,path));
+  AliCodeTimerAutoClass(Form("%d : %s",runNumber,path),0);
   
   AliCDBManager* man = AliCDBManager::Instance();
   
@@ -206,15 +214,29 @@ AliMUONCalibrationData::CreateObject(Int_t runNumber, const char* path, Int_t* s
                if ( startOfValidity )  *startOfValidity = AliCDBRunRange::Infinity();
   }
        
+  {
+    
+    AliCodeTimerAutoClass(Form("Failed to get %s for run %d",path,runNumber),1);
+
+  }
+  
   return 0x0;
 }
 
 //_____________________________________________________________________________
 AliMUONVStore*
-AliMUONCalibrationData::CreateKillMap(Int_t runNumber, Int_t* startOfValidity)
+AliMUONCalibrationData::CreateOccupancyMap(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));
+  /// 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));
 }
 
 //_____________________________________________________________________________
@@ -225,6 +247,14 @@ AliMUONCalibrationData::CreatePedestals(Int_t runNumber, Int_t* startOfValidity)
   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));
+}
+
 
 //_____________________________________________________________________________
 AliMUONRegionalTriggerConfig*
@@ -258,6 +288,8 @@ AliMUONVStore*
 AliMUONCalibrationData::Gains() const
 {
   /// Create (if needed) and return the internal store for gains.
+  if (fBypassGains) return fBypassGains;
+  
   if (!fGains)
   {
     fGains = CreateGains(fRunNumber);
@@ -360,39 +392,46 @@ AliMUONCalibrationData::LocalTriggerBoardMasks(Int_t localBoardNumber) const
 
 //_____________________________________________________________________________
 AliMUONVStore*
-AliMUONCalibrationData::KillMap() const
+AliMUONCalibrationData::OccupancyMap() const
 {
-  /// Get kill map
-  if (!fKillMap)
+  /// Get occupancy map
+  if (!fOccupancyMap)
   {
-    fKillMap = CreateKillMap(fRunNumber);
+    fOccupancyMap = CreateOccupancyMap(fRunNumber);
   }
-  return fKillMap;
+  return fOccupancyMap;
 }
 
 //_____________________________________________________________________________
-AliMUONVCalibParam*
-AliMUONCalibrationData::KillMap(Int_t detElemId, Int_t manuId) const
+AliMUONRejectList*
+AliMUONCalibrationData::RejectList() 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) 
+  /// Get reject list
+  if (!fRejectList)
   {
-    return 0x0;
+    fRejectList = CreateRejectList(fRunNumber);
   }
-  
-  return static_cast<AliMUONVCalibParam*>(killMap->FindObject(detElemId,manuId));
+  return fRejectList;
 }
 
+//_____________________________________________________________________________
+void
+AliMUONCalibrationData::BypassStores(AliMUONVStore* ped, AliMUONVStore* gain)
+{
+  /// Force the use of those pedestals and gains
+  fBypassPedestals = ped;
+  fBypassGains = gain;
+  
+}
 
 //_____________________________________________________________________________
 AliMUONVStore*
 AliMUONCalibrationData::Pedestals() const
 {
   /// Return pedestals
+  
+  if (fBypassPedestals) return fBypassPedestals;
+  
   if (!fPedestals)
   {
     fPedestals = CreatePedestals(fRunNumber);
@@ -400,6 +439,19 @@ AliMUONCalibrationData::Pedestals() const
   return fPedestals;
 }
 
+//_____________________________________________________________________________
+AliMUONVStore*
+AliMUONCalibrationData::Config() const
+{
+  /// Return config
+  
+  if (!fConfig)
+  {
+    fConfig = CreateConfig(fRunNumber);
+  }
+  return fConfig;
+}
+
 //_____________________________________________________________________________
 AliMUONVCalibParam*
 AliMUONCalibrationData::Pedestals(Int_t detElemId, Int_t manuId) const
@@ -426,6 +478,7 @@ AliMUONCalibrationData::Print(Option_t*) const
   cout << "RunNumber " << RunNumber()
   << " fGains=" << fGains
   << " fPedestals=" << fPedestals
+  << " fConfig=" << fConfig
   << " fHV=" << fHV
   << " fTriggerDCS=" << fTriggerDCS
   << " fLocalTriggerBoardMasks=" << fLocalTriggerBoardMasks
@@ -483,6 +536,8 @@ AliMUONCalibrationData::Reset()
 {
 /// Reset all data
 
+  delete fConfig;
+  fConfig = 0x0;
   delete fPedestals;
   fPedestals = 0x0;
   delete fGains;
@@ -586,6 +641,15 @@ AliMUONCalibrationData::Check(Int_t runNumber)
   {
     AliInfoClass("Pedestals read OK");
   }
+
+  if ( ! CreateConfig(runNumber) )
+  {
+    AliErrorClass("Could not read config");
+  }
+  else
+  {
+    AliInfoClass("Config read OK");
+  }
   
   if ( ! CreateRegionalTriggerConfig(runNumber) )
   {