Removing warnings (icc), adding more detailed description

[u/mrichter/AliRoot.git] / RALICE / AliPosition.h

diff --git a/RALICE/AliPosition.h b/RALICE/AliPosition.h
index 37bc16649465e08a10e56d849243628c24da36cf..83af0774aa30e476baea4ba2cb1139acb2c7922e 100644 (file)
--- a/RALICE/AliPosition.h
+++ b/RALICE/AliPosition.h
@@ -3,39 +3,8 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
-/* $Id$ */
+// $Id$
 
-///////////////////////////////////////////////////////////////////////////
-// Class AliPosition
-// Handling of positions in various reference frames.
-//
-// This class is meant to serve as a base class for ALICE objects
-// that have a unique position in 3-dimensional space.
-//
-// Note :
-// ------
-// Positions (r) and reference frames (f) are specified via
-// SetPosition(Float_t* r,TString f) under the following conventions :
-//
-// f="car" ==> r in Cartesian coordinates   (x,y,z)
-// f="sph" ==> r in Spherical coordinates   (r,theta,phi)
-// f="cyl" ==> r in Cylindrical coordinates (rho,phi,z)
-//
-// All angles are in radians.
-//
-// Example :
-// ---------
-//
-// AliPosition q;
-// Float_t pos[3]={-1,25,7};
-// q.SetPosition(pos,"car");
-// Float_t loc[3];
-// q.GetPosition(loc,"sph");
-//
-//--- NvE 06-feb-1999 UU-SAP Utrecht
-///////////////////////////////////////////////////////////////////////////
-
-#include <iostream.h>
 #include <math.h>
  
 #include "TObject.h"
@@ -46,15 +15,23 @@
 class AliPosition : public Ali3Vector
 {
  public:
-  AliPosition();                                   // Default constructor
-  virtual ~AliPosition();                          // Destructor
-  virtual void SetPosition(Double_t* r,TString f); // Store position r in frame f
-  virtual void GetPosition(Double_t* r,TString f); // Provide position r in frame f
-  virtual void SetPosition(Float_t*  r,TString f); // Store position r in frame f
-  virtual void GetPosition(Float_t*  r,TString f); // Provide position r in frame f
-  AliPosition& GetPosition();                      // Provide position
-  virtual void SetPosition(Ali3Vector& r);         // Store position r
+  AliPosition();                                         // Default constructor
+  virtual ~AliPosition();                                // Destructor
+  AliPosition(const AliPosition& p);                     // Copy constructor
+  void SetPosition(Double_t* r,TString f);               // Store position r in frame f
+  void GetPosition(Double_t* r,TString f);               // Provide position r in frame f
+  void SetPosition(Float_t*  r,TString f);               // Store position r in frame f
+  void GetPosition(Float_t*  r,TString f);               // Provide position r in frame f
+  AliPosition& GetPosition();                            // Provide position
+  void SetPosition(Ali3Vector& r);                       // Store position r
+  Double_t GetDistance(AliPosition& p);                  // Provide distance to position p
+  Double_t GetDistance(AliPosition* p) { return GetDistance(*p); }
+  void SetPositionErrors(Double_t* r,TString f);         // Store position r in frame f
+  void GetPositionErrors(Double_t* r,TString f);         // Provide position r in frame f
+  void SetPositionErrors(Float_t*  r,TString f);         // Store position r in frame f
+  void GetPositionErrors(Float_t*  r,TString f);         // Provide position r in frame f
+  void ResetPosition();                                  // Reset position and errors to 0
 
- ClassDef(AliPosition,1) // Class definition to enable ROOT I/O
+ ClassDef(AliPosition,4) // Handling of positions in various reference frames.
 };
 #endif