Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
9be371f3
Commit
9be371f3
authored
Oct 09, 2017
by
Simon Spannagel
Browse files
Make Analysis.C compile again
parent
613c33b7
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/core/Algorithm.h
View file @
9be371f3
#ifndef ALGORITHM_H
#ifndef ALGORITHM_H
#define ALGORITHM_H 1
// Include files
...
...
src/core/Analysis.C
View file @
9be371f3
...
...
@@ -91,6 +91,7 @@ void Analysis::load() {
throw
RuntimeError
(
"Cannot create main ROOT file "
+
std
::
string
(
m_parameters
->
histogramFile
.
c_str
()));
}
LOG
(
DEBUG
)
<<
"Start loading algorithms, have "
<<
configs
.
size
()
<<
" configurations."
;
// Loop through all non-global configurations
for
(
auto
&
config
:
configs
)
{
// Load library for each module. Libraries are named (by convention + CMAKE) libAllpixModule Name.suffix
...
...
@@ -132,7 +133,7 @@ void Analysis::load() {
dl_info
.
dli_fname
=
""
;
// workaround to get the location of the library
int
ret
=
dladdr
(
dlsym
(
lib
,
ALLPIX_UNIQUE
_FUNCTION
),
&
dl_info
);
int
ret
=
dladdr
(
dlsym
(
lib
,
CORRYVRECKAN_GENERATOR
_FUNCTION
),
&
dl_info
);
if
(
ret
!=
0
)
{
LOG
(
DEBUG
)
<<
"Found library during global search in runtime paths at "
<<
dl_info
.
dli_fname
;
}
else
{
...
...
@@ -168,7 +169,7 @@ void Analysis::load() {
<<
std
::
endl
<<
"- Recompile the library "
<<
problem_lib
<<
" with tls-model=global-dynamic"
;
}
else
if
(
lib_error
!=
nullptr
&&
std
::
strstr
(
lib_error
,
"cannot open shared object file"
)
!=
nullptr
&&
problem_lib
.
find
(
ALLPIX_MODULE
_PREFIX
)
==
std
::
string
::
npos
)
{
problem_lib
.
find
(
CORRYVRECKAN_ALGORITHM
_PREFIX
)
==
std
::
string
::
npos
)
{
LOG
(
ERROR
)
<<
"Library could not be loaded: one of its dependencies is missing"
<<
std
::
endl
<<
"The name of the missing library is "
<<
problem_lib
<<
std
::
endl
<<
"Please make sure the library is properly initialized and try again"
;
...
...
src/core/Parameters.C
View file @
9be371f3
...
...
@@ -139,7 +139,7 @@ bool Parameters::readConditions(){
conditions
.
open
(
conditionsFile
.
c_str
());
string
line
;
LOG
(
INFO
)
<<
"-------------------------------------------------------------------------------------------------------------------
---------------------------------------------
"
;
LOG
(
INFO
)
<<
"-------------------------------------------------------------------------------------------------------------------"
;
// Loop over file
while
(
getline
(
conditions
,
line
)){
...
...
@@ -168,7 +168,7 @@ bool Parameters::readConditions(){
LOG
(
INFO
)
<<
"Device parameters: "
<<
line
;
}
LOG
(
INFO
)
<<
"-------------------------------------------------------------------------------------------------------------------
---------------------------------------------
"
;
LOG
(
INFO
)
<<
"-------------------------------------------------------------------------------------------------------------------"
;
// Now check that all devices which are registered have parameters as well
bool
unregisteredDetector
=
false
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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