Using the recommended way of forward declarations for TVector and TMatrix (see v5...

diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h
index 0903929a1611043a82c3063543b5f7c686bcfbcb..60aad85833e481ad43e2825bcdfa83eee40b8bce 100644 (file)
--- a/EMCAL/AliEMCALGeometry.h
+++ b/EMCAL/AliEMCALGeometry.h
@@ -41,7 +41,7 @@ public:
   };
 
   Bool_t AreInSameTower(Int_t id1, Int_t id2) const ;  
-  virtual void GetGlobal(const AliRecPoint *, TVector3 &, TMatrix &) const {}
+  virtual void GetGlobal(const AliRecPoint *, TVector3 &, TMatrixF &) const {}
   virtual void GetGlobal(const AliRecPoint *, TVector3 &) const {}
   virtual Bool_t Impact(const TParticle *) const {return kTRUE;}
 

diff --git a/EMCAL/AliEMCALPIDv1.h b/EMCAL/AliEMCALPIDv1.h
index bd1e1cfdb377f2c377f53b54e2a5804d2fde2b36..5b483a7920dc6766ad61eca5373396c8d769ec66 100644 (file)
--- a/EMCAL/AliEMCALPIDv1.h
+++ b/EMCAL/AliEMCALPIDv1.h
@@ -15,7 +15,6 @@
 // --- ROOT system ---
 //class TFormula ;
 class TVector3 ;
-class TMatrix ;
 class TPrincipal ;
 
 // --- Standard library ---

diff --git a/EVGEN/AliGenHBTosl.h b/EVGEN/AliGenHBTosl.h
index 76384fd59a36c20aeb0e4025992b7c5fd2c53f46..2274046fedd54920e53377be7bf5d1fc60766992 100644 (file)
--- a/EVGEN/AliGenHBTosl.h
+++ b/EVGEN/AliGenHBTosl.h
@@ -54,7 +54,7 @@
 class TH3D;
 class AliStack;
 class TParticle;
-class TVector;
+class TVector3;
 
 #include <Riostream.h>
 

diff --git a/FMD/AliFMDGeometry.cxx b/FMD/AliFMDGeometry.cxx
index 83031a45638735b844b0349a98b3197cd7e61750..4cd5899d11352d5ce10527d5d94197087eff58ea 100644 (file)
--- a/FMD/AliFMDGeometry.cxx
+++ b/FMD/AliFMDGeometry.cxx
@@ -325,7 +325,7 @@ AliFMDGeometry::XYZ2Detector(Double_t  x,
 void
 AliFMDGeometry::GetGlobal(const AliRecPoint* p, 
                          TVector3& pos, 
-                         TMatrix& /* mat */) const 
+                         TMatrixF& /* mat */) const 
 {
   // Get the global coordinates cooresponding to the reconstructed
   // point p.  The coordiates is returned in the 3-vector pos passed

diff --git a/FMD/AliFMDGeometry.h b/FMD/AliFMDGeometry.h
index 210d9f44e6d9c1f7cd24f2e65854de420411be8f..a40e4ccf618a39e1d21a266441bf9f680a19c0a4 100644 (file)
--- a/FMD/AliFMDGeometry.h
+++ b/FMD/AliFMDGeometry.h
@@ -17,8 +17,6 @@
 #ifndef ALIGEOMETRY_H
 # include <AliGeometry.h>
 #endif
-class TVector3;
-class TMatrix;
 class TParticle;
 class AliRecPoint;
 class AliFMDRing;
@@ -81,7 +79,7 @@ public:
 
   // AliGeometry member functions 
   virtual void GetGlobal(const AliRecPoint* p, TVector3& pos, 
-                        TMatrix& mat) const;
+                        TMatrixF& mat) const;
   virtual void GetGlobal(const AliRecPoint* p, TVector3& pos) const;
   virtual Bool_t Impact(const TParticle* particle) const;
 protected:

diff --git a/ITS/AliITSIOTrack.h b/ITS/AliITSIOTrack.h
index f298c2a9a9a9d610efbb87ddf310966a61f4ba5d..22090ce786f12eb91abb8645cbca67e14d3f4556 100644 (file)
--- a/ITS/AliITSIOTrack.h
+++ b/ITS/AliITSIOTrack.h
@@ -7,7 +7,6 @@
 
 #include <TObject.h>
 
