bug fixed

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

diff --git a/MUON/AliMUONTrackerData.h b/MUON/AliMUONTrackerData.h
index 8ecd022d70adc894f990df1a32f6f1138ea032be..c6fdaa8c5f296b3b7a4ba8408cfc20550c6914c3 100644 (file)
--- a/MUON/AliMUONTrackerData.h
+++ b/MUON/AliMUONTrackerData.h
@@ -27,6 +27,13 @@ public:
   AliMUONTrackerData(const char* name="", const char* title="", 
                      Int_t dimension=0,
                      Bool_t issingleevent=kFALSE);
+  
+  AliMUONTrackerData(const char* name, const char* title,
+                     const AliMUONVStore& manuValues);
+
+  AliMUONTrackerData(const char* name, const char* title,
+                     const AliMUONVStore& deValues, Int_t val);
+
   virtual ~AliMUONTrackerData();
 
   Bool_t Add(const AliMUONTrackerData& data);
@@ -118,6 +125,17 @@ public:
        /// Whether we store values at the manu level or not
        virtual Bool_t IsManuLevelEnabled() const { return fIsManuLevelEnabled; }
   
+  /// Whether we store values at the bus patch level or not
+  virtual Bool_t IsBusPatchLevelEnabled() const { return fIsBustPatchLevelEnabled; }
+
+  /// Whether we store values at the PCB level or not
+  virtual Bool_t IsPCBLevelEnabled() const { return fIsPCBLevelEnabled; }
+
+  /// To allow merging of different objects
+  virtual Long64_t Merge(TCollection* list);
+    
+  Bool_t ExportAsASCIIOccupancyFile(const char* filename, Int_t runNumber) const;
+  
 private:
     
   void FillHisto(Int_t detElemId, Int_t manuId, Int_t manuChannel,
@@ -132,7 +150,7 @@ private:
   AliMUONVCalibParam* CreateChamberParam(Int_t chamberId) const;
   
   AliMUONVCalibParam* ChannelParam(Int_t detElemId, Int_t manuId,
-                                   AliMUONVCalibParam* external=0x0) const;
+                                   const AliMUONVCalibParam* external=0x0) const;
 
   AliMUONVCalibParam* DetectionElementParam(Int_t detElemId, Bool_t create=kFALSE) const;
 
@@ -155,9 +173,6 @@ private:
   /// Whether we have histograms for a given dimension, or not
   virtual Bool_t IsHistogrammed(Int_t dim) const { return ( fHistogramming[dim] > 0 ); }
 
-  /// To allow merging of different objects
-  virtual Long64_t Merge(TCollection* list);
-
   Int_t DdlIdFromBusPatchId(Int_t buspatchid) const;
   Int_t DdlIdFromDetElemId(Int_t detelemid) const;
   Int_t DdlIdFromChamberId(Int_t chamberid) const;
@@ -201,6 +216,10 @@ private:
   
   void Add1D(const AliMUONVStore& src, AliMUONVStore& dest) const;
   
+  void AssertStores();
+  
+  Bool_t UpdateNumberOfEvents(TArrayI* nevents);
+  
 private:
   
   Bool_t fIsSingleEvent; ///< whether we can deal with more than one event
@@ -224,11 +243,13 @@ private:
   static const Int_t fgkVirtualExtraDimension; ///< to give access to information not stored, but computed on the fly
   Bool_t fIsChannelLevelEnabled; ///< whether we allow storing of channel (fChannelValues) values
   Bool_t fIsManuLevelEnabled; ///< whether we allow storing of manu (fManuValues) values
+  Bool_t fIsBustPatchLevelEnabled; ///< whether we allow storing of bus patches (fBusPatchValues) values
+  Bool_t fIsPCBLevelEnabled; ///< whether we allow storing of PCB values (fPCBValues)
   Int_t fNofDDLs; ///< nof of DDLs we're dealing with
   /// the number of events treated (per DDL)
   Int_t* fNofEventsPerDDL; //[fNofDDLs] the number of events treated (per DDL)
 
-  ClassDef(AliMUONTrackerData,7) // Implementation of AliMUONVTrackerData
+  ClassDef(AliMUONTrackerData,8) // Implementation of AliMUONVTrackerData
 };
 
 #endif