Commit afc22692 authored by Lennart Huth's avatar Lennart Huth
Browse files

minor adjustments

parent 06482c6e
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
MESSAGE(STATUS "Looking for MuPix Telescope Readout...") MESSAGE(STATUS "Looking for MuPix Telescope Readout...")
FIND_PATH(MUPIX8DAQ_INCLUDE_DIR NAMES "telescope_frame.hpp" "*.hpp" "*.h" PATHS "$ENV{MUPIX8DAQ}/include/") FIND_PATH(MUPIX8DAQ_INCLUDE_DIR NAMES "telescope_frame.hpp" "*.hpp" "*.h" PATHS "$ENV{MUPIX8DAQ}/library")
MESSAGE(STATUS "telescope_frame.hpp => ${MUPIX8DAQ_INCLUDE_DIR}") MESSAGE(STATUS "telescope_frame.hpp => ${MUPIX8DAQ_INCLUDE_DIR}")
IF(MUPIX8DAQ_INCLUDE_DIR) IF(MUPIX8DAQ_INCLUDE_DIR)
SET(MUPIX8DAQ_INC_FOUND TRUE) SET(MUPIX8DAQ_INC_FOUND TRUE)
......
...@@ -11,8 +11,8 @@ IF(NOT MUPIX8DAQ_FOUND) ...@@ -11,8 +11,8 @@ IF(NOT MUPIX8DAQ_FOUND)
MESSAGE(FATAL_ERROR "Could not find MuPix-telescope. You need to do: \n export MUPIX8DAQ=/path/to/repo") MESSAGE(FATAL_ERROR "Could not find MuPix-telescope. You need to do: \n export MUPIX8DAQ=/path/to/repo")
ENDIF() ENDIF()
#INCLUDE_DIRECTORIES(SYSTEM ${MUPIX8DAQ_INCLUDE_DIR}) INCLUDE_DIRECTORIES(SYSTEM ${MUPIX8DAQ_INCLUDE_DIR})
#include_directories(${EIGEN3_INCLUDE_DIR}) include_directories(${EIGEN3_INCLUDE_DIR})
# Add source files to library # Add source files to library
CORRYVRECKAN_MODULE_SOURCES(${MODULE_NAME} CORRYVRECKAN_MODULE_SOURCES(${MODULE_NAME}
......
...@@ -9,6 +9,9 @@ ...@@ -9,6 +9,9 @@
#include "EventLoaderMuPixTelescope.h" #include "EventLoaderMuPixTelescope.h"
#include "dirent.h" #include "dirent.h"
#include "objects/Cluster.hpp"
#include "objects/Pixel.hpp"
#include "objects/Track.hpp"
using namespace corryvreckan; using namespace corryvreckan;
// using namespace std; // using namespace std;
...@@ -28,7 +31,7 @@ void EventLoaderMuPixTelescope::initialise() { ...@@ -28,7 +31,7 @@ void EventLoaderMuPixTelescope::initialise() {
int i = 0; int i = 0;
for(auto& detector : get_detectors()) { for(auto& detector : get_detectors()) {
LOG(DEBUG) << "Initialise for detector " + detector->name(); LOG(DEBUG) << "Initialise for detector " + detector->name();
_sensors.push_back(new SensorHistograms(i, detector->name(), false)); _sensors.push_back(new mudaq::SensorHistograms(i, detector->name(), false));
i++; i++;
} }
......
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
#include "blockfile.hpp" #include "blockfile.hpp"
#include "monitor_histograms.hpp" #include "monitor_histograms.hpp"
//#include "objects/Cluster.hpp"
//#include "objects/Pixel.hpp"
//#include "objects/Track.hpp"
namespace corryvreckan { namespace corryvreckan {
/** @ingroup Modules /** @ingroup Modules
* @brief Module to do function * @brief Module to do function
......
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