Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Guillaume Baulieu
agapro
Commits
d3402576
Commit
d3402576
authored
Mar 17, 2020
by
Jérémie Dudouet
Browse files
Merge branch 'preprod' into 'master'
Preprod See merge request IPNL_GAMMA/narval_emulator!68
parents
7176d1ce
87fc3de4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
builders/EventQueue.cpp
builders/EventQueue.cpp
+2
-1
No files found.
builders/EventQueue.cpp
View file @
d3402576
...
@@ -80,7 +80,8 @@ UInt_t EventQueue::addData(UInt_t * i4dat, UInt_t n4dat, Int_t tstCorr)
...
@@ -80,7 +80,8 @@ UInt_t EventQueue::addData(UInt_t * i4dat, UInt_t n4dat, Int_t tstCorr)
addTstDiff
(
tstNew
);
// LM produced with original time stamp value
addTstDiff
(
tstNew
);
// LM produced with original time stamp value
#endif
#endif
tstNew
+=
tstCorr
;
// apply timestamp correction
if
(
tstNew
!=
0xFFFFFFFFFFFFFFFFULL
)
tstNew
+=
tstCorr
;
// apply timestamp correction
if
(
tstNew
<
tstLast
)
{
if
(
tstNew
<
tstLast
)
{
errCount
++
;
// timestamp inversions counted as errors
errCount
++
;
// timestamp inversions counted as errors
...
...
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