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
7e1b3aab
Commit
7e1b3aab
authored
Mar 28, 2019
by
Simon Spannagel
Browse files
ELEUDAQ2: also include data from main event
parent
a68d5883
Pipeline
#780360
passed with stages
in 11 minutes and 55 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/modules/EventLoaderEUDAQ2/EventLoaderEUDAQ2.cpp
View file @
7e1b3aab
...
...
@@ -43,14 +43,12 @@ std::shared_ptr<eudaq::StandardEvent> EventLoaderEUDAQ2::get_next_event() {
LOG
(
DEBUG
)
<<
"Reached EOF"
;
throw
EndOfFile
();
}
// Build buffer from all sub-events:
events_
=
new_event
->
GetSubEvents
();
// If there are no sub-events just add the one event we have to the list:
if
(
events_
.
empty
())
{
// The main event might also contain data, so add it to the buffer:
events_
.
push_back
(
new_event
);
}
// FIXME get TL
u
before Ni - sort by name, reversed
// FIXME get TL
U events with trigger IDs
before Ni - sort by name, reversed
sort
(
events_
.
begin
(),
events_
.
end
(),
[](
const
eudaq
::
EventSPC
&
a
,
const
eudaq
::
EventSPC
&
b
)
->
bool
{
return
a
->
GetDescription
()
>
b
->
GetDescription
();
});
...
...
@@ -70,7 +68,7 @@ std::shared_ptr<eudaq::StandardEvent> EventLoaderEUDAQ2::get_next_event() {
EventLoaderEUDAQ2
::
EventPosition
EventLoaderEUDAQ2
::
is_within_event
(
std
::
shared_ptr
<
Clipboard
>
clipboard
,
std
::
shared_ptr
<
eudaq
::
StandardEvent
>
evt
)
{
//
FIXME for c
heck
ing
if timestamp
i
s availale
//
C
heck if
this event has
timestamps availa
b
le
:
if
(
evt
->
GetTimeBegin
()
==
0
)
{
LOG
(
DEBUG
)
<<
"Event "
<<
evt
->
GetDescription
()
<<
" has no timestamp, comparing trigger number"
;
...
...
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