Coding conventions

diff --git a/PHOS/AliPHOSClusterizerv1.cxx b/PHOS/AliPHOSClusterizerv1.cxx
index fd1818bff3d12b17c1b494ea4d18fab869823eb9..5506a5225621bbc949c8a6ad7a6757ea971ce8dd 100644 (file)
--- a/PHOS/AliPHOSClusterizerv1.cxx
+++ b/PHOS/AliPHOSClusterizerv1.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.85  2005/09/27 16:08:08  hristov
+ * New version of CDB storage framework (A.Colla)
+ *
  * Revision 1.84  2005/09/21 10:02:47  kharlov
  * Reading calibration from CDB (Boris Polichtchouk)
  *
@@ -87,6 +90,7 @@
 #include "AliPHOSCalibrationDB.h"
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
+#include "AliCDBEntry.h"
 
 ClassImp(AliPHOSClusterizerv1)
   

diff --git a/STEER/AliAlignObj.cxx b/STEER/AliAlignObj.cxx
index 4065a88f3bd13e5d7e2a1d004edd6698f69dfdcd..d33331b714e044639d3b7b5d01e1d556b87b7b6f 100644 (file)
--- a/STEER/AliAlignObj.cxx
+++ b/STEER/AliAlignObj.cxx
@@ -20,6 +20,15 @@
 //      - AliAlignObjAngles
 //      - AliAlignObjMatrix
 //-----------------------------------------------------------------
+/*****************************************************************************
+ * AliAlignObjAngles: derived alignment class storing alignment information  *
+ *   for a single volume in form of three doubles for the translation        *
+ *   and three doubles for the rotation expressed with the euler angles      *
+ *   in the xyz-convention (http://mathworld.wolfram.com/EulerAngles.html),  *
+ *   also known as roll, pitch, yaw. PLEASE NOTE THE ANGLES SIGNS ARE        *
+ *   INVERSE WITH RESPECT TO THIS REFERENCE!!! In this way the representation*
+ *   is fully consistent with the TGeo Rotation methods.                     *
+ *****************************************************************************/
 
 #include "AliAlignObj.h"
 //#include "AliLog.h"
