Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
005c2292
Commit
005c2292
authored
May 04, 2018
by
Simon Spannagel
Browse files
Fix some new compiler warnings from GCC 7.3
parent
a393ea44
Changes
6
Hide whitespace changes
Inline
Side-by-side
src/core/module/Module.hpp
View file @
005c2292
...
...
@@ -100,7 +100,7 @@ namespace corryvreckan {
*
* Does nothing if not overloaded.
*/
virtual
StatusCode
run
(
Clipboard
*
clipboard
)
{
(
void
)
clipboard
;
}
virtual
StatusCode
run
(
Clipboard
*
)
{
return
Success
;
}
/**
* @brief Finalise the module after the event sequence
...
...
src/modules/ATLASpixEventLoader/ATLASpixEventLoader.cpp
View file @
005c2292
...
...
@@ -13,7 +13,7 @@ ATLASpixEventLoader::ATLASpixEventLoader(Configuration config, std::vector<Detec
m_inputDirectory
=
m_config
.
get
<
std
::
string
>
(
"inputDirectory"
);
m_calibrationFile
=
m_config
.
get
<
std
::
string
>
(
"calibrationFile"
);
m_startTime
-
m_config
.
get
<
double
>
(
"startTime"
,
0.
);
m_startTime
=
m_config
.
get
<
double
>
(
"startTime"
,
0.
);
m_toaMode
=
m_config
.
get
<
bool
>
(
"toaMode"
,
false
);
}
...
...
@@ -34,7 +34,7 @@ void ATLASpixEventLoader::initialise() {
dirent
*
file
;
// Read the entries in the folder
while
(
entry
=
readdir
(
directory
))
{
while
(
(
entry
=
readdir
(
directory
))
)
{
// Check for the data file
string
filename
=
m_inputDirectory
+
"/"
+
entry
->
d_name
;
if
(
filename
.
find
(
".dat"
)
!=
string
::
npos
)
{
...
...
src/modules/CLICpixEventLoader/CLICpixEventLoader.cpp
View file @
005c2292
...
...
@@ -25,7 +25,7 @@ void CLICpixEventLoader::initialise() {
dirent
*
file
;
// Read the entries in the folder
while
(
entry
=
readdir
(
directory
))
{
while
(
(
entry
=
readdir
(
directory
))
)
{
// Check for the data file
string
filename
=
inputDirectory
+
"/"
+
entry
->
d_name
;
if
(
filename
.
find
(
".dat"
)
!=
string
::
npos
)
{
...
...
src/modules/DataDump/DataDump.cpp
View file @
005c2292
...
...
@@ -36,7 +36,7 @@ StatusCode DataDump::run(Clipboard* clipboard) {
bool
clearedHeader
=
false
;
// Get all of the files for this chip
while
(
file
=
readdir
(
directory
))
{
while
(
(
file
=
readdir
(
directory
))
)
{
string
filename
=
inputDirectory
+
"/"
+
file
->
d_name
;
// Check if file has extension .dat
...
...
src/modules/Timepix1EventLoader/Timepix1EventLoader.cpp
View file @
005c2292
...
...
@@ -49,7 +49,7 @@ void Timepix1EventLoader::initialise() {
dirent
*
file
;
// Read the entries in the folder
while
(
entry
=
readdir
(
directory
))
{
while
(
(
entry
=
readdir
(
directory
))
)
{
// Get the name of this entry
string
filename
=
entry
->
d_name
;
...
...
src/modules/Timepix3EventLoader/Timepix3EventLoader.cpp
View file @
005c2292
...
...
@@ -57,7 +57,7 @@ void Timepix3EventLoader::initialise() {
std
::
map
<
std
::
string
,
std
::
vector
<
std
::
string
>>
detector_files
;
// Read the entries in the folder
while
(
entry
=
readdir
(
directory
))
{
while
(
(
entry
=
readdir
(
directory
))
)
{
// Ignore UNIX functional directories:
if
(
std
::
string
(
entry
->
d_name
).
at
(
0
)
==
'.'
)
{
...
...
@@ -92,7 +92,7 @@ void Timepix3EventLoader::initialise() {
}
// Get all of the files for this chip
while
(
file
=
readdir
(
dataDir
))
{
while
(
(
file
=
readdir
(
dataDir
))
)
{
string
filename
=
dataDirName
+
"/"
+
file
->
d_name
;
// Check if file has extension .dat
...
...
@@ -138,7 +138,6 @@ void Timepix3EventLoader::initialise() {
std
::
sort
(
detector_files
[
detector
->
name
()].
begin
(),
detector_files
[
detector
->
name
()].
end
(),
[](
std
::
string
a
,
std
::
string
b
)
{
auto
get_serial
=
[](
std
::
string
name
)
{
const
auto
pos1
=
name
.
find_last_of
(
'-'
);
const
auto
pos2
=
name
.
find_last_of
(
'.'
);
...
...
Write
Preview
Markdown
is supported
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