X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliAlignObjMatrix.h;h=42fb7ddb3a2c6bc5839595295e2b70beb5199e93;hb=20e07869420e3b92352dff955bd5b71138c46061;hp=1e5b620ced50e7ac44ee75e9631f64946072a67e;hpb=befe2c08976d471ea975c93768dbbc03f37671dc;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliAlignObjMatrix.h b/STEER/AliAlignObjMatrix.h
index 1e5b620ced5..42fb7ddb3a2 100644
--- a/STEER/AliAlignObjMatrix.h
+++ b/STEER/AliAlignObjMatrix.h
@@ -10,14 +10,15 @@
 #include "TString.h"
 #include "TGeoMatrix.h"
 
+#include "AliAlignObj.h"
+
 class AliAlignObjMatrix : public AliAlignObj {
  public:
   AliAlignObjMatrix();
-  AliAlignObjMatrix(const char* volpath, UShort_t voluid, Double_t x, Double_t y, Double_t z, Double_t psi, Double_t theta, Double_t phi);
-  AliAlignObjMatrix(const char* volpath, ELayerID detId, Int_t volId, Double_t x, Double_t y, Double_t z, Double_t psi, Double_t theta, Double_t phi);
-  AliAlignObjMatrix(const char* volpath, UShort_t voluid, TGeoMatrix& m);
-  AliAlignObjMatrix(const AliAlignObjMatrix& theAlignObj);
-  AliAlignObjMatrix& operator= (const AliAlignObjMatrix& theAlignObj);
+  AliAlignObjMatrix(const char* symname, UShort_t volUId, Double_t x, Double_t y, Double_t z, Double_t psi, Double_t theta, Double_t phi, Bool_t global) throw (const Char_t *);
+  AliAlignObjMatrix(const char* symname, UShort_t volUId, TGeoMatrix& m, Bool_t global) throw (const Char_t *);
+  AliAlignObjMatrix(const AliAlignObj& theAlignObj);
+  AliAlignObjMatrix& operator= (const AliAlignObj& theAlignObj);
   virtual ~AliAlignObjMatrix();
   
   //Setters
@@ -25,14 +26,13 @@ class AliAlignObjMatrix : public AliAlignObj {
   virtual void SetTranslation(const TGeoMatrix& m);
   virtual void SetRotation(Double_t psi, Double_t theta, Double_t phi);
   virtual Bool_t SetRotation(const TGeoMatrix& m);
-  virtual void SetMatrix(const TGeoMatrix& m);
-  virtual void SetPars(Double_t x, Double_t y, Double_t z, Double_t psi,
-		   Double_t theta, Double_t phi);
+
   //Getters
   virtual void GetTranslation(Double_t* tr)  const;
   virtual Bool_t GetAngles(Double_t* angles)  const;
-  virtual void GetPars(Double_t tr[], Double_t rot[]) const;
   virtual void GetMatrix(TGeoHMatrix& m) const;
+
+  virtual AliAlignObj& Inverse() const;
   
  protected:
   TGeoHMatrix fMatrix; // Transformation matrix