mx/Jungfraujoch
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 42 Wiki Activity

DiffractionExperiment: Remove 2x2 binning to simplify transformation code

Browse Source
This commit is contained in:
leonarski_f
2023-11-06 14:16:15 +01:00
parent e6442f6384
commit fcd7612656
15 changed files with 134 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
common/FrameTransformation.cpp
View File

@@ -10,8 +10,7 @@
FrameTransformation::FrameTransformation(const DiffractionExperiment &in_experiment) :
experiment(in_experiment), summation(experiment.GetSummation()),
pixel_depth(experiment.GetPixelDepth()), compressor(in_experiment.GetCompressionAlgorithmEnum()),
binning_2x2(experiment.GetBinning2x2()), conversion_buffer(RAW_MODULE_SIZE) {
pixel_depth(experiment.GetPixelDepth()), compressor(in_experiment.GetCompressionAlgorithmEnum()) {
if ((experiment.GetDetectorMode() == DetectorMode::Conversion) && (summation > 1)) {
for (int i = 0; i < experiment.GetModulesNum(); i++)
@@ -19,11 +18,6 @@ FrameTransformation::FrameTransformation(const DiffractionExperiment &in_experim
}
precompression_buffer.resize(experiment.GetPixelsNum() * pixel_depth);
if (pixel_depth == 4)
image16bit.resize(experiment.GetPixelsNum(), 0);
if (binning_2x2)
full_image_buffer.resize(experiment.GetPixelsNumFullImage() * pixel_depth);
if (experiment.GetApplyPixelMaskInFPGA()) {
// Mask gaps
@@ -52,10 +46,8 @@ template <class Td> void AddToFramesSum(Td *destination, const int16_t *source)
void FrameTransformation::PackSummation() {
for (int m = 0; m < experiment.GetModulesNum(); m++) {
int32_t *output;
if (binning_2x2)
output = (int32_t *) full_image_buffer.data();
else
output = (int32_t *) precompression_buffer.data();
output = (int32_t *) precompression_buffer.data();
TransferModuleAdjustMultipixels(output,
(int32_t *) summation_buffer[m].data(),
@@ -71,25 +63,8 @@ void FrameTransformation::PackSummation() {
}
void FrameTransformation::Pack() {
if (summation > 1) {
if (summation > 1)
PackSummation();
if (binning_2x2)
Bin2x2_sum<int32_t>((int32_t *) precompression_buffer.data(),
(int32_t *) full_image_buffer.data(),
experiment.GetXPixelsNumFullImage(),
experiment.GetYPixelsNumFullImage(),
static_cast<int32_t>(experiment.GetUnderflow()),
static_cast<int32_t>(experiment.GetOverflow()));
} else {
if (binning_2x2)
Bin2x2_sum<int16_t>((int16_t *) precompression_buffer.data(),
(int16_t *) full_image_buffer.data(),
experiment.GetXPixelsNumFullImage(),
experiment.GetYPixelsNumFullImage(),
INT16_MIN, INT16_MAX);
}
}
size_t FrameTransformation::SaveCompressedImage(void *output) {
@@ -102,12 +77,7 @@ void FrameTransformation::ProcessModule(const int16_t *input, uint16_t module_nu
size_t module_number_abs = experiment.GetFirstModuleOfDataStream(data_stream) + module_number;
if (summation == 1) {
int16_t *output;
if (binning_2x2)
output = (int16_t *) full_image_buffer.data();
else
output = (int16_t *) precompression_buffer.data();
auto output = (int16_t *) precompression_buffer.data();
if (experiment.GetDetectorMode() != DetectorMode::Conversion)
memcpy(output + RAW_MODULE_SIZE * module_number_abs,
@@ -136,31 +106,4 @@ const void *FrameTransformation::GetPreviewImage() const {
return precompression_buffer.data();
}
void FrameTransformation::ProcessModule(JFConversion &conv, const int16_t *input, uint16_t module_number, int data_stream) {
size_t module_number_abs = experiment.GetFirstModuleOfDataStream(data_stream) + module_number;
if (summation == 1) {
int16_t *output;
if (binning_2x2)
output = (int16_t *) full_image_buffer.data();
else
output = (int16_t *) precompression_buffer.data();
if (experiment.GetDetectorMode() != DetectorMode::Conversion)
memcpy(output + RAW_MODULE_SIZE * module_number_abs, input, RAW_MODULE_SIZE * experiment.GetPixelDepth());
else {
conv.ConvertModule(conversion_buffer.data(), (uint16_t *) input);
TransferModuleAdjustMultipixels(output, conversion_buffer.data(),
experiment.GetModuleSlowDirectionStep(module_number_abs),
static_cast<int16_t>(INT16_MIN),
static_cast<int16_t>(INT16_MAX),
experiment.GetModuleFastDirectionStep(module_number_abs),
experiment.GetPixel0OfModule(module_number_abs));
}
} else {
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Summation with CPU conversion not supported at the moment");
}
}