X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONMerger.h;h=4594bbb1b7b69699e4216ae1721a1c7e41a17d7b;hb=0a28c519706b68a373542f9e8df36bc4233411a6;hp=14ad881b9f0c011d7bd8755d23dbaf8e63670174;hpb=c7955c78acec35ee5e7f7131aece26c1a5541290;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONMerger.h b/MUON/AliMUONMerger.h
index 14ad881b9f0..4594bbb1b7b 100644
--- a/MUON/AliMUONMerger.h
+++ b/MUON/AliMUONMerger.h
@@ -4,9 +4,9 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
+// Revision of includes 07/05/2004
 
-// #include "AliMerger.h"
-// #include "AliMergable.h"
+class TTree;
 
 class AliMUONPadHit;
 class AliHitMap;
@@ -37,13 +37,18 @@ class AliMUONMerger {
     void SetBackgroundEventNumber(Int_t i) {fEvNrBgr = i;}    
     void SetBackgroundFileName(char* file) {fFnBgr = file;}        
     void SetMode(MergeMode_t mode) {fMerge = mode;}
+    void SetDebug(Int_t debug) {fDebug = debug;}
 	
     enum {kBgTag = -1};
-    
+
+ protected:    
+    AliMUONMerger(const AliMUONMerger& rhs);
+    AliMUONMerger& operator=(const AliMUONMerger& rhs);
+
  private:    
     // Open the bgr file
     TFile *InitBgr();
-    void SortTracks(Int_t *tracks,Int_t *charges,Int_t ntr);
+    void SortTracks(Int_t *tracks,Int_t *charges,Int_t ntr) const;
     
  private:
     TTree *fTrH1;                   //! Hits Tree for background event
@@ -62,6 +67,7 @@ class AliMUONMerger {
     MergeMode_t fMerge;             // merging type kDigitize, kMerge
     char  *fFnBgr;                  // background file name
     TFile *fBgrFile;                // Pointer to background file
+    Int_t  fDebug;                  // level of debug printing
     
     ClassDef(AliMUONMerger,0)
 };