Skip to content

Commit cbf4509

Browse files
marc1ukbrichards64
andauthored
add m_configfile to Tool (#34)
* add m_configfile to Tool * Update MyTool.cpp add populating m_configfile in Initialise to MyTool.cpp template * Update MyToolDynamicMultiThread.cpp add populating m_configfile in Initialise to MyToolDynamicMultiThread.cpp template * Update MyToolMultiThread.cpp add populating m_configfile in Initialise to MyToolMultiThread.cpp template * Update MyToolThread.cpp add populating m_configfile in Initialise to MyToolThread.cpp template --------- Co-authored-by: brichards64 <b.richards@qmul.ac.uk>
1 parent f17a6a9 commit cbf4509

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

UserTools/template/MyTool.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ MyTool::MyTool():Tool(){}
66
bool MyTool::Initialise(std::string configfile, DataModel &data){
77

88
InitialiseTool(data);
9+
m_configfile = configfile;
910
InitialiseConfiguration(configfile);
1011
//m_variables.Print();
1112

UserTools/template/MyToolDynamicMultiThread.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ MyToolDynamicMultiThread::MyToolDynamicMultiThread():Tool(){}
1111
bool MyToolDynamicMultiThread::Initialise(std::string configfile, DataModel &data){
1212

1313
InitialiseTool(data);
14+
m_configfile = configfile;
1415
InitialiseConfiguration(configfile);
1516
//m_variables.Print();
1617

UserTools/template/MyToolMultiThread.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ MyToolMultiThread::MyToolMultiThread():Tool(){}
1010

1111
bool MyToolMultiThread::Initialise(std::string configfile, DataModel &data){
1212

13-
InitialiseTool(data);
13+
InitialiseTool(data);
14+
m_configfile = configfile;
1415
InitialiseConfiguration(configfile);
1516
//m_variables.Print();
1617

UserTools/template/MyToolThread.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ MyToolThread::MyToolThread():Tool(){}
1111
bool MyToolThread::Initialise(std::string configfile, DataModel &data){
1212

1313
InitialiseTool(data);
14+
m_configfile = configfile;
1415
InitialiseConfiguration(configfile);
1516
//m_variables.Print();
1617

src/Tool/Tool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ namespace ToolFramework{
4040
DataModel* m_data; ///< Pointer to transiant DataModel class
4141
Logging* m_log; ///< Pointer to logging class
4242
int m_verbose; ///< verbosity variable for direct logging level
43+
std::string m_configfile; ///< path to configuration file
4344
MsgL ML(int messagelevel) {return MsgL(messagelevel,m_verbose);} ///< Function for setting logging level instream @param messagelevel the verboisty level at which to show the message. Checked against internal verbosity level.
4445
void MLC() {*(m_log)<<MsgL(0,m_verbose);} ///< Function for clearing logging level
4546
template <typename T> void Log(T message, int messagelevel, int verbosity){m_log->Log("-"+m_tool_name+"-: "+message,messagelevel,verbosity);}
@@ -58,9 +59,8 @@ namespace ToolFramework{
5859
m_variables>>vars_json;
5960
reinterpret_cast<DataModelBase*>(m_data)->vars.Set(m_tool_name,vars_json);
6061
}
61-
62+
6263
private:
63-
6464
};
6565

6666
}

0 commit comments

Comments
 (0)