Merge branch 'const.SCT_ConditionsTools-20180322' into 'master'

SCT_ConditionsTools: Declare tool methods const.

See merge request atlas/athena!9941

Former-commit-id: b143a0d9

InnerDetector/InDetConditions/SCT_ConditionsTools/SCT_ConditionsTools/ISCT_ChargeTrappingTool.h

@@ -31,14 +31,14 @@ class ISCT_ChargeTrappingTool: virtual public IAlgTool
   /// Creates the InterfaceID and interfaceID() method
   DeclareInterfaceID(ISCT_ChargeTrappingTool, 1, 0);
 
-  virtual double getTrappingProbability(const IdentifierHash& elementHash, const double& pos)=0;
-  virtual double getTrappingElectrons(const IdentifierHash& elementHash, const double& pos)=0;
-  virtual double getElectricField(const IdentifierHash& elementHash, const double& pos)=0;
-  virtual double getTrappingTime(const IdentifierHash& elementHash, const double& pos)=0;
-  virtual double getTimeToElectrode(const IdentifierHash& elementHash, const double& pos)=0;
-  virtual double getTrappingPositionZ(const IdentifierHash& elementHash, const double& pos)=0;
-  virtual double getTrappingHoles(const IdentifierHash& elementHash, const double& pos)=0;  
-  virtual double getHoleDriftMobility(const IdentifierHash& elementHash, const double& pos)=0;
+  virtual double getTrappingProbability(const IdentifierHash& elementHash, const double& pos) const =0;
+  virtual double getTrappingElectrons(const IdentifierHash& elementHash, const double& pos) const =0;
+  virtual double getElectricField(const IdentifierHash& elementHash, const double& pos) const =0;
+  virtual double getTrappingTime(const IdentifierHash& elementHash, const double& pos) const =0;
+  virtual double getTimeToElectrode(const IdentifierHash& elementHash, const double& pos) const =0;
+  virtual double getTrappingPositionZ(const IdentifierHash& elementHash, const double& pos) const =0;
+  virtual double getTrappingHoles(const IdentifierHash& elementHash, const double& pos) const =0;  
+  virtual double getHoleDriftMobility(const IdentifierHash& elementHash, const double& pos) const =0;
   virtual bool getdoCTrap(const IdentifierHash& elementHash,  const double& pos)=0;
   virtual void getHoleTransport(double& x0, double& y0, double& xfin, double& yfin, double& Q_m2, double& Q_m1, double& Q_00, double& Q_p1, double& Q_p2) const =0;
   virtual void getInitPotentialValue()=0;

InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ChargeTrappingTool.cxx

@@ -143,17 +143,17 @@ bool SCT_ChargeTrappingTool::getdoCTrap(const IdentifierHash &  elementHash, con
 }
 
 
-double SCT_ChargeTrappingTool::getElectricField(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getElectricField(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_electricField[elementHash];
 }
 
-double SCT_ChargeTrappingTool::getTrappingElectrons(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getTrappingElectrons(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_trappingElectrons[elementHash];
 }
 
-double SCT_ChargeTrappingTool::getTrappingHoles(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getTrappingHoles(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_trappingHoles[elementHash];
 } 
@@ -168,27 +168,27 @@ double SCT_ChargeTrappingTool::getMeanFreePathHoles(const IdentifierHash &  elem
   return m_meanFreePathHoles[elementHash];
 }
 
-double SCT_ChargeTrappingTool::getTrappingProbability(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getTrappingProbability(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_trappingProbability[elementHash];
 }
 
-double SCT_ChargeTrappingTool::getTrappingTime(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getTrappingTime(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_trappingTime[elementHash];
 }
 
-double SCT_ChargeTrappingTool::getTimeToElectrode(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getTimeToElectrode(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_electrodeTime[elementHash];
 }
 
-double SCT_ChargeTrappingTool::getTrappingPositionZ(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getTrappingPositionZ(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_trappingPosition[elementHash];
 }
 
-double SCT_ChargeTrappingTool::getHoleDriftMobility(const IdentifierHash &  elementHash, const double & /*pos*/)
+double SCT_ChargeTrappingTool::getHoleDriftMobility(const IdentifierHash &  elementHash, const double & /*pos*/) const
 {
   return m_holeDriftMobility[elementHash];
 }

InnerDetector/InDetConditions/SCT_ConditionsTools/src/SCT_ChargeTrappingTool.h

@@ -49,17 +49,17 @@ public:
   virtual StatusCode finalize() override;
  
   // -- Get the Electric Field for the charge position under consideration
-  virtual double getElectricField(const IdentifierHash &  elementHash, const double & zpos) override;
+  virtual double getElectricField(const IdentifierHash &  elementHash, const double & zpos) const override;
   // -- Get the Mean Free Path for the charge position under consideration
   virtual double getMeanFreePathElectrons(const IdentifierHash &  elementHash, const double & pos);
   virtual double getMeanFreePathHoles(const IdentifierHash &  elementHash, const double & pos);
-  virtual double getTrappingElectrons(const IdentifierHash &  elementHash, const double & pos) override;
-  virtual double getTrappingHoles(const IdentifierHash &  elementHash, const double & pos) override;
-  virtual double getTrappingProbability(const IdentifierHash &  elementHash, const double & pos) override;
-  virtual double getTrappingTime(const IdentifierHash &  elementHash, const double & pos) override;
-  virtual double getTimeToElectrode(const IdentifierHash &  elementHash, const double & pos) override;
-  virtual double getTrappingPositionZ(const IdentifierHash &  elementHash, const double & pos) override;
-  virtual double getHoleDriftMobility(const IdentifierHash &  elementHash, const double & pos) override;
+  virtual double getTrappingElectrons(const IdentifierHash &  elementHash, const double & pos) const override;
+  virtual double getTrappingHoles(const IdentifierHash &  elementHash, const double & pos) const override;
+  virtual double getTrappingProbability(const IdentifierHash &  elementHash, const double & pos) const override;
+  virtual double getTrappingTime(const IdentifierHash &  elementHash, const double & pos) const override;
+  virtual double getTimeToElectrode(const IdentifierHash &  elementHash, const double & pos) const override;
+  virtual double getTrappingPositionZ(const IdentifierHash &  elementHash, const double & pos) const override;
+  virtual double getHoleDriftMobility(const IdentifierHash &  elementHash, const double & pos) const override;
   virtual bool getdoCTrap(const IdentifierHash & elementHash, const  double & pos) override;
   virtual void getHoleTransport(double & x0, double & y0, double & xfin, double & yfin, double &  Q_m2, double & Q_m1, double & Q_00, double & Q_p1, double & Q_p2 ) const override;
   virtual void getInitPotentialValue() override;