Fixing memory leak introduced with rev. 45388

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

diff --git a/MUON/AliMUONCalibrationData.h b/MUON/AliMUONCalibrationData.h
index 43013a9775eea1ad3d144656988c7c09402b1aef..fa3e2931437d86bb7cc478316826f9c216e61ccc 100644 (file)
--- a/MUON/AliMUONCalibrationData.h
+++ b/MUON/AliMUONCalibrationData.h
@@ -17,13 +17,14 @@
 #endif
 
 class AliCDBEntry;
+class AliMUONGlobalCrateConfig;
+class AliMUONRegionalTriggerConfig;
+class AliMUONRejectList;
 class AliMUONTriggerEfficiencyCells;
 class AliMUONTriggerLut;
+class AliMUONVCalibParam;
 class AliMUONVStore;
 class AliMUONVStore;
-class AliMUONVCalibParam;
-class AliMUONGlobalCrateConfig;
-class AliMUONRegionalTriggerConfig;
 class TMap;
 
 class AliMUONCalibrationData : public TObject
@@ -40,34 +41,45 @@ 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 AliMUONGlobalCrateConfig* CreateGlobalTriggerCrateConfig(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, Bool_t patched=kTRUE);
+
+  /// Create a Trigger HV and current  map (which must be deleted) from OCDB for the given run
+  static TMap* CreateTriggerDCS(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 an occupancy map store (which must be deleted) from OCDB for the given run
+  static AliMUONVStore* CreateOccupancyMap(Int_t runNumber, Int_t* startOfValidity=0);
+
+  /// Create a rejectlist store (which must be deleted) from OCDB for the given run
+  static AliMUONRejectList* CreateRejectList(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 configuration store (which must be deleted) from OCDB for the given run
+  static AliMUONVStore* CreateConfig(Int_t runNumber, Int_t* startOfValidity=0);
 
   /// Create a regional trigger mask store (which must be deleted) for a given run
-  static AliMUONRegionalTriggerConfig* CreateRegionalTriggerConfig(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;
@@ -78,8 +90,11 @@ public:
   /// Get the Gain calibration object for channels within (detElemId,manuId).
   AliMUONVCalibParam* Gains(Int_t detElemId, Int_t manuId) const;
     
-  /// Get the HV values
-  TMap* HV() const;
+  /// Get the HV values. Use patched=kFALSE to get unprocessed (i.e. "raw") values as they are in the OCDB
+  TMap* HV(Bool_t patched=kTRUE) const;
+
+  /// Get the Trigger HV and current values
+  TMap* TriggerDCS() const;
     
   /// Whether this object is valid or not (might be invalid if fetching from CDB failed).
   Bool_t IsValid() const { return fIsValid; }
@@ -92,7 +107,16 @@ public:
   
   /// Get the pedestal store
   AliMUONVStore* Pedestals() const;
+
+  /// Get the config store
+  AliMUONVStore* Config() const;
   
+  /// Get the occupancy map store
+  AliMUONVStore* OccupancyMap() const;
+
+  /// Get the reject list store
+  AliMUONRejectList* RejectList() const;
+
   /// Get the Pedestal calibration object for channels within (detElemId,manuId).
   AliMUONVCalibParam* Pedestals(Int_t detElemId, Int_t manuId) const;
   
@@ -114,7 +138,18 @@ 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);
+  
+  static void BypassStores(AliMUONVStore* ped, AliMUONVStore* gain);
+  
+  static void PatchHVValues(TObjArray& values,
+                            Int_t& nbelowready,
+                            Int_t& noff,
+                            Int_t& ntrips,
+                            Int_t& neor,
+                            TString* msg);
   
 protected:
   /// Not implemented
@@ -128,6 +163,7 @@ private:
   mutable AliMUONVStore* fGains; //!< Gains
   mutable AliMUONVStore* fPedestals; //!< Pedestals
   mutable TMap* fHV; //!< HV
+  mutable TMap* fTriggerDCS; //!< Trigger HV and Currents
   mutable AliMUONVStore* fLocalTriggerBoardMasks; //!< Local trigger board maska  
   mutable AliMUONRegionalTriggerConfig* fRegionalTriggerConfig; //!< Regional trigger config
   mutable AliMUONGlobalCrateConfig* fGlobalTriggerCrateConfig; //!< Global trigger crate config
@@ -137,7 +173,16 @@ private:
   mutable AliMUONVStore* fCapacitances; //!< Manu capacitances
   mutable AliMUONVStore* fNeighbours; //!< list of neighbours for all channels
   
-  ClassDef(AliMUONCalibrationData,7) // Storage for all MUON calibration data.
+  mutable AliMUONVStore* fOccupancyMap; //!< occupancy map
+  
+  mutable AliMUONRejectList* fRejectList; //!< reject list
+
+  static AliMUONVStore* fgBypassPedestals;
+  static AliMUONVStore* fgBypassGains;
+  
+  mutable AliMUONVStore* fConfig; //!< configuration of the tracker
+  
+  ClassDef(AliMUONCalibrationData,13) // Storage for all MUON calibration data.
 };
 
 #endif