Merge branch 'master' into 'master'

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

See merge request !252

src/modules/EventLoaderCLICpix2/EventLoaderCLICpix2.cpp

@@ -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) {