From ff821236e693b25cfd76e662e194862668d06912 Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 11 May 2001 07:56:12 +0000 Subject: [PATCH] Consistent declarations needed on Alpha --- TRD/AliTRDdataArrayF.h | 4 ++-- TRD/AliTRDdataArrayI.h | 4 ++-- TRD/AliTRDgeometry.cxx | 11 +++++++---- TRD/AliTRDgeometryFull.cxx | 5 ++++- TRD/AliTRDgeometryFull.h | 2 +- TRD/AliTRDgeometryHole.cxx | 5 ++++- TRD/AliTRDgeometryHole.h | 2 +- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/TRD/AliTRDdataArrayF.h b/TRD/AliTRDdataArrayF.h index 221083b3b48..e8f34f71bd2 100644 --- a/TRD/AliTRDdataArrayF.h +++ b/TRD/AliTRDdataArrayF.h @@ -57,8 +57,8 @@ class AliTRDdataArrayF : public AliTRDdataArray { protected: - inline void SetDataFast(Int_t idx1, Int_t idx2, Float_t v); - inline Float_t GetDataFast(Int_t idx1, Int_t idx2) const; + void SetDataFast(Int_t idx1, Int_t idx2, Float_t v); + Float_t GetDataFast(Int_t idx1, Int_t idx2) const; Float_t GetData1(Int_t idx1, Int_t idx2) const; void Expand1(); diff --git a/TRD/AliTRDdataArrayI.h b/TRD/AliTRDdataArrayI.h index 789f645e946..4f584e50cbb 100644 --- a/TRD/AliTRDdataArrayI.h +++ b/TRD/AliTRDdataArrayI.h @@ -53,8 +53,8 @@ class AliTRDdataArrayI : public AliTRDdataArray { protected: - inline void SetDataFast(Int_t idx1, Int_t idx2, Int_t value); - inline Int_t GetDataFast(Int_t idx1, Int_t idx2) const; + void SetDataFast(Int_t idx1, Int_t idx2, Int_t value); + Int_t GetDataFast(Int_t idx1, Int_t idx2) const; Int_t GetData1(Int_t idx1, Int_t idx2) const; void Expand1(); diff --git a/TRD/AliTRDgeometry.cxx b/TRD/AliTRDgeometry.cxx index 574d242763b..0c3da12abe8 100644 --- a/TRD/AliTRDgeometry.cxx +++ b/TRD/AliTRDgeometry.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.10 2001/05/07 08:08:05 cblume +Update of TRD code + Revision 1.9 2001/03/27 12:48:33 cblume Correct for volume overlaps @@ -534,7 +537,7 @@ Bool_t AliTRDgeometry::RotateBack(Int_t d, Float_t *rot, Float_t *pos) const } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetDetector(Int_t p, Int_t c, Int_t s) const +Int_t AliTRDgeometry::GetDetector(const Int_t p, const Int_t c, const Int_t s) const { // // Convert plane / chamber / sector into detector number @@ -545,7 +548,7 @@ Int_t AliTRDgeometry::GetDetector(Int_t p, Int_t c, Int_t s) const } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetPlane(Int_t d) const +Int_t AliTRDgeometry::GetPlane(const Int_t d) const { // // Reconstruct the plane number from the detector number @@ -556,7 +559,7 @@ Int_t AliTRDgeometry::GetPlane(Int_t d) const } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetChamber(Int_t d) const +Int_t AliTRDgeometry::GetChamber(const Int_t d) const { // // Reconstruct the chamber number from the detector number @@ -567,7 +570,7 @@ Int_t AliTRDgeometry::GetChamber(Int_t d) const } //_____________________________________________________________________________ -Int_t AliTRDgeometry::GetSector(Int_t d) const +Int_t AliTRDgeometry::GetSector(const Int_t d) const { // // Reconstruct the sector number from the detector number diff --git a/TRD/AliTRDgeometryFull.cxx b/TRD/AliTRDgeometryFull.cxx index fe661b2edb4..c4a97379fcc 100644 --- a/TRD/AliTRDgeometryFull.cxx +++ b/TRD/AliTRDgeometryFull.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.6 2001/02/14 18:22:26 cblume +Change in the geometry of the padplane + Revision 1.5 2000/11/01 14:53:21 cblume Merge with TRD-develop @@ -161,7 +164,7 @@ void AliTRDgeometryFull::Init() } //_____________________________________________________________________________ -void AliTRDgeometryFull::SetNRowPad(Int_t p, Int_t c, Int_t npad) +void AliTRDgeometryFull::SetNRowPad(const Int_t p, const Int_t c, const Int_t npad) { // // Redefines the number of pads in raw direction for diff --git a/TRD/AliTRDgeometryFull.h b/TRD/AliTRDgeometryFull.h index cd03aa127e3..25cb1c4897c 100644 --- a/TRD/AliTRDgeometryFull.h +++ b/TRD/AliTRDgeometryFull.h @@ -22,7 +22,7 @@ class AliTRDgeometryFull : public AliTRDgeometry { void SetRICHhole() { fRICHhole = kTRUE; }; void SetNRowPad(); - virtual void SetNRowPad(Int_t p, Int_t c, Int_t npad); + virtual void SetNRowPad(const Int_t p, const Int_t c, const Int_t npad); Bool_t GetPHOShole() const { return fPHOShole; }; Bool_t GetRICHhole() const { return fRICHhole; }; diff --git a/TRD/AliTRDgeometryHole.cxx b/TRD/AliTRDgeometryHole.cxx index 1de25b18b52..2004f786503 100644 --- a/TRD/AliTRDgeometryHole.cxx +++ b/TRD/AliTRDgeometryHole.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.5 2001/02/14 18:22:26 cblume +Change in the geometry of the padplane + Revision 1.4 2000/11/01 14:53:21 cblume Merge with TRD-develop @@ -149,7 +152,7 @@ void AliTRDgeometryHole::Init() } //_____________________________________________________________________________ -void AliTRDgeometryHole::SetNRowPad(Int_t p, Int_t c, Int_t npad) +void AliTRDgeometryHole::SetNRowPad(const Int_t p, const Int_t c, const Int_t npad) { // // Redefines the number of pads in raw direction for diff --git a/TRD/AliTRDgeometryHole.h b/TRD/AliTRDgeometryHole.h index 93f885903e6..bfcac97b4dc 100644 --- a/TRD/AliTRDgeometryHole.h +++ b/TRD/AliTRDgeometryHole.h @@ -22,7 +22,7 @@ class AliTRDgeometryHole : public AliTRDgeometry { void SetRICHhole() { }; void SetNRowPad(); - virtual void SetNRowPad(Int_t p, Int_t c, Int_t npad); + virtual void SetNRowPad(const Int_t p, const Int_t c, const Int_t npad); Bool_t GetPHOShole() const { return kTRUE; }; Bool_t GetRICHhole() const { return kTRUE; }; -- 2.31.1