diff --git a/fpga/hls/stream_24bit_conv.cpp b/fpga/hls/stream_24bit_conv.cpp index 02947640..903db672 100644 --- a/fpga/hls/stream_24bit_conv.cpp +++ b/fpga/hls/stream_24bit_conv.cpp @@ -122,4 +122,4 @@ void stream_24bit_conv(STREAM_768 &data_in, STREAM_512 &data_out) { } } data_out << packet_512_t{.data = packet_in.data, .user = 1, .last = 0}; -} +} \ No newline at end of file diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a8549412..36871cfc 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -25,7 +25,7 @@ ADD_EXECUTABLE(CatchTest RadialIntegrationTest.cpp StatusVectorTest.cpp CBORTest.cpp ../tests/stream2.h ../tests/stream2.c - JFConversionTest.cpp DetectorGeometryTest.cpp JFJochBrokerParserTest.cpp DetectorSetupTest.cpp DiffractionGeometryTest.cpp + DetectorGeometryTest.cpp JFJochBrokerParserTest.cpp DetectorSetupTest.cpp DiffractionGeometryTest.cpp FPGAHLSBitshuffleTest.cpp FPGASpotFindingUnitTest.cpp FPGAAddMultipixelTest.cpp) diff --git a/tools/CompressionBenchmark.cpp b/tools/CompressionBenchmark.cpp index 08339715..9dd174d8 100644 --- a/tools/CompressionBenchmark.cpp +++ b/tools/CompressionBenchmark.cpp @@ -23,7 +23,6 @@ double CheckCompressionThread(const DiffractionExperiment &x, for (int j = 0; j < x.GetModulesNum(); j++ ) { transformation.ProcessModule(image.data() + (j + i * x.GetModulesNum()) * RAW_MODULE_SIZE, j, 0); } - transformation.Pack(); ret += transformation.SaveCompressedImage(output.data() + i * x.GetMaxCompressedSize()); } return ret; @@ -70,7 +69,6 @@ std::string CheckDecompression(const DiffractionExperiment &x, size_t nimages, c for (int j = 0; j < x.GetModulesNum(); j++ ) { transformation.ProcessModule(image.data() + (j + i * x.GetModulesNum()) * RAW_MODULE_SIZE, j, 0); } - transformation.Pack(); compressed_size[i] = transformation.SaveCompressedImage(output[i].data()); output[i].resize(compressed_size[i]); } @@ -199,20 +197,4 @@ int main(int argc, char **argv) { x.Compression(JFJochProtoBuf::BSHUF_ZSTD_RLE); std::cout << "BSHUF/ZSTD (RLE) " << CheckDecompression(x, nimages, image); - - std::cout << std::endl << std::endl << "Binning 2x2" << std::endl << std::endl; - - x.Binning2x2(true); - - x.Compression(JFJochProtoBuf::NO_COMPRESSION); - std::cout << "None (geom transform) " << CheckCompression(x, nimages, image, nthreads); - - x.Compression(JFJochProtoBuf::BSHUF_LZ4); - std::cout << "BSHUF/LZ4 " << CheckCompression(x, nimages, image, nthreads); - - x.Compression(JFJochProtoBuf::BSHUF_ZSTD); - std::cout << "BSHUF/ZSTD (0) " << CheckCompression(x, nimages, image, nthreads); - - x.Compression(JFJochProtoBuf::BSHUF_ZSTD_RLE); - std::cout << "BSHUF/ZSTD (RLE) " << CheckCompression(x, nimages, image, nthreads); } \ No newline at end of file diff --git a/tools/HDF5DatasetWriteTest.cpp b/tools/HDF5DatasetWriteTest.cpp index 7aabe0be..046de4f6 100644 --- a/tools/HDF5DatasetWriteTest.cpp +++ b/tools/HDF5DatasetWriteTest.cpp @@ -88,7 +88,6 @@ int main(int argc, char **argv) { for (int i = 0; i < nimages; i++) { for (int j = 0; j < 8; j++) transformation.ProcessModule(image + (i * x.GetModulesNum() + j) * RAW_MODULE_SIZE, j, 0); - transformation.Pack(); output_size[i] = transformation.SaveCompressedImage(output[i].data()); }