Removed unnecessary forward declarations.

[u/mrichter/AliRoot.git] / FMD / AliFMDRawStream.h

diff --git a/FMD/AliFMDRawStream.h b/FMD/AliFMDRawStream.h
index 9b31b4b606d2af383fd8ea27a9c0443c25e9a6ed..ae891e3afa7e3d625b1dc8953dd3388efccd11a2 100644 (file)
--- a/FMD/AliFMDRawStream.h
+++ b/FMD/AliFMDRawStream.h
@@ -22,28 +22,31 @@
 // 
 class AliFMDRawStream : public AliAltroRawStream 
 {
-private:
-  UShort_t fSampleRate; // # of ALTRO samples per VA1_ALICE clock
-  Int_t    fPrevTime;   // Last time bin
 public:
-  AliFMDRawStream(AliRawReader* reader);
+  AliFMDRawStream(AliRawReader* reader, UShort_t sampleRate=0);
 
   Short_t Sector()      const { return fRow; }
   Char_t  Ring()        const { return (fSector == 0 ? 'I' : 'O'); }
   Short_t Strip()       const { return fPad + fTime / fSampleRate; }
+  Short_t Sample()      const { return fTime % fSampleRate; }
   Short_t PrevSector()  const { return fPrevRow; }
   Char_t  PrevRing()    const { return (fPrevSector == 0 ? 'I' : 'O'); }
   Short_t PrevStrip()   const { return fPrevPad + fPrevTime/fSampleRate; }
-
+    
   Bool_t  IsNewRing()   const { return (fSector != fPrevSector); }
   Bool_t  IsNewSector() const { return (fRow != fPrevRow) || IsNewRing(); }
   Bool_t  IsNewStrip()  const { return(Strip() != PrevStrip())||IsNewSector();}
     
-  Short_t Count()      const { return fSignal; }
-  Short_t SampleRate() const { return fSampleRate; }
+  Short_t Count()       const { return fSignal; }
+  Short_t SampleRate()  const { return fSampleRate; }
   
   virtual Bool_t   Next();
   
+private:
+  UShort_t fSampleRate;         // # of ALTRO samples per VA1_ALICE clock
+  Int_t    fPrevTime;           // Last time bin
+  Bool_t   fExplicitSampleRate; // True if the sample rate was set externally
+  
   ClassDef(AliFMDRawStream, 0) // Read raw FMD Altro data 
 };