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
e31a1a78
Commit
e31a1a78
authored
Feb 12, 2020
by
Morag Jean Williams
Committed by
Jens Kroeger
Apr 02, 2020
Browse files
EventLoaderCLICpix2: fix calculation to set timestamp half way between the shutter open and close
(cherry picked from commit
c50b8200
)
parent
fa473ae8
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.cpp
View file @
e31a1a78
...
...
@@ -256,7 +256,7 @@ StatusCode EventLoaderCLICpix2::run(std::shared_ptr<Clipboard> clipboard) {
}
// Time defaults ot rising shutter edge:
double
timestamp
=
(
shutterStartTime
-
shutterStopTime
)
/
2
;
double
timestamp
=
shutterStartTime
+
(
shutterStopTime
-
shutterStartTime
)
/
2
;
// Decide whether information is counter of ToA
if
(
matrix_config
[
std
::
make_pair
(
row
,
col
)].
GetCountingMode
())
{
...
...
@@ -288,6 +288,8 @@ StatusCode EventLoaderCLICpix2::run(std::shared_ptr<Clipboard> clipboard) {
pixels
->
push_back
(
pixel
);
npixels
++
;
hHitMap
->
Fill
(
col
,
row
);
LOG
(
TRACE
)
<<
"Adding pixel (col, row, tot, timestamp): "
<<
col
<<
", "
<<
row
<<
", "
<<
tot
<<
", "
<<
Units
::
display
(
timestamp
,
{
"ns"
,
"us"
,
"s"
});
}
}
}
catch
(
caribou
::
DataException
&
e
)
{
...
...
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