corrected the Merger for non consecutive run numbers

[u/mrichter/AliRoot.git] / STEER / AliAlignObjMatrix.h

diff --git a/STEER/AliAlignObjMatrix.h b/STEER/AliAlignObjMatrix.h
index c33f2738a4f53ba2f8269ea1bd0619d9a906d237..42fb7ddb3a2c6bc5839595295e2b70beb5199e93 100644 (file)
--- a/STEER/AliAlignObjMatrix.h
+++ b/STEER/AliAlignObjMatrix.h
@@ -15,9 +15,8 @@
 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, Bool_t global=1) throw (const Char_t *);
-  AliAlignObjMatrix(const char* volpath, UShort_t voluid, TGeoMatrix& m);
+  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();
@@ -27,13 +26,10 @@ 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;