-class TMatrix;
 class AliITSIOTrack : public TObject {
 
 

diff --git a/ITS/AliITSPid.cxx b/ITS/AliITSPid.cxx
index 38e7e9df4aebb9302acbabe29312770eabb383a5..6300d29fe179254dab4b2dbe7ce67116cade4dcf 100644 (file)
--- a/ITS/AliITSPid.cxx
+++ b/ITS/AliITSPid.cxx
@@ -260,7 +260,7 @@ void        AliITSPid::SetCut(Int_t n,Float_t pm,Float_t pilo,Float_t pihi,
     return ;    
 }
 //------------------------------------------------------------
-void AliITSPid::SetVec(Int_t ntrack,TVector info) const
+void AliITSPid::SetVec(Int_t ntrack,const TVector& info) const
 {
   //Store track info in tracls table
 TClonesArray& arr=*fTrs;

diff --git a/ITS/AliITSPid.h b/ITS/AliITSPid.h
index fa78149a7dea3a059bb2ffa3013e0176cc64217c..16e81527588c6ec87090f718bdae00427d7adfe2 100644 (file)
--- a/ITS/AliITSPid.h
+++ b/ITS/AliITSPid.h
@@ -7,9 +7,9 @@
 /////////////////////////////////////////////////////////////////
 
 #include <TObject.h>
+#include <TVectorfwd.h>
 
 class TClonesArray;
-class TVector;
 class AliITSIOTrack;
 class AliKalmanTrack;
 class AliITStrackV2;
@@ -29,7 +29,7 @@ public:
         virtual void Print(Option_t *option="") const {TObject::Print(option);}
        void    Tab(void);
        void    Reset(void);
-       void    SetVec(Int_t track,TVector info) const;
+       void    SetVec(Int_t track,const TVector& info) const;
        TVector* GetVec(Int_t track) const;
        Int_t   GetPcode(TClonesArray* rps,Float_t pm);
        Int_t   GetPcode(Float_t p,Float_t pm);

diff --git a/ITS/AliITSRad.h b/ITS/AliITSRad.h
index 3e75a517cf0621001d2e786f162f527047395395..c09e93116cd447f7871cc301a48e1c35d7d6987d 100644 (file)
--- a/ITS/AliITSRad.h
+++ b/ITS/AliITSRad.h
@@ -6,7 +6,6 @@
 
 
 class TObjArray;
-class TMatrix;
 
 
 //                  ITS Class to calculate the radiation lenght matrix

diff --git a/ITS/AliITSTrackerV1.h b/ITS/AliITSTrackerV1.h
index 690a85682d3cf41a37de56b0dfb80bb92607b03e..814199afe93c787356947e985e9c2d533c337c47 100644 (file)
--- a/ITS/AliITSTrackerV1.h
+++ b/ITS/AliITSTrackerV1.h
@@ -23,10 +23,9 @@
 #define ALIITSTRACKERV1_H
 
 #include <TObject.h>
+#include <TVectorfwd.h>
 
 class TObjArray;
-class TVector;
-class TMatrix;
 class AliITSTrackV1;
 class AliITSRad;
 class TStopwatch;

diff --git a/ITS/AliITSsimulationSDD.h b/ITS/AliITSsimulationSDD.h
index 8fde01e78d00ae1239ca2d8d6ef44191dd18bd29..bae73d1de013a0b462ad25eab898b2561027c4ca 100644 (file)
--- a/ITS/AliITSsimulationSDD.h
+++ b/ITS/AliITSsimulationSDD.h
@@ -16,7 +16,6 @@
 
 class TH1F;
 class TFile;
-class TVector;
 class TArrayI;
 class TArrayF;
 class AliITS;

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 3f692b0807c3fb1b702877a62c7d146b7b1bd820..3ec582fb8be4be6ab0de023daa5e68a04718e7cb 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -21,7 +21,8 @@
 #include "AliMUONChamber.h"
 #include "AliMUONTrigger.h"
 
-class TVector;
+#include <TVectorfwd.h>
+
 class TFile;
 class TTree;
 

diff --git a/MUON/AliMUONClusterFinderAZ.h b/MUON/AliMUONClusterFinderAZ.h
index f90a5c750e2dd6e03dfd73e535d205834d7a7315..891f10c6ffce4613837350c66e6113a5af6a8492 100644 (file)
--- a/MUON/AliMUONClusterFinderAZ.h
+++ b/MUON/AliMUONClusterFinderAZ.h
@@ -11,11 +11,11 @@
 /// \brief Cluster finder in MUON arm of ALICE
 
 #include "AliMUONClusterFinderVS.h"
+#include <TMatrixDfwd.h>
 
 class TH2D;
 class TClonesArray;
 class TMinuit;
-class TMatrixD;
 
 class AliSegmentation;
 class AliMUONResponse;

diff --git a/MUON/AliMUONPoints.cxx b/MUON/AliMUONPoints.cxx
index a12a4d5fb494a24ae4b7ccb64b39f1f7523bdea6..a921bd85fa43cad4ca815f189fa982baf9f53ccf 100644 (file)
--- a/MUON/AliMUONPoints.cxx
+++ b/MUON/AliMUONPoints.cxx
@@ -30,7 +30,7 @@
 
 #include <TROOT.h>
 #include <TPolyMarker3D.h>
-#include <TMatrix.h>
+#include <TMatrixF.h>
 #include <TVirtualPad.h>
 #include <TPaveText.h>
 #include <TMarker3DBox.h>

diff --git a/MUON/AliMUONPoints.h b/MUON/AliMUONPoints.h
index 3628a920a8b652bddedd14acd935b3665dad8b7a..907886de7b172a349255cc2335f5f539664e2580 100644 (file)
--- a/MUON/AliMUONPoints.h
+++ b/MUON/AliMUONPoints.h
@@ -12,8 +12,8 @@
 /// \brief Class to draw detector clusters (is PolyMarker3D)
 
 #include "AliPoints.h"
+#include <TMatrixFfwd.h>
 
-class TMatrix;
 class TMarker3DBox;
 
 class AliMUONDigit;
@@ -40,7 +40,7 @@ public:
   virtual void          SetTrackIndex(Int_t trackindex) {fTrackIndex = trackindex;}
   virtual void          SetDigitIndex(Int_t digitindex) {fDigitIndex = digitindex;}
   virtual void          Set3DMarker(Int_t i,TMarker3DBox *marker) {fMarker[i] = marker;}
-  virtual void          SetMatrix(TMatrix *matrix) {fMatrix = matrix;}
+  virtual void          SetMatrix(TMatrixF *matrix) {fMatrix = matrix;}
   
 protected:
   AliMUONPoints(const AliMUONPoints& points);  
@@ -50,7 +50,7 @@ protected:
    Int_t            fTrackIndex;       // Link to track number 
    Int_t            fDigitIndex;       // Link to digit 
   TMarker3DBox     *fMarker[3];        // pointer to  associated 3D-marker
-  TMatrix          *fMatrix;           // test
+  TMatrixF          *fMatrix;           // test
   
   ClassDef(AliMUONPoints,1) //Class to draw detector clusters (is PolyMarker3D) for MUON
 };

diff --git a/MUON/AliMUONTrackK.h b/MUON/AliMUONTrackK.h
index 7c79a3d1323eafc09e3847acb9dfcddbbc5990c9..6c761086ac57fdce646c259b367843f0d2109bc0 100644 (file)
--- a/MUON/AliMUONTrackK.h
+++ b/MUON/AliMUONTrackK.h
@@ -12,9 +12,9 @@
 
 #include <TObject.h>
 #include "AliMUONTrack.h" 
+#include <TMatrixDfwd.h>
 
 class TArrayD;
-class TMatrixD;
 class AliMUONTrackReconstructor;
 class TClonesArray;
 class TObjArray;

diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx
index bfd942387e140fe445d9af0ee1e5f9a81fbb83fa..5bb0aeb62c0b14d33774c5e15018702329170628 100644 (file)
--- a/PHOS/AliPHOSGeometry.cxx
+++ b/PHOS/AliPHOSGeometry.cxx
@@ -266,7 +266,7 @@ void AliPHOSGeometry::EmcXtalCoverage(Double_t & theta, Double_t & phi, Option_t
  
 
 //____________________________________________________________________________
-void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrix & /*gmat*/) const
+void AliPHOSGeometry::GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrixF & /*gmat*/) const
 {
   // Calculates the coordinates of a RecPoint and the error matrix in the ALICE global coordinate system
  

diff --git a/PHOS/AliPHOSGeometry.h b/PHOS/AliPHOSGeometry.h
index 990e88b60d280486e14e30fe81177bab89887d72..a2caa3c2246f780cb3a1284f15250fb2c9864217 100644 (file)
--- a/PHOS/AliPHOSGeometry.h
+++ b/PHOS/AliPHOSGeometry.h
@@ -39,7 +39,7 @@ public:
   virtual ~AliPHOSGeometry(void) ; 
   static AliPHOSGeometry * GetInstance(const Text_t* name, const Text_t* title="") ; 
   static AliPHOSGeometry * GetInstance() ; 
-  virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrix & gmat) const ;
+  virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos, TMatrixF & gmat) const ;
   virtual void   GetGlobal(const AliRecPoint* RecPoint, TVector3 & gpos) const ;
   virtual Bool_t Impact(const TParticle * particle) const ;
 

