From: laphecet <laphecet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 29 Sep 2008 12:52:59 +0000 (+0000)
Subject: No reason to make the Merge method private !
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=6c35944ee2533c255b8e683d530270e75ccc6f1d;p=u%2Fmrichter%2FAliRoot.git

No reason to make the Merge method private !
---

diff --git a/MUON/AliMUONTrackerData.h b/MUON/AliMUONTrackerData.h
index 8ecd022d70a..307560f9c74 100644
--- a/MUON/AliMUONTrackerData.h
+++ b/MUON/AliMUONTrackerData.h
@@ -118,6 +118,9 @@ 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);
+    
 private:
     
   void FillHisto(Int_t detElemId, Int_t manuId, Int_t manuChannel,
@@ -155,9 +158,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;