From 8bc6ca1abfe2351c24b321d199865b11bef5b98d Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Thu, 6 Dec 2018 15:28:36 +0100
Subject: [PATCH] Remove obsolete methods and member variables from HitIdHelper
Now that all clients have been migrated it is safe to drop all
methods which try to modify the internal state of HitIdHelper after
initialization. The `m_id` member variable can then be dropped too.
Also update methods to pass `std::string` arguments by reference.
Former-commit-id: 22f74dfdb2c5371c79f1e61e6a600c773891abfd
---
.../HitManagement/HitManagement/HitIdHelper.h | 16 +++-----
Simulation/HitManagement/src/HitIdHelper.cxx | 40 ++-----------------
2 files changed, 9 insertions(+), 47 deletions(-)
diff --git a/Simulation/HitManagement/HitManagement/HitIdHelper.h b/Simulation/HitManagement/HitManagement/HitIdHelper.h
index 9d065a82128..c5e90d3fb90 100755
--- a/Simulation/HitManagement/HitManagement/HitIdHelper.h
+++ b/Simulation/HitManagement/HitManagement/HitIdHelper.h
@@ -22,21 +22,15 @@ typedef std::vector<IdField> IdFields;
class HitIdHelper {
public:
- HitIdHelper():m_id(0), m_currentStorage(0) {}
+ HitIdHelper(): m_currentStorage(0) {}
virtual ~HitIdHelper() {}
- void InitializeField(std::string n, int vmn, int vmx);
- void InitializeField(std::string n, int nb);
- void SetFieldValue(std::string name, int n);
- void SetFieldValue(std::string name, int n, HitID& targetID) const;
- int GetFieldValue(std::string name);
- int GetFieldValue(std::string name, HitID targetID) const;
+ void InitializeField(const std::string& n, int vmn, int vmx);
+ void InitializeField(const std::string& n, int nb);
+ void SetFieldValue(const std::string& name, int n, HitID& targetID) const;
+ int GetFieldValue(const std::string& name, HitID targetID) const;
void PrintFields();
- void SetID(int i) {m_id=i;} // FIXME drop this method?
- HitID GetID() {return m_id;} // FIXME drop this method?
- void ResetID() {m_id=0;} // FIXME drop this method?
void Print(int id);
protected:
- HitID m_id; // FIXME drop this member variable
IdFields m_IDs;
int m_currentStorage;
void SetBit(int& i, int bitpos) const;
diff --git a/Simulation/HitManagement/src/HitIdHelper.cxx b/Simulation/HitManagement/src/HitIdHelper.cxx
index 7880e8cfbc8..6009c4e7ff3 100755
--- a/Simulation/HitManagement/src/HitIdHelper.cxx
+++ b/Simulation/HitManagement/src/HitIdHelper.cxx
@@ -7,7 +7,7 @@
#include <cmath>
#include <assert.h>
-void HitIdHelper::InitializeField(std::string n, int vmn, int vmx)
+void HitIdHelper::InitializeField(const std::string& n, int vmn, int vmx)
{
int field = vmx -vmn+1;
int nb=1;
@@ -18,7 +18,7 @@ void HitIdHelper::InitializeField(std::string n, int vmn, int vmx)
assert (m_currentStorage<33);
}
-void HitIdHelper::InitializeField(std::string n,int nb)
+void HitIdHelper::InitializeField(const std::string& n,int nb)
{
int vmn=0;
int vmx=int(pow(2,nb))-1;
@@ -28,24 +28,7 @@ void HitIdHelper::InitializeField(std::string n,int nb)
assert (m_currentStorage<33);
}
-void HitIdHelper::SetFieldValue(std::string name, int n)
-{
- for (unsigned int i=0;i<m_IDs.size();i++)
- {
- if (m_IDs[i].fieldName==name)
- {
- if (n<m_IDs[i].vMin || n>m_IDs[i].vMax)
- std::cout<<"HitIdHelper: field "<<name<<": supplied value "<<n<<
- " is not within the allowed range ["<<m_IDs[i].vMin<<","<<m_IDs[i].vMax
- <<"] : the result of this action is unpredictable "<<std::endl;
- n-=m_IDs[i].vMin;
- Store(m_id,n,m_IDs[i].firstBit,m_IDs[i].nBits);
- break;
- }
- }
-}
-
-void HitIdHelper::SetFieldValue(std::string name, int n, HitID& targetID) const
+void HitIdHelper::SetFieldValue(const std::string& name, int n, HitID& targetID) const
{
for (unsigned int i=0;i<m_IDs.size();i++)
{
@@ -62,22 +45,7 @@ void HitIdHelper::SetFieldValue(std::string name, int n, HitID& targetID) const
}
}
-int HitIdHelper::GetFieldValue(std::string name)
-{
- for (unsigned int i=0;i<m_IDs.size();i++)
- {
- if (m_IDs[i].fieldName==name)
- {
- int n=Retrieve(m_id,m_IDs[i].firstBit,m_IDs[i].nBits);
- return n+m_IDs[i].vMin;
- }
- }
- std::cout<<"HitIdHelper: field "<<name<<" not found: returning 0"<<
- std::endl;
- return 0;
-}
-
-int HitIdHelper::GetFieldValue(std::string name, HitID targetID) const
+int HitIdHelper::GetFieldValue(const std::string& name, HitID targetID) const
{
for (unsigned int i=0;i<m_IDs.size();i++)
{
--
GitLab