diff --git a/PHOS/AliPHOSPIDv1.cxx b/PHOS/AliPHOSPIDv1.cxx
index 25079b84f357ef002466e509484694a605a49a3c..0348effcddfd5b0ee5b39d22cdace4f13695bf2d 100644 (file)
--- a/PHOS/AliPHOSPIDv1.cxx
+++ b/PHOS/AliPHOSPIDv1.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.101  2005/05/28 14:19:04  schutz
+ * Compilation warnings fixed by T.P.
+ *
  */
 
 //_________________________________________________________________________
@@ -87,6 +90,7 @@
 
 
 // --- Standard library ---
+#include <TMatrixF.h>
 #include "TFormula.h"
 #include "TBenchmark.h"
 #include "TPrincipal.h"
@@ -787,7 +791,7 @@ TVector3 AliPHOSPIDv1::GetMomentumDirection(AliPHOSEmcRecPoint * emc, AliPHOSCpv
   //  in case 1.
 
   TVector3 dir(0,0,0) ; 
-  TMatrix  dummy ;
+  TMatrixF  dummy ;
   
   emc->GetGlobalPosition(dir, dummy) ;
 
@@ -1452,7 +1456,7 @@ void  AliPHOSPIDv1::SetParameters()
   // lines 14-15: parameters to calculate border for high-pt photons and pi0
 
   fFileNameParameters = gSystem->ExpandPathName("$ALICE_ROOT/PHOS/Parameters.dat");
-  fParameters = new TMatrix(16,4) ;
+  fParameters = new TMatrixF(16,4) ;
   const Int_t kMaxLeng=255;
   char string[kMaxLeng];
 

diff --git a/PHOS/AliPHOSPIDv1.h b/PHOS/AliPHOSPIDv1.h
index 5192cf6f2866dc46e2590432bd7f6e38f56687fc..ee5bf6a7d9ad7884f4ffc0e74cfef0a1f5a966be 100644 (file)
--- a/PHOS/AliPHOSPIDv1.h
+++ b/PHOS/AliPHOSPIDv1.h
@@ -8,6 +8,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.56  2005/05/28 14:19:04  schutz
+ * Compilation warnings fixed by T.P.
+ *
  */
 
 //_________________________________________________________________________
@@ -17,14 +20,14 @@
 //*-- Author: Yves Schutz (SUBATECH), Gustavo Conesa.
 
 // --- ROOT system ---
+#include <TMatrixFfwd.h>
+
 class TVector3 ;
-class TMatrix ;
 class TPrincipal ;
 class TROOT ;
 class TTree ;
 class TCanvas ;
 class TFolder ;
-class TMatrixD ;
 class TFormula;
 // --- Standard library ---
 // --- AliRoot header files ---
@@ -143,7 +146,7 @@ private:
   Double_t   *fPPhoton ;                 //! Principal photon eigenvalues
   Double_t   *fPPi0 ;                    //! Principal pi0 eigenvalues
   Int_t       fRecParticlesInRun ;       //! Total number of recparticles in one run
-  TMatrix    *fParameters;               //! Matrix of identification Parameters
+  TMatrixF    *fParameters;               //! Matrix of identification Parameters
 
   //Initial pid population
   Double_t fInitPID[AliPID::kSPECIESN] ; // Initial population to do bayesian PID

diff --git a/PHOS/AliPHOSRecPoint.cxx b/PHOS/AliPHOSRecPoint.cxx
index 0e28471360593ac3e618581acb147169de707d5c..30b88aa4a4e327b5317dd3a0f9cc512f0de54d76 100644 (file)
--- a/PHOS/AliPHOSRecPoint.cxx
+++ b/PHOS/AliPHOSRecPoint.cxx
@@ -247,7 +247,7 @@ void  AliPHOSRecPoint::EvalPrimaries(TClonesArray * digits)
   
 }
 //____________________________________________________________________________
-void AliPHOSRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const
+void AliPHOSRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const
 {
   // returns the position of the cluster in the global reference system of ALICE
   // and the uncertainty on this position

diff --git a/PHOS/AliPHOSRecPoint.h b/PHOS/AliPHOSRecPoint.h
index c6427c4a71f9190fb957c600bf845c19d17a2c4d..765e02e78af2bc9158c99668493a1d44a1192176 100644 (file)
--- a/PHOS/AliPHOSRecPoint.h
+++ b/PHOS/AliPHOSRecPoint.h
@@ -45,7 +45,7 @@ class AliPHOSRecPoint : public AliRecPoint {
   void    EvalAll(TClonesArray * digits) ;  
   virtual void    EvalPHOSMod(AliPHOSDigit * digit) ;  
   virtual void    EvalPrimaries(TClonesArray * digits) ;  
-  virtual void    GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const ; // return global position in ALICE
+  virtual void    GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const ; // return global position in ALICE
   virtual Int_t   GetPHOSMod(void) const {return fPHOSMod ; }
   virtual Int_t * GetPrimaries(Int_t & number) const {number = fMulTrack ; 
                                                       return fTracksList ; }

diff --git a/PHOS/AliPHOSTrigger.h b/PHOS/AliPHOSTrigger.h
index 74315ec8615a50d92dc946a83215b5e4c00fc314..9df639605440130e5eaa2a3ba948d37d3c838e3d 100644 (file)
--- a/PHOS/AliPHOSTrigger.h
+++ b/PHOS/AliPHOSTrigger.h
@@ -12,7 +12,6 @@
      
 // --- ROOT system ---
 
-class TMatrixD ;
 class TClonesArray ;
 
 
@@ -30,13 +29,13 @@ class AliPHOSTrigger : public AliTriggerDetector {
   virtual void    CreateInputs();
   virtual void    Trigger();  //Make PHOS trigger
   
-  const Int_t  GetNTRU() const              {return fNTRU ; }  
-  const Int_t  GetNTRUZ() const             {return fNTRUZ ; }  
-  const Int_t  GetNTRUPhi() const           {return fNTRUPhi ; }  
-  const Int_t  GetL0Threshold() const       {return fL0Threshold ; }  
-  const Int_t  GetL1LowThreshold() const    {return fL1LowThreshold ; }
-  const Int_t  GetL1MediumThreshold() const {return fL1MediumThreshold ; }
-  const Int_t  GetL1HighThreshold() const   {return fL1HighThreshold ; }
+  Int_t  GetNTRU() const              {return fNTRU ; }  
+  Int_t  GetNTRUZ() const             {return fNTRUZ ; }  
+  Int_t  GetNTRUPhi() const           {return fNTRUPhi ; }  
+  Int_t  GetL0Threshold() const       {return fL0Threshold ; }  
+  Int_t  GetL1LowThreshold() const    {return fL1LowThreshold ; }
+  Int_t  GetL1MediumThreshold() const {return fL1MediumThreshold ; }
+  Int_t  GetL1HighThreshold() const   {return fL1HighThreshold ; }
 
   void         Print(const Option_t * opt ="") const ;  
 

diff --git a/STEER/AliCDBPath.cxx b/STEER/AliCDBPath.cxx
index 82cce369718c13fc9fdd3fb3a90ff44b8a18af65..6e658296c36e7de867e0634dcadf503d596c516b 100644 (file)
--- a/STEER/AliCDBPath.cxx
+++ b/STEER/AliCDBPath.cxx
@@ -34,14 +34,17 @@
 ClassImp(AliCDBPath)
 
 //_____________________________________________________________________________
-AliCDBPath::AliCDBPath() {
+AliCDBPath::AliCDBPath() :
+fIsValid(kTRUE),
+fIsWildcard(kFALSE)
+{
 // default constructor
 
 }
 
 //_____________________________________________________________________________
 AliCDBPath::AliCDBPath(const AliCDBPath& other):
-TObject(),
+TObject(other),
 fPath(other.fPath)
 {
 // constructor
@@ -105,7 +108,7 @@ void AliCDBPath::InitPath() {
        TString aString(strippedString);
        strippedString = aString.Strip(TString::kBoth, '/');
 
-       TObjArray* anArray = TString(strippedString).Tokenize("/");     
+       TObjArray* anArray = TString(strippedString).Tokenize("/");
        Int_t paramCount = anArray->GetEntriesFast();
        
        if (paramCount == 1) {

diff --git a/STEER/AliCentralTrigger.h b/STEER/AliCentralTrigger.h
index cc8f6e51346910b6a6f0df978acae291c81d4de4..0a22e67991ebd762b88836d2ad004b2523987f94 100644 (file)
--- a/STEER/AliCentralTrigger.h
+++ b/STEER/AliCentralTrigger.h
@@ -25,6 +25,8 @@
 #include <TObject.h>
 #include <TObjArray.h>
 
+class AliRunLoader;
+
 class AliCentralTrigger : public TObject {
 
 public:

diff --git a/STEER/AliGeometry.h b/STEER/AliGeometry.h
index a2d9d3ab4e416a22f4221cd47e6510465265ae6a..2f492e3a09d7c846c30aa49274aa9cac6db081a8 100644 (file)
--- a/STEER/AliGeometry.h
+++ b/STEER/AliGeometry.h
@@ -14,12 +14,13 @@
 ////////////////////////////////////////////////
 
 // --- ROOT system ---
-#include "TNamed.h"
 
-class AliRecPoint;
-class TMatrix;
 class TParticle;
 class TVector3;
+#include <TNamed.h>
+#include <TMatrixFfwd.h>
+
+class AliRecPoint;
 
 class AliGeometry : public TNamed {
 
@@ -28,7 +29,7 @@ public:
   AliGeometry() ;          // ctor            
   virtual ~AliGeometry() ; // dtor
  
-  virtual void GetGlobal(const AliRecPoint * p, TVector3 & pos, TMatrix & mat) const = 0; 
+  virtual void GetGlobal(const AliRecPoint * p, TVector3 & pos, TMatrixF & mat) const = 0; 
   virtual void GetGlobal(const AliRecPoint * p, TVector3 & pos) const = 0; 
   virtual Bool_t Impact(const TParticle * particle) const             = 0;
 

diff --git a/STEER/AliRecPoint.cxx b/STEER/AliRecPoint.cxx
index 18b01bb5bdda1be1a8591671499acfb252f320c9..7ab6b8a999f779d9f7e5426417466fea2a52d94b 100644 (file)
--- a/STEER/AliRecPoint.cxx
+++ b/STEER/AliRecPoint.cxx
@@ -63,7 +63,7 @@ AliRecPoint::AliRecPoint(const char * ):
   fGeom(0),
   fIndexInList(-1), // to be set when the point is already stored
   fLocPos(0,0,0),
-  fLocPosM(new TMatrix(3,3)),
+  fLocPosM(new TMatrixF(3,3)),
   fMaxDigit(100),
   fMulDigit(0),
   fMaxTrack(5),
@@ -164,7 +164,7 @@ void AliRecPoint::Copy(TObject& recp) const
     (dynamic_cast<AliRecPoint&>(recp)).fGeom = fGeom;
     (dynamic_cast<AliRecPoint&>(recp)).fIndexInList = fIndexInList;
     (dynamic_cast<AliRecPoint&>(recp)).fLocPos = fLocPos;
-    (dynamic_cast<AliRecPoint&>(recp)).fLocPosM = new TMatrix(*fLocPosM);
+    (dynamic_cast<AliRecPoint&>(recp)).fLocPosM = new TMatrixF(*fLocPosM);
     (dynamic_cast<AliRecPoint&>(recp)).fMaxDigit = fMaxDigit;
     (dynamic_cast<AliRecPoint&>(recp)).fMulDigit = fMulDigit;
     (dynamic_cast<AliRecPoint&>(recp)).fMaxTrack = fMaxTrack;
@@ -179,7 +179,7 @@ void AliRecPoint::Copy(TObject& recp) const
 }
 
 //_______________________________________________________________________
-void AliRecPoint::GetCovarianceMatrix(TMatrix & mat) const
+void AliRecPoint::GetCovarianceMatrix(TMatrixF & mat) const
 {
   // returns the covariant matrix for the local position
   
@@ -198,7 +198,7 @@ void AliRecPoint::GetLocalPosition(TVector3 & pos) const
 }
 
 //____________________________________________________________________________
-void AliRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const
+void AliRecPoint::GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const
 {
   // returns the position of the cluster in the global reference system of ALICE
   // and the uncertainty on this position

diff --git a/STEER/AliRecPoint.h b/STEER/AliRecPoint.h
index ae5702e561ff2a47ad3e69d93f32a5a01054fa30..06874552b41a8db08de285ed70b85c1fdc580b59 100644 (file)
--- a/STEER/AliRecPoint.h
+++ b/STEER/AliRecPoint.h
@@ -18,9 +18,9 @@
 
 // --- ROOT system ---
 
-#include "TObject.h"
-#include "TVector3.h"
-class TMatrix;
+#include <TObject.h>
+#include <TMatrixFfwd.h>
+#include <TVector3.h>
 
 // --- AliRoot header files ---
 
@@ -38,9 +38,9 @@ public:
  
   virtual void  AddDigit(AliDigitNew & digit) ;  // add a digit to the digit's indexes list  
   //  virtual void  AddTrack(AliTrack & track) ;  // add a track to the tracks list  
-  virtual void  GetCovarianceMatrix(TMatrix & mat) const;
+  virtual void  GetCovarianceMatrix(TMatrixF & mat) const;
   virtual AliGeometry * GetGeom() const { return fGeom; } 
-  virtual void  GetGlobalPosition(TVector3 & gpos, TMatrix & gmat) const ; // return global position in ALICE
+  virtual void  GetGlobalPosition(TVector3 & gpos, TMatrixF & gmat) const ; // return global position in ALICE
   virtual int * GetDigitsList(void) const { return fDigitsList ; }
   //  virtual int * GetTracksList(void) const { return fTracksList ; }
   virtual Float_t GetEnergy() const {return fAmp; } 
@@ -63,7 +63,7 @@ protected:
   AliGeometry * fGeom ;       //! pointer to the geometry class 
   Int_t         fIndexInList ;// the index of this RecPoint in the list stored in TreeR (to be set by analysis)
   TVector3      fLocPos ;     // local position in the sub-detector coordinate
-  TMatrix *     fLocPosM ;    // covariance matrix ;  
+  TMatrixF *     fLocPosM ;    // covariance matrix ;  
   Int_t         fMaxDigit ;   //! max initial size of digits array (not saved)
   Int_t         fMulDigit ;   // total multiplicity of digits
   Int_t         fMaxTrack ;   //! max initial size of tracks array (not saved)

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 49fbe1b92a96e4fb94cd738f254a77a9c09848eb..c989bf0cd0fcc1f484c96fa6c875ba04e007dbd9 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -105,13 +105,24 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TGeoManager.h>
+#include <TGeoShape.h>
+#include <TGeoNode.h>
+#include <TGeoMatrix.h>
+#include <TGeoPhysicalNode.h>
 #include <TObjString.h>
 #include <TStopwatch.h>
 #include <TSystem.h>
 
-#include "AliLog.h"
+#include "AliCDBStorage.h"
+#include "AliCDBEntry.h"
+#include "AliCDBManager.h"
+#include "AliAlignObj.h"
+#include "AliCentralTrigger.h"
+#include "AliDAQConfig.h"
 #include "AliDigitizer.h"
 #include "AliGenerator.h"
+#include "AliLog.h"
 #include "AliModule.h"
 #include "AliRun.h"
 #include "AliRunDigitizer.h"
@@ -120,11 +131,6 @@
 #include "AliVertexGenFile.h"
 #include "AliCentralTrigger.h"
 
-#include "AliDAQConfig.h"
-#include "AliAlignObj.h"
-#include "AliAlignObjAngles.h"
-#include "AliAlignObjMatrix.h"
-
 ClassImp(AliSimulation)
 
 

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index a43276c0c67b21cdfb913a4814a3932d7c6f1227..db9303fa6d6fc66f8ce1c25ba46296f636c1ceb2 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -15,13 +15,9 @@
 #include <TNamed.h>
 #include <TString.h>
 #include <TObjArray.h>
-#include <TGeoManager.h>
-#include <TGeoPhysicalNode.h>
-#include "AliCDBManager.h"
-#include "AliCDBStorage.h"
-#include "AliCDBEntry.h"
-#include "AliCDBId.h"
 
+class AliCDBId;
+class AliCDBParam;
 class AliRunLoader;
 
 
@@ -59,6 +55,7 @@ public:
                                 Bool_t deleteIntermediateFiles = kFALSE)
                    {fWriteRawData = detectors; fRawDataFileName = fileName;
                   fDeleteIntermediateFiles = deleteIntermediateFiles;};
+
   static Bool_t  ApplyDisplacements(const char* fileName,
                                    const char* ClArrayName);
   static Bool_t  ApplyDisplacements(TClonesArray* AlObjArray);

diff --git a/STEER/AliTrackFitter.h b/STEER/AliTrackFitter.h
index 73caed152efae39b0c7bb74336f79e46840ec3a5..5c700d6af4b15ec24e603a0fa23efb25f9148f2f 100644 (file)
--- a/STEER/AliTrackFitter.h
+++ b/STEER/AliTrackFitter.h
@@ -8,12 +8,12 @@
  *                                                                       *
  *************************************************************************/
 
-#include "TObject.h"
+#include <TObject.h>
+#include <TMatrixDSymfwd.h>
 
 #include "AliTrackPointArray.h"
 #include "AliAlignObj.h"
 
-class TMatrixDSym;
 
 class AliTrackFitter : public TObject {
 

diff --git a/STEER/ESDLinkDef.h b/STEER/ESDLinkDef.h
index 34084d56f8a0b452f3b6c0d168cb38eb76dc1a90..1db3abaf29602690a93259de79517f0c32b0b216 100644 (file)
--- a/STEER/ESDLinkDef.h
+++ b/STEER/ESDLinkDef.h
@@ -28,6 +28,8 @@
 #pragma link C++ class  AliExternalTrackParam+;
 #pragma link C++ class  AliLog+;
 #pragma link C++ class  AliPID+;
+#pragma link C++ class  AliTrackPointArray+;
+#pragma link C++ class  AliTrackPoint+;
 
 #pragma link C++ class AliRunTag+;
 #pragma link C++ class AliLHCTag+;

diff --git a/STEER/STEERLinkDef.h b/STEER/STEERLinkDef.h
index fbbc2f25338b787b18403d0a4d9bc9c25cd84e1f..5b07ce0a3909feb612c36653d25d823fd5409511 100644 (file)
--- a/STEER/STEERLinkDef.h
+++ b/STEER/STEERLinkDef.h
@@ -91,13 +91,22 @@
 #pragma link C++ class AliCDBDumpParam; 
 #pragma link C++ class AliCDBGrid;
 #pragma link C++ class AliCDBGridFactory;
-#pragma link C++ class AliCDBGridParam; 
+#pragma link C++ class AliCDBGridParam;
+
+#pragma link C++ class AliExpression+;
+#pragma link C++ class AliVariableExpression+;
+#pragma link C++ class AliTriggerInput+;
+#pragma link C++ class AliTriggerDetector+;
+#pragma link C++ class AliTriggerCondition+;
+#pragma link C++ class AliTriggerDescriptor+;
+#pragma link C++ class AliCentralTrigger+;
 
 #pragma link C++ class  AliDetectorEventHeader+;
 
 #pragma link C++ class AliAlignObj+;
 #pragma link C++ class AliAlignObjAngles+;
 #pragma link C++ class AliAlignObjMatrix+;
+
 #pragma link C++ class AliTrackFitter+;
 #pragma link C++ class AliTrackFitterRieman+;
 #pragma link C++ class AliTrackResiduals+;
@@ -117,4 +126,5 @@
 #pragma link C++ class AliTriggerCondition+;
 #pragma link C++ class AliTriggerDescriptor+;
 #pragma link C++ class AliCentralTrigger+;
+
 #endif

diff --git a/STEER/libSTEER.pkg b/STEER/libSTEER.pkg
index 5c5f6ad033c8e0d61ed697a2881536f77f5a89f5..f3847cfb4dae663a4e3da97a3b37d83319efb0dd 100644 (file)
--- a/STEER/libSTEER.pkg
+++ b/STEER/libSTEER.pkg
@@ -24,16 +24,15 @@ AliCDBPath.cxx AliCDBRunRange.cxx AliCDBManager.cxx\
 AliCDBStorage.cxx AliCDBLocal.cxx AliCDBDump.cxx AliCDBGrid.cxx\
 AliReconstructor.cxx AliDetectorEventHeader.cxx TTreeStream.cxx\
 AliAlignObj.cxx AliAlignObjAngles.cxx AliAlignObjMatrix.cxx \
-AliRieman.cxx\
-AliTrackFitter.cxx AliTrackFitterRieman.cxx\
-AliTrackResiduals.cxx AliTrackResidualsChi2.cxx\
-AliAlignmentTracks.cxx \
-AliExpression.cxx \
 AliTriggerInput.cxx \
 AliTriggerDetector.cxx \
 AliTriggerCondition.cxx \
 AliTriggerDescriptor.cxx \
-AliCentralTrigger.cxx
+AliCentralTrigger.cxx AliRieman.cxx\
+AliTrackFitter.cxx AliTrackFitterRieman.cxx\
+AliTrackResiduals.cxx AliTrackResidualsChi2.cxx\
+AliAlignmentTracks.cxx \
+AliExpression.cxx
 
 HDRS:= $(SRCS:.cxx=.h) 
 

diff --git a/TPC/AliH2F.h b/TPC/AliH2F.h
index 7f015bcd26189b9f7a7bb84624c7c454952dbf9a..552a01159c656890cd008d3ebd34ff555adf9c68 100644 (file)
--- a/TPC/AliH2F.h
+++ b/TPC/AliH2F.h
@@ -9,7 +9,6 @@
 
 #include "TH2.h" 
 
-class TMatrix;
 class TH1F;
 class TClonesArray;
 

diff --git a/TPC/AliTPC.cxx b/TPC/AliTPC.cxx
index d0c8a7cd28caa09878f26cf811e02e336158c2b2..266d9c351b24a59f31693c711099c785c5042c13 100644 (file)
--- a/TPC/AliTPC.cxx
+++ b/TPC/AliTPC.cxx
@@ -40,7 +40,8 @@
 #include <TGeometry.h>
 #include <TInterpreter.h>
 #include <TMath.h>
-#include <TMatrix.h>
+#include <TMatrixF.h>
+#include <TVector.h>
 #include <TNode.h>
 #include <TObjectTable.h>
 #include <TParticle.h>
@@ -1421,10 +1422,10 @@ void AliTPC::DigitizeRow(Int_t irow,Int_t isec,TObjArray **rows)
   //  and a single track signal
   //    
 
-  TMatrix *m1 = new TMatrix(0,nofPads,0,nofTbins); // integrated
-  TMatrix *m2 = new TMatrix(0,nofPads,0,nofTbins); // single
+  TMatrixF *m1 = new TMatrixF(0,nofPads,0,nofTbins); // integrated
+  TMatrixF *m2 = new TMatrixF(0,nofPads,0,nofTbins); // single
   //
-  TMatrix &total  = *m1;
+  TMatrixF &total  = *m1;
 
   //  Array of pointers to the label-signal list
 
@@ -1519,7 +1520,7 @@ void AliTPC::DigitizeRow(Int_t irow,Int_t isec,TObjArray **rows)
 //_____________________________________________________________________________
 
 Float_t AliTPC::GetSignal(TObjArray *p1, Int_t ntr, 
-             TMatrix *m1, TMatrix *m2,Int_t *indexRange)
+             TMatrixF *m1, TMatrixF *m2,Int_t *indexRange)
 {
 
   //---------------------------------------------------------------
@@ -1547,8 +1548,8 @@ Float_t AliTPC::GetSignal(TObjArray *p1, Int_t ntr,
   indexRange[2]=9999; //min time
   indexRange[3]=-1; // max time
 
-  TMatrix &signal = *m1;
-  TMatrix &total = *m2;
+  TMatrixF &signal = *m1;
+  TMatrixF &total = *m2;
   //
   //  Loop over all electrons
   //
@@ -1587,7 +1588,7 @@ Float_t AliTPC::GetSignal(TObjArray *p1, Int_t ntr,
 }
 
 //_____________________________________________________________________________
-void AliTPC::GetList(Float_t label,Int_t np,TMatrix *m,
+void AliTPC::GetList(Float_t label,Int_t np,TMatrixF *m,
                      Int_t *indexRange, Float_t **pList)
 {
   //----------------------------------------------------------------------
@@ -1598,7 +1599,7 @@ void AliTPC::GetList(Float_t label,Int_t np,TMatrix *m,
   // Origin: Marek Kowalski  IFJ, Krakow, Marek.Kowalski@ifj.edu.pl
   //-----------------------------------------------------------------
 
-  TMatrix &signal = *m;
+  TMatrixF &signal = *m;
 
   // lop over nonzero digits
 

diff --git a/TPC/AliTPC.h b/TPC/AliTPC.h
index 8522ca8f6e91800b1ae80aa045d0068c71910cd3..0300df657d6191f75bfd748185b88c775d83706f 100644 (file)
--- a/TPC/AliTPC.h
+++ b/TPC/AliTPC.h
@@ -11,10 +11,7 @@
 #include "AliDetector.h"
 #include "AliHit.h" 
 #include "AliDigit.h" 
-#include <TVector.h>
-
-
-class TMatrix;
+#include <TMatrixFfwd.h>
 
 class TTree;
 
@@ -137,9 +134,9 @@ protected:
   //
   void SetDefaults();
   void DigitizeRow(Int_t irow,Int_t isec,TObjArray **rowTriplet);
-  Float_t GetSignal(TObjArray *p1, Int_t ntr, TMatrix *m1, 
-                   TMatrix *m2,Int_t *IndexRange);
-  void GetList (Float_t label,Int_t np,TMatrix *m,Int_t *IndexRange,
+  Float_t GetSignal(TObjArray *p1, Int_t ntr, TMatrixF *m1, 
+                   TMatrixF *m2,Int_t *IndexRange);
+  void GetList (Float_t label,Int_t np,TMatrixF *m,Int_t *IndexRange,
                 Float_t **pList);
   void MakeSector(Int_t isec,Int_t nrows,TTree *TH,Stat_t ntracks,TObjArray **row);
   void TransportElectron(Float_t *xyz, Int_t *index);

diff --git a/TPC/AliTPCFast.cxx b/TPC/AliTPCFast.cxx
index d37d2c06a57ff571ce3f904b70f118f7e6cb99de..7e074f739758bcf9bbbff336d6ac033abbbe4630 100644 (file)
--- a/TPC/AliTPCFast.cxx
+++ b/TPC/AliTPCFast.cxx
@@ -22,6 +22,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <TParticle.h>
+#include <TVector.h>
 
 #include "AliRunLoader.h"
 #include "AliRun.h"

diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h
index af2fc5d0fb7dc1526d821f764152fc6a850e8b97..06dadd61ab15d281582abd571b237114e1cd9743 100644 (file)
--- a/TRD/AliTRDgeometry.h
+++ b/TRD/AliTRDgeometry.h
@@ -81,7 +81,7 @@ class AliTRDgeometry : public AliGeometry {
           Float_t  GetChamberWidth(Int_t p) const           { return fCwidth[p];     };
           Float_t  GetChamberLength(Int_t p, Int_t c) const { return fClength[p][c]; }; 
 
-  virtual void     GetGlobal(const AliRecPoint* , TVector3& , TMatrix& ) const { }; 
+  virtual void     GetGlobal(const AliRecPoint* , TVector3& , TMatrixF& ) const { }; 
   virtual void     GetGlobal(const AliRecPoint* , TVector3& ) const { };
  
   static  Double_t GetAlpha()  { return 2 * 3.14159265358979323846 / fgkNsect; };