Commit 651f2275 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'master' into 'master'

EventLoaderCLICpix2: fix calculation to set timestamp half way between the shutter open and close

See merge request !252
parents 9201705f c50b8200
Pipeline #1408244 passed with stages
in 25 minutes and 27 seconds
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment