X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliGeomManager.h;h=6eb1d287eb1dad36dae5d4acc934e859c2ef392c;hb=26b9ac7ac5e19eccdd5b5dcb83e2d688ad118cea;hp=762e6e1945f54a3261c7808bef0b4b9ccbfee3b1;hpb=36b010bf252ecf937975c1b24bee4837996738dc;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliGeomManager.h b/STEER/AliGeomManager.h
index 762e6e1945f..6eb1d287eb1 100644
--- a/STEER/AliGeomManager.h
+++ b/STEER/AliGeomManager.h
@@ -36,8 +36,10 @@ public:
 		kPHOS1=16, kPHOS2=17,
 		kHMPID=18,
 		kMUON=19,
-		kLastLayer=20};
+		kEMCAL=20,
+		kLastLayer=21};
 
+  static TGeoManager* GetGeometry() { return fgGeometry; }
 
   static Int_t       LayerSize(Int_t layerId);
   static const char* LayerName(Int_t layerId);
@@ -63,6 +65,8 @@ public:
   static Bool_t GetTranslation(Int_t index, Double_t t[3]);
   static Bool_t GetRotation(Int_t index, Double_t r[9]);
 
+  static Bool_t GetDeltaForBranch(AliAlignObj& aao, TGeoHMatrix &inclusiveD);
+  static Bool_t GetDeltaForBranch(Int_t index, TGeoHMatrix &inclusiveD);
   static TGeoHMatrix* GetOrigGlobalMatrix(Int_t index);
   static Bool_t GetOrigGlobalMatrix(const char *symname, TGeoHMatrix &m);
   static Bool_t GetOrigTranslation(Int_t index, Double_t t[3]);
@@ -72,8 +76,10 @@ public:
   static Bool_t GetTrackingMatrix(Int_t index, TGeoHMatrix &m);
 
   static void        LoadGeometry(const char *geomFileName = NULL);
+  static void        SetGeometry(TGeoManager *geom);
+  static void        CheckOverlapsOverPNs(Double_t threshold);  
 
-  static Bool_t         ApplyAlignObjsToGeom(TObjArray& alObjArray);
+  static Bool_t         ApplyAlignObjsToGeom(TObjArray& alObjArray, Bool_t ovlpcheck=kFALSE);
 
   static Bool_t         ApplyAlignObjsToGeom(const char* fileName,
 				      const char* clArrayName);
@@ -84,7 +90,6 @@ public:
 				      Int_t sversion);
   static Bool_t         ApplyAlignObjsToGeom(const char* detName, Int_t runnum, Int_t version,
 				      Int_t sversion);
-
   static Bool_t         ApplyAlignObjsFromCDB(const char* AlDetsList);
   static Bool_t         LoadAlignObjsFromCDBSingleDet(const char* detName, TObjArray& alignObjArray);