X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=RALICE%2FAli4Vector.h;h=9eff7c6f8a31dfbebe7e64cfe938110afdea6e9b;hb=b7e18fda9615600046628c97ad2e52aa7064abdc;hp=b60ae926a7499d0bb69f4104ec173eb5992e5a39;hpb=3da306186bdfe9b8dedf54c4b9cdcf2bff5b132c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RALICE/Ali4Vector.h b/RALICE/Ali4Vector.h
index b60ae926a74..9eff7c6f8a3 100644
--- a/RALICE/Ali4Vector.h
+++ b/RALICE/Ali4Vector.h
@@ -5,64 +5,6 @@
 
 /* $Id$ */
 
-///////////////////////////////////////////////////////////////////////////
-// Class Ali4Vector
-// Handling of Lorentz 4-vectors in various reference frames.
-//
-// This class is meant to serve as a base class for ALICE objects
-// that have Lorentz 4-vector characteristics.
-//
-// All 4-vectors are treated in the contravariant form and the convention
-// for the metric and the 4-vector components is according to the one
-// used in the book "Classical Electrodynamics" by J.D. Jackson.
-//
-// The dotproduct is defined such that p.Dot(p) yields the Lorentz invariant
-// scalar of the 4-vector p (i.e. m**2 in case p is a 4-momentum).   
-//
-// Note :
-// ------
-// Vectors (v) and reference frames (f) are specified via
-// SetVector(Float_t* v,TString f) under the following conventions :
-//
-// f="car" ==> 3-vector part of v in Cartesian coordinates   (x,y,z)
-// f="sph" ==> 3-vector part of v in Spherical coordinates   (r,theta,phi)
-// f="cyl" ==> 3-vector part of v in Cylindrical coordinates (rho,phi,z)
-//
-// All angles are in radians.
-//
-// Example :
-// ---------
-//
-// Ali4Vector a;
-//
-// Float_t v[4]={25,-1,3,7};
-// a.SetVector(v,"car");
-//
-// Float_t vec[4];
-// a.GetVector(vec,"sph");
-//
-// Ali4Vector b;
-// Float_t v2[4]={33,6,-18,2};
-// b.SetVector(v2,"car");
-//
-// Float_t dotpro=a.Dot(b);
-//
-// Float_t x0=16;
-// Ali3Vector x;
-// Float_t vec2[3]={1,2,3};
-// x.SetVector(vec2,"car");
-//
-// Ali4Vector c;
-// c.SetVector(x0,x);
-// c.GetVector(vec,"car");
-// c.Info("cyl");
-// c=a+b;
-// c=a-b;
-// c=a*5;
-//
-//--- NvE 01-apr-1999 UU-SAP Utrecht
-///////////////////////////////////////////////////////////////////////////
-
 #include <iostream.h>
 #include <math.h>
  
@@ -78,10 +20,23 @@ class Ali4Vector
   virtual void GetVector(Double_t* v,TString f);    // Provide contravariant vector v^i in frame f
   virtual void SetVector(Float_t*  v,TString f);    // Store contravariant vector v^i in frame f
   virtual void GetVector(Float_t*  v,TString f);    // Provide contravariant vector v^i in frame f
+  virtual void SetScalar(Double_t v0,Double_t dv0=0); // Set the scalar part (with error) of v
+  virtual void SetScalarError(Double_t dv0);        // Set error on the scalar part of v
   Double_t GetScalar();                             // Provide the scalar part of v
+  virtual void Set3Vector(Ali3Vector v);            // Set the 3-vector part of v
+  virtual void Set3Vector(Double_t* v,TString f);   // Set the 3-vector part of v in frame f
+  virtual void Set3Vector(Float_t*  v,TString f);   // Set the 3-vector part of v in frame f
   Ali3Vector Get3Vector();                          // Provide the 3-vector part of v
+  virtual void SetInvariant(Double_t v2,Double_t dv2=0); // Set the Lorentz invariant (with error)
+  virtual void SetInvariantError(Double_t dv2);     // Set error on the Lorentz invariant
+  Double_t GetInvariant();                          // Provide the Lorentz invariant
+  virtual void SetErrors(Double_t* v,TString f);    // Store errors of vector v^i in frame f
+  virtual void GetErrors(Double_t* v,TString f);    // Provide errors of vector v^i in frame f
+  virtual void SetErrors(Float_t*  v,TString f);    // Store errors of vector v^i in frame f
+  virtual void GetErrors(Float_t*  v,TString f);    // Provide errors of vector v^i in frame f
   virtual void Info(TString f="car");               // Print contravariant components in frame f
   Double_t Dot(Ali4Vector& q);                      // Provide dot product v^i*q_i
+  Double_t GetResultError();                        // Provide error on scalar result (e.g. Dot)
   Ali4Vector operator+(Ali4Vector& q);              // Add contravariant vector q
   Ali4Vector operator-(Ali4Vector& q);              // Subtract contravariant vector q
   Ali4Vector operator*(Double_t s);                 // Multiply contravariant vector with scalar s
@@ -90,11 +45,17 @@ class Ali4Vector
   Ali4Vector& operator-=(Ali4Vector& q);            // Subtract contravariant vector q
   Ali4Vector& operator*=(Double_t s);               // Multiply with scalar s
   Ali4Vector& operator/=(Double_t s);               // Divide by scalar s
+  Int_t GetScalarFlag();                            // Provide the fScalar flag value
 
  protected:
-  Double_t fV0;  // The scalar part
-  Ali3Vector fV; // The 3-vector part
+  Double_t fV2;      // The Lorentz invariant (v^i*v_i)
+  Double_t fV0;      // The scalar part
+  Ali3Vector fV;     // The 3-vector part
+  Double_t fDv2;     // The error on the Lorentz invariant
+  Double_t fDv0;     // The error on the scalar part
+  Double_t fDresult; // The error on the scalar result of an operation (e.g. dotproduct) 
+  Int_t fScalar;     // Flag denoting scalar mode
 
- ClassDef(Ali4Vector,1) // Class definition to enable ROOT I/O
+ ClassDef(Ali4Vector,1) // Handling of Lorentz 4-vectors in various reference frames.
 };
 #endif