fixed const problems (Bjorn said)

diff --git a/EMCAL/AliEMCALDigit.cxx b/EMCAL/AliEMCALDigit.cxx
index 23108bcb0fcdfb92c4b43129bb3572869374e241..4d810fedd14c0affb4561d7a05e1eeb4dbdfbd5c 100644 (file)
--- a/EMCAL/AliEMCALDigit.cxx
+++ b/EMCAL/AliEMCALDigit.cxx
@@ -42,7 +42,7 @@
 ClassImp(AliEMCALDigit)
 
 //____________________________________________________________________________
-  AliEMCALDigit::AliEMCALDigit() 
+  AliEMCALDigit::AliEMCALDigit()  
 {
   // default ctor 
 
@@ -149,7 +149,7 @@ const Float_t AliEMCALDigit::GetEta() const
 {
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
   g->EtaPhiFromIndex(id,eta,phi);
   return eta ;
 }
@@ -159,7 +159,7 @@ const Float_t AliEMCALDigit::GetPhi() const
 {
   Float_t eta=-10., phi=-10.;
   Int_t id = GetId();
-  AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
+  const AliEMCALGeometry *g = AliEMCALGetter::GetInstance()->EMCALGeometry();
   g->EtaPhiFromIndex(id,eta,phi);
   return phi ;
 }

diff --git a/EMCAL/AliEMCALGeometry.cxx b/EMCAL/AliEMCALGeometry.cxx
index 0fe05a97c5f6fd5e5f56a8ed17694d75edd35799..38839596c69d3e0b22fa72c218c6fc4bfc7d5798 100644 (file)
--- a/EMCAL/AliEMCALGeometry.cxx
+++ b/EMCAL/AliEMCALGeometry.cxx
@@ -142,7 +142,7 @@ AliEMCALGeometry* AliEMCALGeometry::GetInstance(const Text_t* name,
     return rv; 
 }
 //______________________________________________________________________
-Int_t AliEMCALGeometry::TowerIndex(Int_t ieta,Int_t iphi,Int_t ipre){
+Int_t AliEMCALGeometry::TowerIndex(Int_t ieta,Int_t iphi,Int_t ipre) const{
     // Returns the tower index number from the based on the Z and Phi
     // index numbers. There are 2 times the number of towers to separate
     // out the full towsers from the pre-towsers.
@@ -168,7 +168,7 @@ Int_t AliEMCALGeometry::TowerIndex(Int_t ieta,Int_t iphi,Int_t ipre){
 }
 //______________________________________________________________________
 void AliEMCALGeometry::TowerIndexes(Int_t index,Int_t &ieta,Int_t &iphi,
-                                   Int_t &ipre){
+                                   Int_t &ipre) const{
     // given the tower index number it returns the based on the Z and Phi
     // index numbers and if it is for the full tower or the pre-tower number.
     // There are 2 times the number of towers to separate
@@ -200,7 +200,7 @@ void AliEMCALGeometry::TowerIndexes(Int_t index,Int_t &ieta,Int_t &iphi,
     return;
 }
 //______________________________________________________________________
-void AliEMCALGeometry::EtaPhiFromIndex(Int_t index,Float_t &eta,Float_t &phi){
+void AliEMCALGeometry::EtaPhiFromIndex(Int_t index,Float_t &eta,Float_t &phi) const{
     // given the tower index number it returns the based on the eta and phi
     // of the tower.
     // Inputs:
@@ -221,7 +221,7 @@ void AliEMCALGeometry::EtaPhiFromIndex(Int_t index,Float_t &eta,Float_t &phi){
     phi  = phid;
 }
 //______________________________________________________________________
-Int_t AliEMCALGeometry::TowerIndexFromEtaPhi(Float_t eta,Float_t phi){
+Int_t AliEMCALGeometry::TowerIndexFromEtaPhi(Float_t eta,Float_t phi) const{
     // returns the tower index number based on the eta and phi of the tower.
     // Inputs:
     //   Float_t eta  // eta of center of tower in pseudorapidity
@@ -253,7 +253,7 @@ Int_t AliEMCALGeometry::TowerIndexFromEtaPhi(Float_t eta,Float_t phi){
     return TowerIndex(ieta,iphi,0);
 }
 //______________________________________________________________________
-Int_t AliEMCALGeometry::PreTowerIndexFromEtaPhi(Float_t eta,Float_t phi){
+Int_t AliEMCALGeometry::PreTowerIndexFromEtaPhi(Float_t eta,Float_t phi) const{
     // returns the pretower index number based on the eta and phi of the tower.
     // Inputs:
     //   Float_t eta  // eta of center of tower in pseudorapidity
@@ -266,7 +266,7 @@ Int_t AliEMCALGeometry::PreTowerIndexFromEtaPhi(Float_t eta,Float_t phi){
     return GetNEta()*GetNPhi()+TowerIndexFromEtaPhi(eta,phi);
 }
 //______________________________________________________________________
-Bool_t AliEMCALGeometry::AbsToRelNumbering(Int_t AbsId, Int_t *relid){
+Bool_t AliEMCALGeometry::AbsToRelNumbering(Int_t AbsId, Int_t *relid) const{
     // Converts the absolute numbering into the following array/
     //  relid[0] = EMCAL Arm number 1:1 
     //  relid[1] = 0  Not in Pre Shower layers
@@ -310,7 +310,7 @@ void AliEMCALGeometry::PosInAlice(const Int_t *relid,Float_t &theta,
 }
 //______________________________________________________________________
 /*
-Boot_t AliEMCALGeometry::AreNeighbours(Int_t index1,Int_t index2){
+Boot_t AliEMCALGeometry::AreNeighbours(Int_t index1,Int_t index2) const{
     // Returns kTRUE if the two towers are neighbours or not, including
     // diagonals. Both indexes are required to be either towers or preshower.
     // Inputs:

diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h
index af4dce60338b3063a7390dbe07be9f89114517fb..2fa1a6611814428ef34f732982d4d2b79105fa56 100644 (file)
--- a/EMCAL/AliEMCALGeometry.h
+++ b/EMCAL/AliEMCALGeometry.h
@@ -86,23 +86,23 @@ class AliEMCALGeometry : public AliGeometry {
        // pseudorapidity and r=sqrt(x*x+y*y).
        return r/TMath::Tan(AngleFromEta(eta));
        }
-    Int_t TowerIndex(Int_t iz,Int_t iphi,Int_t ipre); // returns tower index
+    Int_t TowerIndex(Int_t iz,Int_t iphi,Int_t ipre) const; // returns tower index
     // returns tower indexs iz, iphi.
-    void TowerIndexes(Int_t index,Int_t &iz,Int_t &iphi,Int_t &ipre);
+    void TowerIndexes(Int_t index,Int_t &iz,Int_t &iphi,Int_t &ipre) const;
     // for a given tower index it returns eta and phi of center of that tower.
-    void EtaPhiFromIndex(Int_t index,Float_t &eta,Float_t &phi);
+    void EtaPhiFromIndex(Int_t index,Float_t &eta,Float_t &phi) const;
     // for a given eta and phi in the EMCAL it returns the tower index.
-    Int_t TowerIndexFromEtaPhi(Float_t eta,Float_t phi);
+    Int_t TowerIndexFromEtaPhi(Float_t eta,Float_t phi) const;
     // for a given eta and phi in the EMCAL it returns the pretower index.
-    Int_t PreTowerIndexFromEtaPhi(Float_t eta,Float_t phi);
+    Int_t PreTowerIndexFromEtaPhi(Float_t eta,Float_t phi) const;
     // Returns theta and phi (degree) for a given EMCAL cell indecated by relid
     void PosInAlice(const Int_t *relid,Float_t &theta,Float_t &phi);
     // Returns an array indicating the Tower/preshower, iz, and iphi for a
     // specific EMCAL indes.
-    Bool_t AbsToRelNumbering(Int_t AbsId, Int_t *relid);
+    Bool_t AbsToRelNumbering(Int_t AbsId, Int_t *relid) const;
     /*
     // Returns kTRUE if the two indexs are neighboring towers or preshowers.
-    Boot_t AliEMCALGeometry::AreNeighbours(Int_t index1,Int_t index2);
+    Boot_t AliEMCALGeometry::AreNeighbours(Int_t index1,Int_t index2) const;
  */
 
  protected: