- fixes to the geometry classes

diff --git a/HLT/CALO/AliHLTCaloGeometry.cxx b/HLT/CALO/AliHLTCaloGeometry.cxx
index 191a22d87edd24c8746fb1d51816f6f987a16604..db0dbebf958a822b660375a00984db276fd22bd9 100644 (file)
--- a/HLT/CALO/AliHLTCaloGeometry.cxx
+++ b/HLT/CALO/AliHLTCaloGeometry.cxx
@@ -35,7 +35,7 @@ AliHLTCaloGeometry::AliHLTCaloGeometry(TString det) :
 
 AliHLTCaloGeometry::~AliHLTCaloGeometry()
 {
-   //see header file for class documentation
+
 }
 
 

diff --git a/HLT/CALO/AliHLTCaloGeometry.h b/HLT/CALO/AliHLTCaloGeometry.h
index f0e33ab0487051e51e541623b45faea6cd85dd18..6006c141fa91bff3fc4b2b24f56d7f3ae3df397e 100644 (file)
--- a/HLT/CALO/AliHLTCaloGeometry.h
+++ b/HLT/CALO/AliHLTCaloGeometry.h
@@ -20,34 +20,16 @@ class AliHLTCaloGeometry : public AliHLTCaloConstantsHandler
 {
 
  public:
-   
-   /** Constructor */
-  AliHLTCaloGeometry (TString det);  //COMMENT
-  
-  /** Destructor */
-  virtual ~AliHLTCaloGeometry(); //COMMENT
-  
-  /**
-  * Get the global coordinates for a rec point. 
-  * Pure virtual - must be implemented by child classes
-  * @param recPoint is the rec point containing the local coordinates
-  * @param globalCoord is a AliHLTCaloGlobalCoordinate to write to
-  */
-  virtual void GetGlobalCoordinates(AliHLTCaloRecPointDataStruct &recPoint, AliHLTCaloGlobalCoordinate &globalCoord ) = 0;  //COMMENT
-  
-  /**
-  * Get the absolute ID from the relative position in the module
-  * pure virtual - must be imlemented by child classes
-  * @param module is the module id
-  * @param x is the x position in the module
-  * @param z is the z position in the module
-  * @param AbsId is a the absolute id variable
-  */
+  AliHLTCaloGeometry (TString det);
+  virtual ~AliHLTCaloGeometry();
+
+  virtual void GetGlobalCoordinates(AliHLTCaloRecPointDataStruct &recPoint, AliHLTCaloGlobalCoordinate &globalCoord ) = 0;
+
   virtual void GetCellAbsId(UInt_t module, UInt_t x, UInt_t z, Int_t& AbsId) const = 0; //COMMENT
-  
-  private:
-     
-    /** Default constructor, not implemented */
+
+ private:
+
+  /** Default constructor, not implemented */
    AliHLTCaloGeometry();   //COMMENT
 
 

diff --git a/HLT/CALO/AliHLTCaloGlobalCoordinate.h b/HLT/CALO/AliHLTCaloGlobalCoordinate.h
index 009d3b771b2a8066f7c75699bd38d03fcdb23e1a..fbd000ee84809989e638c3dcf612b9e10545656c 100644 (file)
--- a/HLT/CALO/AliHLTCaloGlobalCoordinate.h
+++ b/HLT/CALO/AliHLTCaloGlobalCoordinate.h
@@ -21,9 +21,9 @@
 
 struct  AliHLTCaloGlobalCoordinate
 {
-  float fX;
-  float fY;
-  float fZ;
+  Double_t fX;
+  Double_t fY;
+  Double_t fZ;
 };
 
 #endif

diff --git a/HLT/PHOS/AliHLTPHOSGeometry.cxx b/HLT/PHOS/AliHLTPHOSGeometry.cxx
index e5990f60ff31f17f365ab07e062407e05c7911cc..40828e6f646780df6961171758b44f2b952ed651 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSGeometry.cxx
+++ b/HLT/PHOS/AliHLTPHOSGeometry.cxx
@@ -14,11 +14,11 @@
 */
 
 #include "AliHLTPHOSGeometry.h"
-
-
+#include "AliPHOSGeoUtils.h"
 
 AliHLTPHOSGeometry::AliHLTPHOSGeometry() :
-AliHLTCaloGeometry("PHOS")
+AliHLTCaloGeometry("PHOS"),
+fGeoUtils(0)
 {
  // See header file for class documentation
 }

diff --git a/HLT/PHOS/AliHLTPHOSGeometry.h b/HLT/PHOS/AliHLTPHOSGeometry.h
index 95e8ed1847d4513f272ebfd16df01823ce2ecb02..dc94375ba8385211b9c82464958e8ea075e7c76e 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSGeometry.h
+++ b/HLT/PHOS/AliHLTPHOSGeometry.h
@@ -18,6 +18,8 @@
 
 #include "AliHLTCaloGeometry.h"
 
+class AliPHOSGeoUtils;
+
 class AliHLTPHOSGeometry : public AliHLTCaloGeometry
   {
      public:
@@ -32,8 +34,15 @@ class AliHLTPHOSGeometry : public AliHLTCaloGeometry
       virtual void GetGlobalCoordinates ( AliHLTCaloRecPointDataStruct& recPoint,  AliHLTCaloGlobalCoordinate& globalCoord ); //COMMENT
 
       /** See base class for class documentation */
-      virtual void GetCellAbsId(UInt_t /*module*/, UInt_t /*x*/, UInt_t /*z*/, Int_t& AbsId) const { AbsId = 0; }
+      virtual void GetCellAbsId(UInt_t module, UInt_t x, UInt_t z, Int_t& AbsId) const { AbsId = 0; }
+    
+      /** Intialise the geometry from the HCDB/OCDB */
+      virtual Int_t InitialiseGeometry() {return 0; }
     
+     private:
+       
+       /** Geometry class from offline code */
+       AliPHOSGeoUtils *fGeoUtils;  //! transient
   };
 
 #endif // ALIHLTPHOSGEOMETRY_H