From aabb6060b8873af5593024d5e1f6d2189db246d2 Mon Sep 17 00:00:00 2001
From: Susumu Oda <susumu.oda@cern.ch>
Date: Sun, 17 Mar 2019 15:43:19 +0100
Subject: [PATCH] Make 'const static' 'static const'
---
.../SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx | 6 ++--
.../SCT_CalibAlgs/src/SCT_CalibHvTool.cxx | 4 +--
.../SCT_GeoModel/SCT_ComponentFactory.h | 2 +-
.../SCT_Monitoring/SCTMotherTrigMonTool.h | 2 +-
.../TrigFTK/TrigFTKSim/TrigFTKSim/FTKRawHit.h | 32 +++++++++----------
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
index d3ee38ea9e5a..2289686944e7 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHitmapTool.cxx
@@ -30,9 +30,9 @@
using namespace std;
using namespace SCT_CalibAlgs;
-const static string pathRoot{"/HitMaps/"};
-const static string detectorNames[]{"negativeEndcap", "barrel", "positiveEndcap"};
-const static string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
+static const string pathRoot{"/HitMaps/"};
+static const string detectorNames[]{"negativeEndcap", "barrel", "positiveEndcap"};
+static const string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
SCT_CalibHitmapTool::SCT_CalibHitmapTool(const std::string& type, const std::string& name, const IInterface* parent):
base_class(type, name, parent),
diff --git a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
index 1239b093f586..6865c698e467 100644
--- a/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
+++ b/InnerDetector/InDetCalibAlgs/SCT_CalibAlgs/src/SCT_CalibHvTool.cxx
@@ -18,9 +18,9 @@
using namespace std;
using namespace SCT_CalibAlgs;
-const static string detectorNames[]{"negativeEndcap", "barrel", "positiveEndcap"};
+static const string detectorNames[]{"negativeEndcap", "barrel", "positiveEndcap"};
-const static string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
+static const string detectorPaths[]{"SCTEC/", "SCTB/","SCTEA/"};
namespace {
void
initQueue(std::queue<int>& q, const int numvals, const int setval) {
diff --git a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_ComponentFactory.h b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_ComponentFactory.h
index cb3a123995b9..0886db0c5aff 100644
--- a/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_ComponentFactory.h
+++ b/InnerDetector/InDetDetDescr/SCT_GeoModel/SCT_GeoModel/SCT_ComponentFactory.h
@@ -40,7 +40,7 @@ protected:
private:
std::string m_name;
- const static double s_epsilon;
+ static const double s_epsilon;
};
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTMotherTrigMonTool.h b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTMotherTrigMonTool.h
index d889f703a425..58fda5162473 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTMotherTrigMonTool.h
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/SCT_Monitoring/SCTMotherTrigMonTool.h
@@ -50,7 +50,7 @@ protected:
///Check if the event passes L1 item
bool isCalibrationNoise(const std::string& L1_Item);
///Abbreviations for level 1 trigger types
- const static std::string m_triggerNames[8];
+ static const std::string m_triggerNames[8];
///Format and output (INFO msg level) the fired triggers
StatusCode printTriggers() const;
//@deprecated improper camel casing on old method
diff --git a/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTKRawHit.h b/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTKRawHit.h
index f00fd372ec4c..1e68d8cf5a25 100644
--- a/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTKRawHit.h
+++ b/Trigger/TrigFTK/TrigFTKSim/TrigFTKSim/FTKRawHit.h
@@ -229,22 +229,22 @@ public:
friend std::istream& clusterC( std::istream & , FTKRawHit& );
// These are now public because they are needed by FTKHit and FTKCoord
- const static int row_coord_mask = 0x00000FFF; ///< Bitmask marking the location of the row coordinate in m_hw_word for pixel(12 bits)
- const static int phi_width_mask = 0x00007000; ///< Bitmask marking the location of the row width in m_hw_word for pixel(3 bits)
- const static int split_mask = 0x00008000; ///< Bitmask marking the location of the split cluster flag in m_hw_word for pixel(1 bit)
- const static int column_coord_mask = 0x0FFF0000; ///< Bitmask marking the location of the column coordinate in m_hw_word for pixel(12 bits)
- const static int eta_width_mask = 0x70000000; ///< Bitmask marking the location of the column width in m_hw_word for pixel(3 bits)
-
- const static int row_coord_bit = 0; ///< Starting bit of row coordinate in m_hw_word for pixel
- const static int phi_width_bit = 12; ///< Starting bit of row width in m_hw_word for pixel
- const static int split_bit = 15; ///< Bit for the split cluster flag in m_hw_word for pixel
- const static int column_coord_bit = 16; ///< Starting bit of column coordinate in m_hw_word for pixel
- const static int eta_width_bit = 28; ///< Starting bit of column width in m_hw_word for pixel
-
- const static int strip_coord_mask = 0x07FF; ///< Bitmask marking the location of the strip coordinate in m_hw_word for SCT (3 bits)
- const static int strip_coord_bit = 0; ///< Starting bit of strip coordinate in m_hw_word for SCT
- const static int strip_width_mask = 0x7000; ///< Bitmask marking the location of the strip width in m_hw_word for SCT (3 bits)
- const static int strip_width_bit = 12; ///< Starting bit of strip width in m_hw_word for SCT
+ static const int row_coord_mask = 0x00000FFF; ///< Bitmask marking the location of the row coordinate in m_hw_word for pixel(12 bits)
+ static const int phi_width_mask = 0x00007000; ///< Bitmask marking the location of the row width in m_hw_word for pixel(3 bits)
+ static const int split_mask = 0x00008000; ///< Bitmask marking the location of the split cluster flag in m_hw_word for pixel(1 bit)
+ static const int column_coord_mask = 0x0FFF0000; ///< Bitmask marking the location of the column coordinate in m_hw_word for pixel(12 bits)
+ static const int eta_width_mask = 0x70000000; ///< Bitmask marking the location of the column width in m_hw_word for pixel(3 bits)
+
+ static const int row_coord_bit = 0; ///< Starting bit of row coordinate in m_hw_word for pixel
+ static const int phi_width_bit = 12; ///< Starting bit of row width in m_hw_word for pixel
+ static const int split_bit = 15; ///< Bit for the split cluster flag in m_hw_word for pixel
+ static const int column_coord_bit = 16; ///< Starting bit of column coordinate in m_hw_word for pixel
+ static const int eta_width_bit = 28; ///< Starting bit of column width in m_hw_word for pixel
+
+ static const int strip_coord_mask = 0x07FF; ///< Bitmask marking the location of the strip coordinate in m_hw_word for SCT (3 bits)
+ static const int strip_coord_bit = 0; ///< Starting bit of strip coordinate in m_hw_word for SCT
+ static const int strip_width_mask = 0x7000; ///< Bitmask marking the location of the strip width in m_hw_word for SCT (3 bits)
+ static const int strip_width_bit = 12; ///< Starting bit of strip width in m_hw_word for SCT
const float SCT_row_scaling = 2.;
const float PIX_row_scaling = 8.;
--
GitLab