Cosmetic changes for the integration of doxygen

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

diff --git a/MUON/AliMUONMerger.h b/MUON/AliMUONMerger.h
index f894f1ebb6d665200e0317c741232dfe96776ada..14ad881b9f0c011d7bd8755d23dbaf8e63670174 100644 (file)
--- a/MUON/AliMUONMerger.h
+++ b/MUON/AliMUONMerger.h
@@ -20,7 +20,7 @@ class AliMUONMerger {
     virtual ~AliMUONMerger();
     
     // Compare pad hits
-    virtual Bool_t Exists(const AliMUONPadHit * sdigit);
+    virtual Bool_t Exists(const AliMUONPadHit * sdigit) const;
     // Update a pad hit
     virtual  void Update(AliMUONPadHit *sdigit);
     // Create a new hit
@@ -43,19 +43,20 @@ class AliMUONMerger {
  private:    
     // Open the bgr file
     TFile *InitBgr();
+    void SortTracks(Int_t *tracks,Int_t *charges,Int_t ntr);
+    
  private:
-    TTree *fTrH1;                   // ! Hits Tree for background event
-    TClonesArray *fHitsBgr;         // ! List of hits for one track only
-    TClonesArray *fPadHitsBgr;      // ! List of clusters for one track only
-    AliHitMap **fHitMap;            // ! pointer to array of pointers to hitmaps
-    Int_t fNch;                     // ! chamber nr (loop variable)
-    Int_t fTrack;                   // ! track nr (loop variable)
-    TObjArray *fList;               // ! list of AliMUONTransientDigit
-    TObjArray *fTrList;             // ! list of tracks
-    TClonesArray *fAddress;         // ! pointer to TClonesArray of TVectors with trackinfo
-    Int_t fCounter;                 // ! nr. of AliMUONTransientDigit
-    Int_t fCountadr;                // ! counter for trinfo
-    Int_t fDigits[6];               // ! array with digits
+    TTree *fTrH1;                   //! Hits Tree for background event
+    TClonesArray *fHitsBgr;         //! List of hits for one track only
+    TClonesArray *fPadHitsBgr;      //! List of clusters for one track only
+    AliHitMap **fHitMap;            //! pointer to array of pointers to hitmaps
+    Int_t fNch;                     //! chamber nr (loop variable)
+    Int_t fTrack;                   //! track nr (loop variable)
+    Int_t fCharge;                  //! charge generated by fTrack
+    Bool_t fSignal;                 //! kTRUE if signal file is processed
+    TObjArray *fList;               //! list of AliMUONTransientDigit
+    Int_t fCounter;                 //! nr. of AliMUONTransientDigit
+    Int_t fDigits[6];               //! array with digits
     Int_t fEvNrSig;                 // signal     event number
     Int_t fEvNrBgr;                 // background event number    
     MergeMode_t fMerge;             // merging type kDigitize, kMerge