Class version increased

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

diff --git a/MUON/AliMUONCalibrationData.h b/MUON/AliMUONCalibrationData.h
index 6dc468109a3bc4efbc3fdfba7153629ee7046f65..69beda02e656f313531e4054a573c734cfcc225a 100644 (file)
--- a/MUON/AliMUONCalibrationData.h
+++ b/MUON/AliMUONCalibrationData.h
@@ -3,7 +3,7 @@
 
 // $Id$
 
-/// \ingroup base
+/// \ingroup calib
 /// \class AliMUONCalibrationData
 /// \brief Single entry point to access MUON calibration data.
 /// 
@@ -22,6 +22,8 @@ class AliMUONTriggerLut;
 class AliMUONVStore;
 class AliMUONVStore;
 class AliMUONVCalibParam;
+class AliMUONGlobalCrateConfig;
+class AliMUONRegionalTriggerConfig;
 class TMap;
 
 class AliMUONCalibrationData : public TObject
@@ -38,40 +40,39 @@ public:
   AliMUONVStore* Capacitances() const;
 
   /// Create a capa store (which must be deleted) from OCDB for the given run
-  static AliMUONVStore* CreateCapacitances(Int_t runNumber);
+  static AliMUONVStore* CreateCapacitances(Int_t runNumber, Int_t* startOfValidity=0);
 
   /// Create a gain store (which must be deleted) from OCDB for the given run
-  static AliMUONVStore* CreateGains(Int_t runNumber);
+  static AliMUONVStore* CreateGains(Int_t runNumber, Int_t* startOfValidity=0);
 
   /// Create a global trigger mask (which must be deleted) from OCDB for the given run
-  static AliMUONVCalibParam* CreateGlobalTriggerBoardMasks(Int_t runNumber);
+  static AliMUONGlobalCrateConfig* CreateGlobalTriggerCrateConfig(Int_t runNumber, Int_t* startOfValidity=0);
   
   /// Create a hv map (which must be deleted) from OCDB for the given run
-  static TMap* CreateHV(Int_t runNumber);
+  static TMap* CreateHV(Int_t runNumber, Int_t* startOfValidity=0);
 
   /// Create a neighbours store (which must be deleted) from OCDB for the given run
-  static AliMUONVStore* CreateNeighbours(Int_t runNumber);
+  static AliMUONVStore* CreateNeighbours(Int_t runNumber, Int_t* startOfValidity=0);
   
   /// Create a local trigger mask store (which must be deleted) for a given run
-  static AliMUONVStore* CreateLocalTriggerBoardMasks(Int_t runNumber);
+  static AliMUONVStore* CreateLocalTriggerBoardMasks(Int_t runNumber, Int_t* startOfValidity=0);
 
   /// Create a pedestal store (which must be deleted) from OCDB for the given run
-  static AliMUONVStore* CreatePedestals(Int_t runNumber);
+  static AliMUONVStore* CreatePedestals(Int_t runNumber, Int_t* startOfValidity=0);
 
   /// Create a regional trigger mask store (which must be deleted) for a given run
-  static AliMUONVStore* CreateRegionalTriggerBoardMasks(Int_t runNumber);
+  static AliMUONRegionalTriggerConfig* CreateRegionalTriggerConfig(Int_t runNumber, Int_t* startOfValidity=0);
 
   /// Create a trigger Look Up Table (which must be deleted) for a given run
-  static AliMUONTriggerLut* CreateTriggerLut(Int_t runNumber);
-  
+  static AliMUONTriggerLut* CreateTriggerLut(Int_t runNumber, Int_t* startOfValidity=0);
   /// Create a trigger efficiency map (which must be deleted) for a given run
-  static AliMUONTriggerEfficiencyCells* CreateTriggerEfficiency(Int_t runNumber);
+  static AliMUONTriggerEfficiencyCells* CreateTriggerEfficiency(Int_t runNumber, Int_t* startOfValidity=0);
   
   /// Get all the gains
   AliMUONVStore* Gains() const;
 
-  /// Get the mask for the global trigger board.
-  AliMUONVCalibParam* GlobalTriggerBoardMasks() const;
+  /// Get the configuration for the global trigger board.
+  AliMUONGlobalCrateConfig* GlobalTriggerCrateConfig() const;
     
   /// Get the Gain calibration object for channels within (detElemId,manuId).
   AliMUONVCalibParam* Gains(Int_t detElemId, Int_t manuId) const;
@@ -97,8 +98,9 @@ public:
   /// Dump to screen.
   virtual void Print(Option_t* opt="") const;
 
-  /// Get the mask for a given regional trigger board.
-  AliMUONVCalibParam* RegionalTriggerBoardMasks(Int_t index) const;
+  /// Get the config for regional trigger.
+  AliMUONRegionalTriggerConfig* RegionalTriggerConfig() const;
+
 
   /// The runnumber used by this object.
   Int_t RunNumber() const { return fRunNumber; }
@@ -111,7 +113,9 @@ public:
   
   void Reset();
 
-  static TObject* CreateObject(Int_t runNumber, const char* path);
+  static TObject* CreateObject(Int_t runNumber, const char* path, Int_t* startOfValidity=0x0);
+  
+  static void Check(Int_t runNumber);
   
 protected:
   /// Not implemented
@@ -125,9 +129,10 @@ private:
   mutable AliMUONVStore* fGains; //!< Gains
   mutable AliMUONVStore* fPedestals; //!< Pedestals
   mutable TMap* fHV; //!< HV
-  mutable AliMUONVStore* fLocalTriggerBoardMasks; //!< Local trigger board maska
-  mutable AliMUONVStore* fRegionalTriggerBoardMasks; //!< Regional trigger board maska
-  mutable AliMUONVCalibParam* fGlobalTriggerBoardMasks; //!< Global trigger board maska
+  mutable AliMUONVStore* fLocalTriggerBoardMasks; //!< Local trigger board maska  
+  mutable AliMUONRegionalTriggerConfig* fRegionalTriggerConfig; //!< Regional trigger config
+  mutable AliMUONGlobalCrateConfig* fGlobalTriggerCrateConfig; //!< Global trigger crate config
+  
   mutable AliMUONTriggerLut* fTriggerLut; //!< TRigger LUTs
   mutable AliMUONTriggerEfficiencyCells* fTriggerEfficiency; //!< Trigger efficiency cells
   mutable AliMUONVStore* fCapacitances; //!< Manu capacitances