X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=RAW%2FAliAltroMapping.h;h=3c8198d647cb47860503bbd9816db43308847965;hb=08f5b3a341381822b064134959e1cb3060f67d2e;hp=160be043a7226125ef7e31955d3956d90cadb0ae;hpb=8b9301f88dd1ab2e89d36aaa2b8a6218be0d4c2b;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RAW/AliAltroMapping.h b/RAW/AliAltroMapping.h
index 160be043a72..3c8198d647c 100644
--- a/RAW/AliAltroMapping.h
+++ b/RAW/AliAltroMapping.h
@@ -11,6 +11,7 @@
 //////////////////////////////////////////////////////////
 
 #include <TObject.h>
+using std::ifstream;
 
 class AliAltroMapping: public TObject {
  public:
@@ -18,25 +19,29 @@ class AliAltroMapping: public TObject {
   AliAltroMapping(const char *mappingFile);
   virtual ~AliAltroMapping();
 
-  AliAltroMapping(const AliAltroMapping& mapping);
-  AliAltroMapping& operator = (const AliAltroMapping& mapping);
-
-  virtual Int_t GetHWAddress(Int_t padrow, Int_t pad, Int_t sector) const = 0;
+  virtual Int_t GetHWAddress(Int_t padrow, Int_t pad, Int_t sector) = 0;
   virtual Int_t GetPadRow(Int_t hwAddress) const = 0;
   virtual Int_t GetPad(Int_t hwAddress) const = 0;
   virtual Int_t GetSector(Int_t hwAddress) const = 0;
 
  protected:
-  Bool_t OpenMappingFile(const char *mappingFile);
-  Bool_t CloseMappingFile();
+  void           CloseMappingFile();
   virtual Bool_t ReadMapping() = 0;
-  virtual void   DeleteMappingArrays() = 0;
+  virtual Bool_t CreateInvMapping() = 0;
 
   ifstream *fIn;               //! External mapping file
   Int_t     fNumberOfChannels; // Number of ALTRO channels
   Int_t     fMaxHWAddress;     // Maximum HW adress
+  Int_t     fMappingSize;      // Size of the mapping array, used by the streamer of derived classes
+  Short_t  *fMapping;          //[fMappingSize] Array which connects hardware adresses to detector element indices
+
+ private:
+  Bool_t    OpenMappingFile(const char *mappingFile);
+
+  AliAltroMapping(const AliAltroMapping& mapping);
+  AliAltroMapping& operator = (const AliAltroMapping& mapping);
 
-  ClassDef(AliAltroMapping,2)  // Altro mapping handler class
+  ClassDef(AliAltroMapping,4)  // Altro mapping handler class
 };
 
 #endif