- adding possibility to cut on time in the digit maker

[u/mrichter/AliRoot.git] / HLT / PHOS / AliHLTPHOSMapper.h

diff --git a/HLT/PHOS/AliHLTPHOSMapper.h b/HLT/PHOS/AliHLTPHOSMapper.h
index a79937281eba4c82a77d7b12e79c3234ec684d86..a33454cba18cfff221f8f1688d9386a9fab8c019 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSMapper.h
+++ b/HLT/PHOS/AliHLTPHOSMapper.h
@@ -27,57 +27,58 @@
 
 //using namespace PhosHLTConst;
 #include "Rtypes.h"
-#include "AliHLTLogging.h"
-
+#include "AliHLTCaloMapper.h"
 #include "AliPHOSEMCAGeometry.h"
 
+class AliHLTCaloCoordinate;
 class AliHLTPHOSCoordinate;
 
-class AliHLTPHOSMapper : public AliHLTLogging
-//class AliHLTPHOSMapper 
+class AliHLTPHOSMapper : public AliHLTCaloMapper
 {
  public:
+
   AliHLTPHOSMapper();
   virtual ~AliHLTPHOSMapper();
-  void InitAltroMapping(); 
+  
+  Bool_t InitAltroMapping(const unsigned long specification); 
   void InitDDLSpecificationMapping();
   bool GetIsInitializedMapping();
-  char* GetFilePath();
-
-  UShort_t GetChannelID(Int_t specification, Int_t hwAddress);
-  static void GetChannelCoord(const UShort_t channelId, UShort_t* channelCoord);
-  static void ChannelId2Coordinate(const UShort_t channelId, AliHLTPHOSCoordinate &channelCoord );
-  static void GetLocalCoord(const UShort_t channelId, Float_t* localCoord);
-  int GetDDLFromSpec(Int_t specification);
-  int GetModuleFromSpec(Int_t specification);
-
-  struct fAltromap{ 
-    int fZRow; // Coordinate in Z direction (beam direction) relatve too one RCU
-    int fXCol; // Coordinate in X direction (perpendicular too beam direction an parallell to ground) relatve too one RCU
-    int fGain; // Gain (high gain = 1, low gain = 0)
-  };
+  //  char* GetFilePath(const int ddlId);
   
-  struct fDDLSpecificationMap{ 
-    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; 
-  };
+  Int_t GetChannelID(Int_t hwAddress);
+  Int_t GetChannelID(AliHLTUInt32_t specification, Int_t hwAddress);
+
+  //static void GetChannelCoord(const Int_t channelId, UShort_t* channelCoord);
+  //static void ChannelId2Coordinate(const Int_t channelId, AliHLTCaloCoordinate &channelCoord );
+  //static void GetLocalCoord(const Int_t channelId, Float_t* localCoord);
+  int GetDDLFromSpec(AliHLTUInt32_t specification);
+  int GetModuleFromSpec(AliHLTUInt32_t specification);
 
-  fAltromap *fHw2geomapPtr; //pointer to structure holding information about geometrical address 
+//   struct fDDLSpecificationMap{ 
+//     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; 
+//   };
+
+//  fAltromap *fHw2geomapPtr; //pointer to structure holding information about geometrical address 
 
 
   char fFilepath[1024];
 
  private:
   bool fIsInitializedMapping;
+
   AliHLTPHOSMapper(const AliHLTPHOSMapper & );
   AliHLTPHOSMapper & operator = (const AliHLTPHOSMapper &);
   
-  fDDLSpecificationMap* fSpecificationMapPtr;
+  //  fDDLSpecificationMap* fSpecificationMapPtr;
   //AliPHOSEMCAGeometry fPHOSGeometry;
   static const Float_t fCellStep = 2.2;//2.*fPHOSGeometry.GetAirCellHalfSize()[0];
+  
+  Int_t fModuleId;
+    int fDDLId;
 };
 
 #endif