diff --git a/jungfrau/CMakeLists.txt b/jungfrau/CMakeLists.txt index 9e5bbb0b..10e032ac 100644 --- a/jungfrau/CMakeLists.txt +++ b/jungfrau/CMakeLists.txt @@ -5,7 +5,8 @@ ADD_LIBRARY(JFCalibration STATIC JFConversionFixedPoint.cpp JFConversionFixedPoint.h JFModulePedestal.cpp JFModulePedestal.h JFModuleGainCalibration.cpp JFModuleGainCalibration.h - JFPedestalCalc.cpp JFPedestalCalc.h) + JFPedestalCalc.cpp JFPedestalCalc.h + ProcessJFPacket.cpp ProcessJFPacket.h) SET_SOURCE_FILES_PROPERTIES(JFPedestalCalc.cpp JFConversionFloatingPoint.cpp JFConversionFixedPoint.cpp PROPERTIES COMPILE_FLAGS -Ofast) diff --git a/receiver/host/ProcessJFPacket.cpp b/jungfrau/ProcessJFPacket.cpp similarity index 98% rename from receiver/host/ProcessJFPacket.cpp rename to jungfrau/ProcessJFPacket.cpp index e1b31998..bb1f8d81 100644 --- a/receiver/host/ProcessJFPacket.cpp +++ b/jungfrau/ProcessJFPacket.cpp @@ -4,7 +4,7 @@ #include #include "ProcessJFPacket.h" -#include "RawJFUDPPacket.h" +#include "../receiver/host/RawJFUDPPacket.h" #include "../common/JFJochException.h" ProcessJFPacket::ProcessJFPacket(ThreadSafeFIFO &in_c, ThreadSafeFIFO &in_wr, diff --git a/receiver/host/ProcessJFPacket.h b/jungfrau/ProcessJFPacket.h similarity index 86% rename from receiver/host/ProcessJFPacket.h rename to jungfrau/ProcessJFPacket.h index fdf5970c..8491b7b0 100644 --- a/receiver/host/ProcessJFPacket.h +++ b/jungfrau/ProcessJFPacket.h @@ -4,10 +4,10 @@ #ifndef JUNGFRAUJOCH_PROCESSJFPACKET_H #define JUNGFRAUJOCH_PROCESSJFPACKET_H -#include "../../common/ThreadSafeFIFO.h" -#include "Completion.h" -#include "../../jungfrau/JFConversion.h" -#include "RawJFUDPPacket.h" +#include "../common/ThreadSafeFIFO.h" +#include "../receiver/host/Completion.h" +#include "JFConversion.h" +#include "../receiver/host/RawJFUDPPacket.h" #include diff --git a/receiver/host/CMakeLists.txt b/receiver/host/CMakeLists.txt index f25f28d9..bbeb4f9b 100644 --- a/receiver/host/CMakeLists.txt +++ b/receiver/host/CMakeLists.txt @@ -10,7 +10,6 @@ ADD_LIBRARY(JungfraujochHost STATIC MakeAcquisitionDevice.cpp MakeAcquisitionDevice.h AcquisitionOfflineCounters.cpp AcquisitionOfflineCounters.h IBWrappers.cpp IBWrappers.h - ProcessJFPacket.cpp ProcessJFPacket.h RawEthDevice.cpp RawEthDevice.h RawJFUDPPacket.h UdpReceiver.cpp UdpReceiver.h IBReceiver.cpp IBReceiver.h) diff --git a/receiver/host/IBReceiver.h b/receiver/host/IBReceiver.h index 510ada65..e887fc48 100644 --- a/receiver/host/IBReceiver.h +++ b/receiver/host/IBReceiver.h @@ -8,7 +8,7 @@ #include -#include "ProcessJFPacket.h" +#include "../../jungfrau/ProcessJFPacket.h" class IBReceiverBuffer { std::unique_ptr mr; diff --git a/receiver/host/RawEthDevice.h b/receiver/host/RawEthDevice.h index 1ec8990a..d9b4e83b 100644 --- a/receiver/host/RawEthDevice.h +++ b/receiver/host/RawEthDevice.h @@ -6,7 +6,7 @@ #include "AcquisitionDevice.h" #include "IBWrappers.h" -#include "ProcessJFPacket.h" +#include "../../jungfrau/ProcessJFPacket.h" class RawEthDevice : public AcquisitionDevice { IBContext context; diff --git a/receiver/host/UdpReceiver.h b/receiver/host/UdpReceiver.h index e4ad5ed5..ba03c45c 100644 --- a/receiver/host/UdpReceiver.h +++ b/receiver/host/UdpReceiver.h @@ -5,7 +5,7 @@ #define JUNGFRAUJOCH_UDPRECEIVER_H #include -#include "ProcessJFPacket.h" +#include "../../jungfrau/ProcessJFPacket.h" class UdpReceiver { std::vector> futures; diff --git a/tests/ProcessRawPacketTest.cpp b/tests/ProcessRawPacketTest.cpp index 6f520768..d852b58f 100644 --- a/tests/ProcessRawPacketTest.cpp +++ b/tests/ProcessRawPacketTest.cpp @@ -3,7 +3,7 @@ #include -#include "../receiver/host/ProcessJFPacket.h" +#include "../jungfrau/ProcessJFPacket.h" #include "../receiver/host/RawJFUDPPacket.h" #include "../common/DiffractionExperiment.h"