X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=HLT%2FCALO%2FAliHLTCaloMapper.h;h=030936f6b9319902f8385bc04a63f4411b5edca3;hb=380fdeeb9377e76f63b6e3ebfbfab9c443e9da27;hp=0032b0c9991a423b2300d0e2e9e84646d7223d1b;hpb=4f4b7ba49cd92136f8c935f5c3c7b21ca6b4b86a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/HLT/CALO/AliHLTCaloMapper.h b/HLT/CALO/AliHLTCaloMapper.h
index 0032b0c9991..030936f6b93 100644
--- a/HLT/CALO/AliHLTCaloMapper.h
+++ b/HLT/CALO/AliHLTCaloMapper.h
@@ -37,13 +37,13 @@ public:
 
   AliHLTCaloMapper(const unsigned long specification, TString det);
   virtual ~AliHLTCaloMapper();
-  virtual void InitAltroMapping( const unsigned long specification ) = 0; 
+  virtual Bool_t InitAltroMapping( const unsigned long specification ) = 0; 
   virtual void InitDDLSpecificationMapping() = 0;
   bool GetIsInitializedMapping();
-  char* GetFilePath();
+  virtual char* GetFilePath();
  
-  int  GetChannelID(const AliHLTUInt32_t spec, const Int_t hadd);
-  void GetChannelCoord(const UShort_t channelId, UShort_t* channelCoord);
+  virtual int  GetChannelID(const AliHLTUInt32_t spec, const Int_t hadd);
+  static void GetChannelCoord(const UShort_t channelId, UShort_t* channelCoord);
   static void ChannelId2Coordinate(const int channelId,    AliHLTCaloCoordinate &channelCoord);
   virtual void GetLocalCoord(const int channelId, Float_t* localCoord) const; 
   int GetDDLFromSpec( const AliHLTUInt32_t spec );
@@ -56,11 +56,18 @@ public:
     char fXCol; // Coordinate in X direction (perpendicular too beam direction an parallell to ground) relatve to one Module
     char fGain; // Gain (high gain = 1, low gain = 0)
   };
-  
   struct fDDLSpecificationMap{ 
-    char fModId; 
+    UInt_t fRcuX; // Coordinate in Z direction (beam direction) relatve too one RCU
+    UInt_t fRcuZ; // Coordinate in X direction (perpendicular too beam direction an parallell to ground) relatve too one RCU
+    UInt_t fRcuXOffset;
+    UInt_t fRcuZOffset;
+    int fModId; 
   };
   
+//   struct fDDLSpecificationMap{ 
+//     char fModId; 
+//   };
+  
 
   fAltromap *fHw2geomapPtr; //pointer to structure holding information about geometrical address