X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONDataInterface.h;h=183075d17453a3991b44cce7939c25ddbe4a08d9;hb=4ac2548a06ff4f5b995833118fe889b8d9487116;hp=d7732b2059ef24d1e3633a11a68ae042c9d007a8;hpb=e8636ba0697e3e446df0ebf37668c297420a1ad1;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONDataInterface.h b/MUON/AliMUONDataInterface.h
index d7732b2059e..183075d1745 100644
--- a/MUON/AliMUONDataInterface.h
+++ b/MUON/AliMUONDataInterface.h
@@ -17,22 +17,19 @@
 //
 
 #include <TObject.h>
+#include <TString.h>
 
 class TIterator;
 class AliLoader;
 class AliMUONVStore;
 class AliMUONVDigitStore;
 class AliMUONVClusterStore;
-class AliMUONVTrackStore;
 class AliMUONVTriggerStore;
-class AliMUONVTriggerTrackStore;
 class AliMUONVDigit;
-class AliMUONRawCluster;
-class AliMUONTrack;
+class AliMUONVCluster;
 class AliMUONLocalTrigger;
 class AliMUONRegionalTrigger;
 class AliMUONGlobalTrigger;
-class AliMUONTriggerTrack;
 
 
 class AliMUONDataInterface : public TObject
@@ -49,22 +46,20 @@ public:
 
   Int_t NumberOfEvents() const;
   
-  /// Returns the index number of the current event as used int GetEvent(Int_t).
+  /// Returns the index number of the current event loaded.
+  /// This is the event number as was used in the last calls to DigitStore(Int_t),
+  /// ClusterStore(Int_t), TriggerStore(Int_t) or GetEvent(Int_t).
   Int_t   CurrentEvent() const { return fCurrentEvent; }
 
   AliMUONVDigitStore* DigitStore(Int_t event);  
   AliMUONVClusterStore* ClusterStore(Int_t event);
-  AliMUONVTrackStore* TrackStore(Int_t event);
   AliMUONVTriggerStore* TriggerStore(Int_t event, const char* treeLetter="R");
-  AliMUONVTriggerTrackStore* TriggerTrackStore(Int_t event);
 
   /// Dump the clusters for a given event, sorted if so required
   void DumpClusters(Int_t event, Bool_t sorted=kTRUE)  { return DumpRecPoints(event,sorted); }
   void DumpRecPoints(Int_t event, Bool_t sorted=kTRUE);
   void DumpDigits(Int_t event, Bool_t sorted=kTRUE);
-  void DumpTracks(Int_t event, Bool_t sorted=kFALSE);  
   void DumpTrigger(Int_t event, const char* treeLetter="R");  
-  void DumpTriggerTracks(Int_t event, Bool_t sorted=kFALSE);
   
   Bool_t GetEvent(Int_t event = 0);
   
@@ -78,29 +73,24 @@ public:
   Int_t NumberOfDigits(Int_t chamber, Int_t cathode);
   AliMUONVDigit* Digit(Int_t chamber, Int_t cathode, Int_t index);
   Int_t NumberOfRawClusters(Int_t chamber);
-  AliMUONRawCluster* RawCluster(Int_t chamber, Int_t index);
-  Int_t NumberOfTracks();
-  AliMUONTrack* Track(Int_t index);
+  AliMUONVCluster* RawCluster(Int_t chamber, Int_t index);
   Int_t NumberOfLocalTriggers();
   AliMUONLocalTrigger* LocalTrigger(Int_t index);
   Int_t NumberOfRegionalTriggers();
   AliMUONRegionalTrigger* RegionalTrigger(Int_t index);
   AliMUONGlobalTrigger* GlobalTrigger();
-  Int_t NumberOfTriggerTracks();
-  AliMUONTriggerTrack* TriggerTrack(Int_t index);
   
 private:
 
+  /// The various identifiers for the type of iterator constructed.
   enum IteratorType
   {
-    kNoIterator,
-    kDigitIteratorByDetectorElement,
-    kDigitIteratorByChamberAndCathode,
-    kRawClusterIterator,
-    kTrackIterator,
-    kLocalTriggerIterator,
-    kRegionalTriggerIterator,
-    kTriggerTrackIterator
+    kNoIterator,  ///< No iterator was constructed.
+    kDigitIteratorByDetectorElement,  ///< A digit iterator for iterating over detector elements.
+    kDigitIteratorByChamberAndCathode,  ///< A digit iterator for iterating over chambers and cathodes.
+    kRawClusterIterator,  ///< A raw cluster iterator.
+    kLocalTriggerIterator,  ///< An iterator for iterating over reconstructed local triggers.
+    kRegionalTriggerIterator  ///< An iterator for iterating over reconstructed regional triggers.
   };
     
   void DumpSorted(const AliMUONVStore& store) const;
@@ -127,9 +117,8 @@ private:
   AliMUONVDigitStore* fDigitStore; //!< current digit store (owner)
   AliMUONVTriggerStore* fTriggerStore; //!< current trigger store (owner)
   AliMUONVClusterStore* fClusterStore; //!< current cluster store (owner)
-  AliMUONVTrackStore* fTrackStore; //!< current track store (owner)
-  AliMUONVTriggerTrackStore* fTriggerTrackStore; //!< current trigger track store (owner)
   Int_t fCurrentEvent; //!< Current event we've read in
+  TString fTreeLetter; //!< The tree letter used in the last call to TriggerStore().
   Bool_t fIsValid; //!< whether we were initialized properly or not
   
   IteratorType fCurrentIteratorType;  //!< The type of iterator that is currently set.