New constructors added to AliAlignObj and the derived classes (R.Grosso)

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

diff --git a/STEER/AliAlignObj.h b/STEER/AliAlignObj.h
index e4cb6a49097c4eab6e4ed8202a56d7bffd06f8d2..6810d5336c7e329feb8d8eff9f2ad848a0c280df 100644 (file)
--- a/STEER/AliAlignObj.h
+++ b/STEER/AliAlignObj.h
@@ -18,11 +18,6 @@ class AliAlignObj : public TObject {
 
  public:
 
-  AliAlignObj();
-  AliAlignObj(const AliAlignObj& theAlignObj);
-  AliAlignObj& operator= (const AliAlignObj& theAlignObj);
-  AliAlignObj& operator*=(const AliAlignObj& theAlignObj);
-  virtual ~AliAlignObj();
   enum ELayerID{kInvalidLayer=0,
                kFirstLayer=1,
                kSPD1=1, kSPD2=2,
@@ -35,6 +30,13 @@ class AliAlignObj : public TObject {
                kRICH=18,
                kMUON=19,
                kLastLayer=20};
+  AliAlignObj();
+  AliAlignObj(const char* volpath, UShort_t voluid);
+  AliAlignObj(const char* volpath, ELayerID detId, Int_t modId);
+  AliAlignObj(const AliAlignObj& theAlignObj);
+  AliAlignObj& operator= (const AliAlignObj& theAlignObj);
+  AliAlignObj& operator*=(const AliAlignObj& theAlignObj);
+  virtual ~AliAlignObj();
 
   //Setters
   virtual void SetTranslation(Double_t x, Double_t y, Double_t z) = 0;
@@ -43,6 +45,8 @@ class AliAlignObj : public TObject {
   virtual Bool_t SetRotation(const TGeoMatrix& m) = 0;
   virtual void SetPars(Double_t x, Double_t y, Double_t z, Double_t psi,
                Double_t theta, Double_t phi) = 0;
+  virtual Bool_t SetLocalPars(Double_t x, Double_t y, Double_t z,
+                             Double_t psi, Double_t theta, Double_t phi);
   virtual void SetMatrix(const TGeoMatrix& m) = 0;
   void  SetVolPath(const TString& volpath) {fVolPath=volpath;}
   void  SetVolUID(UShort_t voluid) {fVolUID=voluid;}
@@ -57,6 +61,10 @@ class AliAlignObj : public TObject {
   virtual void GetPars(Double_t transl[], Double_t rot[]) const=0;
   virtual void GetMatrix(TGeoHMatrix& m) const=0;
 
+  Bool_t   IsSortable() const {return kTRUE;}
+  Int_t         GetLevel() const;
+  virtual Int_t Compare(const TObject* obj) const;
+
   virtual AliAlignObj& Inverse() const=0;
 
   void  Transform(AliTrackPoint &p) const;
@@ -68,6 +76,7 @@ class AliAlignObj : public TObject {
   static const char* LayerName(Int_t layer) { return fgLayerName[layer]; }
 
   static UShort_t LayerToVolUID(ELayerID layerId, Int_t modId);
+  static UShort_t LayerToVolUID(Int_t    layerId, Int_t modId);
   static ELayerID VolUIDToLayer(UShort_t voluid, Int_t &modId);
   static ELayerID VolUIDToLayer(UShort_t voluid);
 
@@ -81,12 +90,20 @@ class AliAlignObj : public TObject {
   Bool_t ApplyToGeometry();
   static Bool_t   GetFromGeometry(const char *path, AliAlignObj &alobj);
 
+  static void         InitAlignObjFromGeometry();
+  static AliAlignObj* GetAlignObj(UShort_t voluid) {
+    Int_t modId;
+    ELayerID layerId = VolUIDToLayer(voluid,modId);
+    return GetAlignObj(layerId,modId);
+  }
+  static AliAlignObj* GetAlignObj(ELayerID layerId, Int_t modId);
+
  protected:
 
   void AnglesToMatrix(const Double_t *angles, Double_t *rot) const;
   Bool_t MatrixToAngles(const Double_t *rot, Double_t *angles) const;
 
-  void InitVolPaths();
+  static void InitVolPaths();
 
   //Volume identifiers
   TString  fVolPath; // Volume path inside TGeo geometry
@@ -97,6 +114,8 @@ class AliAlignObj : public TObject {
 
   static TString*    fgVolPath[kLastLayer - kFirstLayer];
 
+  static AliAlignObj** fgAlignObjs[kLastLayer - kFirstLayer];
+
   ClassDef(AliAlignObj, 2)
 };