Commit 78123830 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Start adapting framework to new configuration structure

parent fe425fb8
......@@ -6,8 +6,8 @@
#include "objects/Timepix3Track.h"
// Default constructor
Analysis::Analysis(Parameters* parameters){
m_parameters = parameters;
Analysis::Analysis(std::string config_file_name){
m_parameters = new Parameters();
m_clipboard = new Clipboard();
}
......
......@@ -26,8 +26,7 @@ class Analysis {
public:
// Constructors and destructors
Analysis(std::string config_file_name) {};
Analysis(Parameters*);
Analysis(std::string config_file_name);
virtual ~Analysis(){};
// Member functions
......@@ -40,7 +39,6 @@ public:
void finaliseAll();
void reset() {};
void terminate() {};
TBrowser* browser;
......
......@@ -46,7 +46,7 @@ void interrupt_handler(int) {
// Stop the framework if it is loaded
if(cv_ready) {
LOG(STATUS) << "Interrupted! Finishing up current event...";
corry->terminate();
corry->finaliseAll();
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment