Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
78123830
Commit
78123830
authored
Oct 06, 2017
by
Simon Spannagel
Browse files
Start adapting framework to new configuration structure
parent
fe425fb8
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/core/Analysis.C
View file @
78123830
...
...
@@ -6,8 +6,8 @@
#include
"objects/Timepix3Track.h"
// Default constructor
Analysis
::
Analysis
(
Parameters
*
parameters
){
m_parameters
=
p
arameters
;
Analysis
::
Analysis
(
std
::
string
config_file_name
){
m_parameters
=
new
P
arameters
()
;
m_clipboard
=
new
Clipboard
();
}
...
...
src/core/Analysis.h
View file @
78123830
...
...
@@ -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
;
...
...
src/exec/corry.cpp
View file @
78123830
...
...
@@ -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
();
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment