From e8d02863afdd1db4bc9b2816ac38300565f4d8f3 Mon Sep 17 00:00:00 2001 From: hristov Date: Mon, 23 Jan 2006 17:51:49 +0000 Subject: [PATCH] Using the recommended way of forward declarations for TVector and TMatrix (see v5-08-00 release notes). Additional clean-up --- EMCAL/AliEMCALGeometry.h | 2 +- EMCAL/AliEMCALPIDv1.h | 1 - EVGEN/AliGenHBTosl.h | 2 +- FMD/AliFMDGeometry.cxx | 2 +- FMD/AliFMDGeometry.h | 4 +--- ITS/AliITSIOTrack.h | 1 - ITS/AliITSPid.cxx | 2 +- ITS/AliITSPid.h | 4 ++-- ITS/AliITSRad.h | 1 - ITS/AliITSTrackerV1.h | 3 +-- ITS/AliITSsimulationSDD.h | 1 - MUON/AliMUON.h | 3 ++- MUON/AliMUONClusterFinderAZ.h | 2 +- MUON/AliMUONPoints.cxx | 2 +- MUON/AliMUONPoints.h | 6 +++--- MUON/AliMUONTrackK.h | 2 +- PHOS/AliPHOSGeometry.cxx | 2 +- PHOS/AliPHOSGeometry.h | 2 +- PHOS/AliPHOSPIDv1.cxx | 8 ++++++-- PHOS/AliPHOSPIDv1.h | 9 ++++++--- PHOS/AliPHOSRecPoint.cxx | 2 +- PHOS/AliPHOSRecPoint.h | 2 +- PHOS/AliPHOSTrigger.h | 15 +++++++-------- STEER/AliCDBPath.cxx | 9 ++++++--- STEER/AliCentralTrigger.h | 2 ++ STEER/AliGeometry.h | 9 +++++---- STEER/AliRecPoint.cxx | 8 ++++---- STEER/AliRecPoint.h | 12 ++++++------ STEER/AliSimulation.cxx | 18 ++++++++++++------ STEER/AliSimulation.h | 9 +++------ STEER/AliTrackFitter.h | 4 ++-- STEER/ESDLinkDef.h | 2 ++ STEER/STEERLinkDef.h | 12 +++++++++++- STEER/libSTEER.pkg | 11 +++++------ TPC/AliH2F.h | 1 - TPC/AliTPC.cxx | 19 ++++++++++--------- TPC/AliTPC.h | 11 ++++------- TPC/AliTPCFast.cxx | 1 + TRD/AliTRDgeometry.h | 2 +- 39 files changed, 113 insertions(+), 95 deletions(-) diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h index 0903929a161..60aad85833e 100644 --- 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 bd1e1cfdb37..5b483a7920d 100644 --- 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 76384fd59a3..2274046fedd 100644 --- a/EVGEN/AliGenHBTosl.h +++ b/EVGEN/AliGenHBTosl.h @@ -54,7 +54,7 @@ class TH3D; class AliStack; class TParticle; -class TVector; +class TVector3; #include diff --git a/FMD/AliFMDGeometry.cxx b/FMD/AliFMDGeometry.cxx index 83031a45638..4cd5899d113 100644 --- 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 210d9f44e6d..a40e4ccf618 100644 --- a/FMD/AliFMDGeometry.h +++ b/FMD/AliFMDGeometry.h @@ -17,8 +17,6 @@ #ifndef ALIGEOMETRY_H # include #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 f298c2a9a9a..22090ce786f 100644 --- a/ITS/AliITSIOTrack.h +++ b/ITS/AliITSIOTrack.h @@ -7,7 +7,6 @@ #include -class TMatrix; class AliITSIOTrack : public TObject { diff --git a/ITS/AliITSPid.cxx b/ITS/AliITSPid.cxx index 38e7e9df4ae..6300d29fe17 100644 --- 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 fa78149a7de..16e81527588 100644 --- a/ITS/AliITSPid.h +++ b/ITS/AliITSPid.h @@ -7,9 +7,9 @@ ///////////////////////////////////////////////////////////////// #include +#include 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 3e75a517cf0..c09e93116cd 100644 --- 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 690a85682d3..814199afe93 100644 --- a/ITS/AliITSTrackerV1.h +++ b/ITS/AliITSTrackerV1.h @@ -23,10 +23,9 @@ #define ALIITSTRACKERV1_H #include +#include class TObjArray; -class TVector; -class TMatrix; class AliITSTrackV1; class AliITSRad; class TStopwatch; diff --git a/ITS/AliITSsimulationSDD.h b/ITS/AliITSsimulationSDD.h index 8fde01e78d0..bae73d1de01 100644 --- 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 3f692b0807c..3ec582fb8be 100644 --- a/MUON/AliMUON.h +++ b/MUON/AliMUON.h @@ -21,7 +21,8 @@ #include "AliMUONChamber.h" #include "AliMUONTrigger.h" -class TVector; +#include + class TFile; class TTree; diff --git a/MUON/AliMUONClusterFinderAZ.h b/MUON/AliMUONClusterFinderAZ.h index f90a5c750e2..891f10c6ffc 100644 --- a/MUON/AliMUONClusterFinderAZ.h +++ b/MUON/AliMUONClusterFinderAZ.h @@ -11,11 +11,11 @@ /// \brief Cluster finder in MUON arm of ALICE #include "AliMUONClusterFinderVS.h" +#include class TH2D; class TClonesArray; class TMinuit; -class TMatrixD; class AliSegmentation; class AliMUONResponse; diff --git a/MUON/AliMUONPoints.cxx b/MUON/AliMUONPoints.cxx index a12a4d5fb49..a921bd85fa4 100644 --- a/MUON/AliMUONPoints.cxx +++ b/MUON/AliMUONPoints.cxx @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/MUON/AliMUONPoints.h b/MUON/AliMUONPoints.h index 3628a920a8b..907886de7b1 100644 --- a/MUON/AliMUONPoints.h +++ b/MUON/AliMUONPoints.h @@ -12,8 +12,8 @@ /// \brief Class to draw detector clusters (is PolyMarker3D) #include "AliPoints.h" +#include -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 7c79a3d1323..6c761086ac5 100644 --- a/MUON/AliMUONTrackK.h +++ b/MUON/AliMUONTrackK.h @@ -12,9 +12,9 @@ #include #include "AliMUONTrack.h" +#include class TArrayD; -class TMatrixD; class AliMUONTrackReconstructor; class TClonesArray; class TObjArray; diff --git a/PHOS/AliPHOSGeometry.cxx b/PHOS/AliPHOSGeometry.cxx index bfd942387e1..5bb0aeb62c0 100644 --- 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 990e88b60d2..a2caa3c2246 100644 --- 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 25079b84f35..0348effcddf 100644 --- 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 #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 5192cf6f286..ee5bf6a7d9a 100644 --- 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 + 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 0e284713605..30b88aa4a4e 100644 --- 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 c6427c4a71f..765e02e78af 100644 --- 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 74315ec8615..9df63960544 100644 --- 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 82cce369718..6e658296c36 100644 --- 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 cc8f6e51346..0a22e67991e 100644 --- a/STEER/AliCentralTrigger.h +++ b/STEER/AliCentralTrigger.h @@ -25,6 +25,8 @@ #include #include +class AliRunLoader; + class AliCentralTrigger : public TObject { public: diff --git a/STEER/AliGeometry.h b/STEER/AliGeometry.h index a2d9d3ab4e4..2f492e3a09d 100644 --- 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 +#include + +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 18b01bb5bdd..7ab6b8a999f 100644 --- 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(recp)).fGeom = fGeom; (dynamic_cast(recp)).fIndexInList = fIndexInList; (dynamic_cast(recp)).fLocPos = fLocPos; - (dynamic_cast(recp)).fLocPosM = new TMatrix(*fLocPosM); + (dynamic_cast(recp)).fLocPosM = new TMatrixF(*fLocPosM); (dynamic_cast(recp)).fMaxDigit = fMaxDigit; (dynamic_cast(recp)).fMulDigit = fMulDigit; (dynamic_cast(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 ae5702e561f..06874552b41 100644 --- a/STEER/AliRecPoint.h +++ b/STEER/AliRecPoint.h @@ -18,9 +18,9 @@ // --- ROOT system --- -#include "TObject.h" -#include "TVector3.h" -class TMatrix; +#include +#include +#include // --- 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 49fbe1b92a9..c989bf0cd0f 100644 --- a/STEER/AliSimulation.cxx +++ b/STEER/AliSimulation.cxx @@ -105,13 +105,24 @@ // // /////////////////////////////////////////////////////////////////////////////// +#include +#include +#include +#include +#include #include #include #include -#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 a43276c0c67..db9303fa6d6 100644 --- a/STEER/AliSimulation.h +++ b/STEER/AliSimulation.h @@ -15,13 +15,9 @@ #include #include #include -#include -#include -#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 73caed152ef..5c700d6af4b 100644 --- a/STEER/AliTrackFitter.h +++ b/STEER/AliTrackFitter.h @@ -8,12 +8,12 @@ * * *************************************************************************/ -#include "TObject.h" +#include +#include #include "AliTrackPointArray.h" #include "AliAlignObj.h" -class TMatrixDSym; class AliTrackFitter : public TObject { diff --git a/STEER/ESDLinkDef.h b/STEER/ESDLinkDef.h index 34084d56f8a..1db3abaf296 100644 --- 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 fbbc2f25338..5b07ce0a390 100644 --- 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 5c5f6ad033c..f3847cfb4da 100644 --- 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 7f015bcd261..552a01159c6 100644 --- 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 d0c8a7cd28c..266d9c351b2 100644 --- a/TPC/AliTPC.cxx +++ b/TPC/AliTPC.cxx @@ -40,7 +40,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -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 8522ca8f6e9..0300df657d6 100644 --- a/TPC/AliTPC.h +++ b/TPC/AliTPC.h @@ -11,10 +11,7 @@ #include "AliDetector.h" #include "AliHit.h" #include "AliDigit.h" -#include - - -class TMatrix; +#include 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 d37d2c06a57..7e074f73975 100644 --- a/TPC/AliTPCFast.cxx +++ b/TPC/AliTPCFast.cxx @@ -22,6 +22,7 @@ /////////////////////////////////////////////////////////////////////////////// #include +#include #include "AliRunLoader.h" #include "AliRun.h" diff --git a/TRD/AliTRDgeometry.h b/TRD/AliTRDgeometry.h index af2fc5d0fb7..06dadd61ab1 100644 --- 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; }; -- 2.43.0