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

Detector Geometry customization

Browse Source
This commit is contained in:
leonarski_f
2023-04-12 19:22:13 +00:00
parent 94ba13b3a1
commit 0973f3725d
52 changed files with 1335 additions and 973 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/FrameTransformation.cpp
+62 -31
View File
@@ -12,8 +12,6 @@
FrameTransformation::FrameTransformation(const DiffractionExperiment &in_experiment) :
experiment(in_experiment), summation(experiment.GetSummation()),
pixel_depth(experiment.GetPixelDepth()), compressor(in_experiment.GetCompressionAlgorithmEnum()),
compression_algorithm(in_experiment.GetCompressionAlgorithmEnum()),
line_shift((experiment.IsUpsideDown() ? -1 : 1) * experiment.GetXPixelsNum()),
binning_2x2(experiment.GetBinning2x2()) {
if ((experiment.GetDetectorMode() == DetectorMode::Conversion) && (summation > 1)) {
@@ -25,6 +23,9 @@ FrameTransformation::FrameTransformation(const DiffractionExperiment &in_experim
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
if (pixel_depth == 2) {
@@ -56,24 +57,32 @@ template <class Td> void AddToFramesSum(Td *destination, const int16_t *source)
void FrameTransformation::PackSummation() {
for (int m = 0; m < experiment.GetModulesNum(); m++) {
void *output = precompression_buffer.data() + sizeof(int32_t) * experiment.GetPixel0OfModule(m);
int32_t *output;
if (binning_2x2)
TransferModuleAdjustMultipixelsBin2x2((int32_t *) output,
(int32_t *) summation_buffer[m].data(),
line_shift,
static_cast<int32_t>(INT32_MIN),
static_cast<int32_t>(INT32_MAX));
output = (int32_t *) full_image_buffer.data();
else
TransferModuleAdjustMultipixels((int32_t *) output,
(int32_t *) summation_buffer[m].data(),
line_shift,
static_cast<int32_t>(INT32_MIN),
static_cast<int32_t>(INT32_MAX));
output = (int32_t *) precompression_buffer.data();
TransferModuleAdjustMultipixels(output,
(int32_t *) summation_buffer[m].data(),
experiment.GetModuleSlowDirectionStep(m),
static_cast<int32_t>(INT32_MIN),
static_cast<int32_t>(INT32_MAX),
experiment.GetModuleFastDirectionStep(m),
experiment.GetPixel0OfModule(m));
for (auto &i: summation_buffer[m])
i = 0;
}
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()));
if (pixel_depth == 4) {
// Generate 16-bit preview image
auto arr = (int32_t *) precompression_buffer.data();
@@ -92,13 +101,19 @@ void FrameTransformation::PackSummation() {
size_t FrameTransformation::PackStandardOutput() {
if (summation > 1)
PackSummation();
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);
}
return compressor.Compress(standard_output, precompression_buffer.data(),
experiment.GetPixelsNum(), pixel_depth);
}
void FrameTransformation::ProcessModule(const int16_t *input, size_t frame_number, uint16_t module_number,
int data_stream) {
void FrameTransformation::ProcessModule(const int16_t *input, uint16_t module_number, int data_stream) {
if (standard_output == nullptr)
throw JFJochException(JFJochExceptionCategory::ArrayOutOfBounds, "Default stream output not initialized");
@@ -107,18 +122,22 @@ void FrameTransformation::ProcessModule(const int16_t *input, size_t frame_numbe
if (summation == 1) {
int16_t *output;
output = ((int16_t *) precompression_buffer.data()) + experiment.GetPixel0OfModule(module_number_abs);
if (binning_2x2)
output = (int16_t *) full_image_buffer.data();
else
output = (int16_t *) precompression_buffer.data();
if (experiment.GetDetectorMode() != DetectorMode::Conversion)
memcpy(output, input, RAW_MODULE_SIZE * experiment.GetPixelDepth());
else if (binning_2x2)
TransferModuleAdjustMultipixelsBin2x2((int16_t *) output, (int16_t *) input, line_shift,
static_cast<int16_t>(INT16_MIN),
static_cast<int16_t>(INT16_MAX));
memcpy(output + RAW_MODULE_SIZE * module_number_abs,
input,
RAW_MODULE_SIZE * experiment.GetPixelDepth());
else
TransferModuleAdjustMultipixels((int16_t *) output, (int16_t *) input, line_shift,
TransferModuleAdjustMultipixels(output, (int16_t *) input,
experiment.GetModuleSlowDirectionStep(module_number_abs),
static_cast<int16_t>(INT16_MIN),
static_cast<int16_t>(INT16_MAX));
static_cast<int16_t>(INT16_MAX),
experiment.GetModuleFastDirectionStep(module_number_abs),
experiment.GetPixel0OfModule(module_number_abs));
} else {
AddToFramesSum(summation_buffer[module_number_abs].data(), input);
}
@@ -131,18 +150,30 @@ int16_t *FrameTransformation::GetPreview16BitImage() {
return image16bit.data();
}
void FrameTransformation::ProcessModule(JFConversion &conv, const int16_t *input, size_t frame_number,
uint16_t module_number, int data_stream) {
void FrameTransformation::ProcessModule(JFConversion &conv, const int16_t *input, uint16_t module_number, int data_stream) {
if (standard_output == nullptr)
throw JFJochException(JFJochExceptionCategory::ArrayOutOfBounds, "Default stream output not initialized");
size_t module_number_abs = experiment.GetFirstModuleOfDataStream(data_stream) + module_number;
auto output = ((int16_t *) precompression_buffer.data()) + experiment.GetPixel0OfModule(module_number_abs);
if (summation == 1) {
int16_t *output;
if (experiment.GetDetectorMode() != DetectorMode::Conversion)
memcpy(output, input, RAW_MODULE_SIZE * experiment.GetPixelDepth());
else
conv.ConvertAdjustGeom((int16_t *) output, (uint16_t *) input, line_shift);
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.ConvertAdjustGeom((int16_t *) output, (uint16_t *) input,
experiment.GetModuleSlowDirectionStep(module_number_abs),
experiment.GetModuleFastDirectionStep(module_number_abs),
experiment.GetPixel0OfModule(module_number_abs));
} else {
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Summation with CPU conversion not supported at the moment");
}
}