Merge branch 'TPCdev' of https://git.cern.ch/reps/AliRoot into TPCdev

[u/mrichter/AliRoot.git] / HLT / EMCAL / AliHLTEMCALGeometry.h

diff --git a/HLT/EMCAL/AliHLTEMCALGeometry.h b/HLT/EMCAL/AliHLTEMCALGeometry.h
index 6965a886946c2c0c3bf59c44f54740c3aa4f98ee..970b988888f7989c19c948cbfa3a4bb834f2360b 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALGeometry.h
+++ b/HLT/EMCAL/AliHLTEMCALGeometry.h
@@ -17,38 +17,42 @@
  **************************************************************************/
 
 #include "AliHLTCaloGeometry.h"
-#include "AliEMCALGeoUtils.h"
+//#include "AliEMCALGeoUtils.h"
+#include "AliEMCALGeometry.h"
+#include "AliEMCALRecoUtils.h"
 
 class TGeoManager;
 class AliCDBManager;
 class AliCDBPath;
 class AliHLTEMCALRecPointDataStruct;
 
-class AliEMCALGeoUtils;
+//class AliEMCALGeoUtils;
+class AliEMCALGeometry;
 
-class  AliHLTEMCALGeometry : public AliHLTCaloGeometry, public AliHLTLogging
+class  AliHLTEMCALGeometry : public AliHLTCaloGeometry
 {
  public:
        AliHLTEMCALGeometry();
        virtual ~AliHLTEMCALGeometry();
-       void GetGlobalCoordinates(AliHLTCaloRecPointDataStruct &recPoint, AliHLTCaloGlobalCoordinate &globalCoord );
-       void GetCellAbsId(UInt_t module, Double_t x, Double_t z, Int_t& AbsId);
-       virtual void ConvertRecPointCoordinates(Double_t &x, Double_t &y, Double_t &z) const;
+       void GetGlobalCoordinates(AliHLTCaloRecPointDataStruct &recPoint, AliHLTCaloGlobalCoordinate &globalCoord, Int_t iParticle );
+       void GetCellAbsId(UInt_t module, UInt_t x, UInt_t z, Int_t& AbsId);
        virtual Int_t InitialiseGeometry();
-
-
+       
+       virtual void GetLocalCoordinatesFromAbsId(Int_t absId, Int_t& module, Int_t& x, Int_t& z);
+       
+       
 protected:
        int GetGeometryFromCDB();
 
 private:
        AliHLTEMCALGeometry(const AliHLTEMCALGeometry & );
        AliHLTEMCALGeometry & operator = (const AliHLTEMCALGeometry &); 
-       AliEMCALGeoUtils *fGeo;
-       
-       /** The EMCAL geometry */
-       AliEMCALGeoUtils *fGeo;
-
 
+       // EMCal Geometry
+       //AliEMCALGeoUtils *fGeo;
+       
+       AliEMCALGeometry *fGeo;
+       AliEMCALRecoUtils *fReco;
 };
 
 #endif