X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=PHOS%2FAliPHOSRawStream.h;h=489d59fa5d0ca81aa80bd62676ef43d796f41029;hb=b468294fcd6a1e42bc46bb788579eb7eca7bb6b8;hp=3545b872a322dc4547c84f2ca80a052c438791f4;hpb=b7f3cbacb0f0b4bac96f789b4dabbaa38a78607d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/PHOS/AliPHOSRawStream.h b/PHOS/AliPHOSRawStream.h
index 3545b872a32..489d59fa5d0 100644
--- a/PHOS/AliPHOSRawStream.h
+++ b/PHOS/AliPHOSRawStream.h
@@ -16,27 +16,48 @@
 // --- AliRoot header files ---
 #include "AliAltroRawStream.h"
 class AliRawReader;
-
+class AliAltroMapping;
 
 class AliPHOSRawStream: public AliAltroRawStream {
 
 public :
-  
   AliPHOSRawStream(AliRawReader* rawReader);
+  virtual ~AliPHOSRawStream();
+ 
+  virtual void             Reset();
+  virtual Bool_t           Next();
   
-  Int_t            GetColumn() const {return fPad;};
-  Int_t            GetModule() const {return fSector;};
-  Int_t            GetPrevColumn() const {return fPrevPad;};
-  Int_t            GetPrevModule() const {return fPrevSector;};
-  Int_t            GetPrevRow() const {return fPrevRow;};
-  Int_t            GetRow() const {return fRow;};
-  Int_t            GetSignal() const {return fSignal;};
-  Int_t            GetTime() const {return fTime;};
-  Bool_t           IsNewColumn() const {return (GetColumn() != GetPrevColumn()) || IsNewRow();};
-  Bool_t           IsNewModule() const {return GetModule() != GetPrevModule();};
-  Bool_t           IsNewRow() const {return (GetRow() != GetPrevRow()) || IsNewModule();};
+  Int_t            GetModule()     const {return fModule;}
+  Int_t            GetRow()        const {return fRow;}
+  Int_t            GetColumn()     const {return fColumn;}
+  Int_t            GetPrevModule() const {return fPrevModule;}
+  Int_t            GetPrevRow()    const {return fPrevRow;}
+  Int_t            GetPrevColumn() const {return fPrevColumn;}
+  Bool_t           IsNewModule()   const {return GetModule() != GetPrevModule();}
+  Bool_t           IsNewRow()      const {return (GetRow() != GetPrevRow()) || IsNewModule();}
+  Bool_t           IsNewColumn()   const {return (GetColumn() != GetPrevColumn()) || IsNewRow();}
+  Bool_t           IsLowGain()     const {return (!fGain);} 
+
+protected:
+
+  AliPHOSRawStream(const AliPHOSRawStream& stream);
+  AliPHOSRawStream& operator = (const AliPHOSRawStream& stream);
+
+  virtual void ApplyAltroMapping();
+
+  Int_t            fModule;       // index of current module
+  Int_t            fPrevModule;   // index of previous module
+  Int_t            fRow;          // index of current row
+  Int_t            fPrevRow;      // index of previous row
+  Int_t            fColumn;       // index of current column
+  Int_t            fPrevColumn;   // index of previous column
+  Bool_t           fGain;         // low (0) or (1) high gain
   
+  AliAltroMapping *fMapping[4];   // pointers to ALTRO mapping
+
   ClassDef(AliPHOSRawStream, 0)   // class for reading PHOS raw digits
-    };
+
+};
 
 #endif
+