For the display, now uses the human chamberId convention, i.e. starting at one, inste...

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

diff --git a/MUON/AliMUONTrackerData.h b/MUON/AliMUONTrackerData.h
index 2b39b1fcb5b228936e363c356070a78520fb1fbf..ebe2c07503d3506775233201eae04e81f4f8890c 100644 (file)
--- a/MUON/AliMUONTrackerData.h
+++ b/MUON/AliMUONTrackerData.h
@@ -27,9 +27,15 @@ 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);
+  
   virtual ~AliMUONTrackerData();
 
-  virtual Bool_t Add(const AliMUONVStore& channelValues);
+  Bool_t Add(const AliMUONTrackerData& data);
+  
+  virtual Bool_t Add(const AliMUONVStore& channelValues, TArrayI* nofEventsPerDDL=0x0);
 
   virtual Bool_t Replace(const AliMUONVStore& channelValues);
 
@@ -75,7 +81,7 @@ public:
   virtual Int_t InternalToExternal(Int_t dim) const { return dim/2; }
 
   /// Returns the number of events we have seen so far
-  virtual Int_t NumberOfEvents() const { return fNevents; }
+  virtual Int_t NumberOfEvents(Int_t ddlNumber) const;
   
   virtual Double_t PCB(Int_t detElemId, Int_t pcbIndex, Int_t dim=0) const;
 
@@ -116,6 +122,11 @@ public:
        /// Whether we store values at the manu level or not
        virtual Bool_t IsManuLevelEnabled() const { return fIsManuLevelEnabled; }
   
+  /// 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,
@@ -153,10 +164,10 @@ 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);
-
-private:
+  Int_t DdlIdFromBusPatchId(Int_t buspatchid) const;
+  Int_t DdlIdFromDetElemId(Int_t detelemid) const;
+  Int_t DdlIdFromChamberId(Int_t chamberid) const;
+  
   /// Not implemented
   AliMUONTrackerData(const AliMUONTrackerData& rhs);
   /// Not implemented
@@ -180,14 +191,27 @@ private:
 
   void SetExternalDimensionName(Int_t index, const char* value);  
 
-  Double_t Value(const AliMUONVCalibParam& param, Int_t i, Int_t dim) const;
+  Double_t Value(const AliMUONVCalibParam& param, Int_t i, Int_t dim, Int_t ddlId) const;
   
   /// The number of values we actually *store* for each item
   Int_t Dimension() const { return fDimension; }
     
+  Bool_t InternalAdd(const AliMUONVStore& store, TArrayI* nevents, Bool_t replace);
+
+  void GetDEManu(const AliMUONVCalibParam& param,
+                  Int_t& detElemId, Int_t& manuId) const;
+  
+  void AddCalibParams(const AliMUONVCalibParam& src, AliMUONVCalibParam& dest) const;
+
+  void Add2D(const AliMUONVStore& src, AliMUONVStore& dest) const;
+  
+  void Add1D(const AliMUONVStore& src, AliMUONVStore& dest) const;
+  
+  void AssertStores();
+  
+  Bool_t UpdateNumberOfEvents(TArrayI* nevents);
+  
 private:
-    
-    Bool_t InternalAdd(const AliMUONVStore& store, Bool_t replace);
   
   Bool_t fIsSingleEvent; ///< whether we can deal with more than one event
   AliMUONVStore* fChannelValues; ///< the channel store
@@ -210,8 +234,11 @@ 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
-       
-  ClassDef(AliMUONTrackerData,6) // Implementation of AliMUONVTrackerData
+  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
 };
 
 #endif