- data member was shadowed (fTree)

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

diff --git a/MUON/AliMUONVTrackerDataMaker.h b/MUON/AliMUONVTrackerDataMaker.h
index 27a729ae9720d64e8cbbc22f0c4c0f872e5f5dce..bbd783730e546060cc8da9fe469ab1e61938d19f 100644 (file)
--- a/MUON/AliMUONVTrackerDataMaker.h
+++ b/MUON/AliMUONVTrackerDataMaker.h
@@ -6,7 +6,7 @@
 
 // $Id$
 
-/// \ingroup graphics
+/// \ingroup rec
 /// \class AliMUONVTrackerDataMaker
 /// \brief Producer of some AliMUONVTrackerData
 /// 
@@ -17,6 +17,7 @@
 #endif
 
 class AliMUONVTrackerData;
+class TCollection;
 
 class AliMUONVTrackerDataMaker : public TObject
 {
@@ -36,18 +37,24 @@ public:
   /// Whether we are running (must be false if IsRunnable is false)
   virtual Bool_t IsRunning() const = 0;
   
+  /// Whether we're only handling event-by-event data (i.e. no accumulation)
+  virtual Bool_t IsEventByEvent() const { return kFALSE; }
+  
+  /// Set event-by-event mode
+  virtual void SetEventByEvent(Bool_t /*flag*/) { }
+  
   /// Set the running state (no effect if not runnable)
   virtual void SetRunning(Bool_t flag) = 0;
   
-  /// Advance to next event (no effect if not runnable)
-  virtual Bool_t NextEvent() = 0;
+       /// Process current event
+       virtual Bool_t ProcessEvent() = 0;
+       
+  /// Advance to next event and process it (no effect if not runnable)
+  virtual Bool_t NextEvent() { return ProcessEvent(); }
   
   /// Rewind events (no effect if not runnable)
   virtual void Rewind() = 0;
   
-  /// Whether we're owner of our data
-  virtual void SetOwner(Bool_t flag) = 0; 
-  
   /// Set our source URI
   virtual void SetSource(const char* source) = 0;
   
@@ -57,6 +64,9 @@ public:
   /// Get the number of events we have seen (but not necessarily used...)
   virtual Int_t NumberOfEvents() const = 0;
   
+  /// Merge
+  virtual Long64_t Merge(TCollection* list) = 0;
+  
   ClassDef(AliMUONVTrackerDataMaker,1) // Producer of AliMUONVTrackerData
 };