From 83b788e13c1f7dd621947f320b97634044e65d67 Mon Sep 17 00:00:00 2001
From: Marilena Bandieramonte <marilena.bandieramonte@cern.ch>
Date: Fri, 7 Feb 2020 01:45:24 +0100
Subject: [PATCH] Cleaning of the code
---
.../GeoSpecialShapes/LArCustomShape.h | 35 +--------
.../GeoSpecialShapes/LArWheelCalculator.h | 15 ----
GeoSpecialShapes/src/LArCustomShape.cxx | 40 +---------
GeoSpecialShapes/src/LArWheelCalculator.cxx | 76 -------------------
.../DistanceCalculatorFactory.cxx | 8 +-
.../DistanceCalculatorFactory.h | 4 -
.../DistanceCalculatorSaggingOff.cxx | 10 +--
.../DistanceCalculatorSaggingOff.h | 6 +-
.../DistanceCalculatorSaggingOn.cxx | 8 --
.../DistanceCalculatorSaggingOn.h | 4 +-
.../FanCalculatorFactory.cxx | 10 +--
.../FanCalculatorFactory.h | 6 +-
.../IDistanceCalculator.h | 2 -
.../LArWheelCalculator_Impl/IFanCalculator.h | 2 -
.../ModuleFanCalculator.cxx | 7 --
.../ModuleFanCalculator.h | 6 +-
.../WheelFanCalculator.h | 3 -
.../LArWheelCalculator_Impl/sincos_poly.cxx | 12 ---
18 files changed, 15 insertions(+), 239 deletions(-)
diff --git a/GeoSpecialShapes/GeoSpecialShapes/LArCustomShape.h b/GeoSpecialShapes/GeoSpecialShapes/LArCustomShape.h
index 3a24f3c..b7f790f 100644
--- a/GeoSpecialShapes/GeoSpecialShapes/LArCustomShape.h
+++ b/GeoSpecialShapes/GeoSpecialShapes/LArCustomShape.h
@@ -8,12 +8,6 @@
#include <string>
#include <map>
-//#ifndef XAOD_STANDALONE
-// #include "GaudiKernel/ServiceHandle.h"
-// #include "GaudiKernel/StatusCode.h"
-// #include "StoreGate/StoreGateSvc.h"
-//#endif // XAOD_STANDALONE
-
#include "GeoModelKernel/GeoShape.h"
#include "GeoSpecialShapes/LArWheelCalculator.h"
#include "GeoSpecialShapes/LArWheelCalculatorEnums.h"
@@ -28,9 +22,6 @@ class LArCustomShape : public GeoShape
{
public:
- // #ifndef XAOD_STANDALONE
- // typedef ServiceHandle<StoreGateSvc> StoreGateSvc_t;
- // #endif // XAOD_STANDALONE
typedef std::pair<LArG4::LArWheelCalculator_t, int> CalcDef_t;
typedef std::map<std::string, CalcDef_t> ShapeCalc_typemap;
@@ -65,23 +56,13 @@ class LArCustomShape : public GeoShape
/// Executes a GeoShapeAction
virtual void exec(GeoShapeAction* action) const;
-//#ifndef XAOD_STANDALONE
-// /** @brief The standard @c StoreGateSvc/DetectorStore
-// * Returns (kind of) a pointer to the @c StoreGateSvc
-// */
-// StoreGateSvc_t& detStore() const;
-//#endif // XAOD_STANDALONE
-
protected:
virtual ~LArCustomShape();
private:
- //#if defined XAOD_STANDALONE
- int createCalculator(const CalcDef_t & cdef);
- //#else // XAOD_STANDALONE
- // StatusCode createCalculator(const CalcDef_t & cdef);
- //#endif
+
+ int createCalculator(const CalcDef_t & cdef);
// Prohibited operations.
LArCustomShape(const LArCustomShape &right);
@@ -98,11 +79,6 @@ class LArCustomShape : public GeoShape
/// The calculator:
const LArWheelCalculator *m_calculator;
- //#ifndef XAOD_STANDALONE
- /// Pointer to StoreGate (detector store by default)
- // mutable StoreGateSvc_t m_detStore;
- //#endif // XAOD_STANDALONE
-
};
inline const std::string& LArCustomShape::getClassType() {
@@ -113,11 +89,4 @@ inline ShapeType LArCustomShape::getClassTypeID() {
return s_classTypeID;
}
-//#ifndef XAOD_STANDALONE
-// inline ServiceHandle<StoreGateSvc>& LArCustomShape::detStore() const {
-// return m_detStore;
-// }
-//#endif // XAOD_STANDALONE
-
-
#endif // LArCustomShape_h
diff --git a/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h b/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h
index bcbebd1..df379a6 100644
--- a/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h
+++ b/GeoSpecialShapes/GeoSpecialShapes/LArWheelCalculator.h
@@ -7,11 +7,7 @@
#include <vector>
-//#include "CLHEP/Vector/ThreeVector.h"
#include "GeoModelKernel/GeoDefinitions.h"
-//#ifndef XAOD_STANDALONE
-// #include "AthenaKernel/CLASS_DEF.h"
-//#endif // XAOD_STANDALONE
#include "GeoSpecialShapes/LArWheelCalculatorEnums.h"
// Physical constants
@@ -22,8 +18,6 @@
#define LARWC_DTNF_NEW
class IRDBRecordset;
-//class RDBParamRecords;
-
//#define HARDDEBUG
// Forward declarations
@@ -138,9 +132,6 @@ class LArWheelCalculator
double m_sin_parametrization[7]; // up to pol6
double m_cos_parametrization[7];
std::vector<std::vector<double> > m_sagging_parameter; // !
- //double m_WheelThickness;
- // double m_HalfWheelThickness;
- //double m_zWheelFrontFace, m_zWheelBackFace;
// N.B. all const values copied from the DB@
// https://atlas-geometry-db.web.cern.ch/atlas-geometry-db/
@@ -224,10 +215,4 @@ class LArWheelCalculator
void fill_sincos_parameterization();
};
-//#ifndef XAOD_STANDALONE
- //using the macro below we can assign an identifier (and a version)
- //This is required and checked at compile time when you try to record/retrieve
-// CLASS_DEF(LArWheelCalculator , 900345678 , 1)
-//#endif // XAOD_STANDALONE
-
#endif // GEOSPECIALSHAPES_LARWHEELCALCULATOR_H
diff --git a/GeoSpecialShapes/src/LArCustomShape.cxx b/GeoSpecialShapes/src/LArCustomShape.cxx
index 86af121..c6f2a23 100644
--- a/GeoSpecialShapes/src/LArCustomShape.cxx
+++ b/GeoSpecialShapes/src/LArCustomShape.cxx
@@ -95,35 +95,13 @@ const LArCustomShape::ShapeCalc_typemap LArCustomShape::s_calculatorTypes = {
LArCustomShape::LArCustomShape(const std::string& a_shapeName)
: m_shapeName(a_shapeName),
m_calculator(0)
- //#ifndef XAOD_STANDALONE
- // ,m_detStore( "StoreGateSvc/DetectorStore", a_shapeName )
- //#endif // XAOD_STANDALONE
{
-//#ifdef XAOD_STANDALONE
std::cout << "LArCustomShape::LArCustomShape()" << std::endl;
std::cout << "Constructor -- Creating the calculator..." << std::endl;
if ( createCalculator( s_calculatorTypes.at(a_shapeName) ) == 1 ) { // map.at throws std::out_of_range exception on unknown shape name
std::string error = std::string("Can't create LArWheelCalculator for name ") + a_shapeName + " in LArCustomShape constructor";
throw std::runtime_error(error);
}
-//#else // XAOD_STANDALONE
-// std::string name = a_shapeName;
-// size_t index = name.find("Slice");
-// if(index != std::string::npos) name.replace(index + 5, 2, "00");
-// if(s_calculatorTypes.find(name) == s_calculatorTypes.end()){
-// std::string error =
-// std::string("LArCustomShape: unknown shape name ") +
-// a_shapeName;
-// throw std::runtime_error(error);
-// } else {
-// if(createCalculator(s_calculatorTypes.at(name)).isFailure()){ // map.at throws std::out_of_range exception on unknown shape name
-// std::string error =
-// std::string("Can't create LArWheelCalculator for name ") +
-// a_shapeName + " in LArCustomShape constructor";
-// throw std::runtime_error(error);
-// }
-// }
-//#endif // Athena
}
LArCustomShape::~LArCustomShape()
@@ -131,7 +109,7 @@ LArCustomShape::~LArCustomShape()
//delete m_calculator;
}
-//#if defined XAOD_STANDALONE
+
int LArCustomShape::createCalculator(const CalcDef_t & cdef) { // LArG4::LArWheelCalculator_t wheelType, int zside
std::cout << "LArCustomShape::createCalculator()" << std::endl;
@@ -150,22 +128,6 @@ int LArCustomShape::createCalculator(const CalcDef_t & cdef) { // LArG4::LArWhee
std::cout << "createCalculator() - done." << std::endl;
}
-//#else // XAOD_STANDALONE
-//StatusCode LArCustomShape::createCalculator(const CalcDef_t & cdef) { // LArG4::LArWheelCalculator_t wheelType, int zside
-// LArG4::LArWheelCalculator_t wheelType = cdef.first;
-// int zside = cdef.second;
-//
-// std::string calcDSname = std::string("LAr::EMEC::")+ (zside>0?"Pos::":"Neg::")+LArWheelCalculator::LArWheelCalculatorTypeString(wheelType);
-// if(detStore()->contains<LArWheelCalculator>(calcDSname)){
-// return detStore()->retrieve(m_calculator, calcDSname);
-// }
-//
-// m_calculator = new LArWheelCalculator(wheelType, zside);
-//
-// // ownership is passed to detStore
-// return detStore()->record(m_calculator, calcDSname);
-//}
-//#endif // Athena
const LArWheelCalculator *LArCustomShape::calculator() const
{
diff --git a/GeoSpecialShapes/src/LArWheelCalculator.cxx b/GeoSpecialShapes/src/LArWheelCalculator.cxx
index baaae58..0792b35 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator.cxx
+++ b/GeoSpecialShapes/src/LArWheelCalculator.cxx
@@ -9,31 +9,11 @@
#include <climits>
#include <cassert>
-//#ifndef BUILDVP1LIGHT
-// #include "GaudiKernel/ISvcLocator.h"
-// #include "GaudiKernel/Bootstrap.h"
-// #include "GaudiKernel/MsgStream.h"
-// #include "GaudiKernel/PhysicalConstants.h"
-// #include "GeoModelInterfaces/IGeoModelSvc.h"
-// #include "RDBAccessSvc/IRDBRecord.h"
-// #include "RDBAccessSvc/IRDBRecordset.h"
-// #include "RDBAccessSvc/IRDBAccessSvc.h"
-// #include "./LArWheelCalculator_Impl/RDBParamReader.h"
-// #include "./LArWheelCalculator_Impl/RDBParamRecords.h"
-//#endif
-
-//#include "GeoModelUtilities/DecodeVersionKey.h"
-
#include "GeoSpecialShapes/LArWheelCalculator.h"
#include "./LArWheelCalculator_Impl/DistanceCalculatorFactory.h"
#include "./LArWheelCalculator_Impl/FanCalculatorFactory.h"
-//#include "AthenaKernel/Units.h"
-
-
-//using namespace Athena::Units;
-//using Gaudi::Units::twopi;
// The radial boundaries of the inner and outer wheels are defined
@@ -114,25 +94,6 @@ LArWheelCalculator::LArWheelCalculator(LArG4::LArWheelCalculator_t a_wheelType,
m_distanceCalcImpl(0),
m_fanCalcImpl(0)
{
- // Get pointer to the message service
- //ISvcLocator* svcLocator = Gaudi::svcLocator();
- //IMessageSvc* msgSvc;
- //StatusCode status = svcLocator->service("MessageSvc", msgSvc);
- //if(status.isFailure()){
- // throw std::runtime_error("LArWheelCalculator constructor: cannot initialze message service");
- //}
- //MsgStream msg(msgSvc, "LArWheelCalculator");
- //msg << MSG::VERBOSE << "LArWheelCalculator constructor at " << this
- // << " (type " << LArWheelCalculatorTypeString(m_type)
- // << "):" << endmsg;
-
-//#ifdef LARWC_DTNF_NEW
-// msg << MSG::VERBOSE << "compiled with new DTNF" << endmsg;
-//#endif
-
- // Access source of detector parameters.
- // msg << MSG::VERBOSE
- // << "initializing data members from DB..." << endmsg;
//#ifndef BUILDVP1LIGHT
@@ -199,43 +160,6 @@ LArWheelCalculator::LArWheelCalculator(LArG4::LArWheelCalculator_t a_wheelType,
// m_zWheelFrontFace = m_dMechFocaltoWRP + m_dWRPtoFrontFace;
// m_zWheelBackFace = m_zWheelFrontFace + m_WheelThickness;
//
-// msg << MSG::DEBUG << "... got these values:" << std::endl
-// << "m_zWheelRefPoint : " << m_zWheelRefPoint / cm << " [cm]" << std::endl
-// << "m_dMechFocaltoWRP : " << m_dMechFocaltoWRP / cm << " [cm]" << std::endl
-// << "m_dElecFocaltoWRP : " << m_dElecFocaltoWRP / cm << " [cm]" << std::endl
-// << "m_HalfGapBetweenWheels : " << m_HalfGapBetweenWheels / cm << " [cm]" << std::endl
-// << "m_rOuterCutoff : " << m_rOuterCutoff / cm << " [cm]" << std::endl
-// << "m_zWheelFrontFace : " << m_zWheelFrontFace / cm << " [cm]" << std::endl
-// << "m_zWheelBackFace : " << m_zWheelBackFace / cm << " [cm]" << std::endl
-// << "m_zShift : " << m_zShift / cm << " [cm]" << std::endl
-// << "Phi rotation : " << (m_phiRotation? "true": "false") << std::endl
-// << "eta wheels limits : " << m_eta_low << ", " << m_eta_mid << ", " << m_eta_hi
-// << endmsg;
-// msg << MSG::VERBOSE << "hardcoded constants: " << std::endl
-// << "m_WheelThickness : " << m_WheelThickness / cm << " [cm]" << std::endl
-// << "m_dWRPtoFrontFace : " << m_dWRPtoFrontFace / cm << " [cm]"
-// << endmsg;
-
- //#endif
-//#ifdef BUILDVP1LIGHT //FIXME: check all this!!!
- //TO DO: put real values
- //m_zWheelRefPoint = 999;// / cm
- //m_dMechFocaltoWRP = 999;// / cm << " [cm]" << std::endl
- //m_dElecFocaltoWRP = 999;// : " << m_dElecFocaltoWRP / cm << " [cm]" << std::endl
- //m_HalfGapBetweenWheels = 999;// : " << m_HalfGapBetweenWheels / cm << " [cm]" << std::endl
- //m_rOuterCutoff = 999;// : " << m_rOuterCutoff / cm << " [cm]" << std::endl
- //m_zWheelFrontFace = 999;// : " << m_zWheelFrontFace / cm << " [cm]" << std::endl
- //m_zWheelBackFace = 999;// : " << m_zWheelBackFace / cm << " [cm]" << std::endl
- //m_zShift = 999;// : " << m_zShift / cm << " [cm]" << std::endl
- m_phiRotation = true;//? "true": "false") << std::endl
- //m_eta_low = 999;//
- //m_eta_mid = 999;//
- //m_eta_hi = 999;//
-
- //m_WheelThickness = 999;// : " << m_WheelThickness / cm << " [cm]" << std::endl
- //m_dWRPtoFrontFace = 999;// : " << m_dWRPtoFrontFace / cm << " [cm]"
-//#endif
-
// Constructor initializes the geometry.
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.cxx b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.cxx
index 055baef..fad07f8 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.cxx
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.cxx
@@ -12,17 +12,15 @@ namespace LArWheelCalculator_Impl
{
IDistanceCalculator* DistanceCalculatorFactory::Create(const std::string & sagging_opt,
- LArWheelCalculator* lwc/*,
- IRDBAccessSvc* rdbAccess,
- const DecodeVersionKey & larVersionKey*/)
+ LArWheelCalculator* lwc)
{
// the same condition is in LArWheelCalculator constructor
bool SaggingOn = (sagging_opt != "" && sagging_opt != "off")? true: false;
if (SaggingOn) {
- return new DistanceCalculatorSaggingOn(sagging_opt, lwc/*, rdbAccess, larVersionKey*/);
+ return new DistanceCalculatorSaggingOn(sagging_opt, lwc);
} else {
- return new DistanceCalculatorSaggingOff(lwc/*, rdbAccess, larVersionKey*/ );
+ return new DistanceCalculatorSaggingOff(lwc);
}
}
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.h
index f1dbc8d..7fd5a6d 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorFactory.h
@@ -10,10 +10,6 @@
#include <string>
#include "IDistanceCalculator.h"
-//#ifndef BUILDVP1LIGHT
-// #include "RDBAccessSvc/IRDBAccessSvc.h"
-//#endif
-//#include "GeoModelUtilities/DecodeVersionKey.h"
class LArWheelCalculator;
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.cxx b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.cxx
index 47289c4..aea5269 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.cxx
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.cxx
@@ -6,7 +6,6 @@
#include "GeoSpecialShapes/LArWheelCalculator.h"
#include "GeoModelKernel/GeoDefinitions.h"
-//#include "GaudiKernel/PhysicalConstants.h"
#include<cassert>
//#define LWC_PARAM_ANGLE
@@ -17,19 +16,12 @@
#include<signal.h>
-//using namespace Gaudi::Units;
-
// Physical constants
#include "GeoModelKernel/Units.h"
#define SYSTEM_OF_UNITS GeoModelKernelUnits
namespace LArWheelCalculator_Impl
-{
-
- //DistanceCalculatorSaggingOff::DistanceCalculatorSaggingOff(LArWheelCalculator* c,
- // IRDBAccessSvc* /*rdbAccess*/,
- // const DecodeVersionKey & /*larVersionKey*/)
- DistanceCalculatorSaggingOff::DistanceCalculatorSaggingOff(LArWheelCalculator* c)
+{ DistanceCalculatorSaggingOff::DistanceCalculatorSaggingOff(LArWheelCalculator* c)
: m_lwc(c)
{
m_EndQuarterWave = lwc()->m_ActiveLength - lwc()->m_QuarterWaveLength;
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.h
index 6812002..fe19799 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOff.h
@@ -8,8 +8,6 @@
#include "IDistanceCalculator.h"
#include "GeoModelKernel/GeoDefinitions.h"
-//#include "RDBAccessSvc/IRDBAccessSvc.h"
-//#include "GeoModelUtilities/DecodeVersionKey.h"
class LArWheelCalculator;
@@ -26,9 +24,7 @@ namespace LArWheelCalculator_Impl
public:
/// Constructor
- DistanceCalculatorSaggingOff(LArWheelCalculator* lwc/*,
- IRDBAccessSvc* rdbAccess,
- const DecodeVersionKey& larVersionKey*/);
+ DistanceCalculatorSaggingOff(LArWheelCalculator* lwc);
/// @name Geometry methods
/// @{
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.cxx b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.cxx
index c7cf211..7e7c1c9 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.cxx
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.cxx
@@ -2,12 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-//#include "GaudiKernel/ISvcLocator.h"
-//#include "GaudiKernel/Bootstrap.h"
-//#include "GaudiKernel/MsgStream.h"
-
#include "DistanceCalculatorSaggingOn.h"
-//#include "CLHEP/Vector/ThreeVector.h"
#include "GeoModelKernel/GeoDefinitions.h"
#include <vector>
@@ -15,9 +10,6 @@
#include "GeoSpecialShapes/LArWheelCalculator.h"
-//#include "AthenaKernel/Units.h"
-//using Athena::Units::mm;
-
// Physical constants
#include "GeoModelKernel/Units.h"
#define SYSTEM_OF_UNITS GeoModelKernelUnits
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.h
index 7ca0448..31ab47d 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/DistanceCalculatorSaggingOn.h
@@ -27,9 +27,7 @@ namespace LArWheelCalculator_Impl
/// Constructor
DistanceCalculatorSaggingOn(const std::string& saggingOptions,
- LArWheelCalculator* lwc/*,
- IRDBAccessSvc* rdbAccess,
- const DecodeVersionKey & larVersionKey*/);
+ LArWheelCalculator* lwc);
/// @name Geometry methods
/// @{
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.cxx b/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.cxx
index 0fb27ac..be80f09 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.cxx
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.cxx
@@ -11,17 +11,15 @@ namespace LArWheelCalculator_Impl
{
IFanCalculator* FanCalculatorFactory::Create(bool isSaggingOn, bool isModule,
- LArWheelCalculator* lwc/*,
- IRDBAccessSvc* rdbAccess,
- const DecodeVersionKey& larVersionKey*/)
+ LArWheelCalculator* lwc)
{
if (isModule) {
- return new ModuleFanCalculator(lwc/*, rdbAccess, larVersionKey*/);
+ return new ModuleFanCalculator(lwc);
}
if (isSaggingOn) {
- return new WheelFanCalculator<SaggingOn_t>(lwc/*, rdbAccess, larVersionKey*/);
+ return new WheelFanCalculator<SaggingOn_t>(lwc);
} else {
- return new WheelFanCalculator<SaggingOff_t>(lwc/*, rdbAccess, larVersionKey*/);
+ return new WheelFanCalculator<SaggingOff_t>(lwc);
}
}
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.h
index 79b207f..e4f8f37 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/FanCalculatorFactory.h
@@ -7,8 +7,6 @@
#include "IFanCalculator.h"
-//#include "RDBAccessSvc/IRDBAccessSvc.h"
-//#include "GeoModelUtilities/DecodeVersionKey.h"
class LArWheelCalculator;
@@ -24,9 +22,7 @@ namespace LArWheelCalculator_Impl
{
public:
static IFanCalculator* Create(bool isSaggingOn, bool isModule,
- LArWheelCalculator* lwc/*,
- IRDBAccessSvc* rdbAccess,
- const DecodeVersionKey & larVersionKey*/);
+ LArWheelCalculator* lwc);
};
}
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/IDistanceCalculator.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/IDistanceCalculator.h
index 4bc81b2..bb553a6 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/IDistanceCalculator.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/IDistanceCalculator.h
@@ -5,8 +5,6 @@
#ifndef __LArWheelCalculator_Impl_IDistanceCalculator_H__
#define __LArWheelCalculator_Impl_IDistanceCalculator_H__
-
-//#include "CLHEP/Vector/ThreeVector.h"
#include "GeoModelKernel/GeoDefinitions.h"
namespace LArWheelCalculator_Impl
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/IFanCalculator.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/IFanCalculator.h
index cd0f7dc..56f9e06 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/IFanCalculator.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/IFanCalculator.h
@@ -5,8 +5,6 @@
#ifndef __LArWheelCalculator_Impl_IFanCalculator_H__
#define __LArWheelCalculator_Impl_IFanCalculator_H__
-
-//#include "CLHEP/Vector/ThreeVector.h"
#include "GeoModelKernel/GeoDefinitions.h"
namespace LArWheelCalculator_Impl
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.cxx b/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.cxx
index 3008f52..6079e0c 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.cxx
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.cxx
@@ -6,10 +6,7 @@
#include "GeoSpecialShapes/LArWheelCalculator.h"
#include "GeoModelKernel/GeoDefinitions.h"
-//#include "CLHEP/Vector/ThreeVector.h"
-//#include "GaudiKernel/PhysicalConstants.h"
-//using namespace Gaudi::Units;
// Physical constants
#include "GeoModelKernel/Units.h"
#define SYSTEM_OF_UNITS GeoModelKernelUnits
@@ -20,10 +17,6 @@
namespace LArWheelCalculator_Impl
{
-
- //ModuleFanCalculator::ModuleFanCalculator(LArWheelCalculator* lwc,
- // IRDBAccessSvc* /*rdbAccess*/,
- // const DecodeVersionKey & /*larVersionKey*/)
ModuleFanCalculator::ModuleFanCalculator(LArWheelCalculator* lwc)
: m_lwc(lwc)
{
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.h
index da2cfbc..a0fe5ce 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/ModuleFanCalculator.h
@@ -6,8 +6,6 @@
#define __LArWheelCalculator_Impl_ModuleFanCalculator_H__
#include "IFanCalculator.h"
-//#include "RDBAccessSvc/IRDBAccessSvc.h"
-//#include "GeoModelUtilities/DecodeVersionKey.h"
#include "GeoModelKernel/GeoDefinitions.h"
class LArWheelCalculator;
@@ -19,9 +17,7 @@ namespace LArWheelCalculator_Impl
class ModuleFanCalculator : public IFanCalculator
{
public:
- ModuleFanCalculator(LArWheelCalculator* lwc/*,
- IRDBAccessSvc* rdbAccess,
- const DecodeVersionKey & larVersionKey*/);
+ ModuleFanCalculator(LArWheelCalculator* lwc);
// geometry methods:
virtual double DistanceToTheNearestFan(GeoTrf::Vector3D &p, int & out_fan_number) const;
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/WheelFanCalculator.h b/GeoSpecialShapes/src/LArWheelCalculator_Impl/WheelFanCalculator.h
index c372142..44ad15a 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/WheelFanCalculator.h
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/WheelFanCalculator.h
@@ -6,12 +6,9 @@
#define LARWHEELCALCULATOR_IMPL_WHEELFANCALCULATOR_H
#include "IFanCalculator.h"
-//#include "RDBAccessSvc/IRDBAccessSvc.h"
-//#include "GeoModelUtilities/DecodeVersionKey.h"
#include "GeoSpecialShapes/LArWheelCalculator.h"
#include "GeoModelKernel/GeoDefinitions.h"
-//#include "GaudiKernel/PhysicalConstants.h"
// Physical constants
#include "GeoModelKernel/Units.h"
#define SYSTEM_OF_UNITS GeoModelKernelUnits
diff --git a/GeoSpecialShapes/src/LArWheelCalculator_Impl/sincos_poly.cxx b/GeoSpecialShapes/src/LArWheelCalculator_Impl/sincos_poly.cxx
index 8d47d28..2a7f18b 100644
--- a/GeoSpecialShapes/src/LArWheelCalculator_Impl/sincos_poly.cxx
+++ b/GeoSpecialShapes/src/LArWheelCalculator_Impl/sincos_poly.cxx
@@ -4,18 +4,6 @@
#include "GeoSpecialShapes/LArWheelCalculator.h"
#include "GeoSpecialShapes/sincos.h"
-//#include "CLHEP/Units/SystemOfUnits.h"
-
-/// TO DO : Dependencies from fROOT - gone
-/// TO BE TESTED : RowVectorXd equivalent of TVectorD
-/// MatrixXd equivalent of TMatrixD
-
-//#include "TMath.h"
-//#include "TMatrixD.h"
-//#include "TVectorD.h"
-//#include "TMatrixDLazy.h"
-//#include "TDecompLU.h"
-//#include "TDecompSVD.h"
#include <Eigen/Dense>
#include <vector>
--
GitLab