@@ -61,6 +70,8 @@ AliAlignObj::~AliAlignObj()
 //_____________________________________________________________________________
 void AliAlignObj::AnglesToMatrix(const Double_t *angles, Double_t *rot) const
 {
+  // Calculates the rotation matrix using the 
+  // Euler angles in "x y z" notation
   Double_t degrad = TMath::DegToRad();
   Double_t sinpsi = TMath::Sin(degrad*angles[0]);
   Double_t cospsi = TMath::Cos(degrad*angles[0]);
@@ -83,6 +94,8 @@ void AliAlignObj::AnglesToMatrix(const Double_t *angles, Double_t *rot) const
 //_____________________________________________________________________________
 Bool_t AliAlignObj::MatrixToAngles(const Double_t *rot, Double_t *angles) const
 {
+  // Calculates the Euler angles in "x y z" notation
+  // using the rotation matrix
   if(rot[0]<1e-7 || rot[8]<1e-7) return kFALSE;
   Double_t raddeg = TMath::RadToDeg();
   angles[0]=raddeg*TMath::ATan2(-rot[5],rot[8]);
@@ -162,6 +175,7 @@ AliAlignObjAngles::~AliAlignObjAngles()
 //_____________________________________________________________________________
 void AliAlignObjAngles::SetTranslation(const TGeoMatrix& m)
 {
+  // Sets the translation parameters from an existing TGeoMatrix
   if(m.IsTranslation()){
     const Double_t* tr = m.GetTranslation();
     fTranslation[0]=tr[0];  fTranslation[1]=tr[1]; fTranslation[2]=tr[2];
@@ -174,6 +188,7 @@ void AliAlignObjAngles::SetTranslation(const TGeoMatrix& m)
 //_____________________________________________________________________________
 Bool_t AliAlignObjAngles::SetRotation(const TGeoMatrix& m)
 {
+  // Sets the rotation components from an existing TGeoMatrix
   if(m.IsRotation()){
     const Double_t* rot = m.GetRotationMatrix();
     return MatrixToAngles(rot,fRotation);
@@ -187,6 +202,8 @@ Bool_t AliAlignObjAngles::SetRotation(const TGeoMatrix& m)
 //_____________________________________________________________________________
 void AliAlignObjAngles::SetMatrix(const TGeoMatrix& m)
 {
+  // Sets both the rotation and translation components from an
+  // existing TGeoMatrix
   SetTranslation(m);
   SetRotation(m);
 }
@@ -194,6 +211,7 @@ void AliAlignObjAngles::SetMatrix(const TGeoMatrix& m)
 //_____________________________________________________________________________
 void AliAlignObjAngles::GetPars(Double_t tr[], Double_t angles[]) const
 {
+  // Returns the translations and the rotation angles
   GetTranslation(tr);
   GetAngles(angles);
 }
@@ -201,6 +219,8 @@ void AliAlignObjAngles::GetPars(Double_t tr[], Double_t angles[]) const
 //_____________________________________________________________________________
 void AliAlignObjAngles::GetMatrix(TGeoHMatrix& m) const
 {
+  // Extracts the information in an existing TGeoHMatrix using the translations
+  // and the rotation parameters
   m.SetTranslation(&fTranslation[0]);
   Double_t rot[9];
   AnglesToMatrix(fRotation,rot);
@@ -254,6 +274,7 @@ AliAlignObjMatrix::~AliAlignObjMatrix()
 //_____________________________________________________________________________
 void AliAlignObjMatrix::SetTranslation(Double_t x, Double_t y, Double_t z)
 {
+  // Sets the translation parameters
   Double_t tr[3];
   tr[0]=x; tr[1]=y; tr[2]=z;
   fMatrix.SetTranslation(tr);
@@ -262,6 +283,7 @@ void AliAlignObjMatrix::SetTranslation(Double_t x, Double_t y, Double_t z)
 //_____________________________________________________________________________
 void AliAlignObjMatrix::SetTranslation(const TGeoMatrix& m)
 {
+  // Sets the translation parameters from an existing TGeoMatrix
   const Double_t *tr = m.GetTranslation();
   fMatrix.SetTranslation(tr);
 }
@@ -269,6 +291,7 @@ void AliAlignObjMatrix::SetTranslation(const TGeoMatrix& m)
 //_____________________________________________________________________________
 void AliAlignObjMatrix::SetRotation(Double_t psi, Double_t theta, Double_t phi)
 {
+  // Sets the rotation parameters
   Double_t angles[3] = {psi, theta, phi};
   Double_t rot[9];
   AnglesToMatrix(angles,rot);
@@ -278,6 +301,7 @@ void AliAlignObjMatrix::SetRotation(Double_t psi, Double_t theta, Double_t phi)
 //_____________________________________________________________________________
 Bool_t AliAlignObjMatrix::SetRotation(const TGeoMatrix& m)
 {
+  // Sets the rotation parameters from an existing TGeoMatrix
   const Double_t* rot = m.GetRotationMatrix();
   fMatrix.SetRotation(rot);
   return kTRUE;
@@ -323,6 +347,7 @@ Bool_t AliAlignObjMatrix::GetAngles(Double_t *angles) const
 //_____________________________________________________________________________
 void AliAlignObjMatrix::GetPars(Double_t tr[], Double_t angles[]) const
 {
+  // Gets the translations and the rotation angles
   GetTranslation(tr);
   GetAngles(angles);
 }
@@ -330,8 +355,8 @@ void AliAlignObjMatrix::GetPars(Double_t tr[], Double_t angles[]) const
 //_____________________________________________________________________________
 void AliAlignObjMatrix::GetMatrix(TGeoHMatrix& m) const
 {
-  // Get TGeoHMatrix
-  //
+  // Extracts the translations and the rotation parameters
+  // in an existing TGeoHMatrix
   const Double_t *tr = fMatrix.GetTranslation();
   m.SetTranslation(tr);
   const Double_t *rot = fMatrix.GetRotationMatrix();

diff --git a/STEER/AliAlignObj.h b/STEER/AliAlignObj.h
index baccf704dc951e1b94113fae286d12b0d62f0dae..909779fd06a38d6262d466ad1a488f7d3039f0f2 100644 (file)
--- a/STEER/AliAlignObj.h
+++ b/STEER/AliAlignObj.h
@@ -1,12 +1,12 @@
 #ifndef ALIALIGNOBJ_H
 #define ALIALIGNOBJ_H
 
-/*************************************************************************
- * AliAlignObj: alignment base class for the storage of alignment        *
- *   information for a single volume, that is a translation, a rotation  *
- *   and a the identity of the volume itself in form of a TGeo path and  *
- *   as a unique integer identifier                                      *
- *************************************************************************/
+//************************************************************************
+// AliAlignObj: alignment base class for the storage of alignment        *
+//   information for a single volume, that is a translation, a rotation  *
+//   and a the identity of the volume itself in form of a TGeo path and  *
+//   as a unique integer identifier                                      *
+// ***********************************************************************
 #include "TObject.h"
 #include "TString.h"
 #include "TGeoMatrix.h"
@@ -53,15 +53,15 @@ class AliAlignObj : public TObject {
   ClassDef(AliAlignObj, 1)
 };
 
-/*****************************************************************************
- * AliAlignObjAngles: derived alignment class storing alignment information  *
- *   for a single volume in form of three doubles for the translation        *
- *   and three doubles for the rotation expressed with the euler angles      *
- *   in the xyz-convention (http://mathworld.wolfram.com/EulerAngles.html),  *
- *   also known as roll, pitch, yaw. PLEASE NOTE THE ANGLES SIGNS ARE        *
- *   INVERSE WITH RESPECT TO THIS REFERENCE!!! In this way the representation*
- *   is fully consistent with the TGeo Rotation methods.                     *
- *****************************************************************************/
+//****************************************************************************
+// AliAlignObjAngles: derived alignment class storing alignment information  *
+//   for a single volume in form of three doubles for the translation        *
+//   and three doubles for the rotation expressed with the euler angles      *
+//   in the xyz-convention (http://mathworld.wolfram.com/EulerAngles.html),  *
+//   also known as roll, pitch, yaw. PLEASE NOTE THE ANGLES SIGNS ARE        *
+//   INVERSE WITH RESPECT TO THIS REFERENCE!!! In this way the representation*
+//   is fully consistent with the TGeo Rotation methods.                     *
+//****************************************************************************
 class AliAlignObjAngles : public AliAlignObj{
  public:
   AliAlignObjAngles();

diff --git a/STEER/AliCDBDump.cxx b/STEER/AliCDBDump.cxx
index 8aad7d2f64060b2598fb3a645ad4bd6a732390ea..552c6da8f9164b48fd00990032a807b49f7bf0b4 100644 (file)
--- a/STEER/AliCDBDump.cxx
+++ b/STEER/AliCDBDump.cxx
@@ -61,9 +61,8 @@ AliCDBDump::~AliCDBDump() {
 
 //_____________________________________________________________________________
 Bool_t AliCDBDump::KeyNameToId(const char* keyname, AliCDBRunRange& runRange,
-// build AliCDBId from keyname numbers
-
        Int_t& version, Int_t& subVersion) {
+// build AliCDBId from keyname numbers
 
         Ssiz_t mSize;
 

diff --git a/STEER/AliCDBDump.h b/STEER/AliCDBDump.h
index d04e1c7165c44aba3b80fb34d03b9b6d1bd1e6d3..1a483ce2a63e34f2e5909a67b67a6f9212ddee8d 100644 (file)
--- a/STEER/AliCDBDump.h
+++ b/STEER/AliCDBDump.h
@@ -22,8 +22,8 @@ class AliCDBDump: public AliCDBStorage {
 
 public:
 
-       virtual Bool_t IsReadOnly() {return fReadOnly;};
-       virtual Bool_t HasSubVersion() {return kFALSE;};
+       virtual Bool_t IsReadOnly() const {return fReadOnly;};
+       virtual Bool_t HasSubVersion() const {return kFALSE;};
 
 protected:
 
@@ -69,6 +69,7 @@ public:
 
         virtual Bool_t Validate(const char* dbString);
         virtual AliCDBParam* CreateParameter(const char* dbString);
+       virtual ~AliCDBDumpFactory() {}
 
 protected:
         virtual AliCDBStorage* Create(const AliCDBParam* param);

diff --git a/STEER/AliCDBGrid.cxx b/STEER/AliCDBGrid.cxx
index 423b411d21ea94404b1d4813e29c7a101c1c98cd..6a695d2846d5dbdb3c0795b6cc6898a93967d5a2 100644 (file)
--- a/STEER/AliCDBGrid.cxx
+++ b/STEER/AliCDBGrid.cxx
@@ -32,6 +32,7 @@
 #include <TRegexp.h>
 
 #include "AliLog.h"
+#include "AliCDBEntry.h"
 #include "AliCDBGrid.h"
 
 

diff --git a/STEER/AliCDBGrid.h b/STEER/AliCDBGrid.h
index fc68330e970766d513ea81ed6dfb64cad2e66638..24ec8867b8ca1dd0249173ee3a809b4f1bf09bcc 100644 (file)
--- a/STEER/AliCDBGrid.h
+++ b/STEER/AliCDBGrid.h
@@ -19,8 +19,8 @@ class AliCDBGrid: public AliCDBStorage {
 
 public:
                  
-       virtual Bool_t IsReadOnly() {return kFALSE;};
-       virtual Bool_t HasSubVersion() {return kFALSE;};
+       virtual Bool_t IsReadOnly() const {return kFALSE;};
+       virtual Bool_t HasSubVersion() const {return kFALSE;};
   
 protected:
 

diff --git a/STEER/AliCDBLocal.h b/STEER/AliCDBLocal.h
index 70745f01c3e89367e581b1dd36392d6ff5e3c9f7..00b11eca3666049c25621515430b6703e417d37f 100644 (file)
--- a/STEER/AliCDBLocal.h
+++ b/STEER/AliCDBLocal.h
@@ -19,8 +19,8 @@ class AliCDBLocal: public AliCDBStorage {
 
 public:
 
-       virtual Bool_t IsReadOnly() {return kFALSE;};
-       virtual Bool_t HasSubVersion() {return kTRUE;};
+       virtual Bool_t IsReadOnly() const {return kFALSE;};
+       virtual Bool_t HasSubVersion() const {return kTRUE;};
 
 protected:
 

diff --git a/STEER/AliCDBManager.cxx b/STEER/AliCDBManager.cxx
index 22802be21f581b05a1eec01b2987f0f830eac16a..69782ad051a98a703a4c649a34b916ab3c12d6b4 100644 (file)
--- a/STEER/AliCDBManager.cxx
+++ b/STEER/AliCDBManager.cxx
@@ -12,6 +12,11 @@
  * about the suitability of this software for any purpose. It is          *
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
+//-------------------------------------------------------------------------
+//   Implementation of AliCDBManager and AliCDBParam classe
+//   Author: Alberto Colla 
+//   e-mail: Alberto.Colla@cern.ch
+//-------------------------------------------------------------------------
 
 #include "AliCDBManager.h"
 #include "AliCDBStorage.h"
@@ -19,8 +24,9 @@
 #include "AliCDBDump.h"
 #include "AliCDBLocal.h"
 #include "AliCDBGrid.h"
+//#include "AliCDBEntry.h"
 
-#include <TObjString.h>
+//#include <TObjString.h>
 #include <TSystem.h>
 
 ClassImp(AliCDBParam)
@@ -103,7 +109,7 @@ void AliCDBManager::RegisterFactory(AliCDBStorageFactory* factory) {
 }
 
 //_____________________________________________________________________________
-Bool_t AliCDBManager::HasStorage(const char* dbString) {
+Bool_t AliCDBManager::HasStorage(const char* dbString) const {
 // check if dbString is a URI valid for one of the registered factories 
 
        TIter iter(&fFactories);
@@ -120,7 +126,7 @@ Bool_t AliCDBManager::HasStorage(const char* dbString) {
 }
 
 //_____________________________________________________________________________
-AliCDBParam* AliCDBManager::CreateParameter(const char* dbString) {
+AliCDBParam* AliCDBManager::CreateParameter(const char* dbString) const {
 // create AliCDBParam object from URI string
 
        TIter iter(&fFactories);

diff --git a/STEER/AliCDBManager.h b/STEER/AliCDBManager.h
index da21b03ed0c7c8ff5d8a39721fd0268ac44c69d2..b0fb2ee390f7968abf6ccfc17ffc0a431f6f28c5 100644 (file)
--- a/STEER/AliCDBManager.h
+++ b/STEER/AliCDBManager.h
@@ -14,8 +14,7 @@
 #include <TList.h>
 #include <TMap.h>
 
-#include "AliCDBEntry.h"
-
+class AliCDBEntry;
 class AliCDBStorage;
 class AliCDBStorageFactory;
 class AliCDBParam;
@@ -26,9 +25,9 @@ class AliCDBManager: public TObject {
 
        void RegisterFactory(AliCDBStorageFactory* factory);
 
-       Bool_t HasStorage(const char* dbString);
+       Bool_t HasStorage(const char* dbString) const;
 
-       AliCDBParam* CreateParameter(const char* dbString);
+       AliCDBParam* CreateParameter(const char* dbString) const;
 
        AliCDBStorage* GetStorage(const char* dbString);
        AliCDBStorage* GetStorage(const AliCDBParam* param);
@@ -39,9 +38,9 @@ class AliCDBManager: public TObject {
        void SetDefaultStorage(const AliCDBParam* param);
        void SetDefaultStorage(AliCDBStorage *storage);
 
-       Bool_t IsDefaultStorageSet() {return fDefaultStorage != 0;}
+       Bool_t IsDefaultStorageSet() const {return fDefaultStorage != 0;}
        
-       AliCDBStorage* GetDefaultStorage() {return fDefaultStorage;}
+       AliCDBStorage* GetDefaultStorage() const {return fDefaultStorage;}
 
        void RemoveDefaultStorage();
 
@@ -49,7 +48,7 @@ class AliCDBManager: public TObject {
        void SetDrain(const AliCDBParam* param);
        void SetDrain(AliCDBStorage *storage);
 
-       Bool_t IsDrainSet() {return fDrainStorage != 0;}
+       Bool_t IsDrainSet() const {return fDrainStorage != 0;}
 
        Bool_t Drain(AliCDBEntry* entry);
 
@@ -66,7 +65,7 @@ class AliCDBManager: public TObject {
  private:
                
        AliCDBManager();
-       static AliCDBManager* fgInstance;
+       static AliCDBManager* fgInstance; // AliCDBManager instance
        
        AliCDBStorage* GetActiveStorage(const AliCDBParam* param);
        void PutActiveStorage(AliCDBParam* param, AliCDBStorage* storage);
@@ -94,7 +93,8 @@ class AliCDBStorageFactory: public TObject {
        
 public:
        virtual Bool_t Validate(const char* dbString) = 0;
-       virtual AliCDBParam* CreateParameter(const char* dbString) = 0; 
+       virtual AliCDBParam* CreateParameter(const char* dbString) = 0;
+       virtual ~AliCDBStorageFactory(){}
 
 protected:
        virtual AliCDBStorage* Create(const AliCDBParam* param) = 0;
@@ -127,8 +127,8 @@ protected:
 
 private:
 
-       TString fType;
-       TString fURI;
+       TString fType; // CDB type?
+       TString fURI;  // CDB URI?
 
        ClassDef(AliCDBParam, 0);
 };

diff --git a/STEER/AliCDBStorage.h b/STEER/AliCDBStorage.h
index a3fdda467cc97dd9804c10716e256e5755e79294..9e34602f2fa9e6e69623d38bafefe14bd3920ee4 100644 (file)
--- a/STEER/AliCDBStorage.h
+++ b/STEER/AliCDBStorage.h
@@ -70,8 +70,8 @@ public:
        Bool_t Put(AliCDBEntry* entry);
 
 
-       virtual Bool_t IsReadOnly() = 0;
-       virtual Bool_t HasSubVersion() = 0;
+       virtual Bool_t IsReadOnly() const = 0;
+       virtual Bool_t HasSubVersion() const = 0;
 
 protected:
                

diff --git a/STEER/AliCollisionGeometry.cxx b/STEER/AliCollisionGeometry.cxx
index 70bf39bed56bdf9f34721dd334567d5fbc2cd46b..32a66543e6642aae68f2e757e6251247fee6141f 100644 (file)
--- a/STEER/AliCollisionGeometry.cxx
+++ b/STEER/AliCollisionGeometry.cxx
@@ -14,6 +14,12 @@
  **************************************************************************/
 
 /* $Id$ */
+//-------------------------------------------------------------------------
+//                          Class AliCollisionGeometry
+//   This is a class to handle the collison geometry defined by
+//   the generator
+//   Author: A.Morsch Andreas.Morsch@cern.ch
+//-------------------------------------------------------------------------
 
 
 #include "AliCollisionGeometry.h"

diff --git a/STEER/AliCollisionGeometry.h b/STEER/AliCollisionGeometry.h
index afe7b420f6590002aea3de3ee4aa58b485788894..aec0d0c5658921da77bb6f135c719d87ad789889 100644 (file)
--- a/STEER/AliCollisionGeometry.h
+++ b/STEER/AliCollisionGeometry.h
@@ -4,6 +4,11 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
+//-------------------------------------------------------------------------
+//                          Class AliCollisionGeometry
+//   This is a class to handle the collison geometry defined by
+//   the generator
+//-------------------------------------------------------------------------
 
 #include <Rtypes.h>
 
@@ -13,19 +18,19 @@ public:
     AliCollisionGeometry();
     virtual ~AliCollisionGeometry(){;}
     // Getters
-    Float_t ImpactParameter()   {return fImpactParameter;}
-    Float_t ReactionPlaneAngle() {return fReactionPlaneAngle;}
-    Int_t   HardScatters() {return fNHardScatters;}
-    Int_t   ProjectileParticipants()  {return fNProjectileParticipants;}
-    Int_t   TargetParticipants()      {return fNTargetParticipants;}
-    Int_t   ProjSpectatorsn()  {return fProjectileSpecn;}
-    Int_t   ProjSpectatorsp()  {return fProjectileSpecp;}
-    Int_t   TargSpectatorsn()  {return fTargetSpecn;    }
-    Int_t   TargSpectatorsp()  {return fTargetSpecp;    }
-    Int_t   NN()    {return fNNColl;}
-    Int_t   NNw()   {return fNNwColl;}
-    Int_t   NwN()   {return fNwNColl;}
-    Int_t   NwNw()  {return fNwNwColl;}
+    Float_t ImpactParameter() const  {return fImpactParameter;}
+    Float_t ReactionPlaneAngle() const {return fReactionPlaneAngle;}
+    Int_t   HardScatters() const {return fNHardScatters;}
+    Int_t   ProjectileParticipants() const {return fNProjectileParticipants;}
+    Int_t   TargetParticipants() const {return fNTargetParticipants;}
+    Int_t   ProjSpectatorsn() const {return fProjectileSpecn;}
+    Int_t   ProjSpectatorsp() const {return fProjectileSpecp;}
+    Int_t   TargSpectatorsn() const {return fTargetSpecn;       }
+    Int_t   TargSpectatorsp() const {return fTargetSpecp;       }
+    Int_t   NN() const  {return fNNColl;}
+    Int_t   NNw() const {return fNNwColl;}
+    Int_t   NwN() const {return fNwNColl;}
+    Int_t   NwNw() const {return fNwNwColl;}
     // Setters
     void SetImpactParameter(Float_t b)     {fImpactParameter=b;}
     void SetReactionPlaneAngle(Float_t phi)     {fReactionPlaneAngle = phi;}

diff --git a/STEER/AliESDHLTtrack.cxx b/STEER/AliESDHLTtrack.cxx
index 9028e5ead3925680e7729e6874d48addaee589a6..8995c0893ecfacbbd3f987cca278a03d19e1898f 100644 (file)
--- a/STEER/AliESDHLTtrack.cxx
+++ b/STEER/AliESDHLTtrack.cxx
@@ -46,6 +46,7 @@ AliESDHLTtrack::AliESDHLTtrack() :
   fSizeY(0),
   fPID(0)
 {
+  // Default constructor
   fRowRange[0] = fRowRange[1] = 0;
   fFirstPoint[0] = fFirstPoint[1] = fFirstPoint[2] = 0;
   fLastPoint[0] = fLastPoint[1] = fLastPoint[2] = 0;
@@ -59,6 +60,7 @@ Double_t AliESDHLTtrack::GetP() const
 
 Double_t AliESDHLTtrack::GetPseudoRapidity() const
 {
+  // Calculates the pseudorapidity
   return 0.5 * TMath::Log((GetP() + GetPz()) / (GetP() - GetPz()));
 }
 

diff --git a/STEER/AliESDHLTtrack.h b/STEER/AliESDHLTtrack.h
index 47564d3f0bab8920d0ef06b867ea6b642cc4d7c7..5856295e9a9e61e7f5f021ecae8b708fad185c86 100644 (file)
--- a/STEER/AliESDHLTtrack.h
+++ b/STEER/AliESDHLTtrack.h
@@ -100,22 +100,22 @@ protected:
   Int_t fRowRange[2]; //Subsector where this track was build
   UShort_t fSector;      //Sector # where  this track was build
 
-  Float_t fFirstPoint[3]; //First and last track point in TPC
-  Float_t fLastPoint[3];
+  Float_t fFirstPoint[3]; //First track point in TPC
+  Float_t fLastPoint[3];  //Last track point in TPC
 
   Int_t    fQ;    //track charge
   Float_t fTanl; //tan of dipangle
   Float_t fPsi;  //azimuthal angle of the momentum 
   Float_t fPt;   //transverse momentum
 
-  Float_t fPterr;
-  Float_t fPsierr;
-  Float_t fTanlerr;
+  Float_t fPterr;   //Pt error
+  Float_t fPsierr;  //Psi error
+  Float_t fTanlerr; //Error of Tangent lambda
 
-  Float_t fBinX;
-  Float_t fBinY;
-  Float_t fSizeX;
-  Float_t fSizeY;
+  Float_t fBinX;  //X bin?
+  Float_t fBinY;  //Y bin?
+  Float_t fSizeX; //X size?
+  Float_t fSizeY; //Y size?
   
   Float_t fPID; //so far filled only for conformal mapper tracks
 

diff --git a/STEER/TTreeStream.cxx b/STEER/TTreeStream.cxx
index 087efde097df959b31be9ec57a3137f6f48886ce..2bc34afa3565a83035a9a774aa627559bd985bef 100644 (file)
--- a/STEER/TTreeStream.cxx
+++ b/STEER/TTreeStream.cxx
@@ -15,7 +15,6 @@
 
 /* $Id$ */
 
-#include "TBrowser.h"
 #include "TFile.h"
 #include "TObjArray.h"
 #include "TTree.h"
@@ -219,7 +218,7 @@ void TTreeSRedirector::Close(){
 
 //-------------------------------------------------------------
 TTreeDataElement:: TTreeDataElement(Char_t type) :
-  fName(),
+  TNamed(),
   fType(type),
   fDType(0),
   fClass(0),
@@ -231,7 +230,7 @@ TTreeDataElement:: TTreeDataElement(Char_t type) :
 }
 
 TTreeDataElement:: TTreeDataElement(TDataType* type) :
-  fName(),
+  TNamed(),
   fType(0),
   fDType(type),
   fClass(0),
@@ -243,7 +242,7 @@ TTreeDataElement:: TTreeDataElement(TDataType* type) :
 }
 
 TTreeDataElement:: TTreeDataElement(TClass* cl) :
-  fName(),
+  TNamed(),
   fType(0),
   fDType(0),
   fClass(cl),

diff --git a/STEER/TTreeStream.h b/STEER/TTreeStream.h
index f09a275e4a96bdecf4819f67d479d30c47d6bc0c..468f83962c8a437e5a8e11946eb8a72669cbd42a 100644 (file)
--- a/STEER/TTreeStream.h
+++ b/STEER/TTreeStream.h
@@ -24,12 +24,11 @@ class TTreeDataElement: public TNamed {
   TTreeDataElement(const TTreeDataElement & tde);
   TTreeDataElement & operator=(const TTreeDataElement & tde);
 
-  TString fName;    // name of the data element
   Char_t  fType;     // type of data element
   TDataType *fDType; //data type pointer 
   TClass    *fClass; //data type pointer
   void * fPointer;  // pointer to element
-  ClassDef(TTreeDataElement,1)
+  ClassDef(TTreeDataElement,2)
 };
 
 class TTreeStream: public TNamed {