Commit a2b4061d authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'master' into 'master'

Slightly more verbose warnings in the Eventloader/Additional cmake HINT

See merge request !172
parents d410c8d8 2a3a01ac
Pipeline #1102635 passed with stages
in 31 minutes and 25 seconds
......@@ -71,7 +71,8 @@ StatusCode EventLoaderEUDAQ::run(std::shared_ptr<Clipboard> clipboard) {
auto row = static_cast<int>(plane.GetY(ipix));
if(col >= detector->nPixels().X() || row >= detector->nPixels().Y()) {
LOG(WARNING) << "Pixel address " << col << ", " << row << " is outside of pixel matrix.";
LOG(WARNING) << "Pixel address " << col << ", " << row << " is outside of pixel matrix with size "
<< detector->nPixels();
}
// Check if this pixel is masked
......
......@@ -333,7 +333,8 @@ std::shared_ptr<PixelVector> EventLoaderEUDAQ2::get_pixel_data(std::shared_ptr<e
auto ts = static_cast<double>(plane.GetTimestamp(i)) / 1000 + m_detector->timingOffset();
if(col >= m_detector->nPixels().X() || row >= m_detector->nPixels().Y()) {
LOG(WARNING) << "Pixel address " << col << ", " << row << " is outside of pixel matrix.";
LOG(WARNING) << "Pixel address " << col << ", " << row << " is outside of pixel matrix with size "
<< m_detector->nPixels();
}
if(m_detector->masked(col, row)) {
......
......@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(SYSTEM ${CORRYVRECKAN_DEPS_INCLUDE_DIRS})
GET_FILENAME_COMPONENT(ROOT_CMAKE_DIR "${ROOT_USE_FILE}" DIRECTORY)
FIND_FILE(ROOT_MACROS_FILE
NAMES RootNewMacros.cmake
HINTS ${ROOT_CMAKE_DIR}/modules/ $ENV{ROOTSYS}/cmake/modules)
HINTS ${ROOT_CMAKE_DIR}/modules/ $ENV{ROOTSYS}/../cmake/modules $ENV{ROOTSYS}/cmake/modules)
IF(NOT ROOT_MACROS_FILE)
MESSAGE(WARNING "Cannot find ROOT macros, including generic file as fallback.")
......
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