Fix tests + re-run FPGA synthesis
This commit is contained in:
@@ -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);
|
||||
}
|
||||
Reference in New Issue
Block a user