From 0d21a20038e7396ca7d07656bb17adbdb9ea9e7f Mon Sep 17 00:00:00 2001
From: Scott Snyder <scott.snyder@cern.ch>
Date: Thu, 15 Dec 2016 05:51:31 +0100
Subject: [PATCH] clang warning: missing override keyword.
(LArDetDescr-03-19-53)
* Tagging LArDetDescr-03-19-53.
* clang warning: missing override keyword.
2016-11-28 scott snyder <snyder@bnl.gov>
* Tagging LArDetDescr-03-19-52.
* Make const methods of LArRecoMaterialTool and
LArRecoSimpleGeomTool.
2016-08-10 scott snyder <snyder@bnl.gov>
* Tagging LArDetDescr-03-19-51.
* endreq -> endmsg.
Former-commit-id: 814c4baebc6ca62dbf5f4d5f5e5ab6346127b6e8
---
.../LArDetDescr/LArRecoMaterialTool.h | 12 +-
.../LArDetDescr/LArRecoSimpleGeomTool.h | 18 +-
.../LArDetDescr/src/LArCellVolumes.cxx | 2 +-
.../LArDetDescr/src/LArNumberHelper.cxx | 14 +-
.../LArDetDescr/src/LArRecoMaterialTool.cxx | 6 +-
.../LArDetDescr/src/LArRecoSimpleGeomTool.cxx | 186 +++++++++---------
6 files changed, 120 insertions(+), 118 deletions(-)
diff --git a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h
index 7ffdf27d97d..3e94bb5684e 100755
--- a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h
+++ b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoMaterialTool.h
@@ -55,22 +55,24 @@ public:
~LArRecoMaterialTool();
static const InterfaceID& interfaceID( ) ;
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
+ virtual
bool get_material (CaloSubdetNames::ALIGNVOL alvol,
double& mass, double& volume,
double& x0, double& dEdx,
double& aveA, double& aveZ
- );
+ ) const override;
/** default material used to fill the envelope */
+ virtual
void get_default_material (double& density,
double& x0, double& dEdx,
double& aveA, double& aveZ
- );
+ ) const override;
- void print();
+ void print() const override;
private:
diff --git a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h
index b4ab295b3b9..11837297287 100755
--- a/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h
+++ b/LArCalorimeter/LArDetDescr/LArDetDescr/LArRecoSimpleGeomTool.h
@@ -44,26 +44,28 @@ public:
const std::string& name,
const IInterface* parent);
- ~LArRecoSimpleGeomTool();
+ virtual ~LArRecoSimpleGeomTool();
static const InterfaceID& interfaceID( ) ;
- StatusCode initialize();
- StatusCode finalize();
+ virtual StatusCode initialize() override;
+ virtual StatusCode finalize() override;
/** the enum ALIGNVOL covers all LAr pieces, including cryostats and coil */
+ virtual
bool get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
Amg::Transform3D& htrans,double& hphi,
std::vector<double>& radius,
std::vector<double>& depth,
- std::vector<double>& hlength );
+ std::vector<double>& hlength ) const override;
+ virtual
bool get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
Amg::Transform3D& htrans,double& hphi,
std::vector<double>& z,
std::vector<double>& depth,
- std::vector<double>& rmin, std::vector<double>& rmax );
+ std::vector<double>& rmin, std::vector<double>& rmax ) const override;
- void print();
+ virtual void print() const override;
private:
@@ -80,7 +82,7 @@ private:
std::vector<double>& hlength );
// mapping between ALIGNVOL and strings (need to retrieve StoredPV-s)
- std::string map_av(CaloSubdetNames::ALIGNVOL alvol);
+ std::string map_av(CaloSubdetNames::ALIGNVOL alvol) const;
const CaloCell_ID* m_calo_id;
CaloPhiRange m_phi_range;
@@ -89,8 +91,6 @@ private:
std::string m_geometry;
IRDBAccessSvc* m_iAccessSvc;
- const IRDBRecordset* m_lar;
- const IRDBRecord* m_rec;
const IGeoModelSvc* m_geoModelSvc;
const IRDBRecordset* m_recCryoCyl;
diff --git a/LArCalorimeter/LArDetDescr/src/LArCellVolumes.cxx b/LArCalorimeter/LArDetDescr/src/LArCellVolumes.cxx
index 75bd4010c90..9391ae29dec 100755
--- a/LArCalorimeter/LArDetDescr/src/LArCellVolumes.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArCellVolumes.cxx
@@ -71,7 +71,7 @@ LArCellVolumes::CellVolume ( Identifier cell_id )
std::cerr << "LArCellVolumes::CellVolume(). Problem in LArCellVolumes: no cell volumes...\n";
else
{
- //log << MSG::INFO << "Looking for volume for cell :" << endreq;
+ //log << MSG::INFO << "Looking for volume for cell :" << endmsg;
//m_calocell_id->print(cell_id);
// compute Identifier of Cell with same eta, but phi=0 and pos side
diff --git a/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx b/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx
index 6c697dc7fad..9383315dd45 100755
--- a/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArNumberHelper.cxx
@@ -68,7 +68,7 @@ LArNumberHelper::LArNumberHelper(const std::string geometry) :
sc = svcLoc->service( "DetectorStore", m_pDetStore );
if (!sc.isSuccess() || 0 == m_pDetStore) {
- log <<MSG::FATAL <<"Could not find DetectorStore" <<endreq;
+ log <<MSG::FATAL <<"Could not find DetectorStore" <<endmsg;
// do not try to go further: nothing will work anyway
return;
}
@@ -80,12 +80,12 @@ LArNumberHelper::LArNumberHelper(const std::string geometry) :
sc = svcLoc->service("GeoModelSvc",m_geoModelSvc);
if (sc.isFailure())
- log << MSG::ERROR << "Unable to get pointer to GeoModel service" << endreq;
+ log << MSG::ERROR << "Unable to get pointer to GeoModel service" << endmsg;
else
{
DecodeVersionKey detectorKey = DecodeVersionKey(m_geoModelSvc, "LAr");
log <<MSG::INFO << "DecodeVersionKey found : " << detectorKey.tag()
- << " " << detectorKey.tag()<<endreq;
+ << " " << detectorKey.tag()<<endmsg;
if ( detectorKey.tag() != "LAr-H8-00" && detectorKey.tag() != "LAr-H6-00"
&& detectorKey.tag() != "LAr-G3-00")
@@ -95,18 +95,18 @@ LArNumberHelper::LArNumberHelper(const std::string geometry) :
}
}
- log <<MSG::INFO <<"Readout geometry will use : " << m_tag << " " << m_node <<endreq;
+ log <<MSG::INFO <<"Readout geometry will use : " << m_tag << " " << m_node <<endmsg;
// Acess the DB service :
sc = svcLoc->service("RDBAccessSvc",m_iAccessSvc);
if (sc.isFailure())
{
- log << MSG::ERROR << "Unable to get RDBAccessSvc." << endreq;
+ log << MSG::ERROR << "Unable to get RDBAccessSvc." << endmsg;
}
else
{
- log <<MSG::INFO <<" did access RDBAccessSvc " <<endreq;
+ log <<MSG::INFO <<" did access RDBAccessSvc " <<endmsg;
m_iAccessSvc->connect();
@@ -130,7 +130,7 @@ LArNumberHelper::LArNumberHelper(const std::string geometry) :
if(recCellVolumes->size())
m_cellVolumes = new LArCellVolumes(recCellVolumes);
else
- log << MSG::ERROR << "Unable to get LArCellVolumes" << endreq;
+ log << MSG::ERROR << "Unable to get LArCellVolumes" << endmsg;
m_iAccessSvc->disconnect();
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
index fe6d2ebe1e8..75719a50aa1 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoMaterialTool.cxx
@@ -92,7 +92,7 @@ LArRecoMaterialTool::get_material (CaloSubdetNames::ALIGNVOL alvol,
double& mass, double& volume,
double& x0, double& dEdx,
double& aveA, double& aveZ
- )
+ ) const
{
bool result = false;
@@ -117,7 +117,7 @@ void
LArRecoMaterialTool::get_default_material (double& density,
double& x0, double& dEdx,
double& aveA, double& aveZ
- )
+ ) const
{
// FIXME ! should take real LAr numbers
density = 1.;
@@ -129,7 +129,7 @@ LArRecoMaterialTool::get_default_material (double& density,
}
void
-LArRecoMaterialTool::print ()
+LArRecoMaterialTool::print () const
{
for ( unsigned int i = 0; i < m_alignvol_number.size(); i++ )
diff --git a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
index c59b92f1ff8..5dad174031a 100755
--- a/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
+++ b/LArCalorimeter/LArDetDescr/src/LArRecoSimpleGeomTool.cxx
@@ -139,7 +139,7 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
Amg::Transform3D& htrans,double& hphi,
std::vector<double>& radius,
std::vector<double>& depth,
- std::vector<double>& hlength )
+ std::vector<double>& hlength ) const
{
double rad,dep,len;
@@ -173,17 +173,17 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
if ( alvol == CaloSubdetNames::SOLENOID ) {
// DDDb : LAr / CryoCylinders / CryoMother nb 11 & 12 & 13
- m_lar = m_recCryoCyl;
- if ( !m_lar || m_lar->size()<14) return false;
-
- m_rec = (*m_lar)[11];
- rad = m_rec->getDouble("RMIN")*CLHEP::cm;
- len = m_rec->getDouble("DZ")*CLHEP::cm /2.;
- dep = m_rec->getDouble("DR")*CLHEP::cm;
- m_rec = (*m_lar)[12];
- dep = dep +m_rec->getDouble("DR")*CLHEP::cm;
- m_rec = (*m_lar)[13];
- dep = dep +m_rec->getDouble("DR")*CLHEP::cm;
+ const IRDBRecordset* lar = m_recCryoCyl;
+ if ( !lar || lar->size()<14) return false;
+
+ const IRDBRecord* rec = (*lar)[11];
+ rad = rec->getDouble("RMIN")*CLHEP::cm;
+ len = rec->getDouble("DZ")*CLHEP::cm /2.;
+ dep = rec->getDouble("DR")*CLHEP::cm;
+ rec = (*lar)[12];
+ dep = dep +rec->getDouble("DR")*CLHEP::cm;
+ rec = (*lar)[13];
+ dep = dep +rec->getDouble("DR")*CLHEP::cm;
//rad = 124.18*CLHEP::cm;
//dep = (.305 + 1.38 + .47 )*CLHEP::cm;
@@ -199,14 +199,14 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
// DDDb : LAr / CryoCylinders
- m_lar = m_recCryoCyl;
- if ( !m_lar || m_lar->size()<15) return false;
+ const IRDBRecordset* lar = m_recCryoCyl;
+ if ( !lar || lar->size()<15) return false;
// CryoMother nb 10
- m_rec = (*m_lar)[10];
- rad = m_rec->getDouble("RMIN")*CLHEP::cm;
- len = m_rec->getDouble("DZ")*CLHEP::cm /2.;
- dep = m_rec->getDouble("DR")*CLHEP::cm;
+ const IRDBRecord* rec = (*lar)[10];
+ rad = rec->getDouble("RMIN")*CLHEP::cm;
+ len = rec->getDouble("DZ")*CLHEP::cm /2.;
+ dep = rec->getDouble("DR")*CLHEP::cm;
//rad = 122.9*CLHEP::cm;
//dep = 1.28*CLHEP::cm;
@@ -217,10 +217,10 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
hlength.push_back( len );
// CryoMother nb 14
- m_rec = (*m_lar)[14];
- rad = m_rec->getDouble("RMIN")*CLHEP::cm;
- len = m_rec->getDouble("DZ")*CLHEP::cm /2.;
- dep = m_rec->getDouble("DR")*CLHEP::cm;
+ rec = (*lar)[14];
+ rad = rec->getDouble("RMIN")*CLHEP::cm;
+ len = rec->getDouble("DZ")*CLHEP::cm /2.;
+ dep = rec->getDouble("DR")*CLHEP::cm;
//rad = 126.335*CLHEP::cm;
//dep = 1.2*CLHEP::cm;
@@ -231,10 +231,10 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
hlength.push_back( len );
// CryoMother nb 0
- m_rec = (*m_lar)[0];
- rad = m_rec->getDouble("RMIN")*CLHEP::cm;
- len = m_rec->getDouble("DZ")*CLHEP::cm /2.;
- dep = m_rec->getDouble("DR")*CLHEP::cm;
+ rec = (*lar)[0];
+ rad = rec->getDouble("RMIN")*CLHEP::cm;
+ len = rec->getDouble("DZ")*CLHEP::cm /2.;
+ dep = rec->getDouble("DR")*CLHEP::cm;
//rad = 2140*mm;
//dep = 30*mm;
@@ -245,10 +245,10 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
hlength.push_back( len );
// CryoMother nb 5
- m_rec = (*m_lar)[5];
- rad = m_rec->getDouble("RMIN")*CLHEP::cm;
- len = m_rec->getDouble("DZ")*CLHEP::cm /2.;
- dep = m_rec->getDouble("DR")*CLHEP::cm;
+ rec = (*lar)[5];
+ rad = rec->getDouble("RMIN")*CLHEP::cm;
+ len = rec->getDouble("DZ")*CLHEP::cm /2.;
+ dep = rec->getDouble("DR")*CLHEP::cm;
//rad = 2220*mm;
//dep = 30*mm;
@@ -265,18 +265,18 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
// DDDb : LAr / PresamplerGeometry / rmin, rmax
// LAr / BarrelGeometry / zmax
- m_lar = m_recPresGeo;
- if ( !m_lar || m_lar->size()==0) return false;
+ const IRDBRecordset* lar = m_recPresGeo;
+ if ( !lar || lar->size()==0) return false;
- m_rec = (*m_lar)[0];
- rad = m_rec->getDouble("RMIN")*CLHEP::cm;
- dep = m_rec->getDouble("RMAX")*CLHEP::cm - rad;
+ const IRDBRecord* rec = (*lar)[0];
+ rad = rec->getDouble("RMIN")*CLHEP::cm;
+ dep = rec->getDouble("RMAX")*CLHEP::cm - rad;
- m_lar = m_recBarrGeo;
- if ( !m_lar || m_lar->size()==0) return false;
+ lar = m_recBarrGeo;
+ if ( !lar || lar->size()==0) return false;
- m_rec = (*m_lar)[0];
- len = m_rec->getDouble("ZMAX")*CLHEP::cm;
+ rec = (*lar)[0];
+ len = rec->getDouble("ZMAX")*CLHEP::cm;
//rad = 138.5*CLHEP::cm;
//dep = (144.7 - 138.5)*CLHEP::cm;
@@ -293,13 +293,13 @@ LArRecoSimpleGeomTool::get_cylinder_surface (CaloSubdetNames::ALIGNVOL alvol,
// DDDb : LAr / BarrelGeometry / rmin, rmax, zmax
- m_lar = m_recBarrGeo;
- if ( !m_lar || m_lar->size()==0) return false;
+ const IRDBRecordset* lar = m_recBarrGeo;
+ if ( !lar || lar->size()==0) return false;
- m_rec = (*m_lar)[0];
- rad = m_rec->getDouble("RMIN")*CLHEP::cm;
- dep = m_rec->getDouble("RMAX")*CLHEP::cm - rad;
- len = m_rec->getDouble("ZMAX")*CLHEP::cm;
+ const IRDBRecord* rec = (*lar)[0];
+ rad = rec->getDouble("RMIN")*CLHEP::cm;
+ dep = rec->getDouble("RMAX")*CLHEP::cm - rad;
+ len = rec->getDouble("ZMAX")*CLHEP::cm;
//rad = 1447.3*CLHEP::cm;
//dep = (2003.35 - 1447.3)*CLHEP::cm;
@@ -320,7 +320,7 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
Amg::Transform3D& htrans,double& hphi,
std::vector<double>& z,
std::vector<double>& depth,
- std::vector<double>& rmin, std::vector<double>& rmax )
+ std::vector<double>& rmin, std::vector<double>& rmax ) const
{
// Tracking geometry convention : z is the center of the layer, it is signed
@@ -358,15 +358,15 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
// DDDb : LAr / CryoCylinders / Endcap nb 11
- m_lar = m_recCryoCyl;
- if ( !m_lar || m_lar->size()<60) return false;
+ const IRDBRecordset* lar = m_recCryoCyl;
+ if ( !lar || lar->size()<60) return false;
- m_rec = (*m_lar)[49];
+ const IRDBRecord* rec = (*lar)[49];
- ri = m_rec->getDouble("RMIN")*CLHEP::cm;
- ra = ri + m_rec->getDouble("DR")*CLHEP::cm;
- dep = m_rec->getDouble("DZ")*CLHEP::cm;
- zcent = m_rec->getDouble("ZMIN")*CLHEP::cm + dep/2.;
+ ri = rec->getDouble("RMIN")*CLHEP::cm;
+ ra = ri + rec->getDouble("DR")*CLHEP::cm;
+ dep = rec->getDouble("DZ")*CLHEP::cm;
+ zcent = rec->getDouble("ZMIN")*CLHEP::cm + dep/2.;
if (alvol == CaloSubdetNames::LARCRYO_EC_NEG) zcent = -1. * zcent;
//ri = 22.1*CLHEP::cm;
@@ -380,12 +380,12 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
z.push_back( zcent );
// DDDb : LAr / CryoCylinders / Endcap nb 6
- m_rec = (*m_lar)[44];
+ rec = (*lar)[44];
- ri = m_rec->getDouble("RMIN")*CLHEP::cm;
- ra = ri + m_rec->getDouble("DR")*CLHEP::cm;
- dep = m_rec->getDouble("DZ")*CLHEP::cm;
- zcent = m_rec->getDouble("ZMIN")*CLHEP::cm + dep/2.;
+ ri = rec->getDouble("RMIN")*CLHEP::cm;
+ ra = ri + rec->getDouble("DR")*CLHEP::cm;
+ dep = rec->getDouble("DZ")*CLHEP::cm;
+ zcent = rec->getDouble("ZMIN")*CLHEP::cm + dep/2.;
if (alvol == CaloSubdetNames::LARCRYO_EC_NEG) zcent = -1. * zcent;
//ri = 79.*CLHEP::cm;
@@ -405,15 +405,15 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
alvol == CaloSubdetNames::PRESAMPLER_EC_NEG ) {
// DDDb Cryostat / PresamplerPosition
- m_lar = m_recPresPos;
- if (!m_lar) return false;
+ const IRDBRecordset* lar = m_recPresPos;
+ if (!lar) return false;
- m_rec = (*m_lar)[0];
+ const IRDBRecord* rec = (*lar)[0];
- ri = m_rec->getDouble("RMIN")*CLHEP::cm;
- ra = m_rec->getDouble("RMAX")*CLHEP::cm;
- dep = m_rec->getDouble("TCK")*CLHEP::cm;
- zcent = m_rec->getDouble("ZPOS")*CLHEP::cm + dep/2.;
+ ri = rec->getDouble("RMIN")*CLHEP::cm;
+ ra = rec->getDouble("RMAX")*CLHEP::cm;
+ dep = rec->getDouble("TCK")*CLHEP::cm;
+ zcent = rec->getDouble("ZPOS")*CLHEP::cm + dep/2.;
if (alvol == CaloSubdetNames::PRESAMPLER_EC_NEG) zcent = -1. * zcent;
//ri = 123.174*CLHEP::cm;
@@ -433,15 +433,15 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
alvol == CaloSubdetNames::EMEC_NEG ) {
// handcoded copy of dddb : LAr / EmecGeometry / z1, etot, rmin, rmax
- m_lar = m_EmecGeo;
- if ( !m_lar ) return false;
+ const IRDBRecordset* lar = m_EmecGeo;
+ if ( !lar ) return false;
- m_rec = (*m_lar)[0];
+ const IRDBRecord* rec = (*lar)[0];
- ri = m_rec->getDouble("RMIN")*CLHEP::cm;
- ra = m_rec->getDouble("RMAX")*CLHEP::cm;
- dep = m_rec->getDouble("ETOT")*CLHEP::cm;
- zcent = m_rec->getDouble("Z1")*CLHEP::cm + dep/2.;
+ ri = rec->getDouble("RMIN")*CLHEP::cm;
+ ra = rec->getDouble("RMAX")*CLHEP::cm;
+ dep = rec->getDouble("ETOT")*CLHEP::cm;
+ zcent = rec->getDouble("Z1")*CLHEP::cm + dep/2.;
if (alvol == CaloSubdetNames::EMEC_NEG) zcent = -1. * zcent;
//ri = 29.*CLHEP::cm;
@@ -461,18 +461,18 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
// DDDb numbers : LAr / HadronicEndcap / zstart, roorig, rend
// + for depth, see LArNumberHelper
- m_lar = m_HEC;
- if ( !m_lar || m_lar->size()==0) return false;
+ const IRDBRecordset* lar = m_HEC;
+ if ( !lar || lar->size()==0) return false;
- m_rec = (*m_lar)[0];
+ const IRDBRecord* rec = (*lar)[0];
- ri = m_rec->getDouble("ROORIG")*CLHEP::cm;
- ra = m_rec->getDouble("REND")*CLHEP::cm;
+ ri = rec->getDouble("ROORIG")*CLHEP::cm;
+ ra = rec->getDouble("REND")*CLHEP::cm;
// Block0+Block1+Block2
- dep = m_rec->getDouble("PLATE_0")/2.
- + 3*8*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_0"));
+ dep = rec->getDouble("PLATE_0")/2.
+ + 3*8*(rec->getDouble("LARG") + rec->getDouble("PLATE_0"));
dep = dep*CLHEP::cm;
- zcent = m_rec->getDouble("ZSTART")*CLHEP::cm + dep/2.;
+ zcent = rec->getDouble("ZSTART")*CLHEP::cm + dep/2.;
if (alvol == CaloSubdetNames::HEC1_NEG) zcent = -1. * zcent;
//ri = 37.2*CLHEP::cm;
@@ -493,22 +493,22 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
// DDDb numbers : LAr / HadronicEndcap / zstart, roorig, rend
// + for depth, see LArNumberHelper
- m_lar = m_HEC;
- if ( !m_lar || m_lar->size()==0) return false;
+ const IRDBRecordset* lar = m_HEC;
+ if ( !lar || lar->size()==0) return false;
- m_rec = (*m_lar)[0];
+ const IRDBRecord* rec = (*lar)[0];
- ri = m_rec->getDouble("ROORIG")*CLHEP::cm;
- ra = m_rec->getDouble("REND")*CLHEP::cm;
+ ri = rec->getDouble("ROORIG")*CLHEP::cm;
+ ra = rec->getDouble("REND")*CLHEP::cm;
// Block 3 + Block 4 + Block 5 + Block 6
- dep = m_rec->getDouble("PLATE_1")/2.
- + 4*4*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_1"));
+ dep = rec->getDouble("PLATE_1")/2.
+ + 4*4*(rec->getDouble("LARG") + rec->getDouble("PLATE_1"));
dep = dep*CLHEP::cm;
// start+depth of HEC1 + gap
- zcent = m_rec->getDouble("ZSTART")
- + m_rec->getDouble("PLATE_0")/2.
- + 3*8*(m_rec->getDouble("LARG") + m_rec->getDouble("PLATE_0"))
- + m_rec->getDouble("GAPWHL") ;
+ zcent = rec->getDouble("ZSTART")
+ + rec->getDouble("PLATE_0")/2.
+ + 3*8*(rec->getDouble("LARG") + rec->getDouble("PLATE_0"))
+ + rec->getDouble("GAPWHL") ;
zcent = zcent*CLHEP::cm + dep/2.;
if (alvol == CaloSubdetNames::HEC2_NEG) zcent = -1. * zcent;
@@ -587,7 +587,7 @@ LArRecoSimpleGeomTool::get_disk_surface (CaloSubdetNames::ALIGNVOL alvol,
}
void
-LArRecoSimpleGeomTool::print()
+LArRecoSimpleGeomTool::print() const
{}
bool
@@ -660,7 +660,7 @@ LArRecoSimpleGeomTool::ScanEMB(CaloSubdetNames::ALIGNVOL alvol,
}
std::string
-LArRecoSimpleGeomTool::map_av(CaloSubdetNames::ALIGNVOL alvol)
+LArRecoSimpleGeomTool::map_av(CaloSubdetNames::ALIGNVOL alvol) const
{
switch(alvol)
{
--
GitLab