Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2-hgx327A Make some trivial changes to the destructors of a few classes in Geometry/HGCalCommonData #39838

Merged
merged 1 commit into from Oct 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/interface/HGCalGeomParameters.h
Expand Up @@ -29,7 +29,7 @@
class HGCalGeomParameters {
public:
HGCalGeomParameters();
~HGCalGeomParameters();
~HGCalGeomParameters() = default;

void loadGeometryHexagon(const DDFilteredView& _fv,
HGCalParameters& php,
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/interface/HGCalGeomRotation.h
Expand Up @@ -7,7 +7,7 @@ class HGCalGeomRotation {
enum class WaferCentring { WaferCentred, CornerCentredY, CornerCentredMercedes };

HGCalGeomRotation(SectorType sectorType) { sectorType_ = sectorType; };
~HGCalGeomRotation() {}
~HGCalGeomRotation() = default;

void uvMappingFromSector0(WaferCentring waferCentring, int& moduleU, int& moduleV, unsigned sector) const;
unsigned uvMappingToSector0(WaferCentring waferCentring, int& moduleU, int& moduleV) const;
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/interface/HGCalGeomTools.h
Expand Up @@ -8,7 +8,7 @@
class HGCalGeomTools {
public:
HGCalGeomTools();
~HGCalGeomTools() {}
~HGCalGeomTools() = default;

static constexpr int k_allCorners = 6;
static constexpr int k_fiveCorners = 5;
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/interface/HGCalParameters.h
Expand Up @@ -57,7 +57,7 @@ class HGCalParameters {
};

HGCalParameters(const std::string& nam);
~HGCalParameters(void);
~HGCalParameters(void) = default;
void fillModule(const hgtrap& mytr, bool reco);
hgtrap getModule(unsigned int k, bool reco) const;
void fillTrForm(const hgtrform& mytr);
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HGCalCommonData/interface/HGCalParametersFromDD.h
Expand Up @@ -11,8 +11,8 @@ class HGCalParameters;

class HGCalParametersFromDD {
public:
HGCalParametersFromDD() {}
virtual ~HGCalParametersFromDD() {}
HGCalParametersFromDD() = default;
virtual ~HGCalParametersFromDD() = default;

bool build(const DDCompactView* cpv,
HGCalParameters& php,
Expand Down
6 changes: 0 additions & 6 deletions Geometry/HGCalCommonData/src/HGCalGeomParameters.cc
Expand Up @@ -36,12 +36,6 @@ HGCalGeomParameters::HGCalGeomParameters() : sqrt3_(std::sqrt(3.0)) {
#endif
}

HGCalGeomParameters::~HGCalGeomParameters() {
#ifdef EDM_ML_DEBUG
edm::LogVerbatim("HGCalGeom") << "HGCalGeomParameters::destructed!!!";
#endif
}

void HGCalGeomParameters::loadGeometryHexagon(const DDFilteredView& _fv,
HGCalParameters& php,
const std::string& sdTag1,
Expand Down
2 changes: 0 additions & 2 deletions Geometry/HGCalCommonData/src/HGCalParameters.cc
Expand Up @@ -12,8 +12,6 @@ HGCalParameters::HGCalParameters(const std::string& nam) : name_(nam), nCells_(0
#endif
}

HGCalParameters::~HGCalParameters() {}

void HGCalParameters::fillModule(const HGCalParameters::hgtrap& mytr, bool reco) {
if (reco) {
moduleLayR_.emplace_back(mytr.lay);
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/test/HGCalCellUVTester.cc
Expand Up @@ -43,7 +43,7 @@
class HGCalCellUVTester : public edm::one::EDAnalyzer<> {
public:
explicit HGCalCellUVTester(const edm::ParameterSet&);
~HGCalCellUVTester() override {}
~HGCalCellUVTester() override = default;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

void beginJob() override {}
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/test/HGCalValidHexTester.cc
Expand Up @@ -40,7 +40,7 @@
class HGCalValidHexTester : public edm::one::EDAnalyzer<> {
public:
explicit HGCalValidHexTester(const edm::ParameterSet&);
~HGCalValidHexTester() override {}
~HGCalValidHexTester() override = default;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

void beginJob() override {}
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/test/HGCalWaferTester.cc
Expand Up @@ -41,7 +41,7 @@
class HGCalWaferTester : public edm::one::EDAnalyzer<> {
public:
explicit HGCalWaferTester(const edm::ParameterSet&);
~HGCalWaferTester() override {}
~HGCalWaferTester() override = default;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

void beginJob() override {}
Expand Down