ZMQPreviewPublisher: Add spots to preview message + allow for frame number management within the ZMQPreviewPublisher
This commit is contained in:
1 parent
ff92984fcc
commit
eaccdf67b7
8 files changed
+163
-62
No files matched your search
@@ -11,6 +11,11 @@ ZMQPreviewPublisher::ZMQPreviewPublisher(ZMQContext& context, const std::string&
|
||||
}
|
||||
|
||||
void ZMQPreviewPublisher::Start(const DiffractionExperiment &experiment, const JFCalibration &calibration) {
|
||||
{
|
||||
std::unique_lock<std::mutex> ul(m);
|
||||
stride = experiment.GetPreviewStride();
|
||||
current_part = -1;
|
||||
}
|
||||
auto mask = calibration.CalculateNexusMask(experiment);
|
||||
JFJochProtoBuf::PreviewFrame frame;
|
||||
frame.set_image_number(-1);
|
||||
@@ -23,9 +28,19 @@ void ZMQPreviewPublisher::Start(const DiffractionExperiment &experiment, const J
|
||||
|
||||
void ZMQPreviewPublisher::Stop(const DiffractionExperiment& experiment) {}
|
||||
|
||||
void ZMQPreviewPublisher::Publish(const DiffractionExperiment& experiment, const int16_t* image_data, uint32_t image_number) {
|
||||
void ZMQPreviewPublisher::Publish(const DiffractionExperiment& experiment, const int16_t* image_data, const DataMessage &message) {
|
||||
{
|
||||
std::unique_lock<std::mutex> ul(m);
|
||||
int64_t part = message.number / stride;
|
||||
if (current_part >= part)
|
||||
return;
|
||||
else
|
||||
current_part = part;
|
||||
}
|
||||
|
||||
JFJochProtoBuf::PreviewFrame frame;
|
||||
frame.set_image_number(image_number);
|
||||
|
||||
frame.set_image_number(message.number);
|
||||
frame.set_total_images(experiment.GetImageNum());
|
||||
frame.set_wavelength_a(experiment.GetWavelength_A());
|
||||
frame.set_beam_x_pxl(experiment.GetBeamX_pxl());
|
||||
@@ -39,6 +54,13 @@ void ZMQPreviewPublisher::Publish(const DiffractionExperiment& experiment, const
|
||||
|
||||
frame.set_data(image_data, experiment.GetPixelsNum() * sizeof(int16_t));
|
||||
|
||||
for (const auto &s: message.spots) {
|
||||
auto fr = frame.add_spots();
|
||||
fr->set_x(s.x);
|
||||
fr->set_y(s.y);
|
||||
fr->set_indexed(s.indexed);
|
||||
}
|
||||
|
||||
SetPreviewImage(frame);
|
||||
socket.Send(grpcToJson(frame));
|
||||
}
|
||||
|
||||
@@ -9,17 +9,22 @@
|
||||
#include "ZMQWrappers.h"
|
||||
#include "DiffractionExperiment.h"
|
||||
#include "../jungfrau/JFCalibration.h"
|
||||
#include "../frame_serialize/ImageMessage.h"
|
||||
|
||||
class ZMQPreviewPublisher {
|
||||
ZMQSocket socket;
|
||||
|
||||
int64_t stride;
|
||||
int64_t current_part;
|
||||
|
||||
mutable std::mutex m;
|
||||
mutable std::mutex frame_mutex;
|
||||
JFJochProtoBuf::PreviewFrame saved_frame;
|
||||
void SetPreviewImage(const JFJochProtoBuf::PreviewFrame &frame);
|
||||
public:
|
||||
ZMQPreviewPublisher(ZMQContext& context, const std::string& addr);
|
||||
void Start(const DiffractionExperiment& experiment, const JFCalibration &calibration);
|
||||
void Publish(const DiffractionExperiment& experiment, const int16_t* image_data, uint32_t image_number);
|
||||
void Publish(const DiffractionExperiment& experiment, const int16_t* image_data, const DataMessage &message);
|
||||
void Stop(const DiffractionExperiment& experiment);
|
||||
JFJochProtoBuf::PreviewFrame GetPreviewImage() const;
|
||||
};
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <map>
|
||||
#include <vector>
|
||||
#include "../compression/CompressionAlgorithmEnum.h"
|
||||
#include "../common/SpotToSave.h"
|
||||
|
||||
struct CBORImage {
|
||||
const uint8_t *data;
|
||||
|
||||
@@ -395,6 +395,12 @@ message DataProcessingSettings {
|
||||
float bkg_estimate_high_q = 9;
|
||||
}
|
||||
|
||||
message PreviewFrameSpot {
|
||||
float x = 1;
|
||||
float y = 2;
|
||||
bool indexed = 3;
|
||||
}
|
||||
|
||||
message PreviewFrame {
|
||||
int64 image_number = 1;
|
||||
int64 total_images = 2;
|
||||
@@ -409,6 +415,7 @@ message PreviewFrame {
|
||||
int64 pixel_depth = 11;
|
||||
reserved 12;
|
||||
bytes data = 13;
|
||||
repeated PreviewFrameSpot spots = 14;
|
||||
}
|
||||
|
||||
// Broker
|
||||
|
||||
+43
-41
@@ -13,7 +13,7 @@ _sym_db = _symbol_database.Default()
|
||||
|
||||
|
||||
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xa5\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12\x13\n\tsummation\x18\x03 \x01(\x03H\x00\x12\x17\n\rimage_time_us\x18\x04 \x01(\x03H\x00\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12\x30\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCellH\x01\x88\x01\x01\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12\x36\n\x11scattering_vector\x18\x0f \x01(\x0b\x32\x16.JFJochProtoBuf.VectorH\x02\x88\x01\x01\x12\x18\n\x10\x61pply_pixel_mask\x18\x10 \x01(\x08\x12\x12\n\nbinning2x2\x18\x11 \x01(\x08\x42\x08\n\x06timingB\x0c\n\n_unit_cellB\x14\n\x12_scattering_vector\"\xf7\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x1a\n\rcount_time_us\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x1a\n\x12storage_cell_count\x18\x03 \x01(\x03\x12%\n\x1duse_internal_packet_generator\x18\x04 \x01(\x08\x12\x18\n\x10\x63ollect_raw_data\x18\x05 \x01(\x08\x12\x1f\n\x12pedestal_g0_frames\x18\x06 \x01(\x03H\x01\x88\x01\x01\x12\x1f\n\x12pedestal_g1_frames\x18\x07 \x01(\x03H\x02\x88\x01\x01\x12\x1f\n\x12pedestal_g2_frames\x18\x08 \x01(\x03H\x03\x88\x01\x01\x12\x19\n\x11\x63onversion_on_cpu\x18\t \x01(\x08\x42\x10\n\x0e_count_time_usB\x15\n\x13_pedestal_g0_framesB\x15\n\x13_pedestal_g1_framesB\x15\n\x13_pedestal_g2_frames\"b\n\x16\x44\x65tectorModuleGeometry\x12\x0e\n\x06pixel0\x18\x01 \x01(\x03\x12\x1b\n\x13\x66\x61st_direction_step\x18\x02 \x01(\x03\x12\x1b\n\x13slow_direction_step\x18\x03 \x01(\x03\"z\n\x10\x44\x65tectorGeometry\x12\x11\n\twidth_pxl\x18\x01 \x01(\x03\x12\x12\n\nheight_pxl\x18\x02 \x01(\x03\x12?\n\x0fmodule_geometry\x18\x03 \x03(\x0b\x32&.JFJochProtoBuf.DetectorModuleGeometry\"\xc1\x01\n\x08\x44\x65tector\x12\x10\n\x08nmodules\x18\x01 \x01(\x03\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x15\n\rpixel_size_mm\x18\x03 \x01(\x02\x12\x17\n\x0fmodule_hostname\x18\x04 \x03(\t\x12\x32\n\x08geometry\x18\x05 \x01(\x0b\x32 .JFJochProtoBuf.DetectorGeometry\x12*\n\x04type\x18\x06 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorType\"\xe1\x05\n\x10InternalSettings\x12\"\n\x1a\x66rame_time_pedestalG1G2_us\x18\x01 \x01(\x03\x12\x15\n\rframe_time_us\x18\x03 \x01(\x03\x12\x15\n\rcount_time_us\x18\x04 \x01(\x03\x12*\n\x08\x64\x65tector\x18\x05 \x01(\x0b\x32\x18.JFJochProtoBuf.Detector\x12\x14\n\x0cndatastreams\x18\x06 \x01(\x03\x12&\n\x1einternal_fpga_packet_generator\x18\t \x01(\x08\x12\x15\n\rstorage_cells\x18\n \x01(\x03\x12\x1a\n\x12storage_cell_start\x18\x0b \x01(\x03\x12\x1a\n\x12pedestal_g0_frames\x18\x0c \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\r \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x0e \x01(\x03\x12\x19\n\x11preview_period_us\x18\x0f \x01(\x03\x12\x1e\n\x16spot_finding_period_us\x18\x10 \x01(\x03\x12*\n\x04mode\x18\x13 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorMode\x12\x19\n\x11mask_module_edges\x18\x14 \x01(\x08\x12\x17\n\x0fmask_chip_edges\x18\x15 \x01(\x08\x12\x16\n\x0eipv4_base_addr\x18\x16 \x01(\x03\x12\r\n\x05low_q\x18\x1a \x01(\x02\x12\x0e\n\x06high_q\x18\x1b \x01(\x02\x12\x11\n\tq_spacing\x18\x1c \x01(\x02\x12\x10\n\x08git_sha1\x18\x1d \x01(\t\x12\x10\n\x08git_date\x18\x1e \x01(\t\x12\x19\n\x11\x63onversion_on_cpu\x18\x1f \x01(\x08\x12\x13\n\x0bsource_name\x18 \x01(\t\x12\x19\n\x11source_name_short\x18! \x01(\t\x12\x17\n\x0finstrument_name\x18\" \x01(\t\x12\x1d\n\x15instrument_name_short\x18# \x01(\t\"|\n\x14JungfraujochSettings\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x1f.JFJochProtoBuf.DatasetSettings\x12\x32\n\x08internal\x18\x02 \x01(\x0b\x32 .JFJochProtoBuf.InternalSettings\"\x1e\n\nJFPedestal\x12\x10\n\x08pedestal\x18\x01 \x01(\x0c\"-\n\x11JFGainCalibration\x12\x18\n\x10gain_calibration\x18\x01 \x01(\x0c\"\xb2\x01\n\rJFCalibration\x12\x10\n\x08nmodules\x18\x01 \x01(\x04\x12\x16\n\x0enstorage_cells\x18\x02 \x01(\x04\x12,\n\x08pedestal\x18\x03 \x03(\x0b\x32\x1a.JFJochProtoBuf.JFPedestal\x12\x0c\n\x04mask\x18Line truncated
|
||||
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xa5\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12\x13\n\tsummation\x18\x03 \x01(\x03H\x00\x12\x17\n\rimage_time_us\x18\x04 \x01(\x03H\x00\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12\x30\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCellH\x01\x88\x01\x01\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12\x36\n\x11scattering_vector\x18\x0f \x01(\x0b\x32\x16.JFJochProtoBuf.VectorH\x02\x88\x01\x01\x12\x18\n\x10\x61pply_pixel_mask\x18\x10 \x01(\x08\x12\x12\n\nbinning2x2\x18\x11 \x01(\x08\x42\x08\n\x06timingB\x0c\n\n_unit_cellB\x14\n\x12_scattering_vector\"\xf7\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x1a\n\rcount_time_us\x18\x02 \x01(\x03H\x00\x88\x01\x01\x12\x1a\n\x12storage_cell_count\x18\x03 \x01(\x03\x12%\n\x1duse_internal_packet_generator\x18\x04 \x01(\x08\x12\x18\n\x10\x63ollect_raw_data\x18\x05 \x01(\x08\x12\x1f\n\x12pedestal_g0_frames\x18\x06 \x01(\x03H\x01\x88\x01\x01\x12\x1f\n\x12pedestal_g1_frames\x18\x07 \x01(\x03H\x02\x88\x01\x01\x12\x1f\n\x12pedestal_g2_frames\x18\x08 \x01(\x03H\x03\x88\x01\x01\x12\x19\n\x11\x63onversion_on_cpu\x18\t \x01(\x08\x42\x10\n\x0e_count_time_usB\x15\n\x13_pedestal_g0_framesB\x15\n\x13_pedestal_g1_framesB\x15\n\x13_pedestal_g2_frames\"b\n\x16\x44\x65tectorModuleGeometry\x12\x0e\n\x06pixel0\x18\x01 \x01(\x03\x12\x1b\n\x13\x66\x61st_direction_step\x18\x02 \x01(\x03\x12\x1b\n\x13slow_direction_step\x18\x03 \x01(\x03\"z\n\x10\x44\x65tectorGeometry\x12\x11\n\twidth_pxl\x18\x01 \x01(\x03\x12\x12\n\nheight_pxl\x18\x02 \x01(\x03\x12?\n\x0fmodule_geometry\x18\x03 \x03(\x0b\x32&.JFJochProtoBuf.DetectorModuleGeometry\"\xc1\x01\n\x08\x44\x65tector\x12\x10\n\x08nmodules\x18\x01 \x01(\x03\x12\x13\n\x0b\x64\x65scription\x18\x02 \x01(\t\x12\x15\n\rpixel_size_mm\x18\x03 \x01(\x02\x12\x17\n\x0fmodule_hostname\x18\x04 \x03(\t\x12\x32\n\x08geometry\x18\x05 \x01(\x0b\x32 .JFJochProtoBuf.DetectorGeometry\x12*\n\x04type\x18\x06 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorType\"\xe1\x05\n\x10InternalSettings\x12\"\n\x1a\x66rame_time_pedestalG1G2_us\x18\x01 \x01(\x03\x12\x15\n\rframe_time_us\x18\x03 \x01(\x03\x12\x15\n\rcount_time_us\x18\x04 \x01(\x03\x12*\n\x08\x64\x65tector\x18\x05 \x01(\x0b\x32\x18.JFJochProtoBuf.Detector\x12\x14\n\x0cndatastreams\x18\x06 \x01(\x03\x12&\n\x1einternal_fpga_packet_generator\x18\t \x01(\x08\x12\x15\n\rstorage_cells\x18\n \x01(\x03\x12\x1a\n\x12storage_cell_start\x18\x0b \x01(\x03\x12\x1a\n\x12pedestal_g0_frames\x18\x0c \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\r \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x0e \x01(\x03\x12\x19\n\x11preview_period_us\x18\x0f \x01(\x03\x12\x1e\n\x16spot_finding_period_us\x18\x10 \x01(\x03\x12*\n\x04mode\x18\x13 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorMode\x12\x19\n\x11mask_module_edges\x18\x14 \x01(\x08\x12\x17\n\x0fmask_chip_edges\x18\x15 \x01(\x08\x12\x16\n\x0eipv4_base_addr\x18\x16 \x01(\x03\x12\r\n\x05low_q\x18\x1a \x01(\x02\x12\x0e\n\x06high_q\x18\x1b \x01(\x02\x12\x11\n\tq_spacing\x18\x1c \x01(\x02\x12\x10\n\x08git_sha1\x18\x1d \x01(\t\x12\x10\n\x08git_date\x18\x1e \x01(\t\x12\x19\n\x11\x63onversion_on_cpu\x18\x1f \x01(\x08\x12\x13\n\x0bsource_name\x18 \x01(\t\x12\x19\n\x11source_name_short\x18! \x01(\t\x12\x17\n\x0finstrument_name\x18\" \x01(\t\x12\x1d\n\x15instrument_name_short\x18# \x01(\t\"|\n\x14JungfraujochSettings\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x1f.JFJochProtoBuf.DatasetSettings\x12\x32\n\x08internal\x18\x02 \x01(\x0b\x32 .JFJochProtoBuf.InternalSettings\"\x1e\n\nJFPedestal\x12\x10\n\x08pedestal\x18\x01 \x01(\x0c\"-\n\x11JFGainCalibration\x12\x18\n\x10gain_calibration\x18\x01 \x01(\x0c\"\xb2\x01\n\rJFCalibration\x12\x10\n\x08nmodules\x18\x01 \x01(\x04\x12\x16\n\x0enstorage_cells\x18\x02 \x01(\x04\x12,\n\x08pedestal\x18\x03 \x03(\x0b\x32\x1a.JFJochProtoBuf.JFPedestal\x12\x0c\n\x04mask\x18Line truncated
|
||||
|
||||
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
|
||||
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jfjoch_pb2', globals())
|
||||
@@ -24,18 +24,18 @@ if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
_RADIALINTEGRATIONPROFILES_PLOTSENTRY._serialized_options = b'8\001'
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._options = None
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._serialized_options = b'8\001'
|
||||
_COMPRESSION._serialized_start=8737
|
||||
_COMPRESSION._serialized_end=8821
|
||||
_DETECTORTYPE._serialized_start=8823
|
||||
_DETECTORTYPE._serialized_end=8862
|
||||
_DETECTORMODE._serialized_start=8864
|
||||
_DETECTORMODE._serialized_end=8954
|
||||
_FPGAFIFOSTATUS._serialized_start=8956
|
||||
_FPGAFIFOSTATUS._serialized_end=9006
|
||||
_STATE._serialized_start=9008
|
||||
_STATE._serialized_end=9102
|
||||
_PLOTTYPE._serialized_start=9104
|
||||
_PLOTTYPE._serialized_end=9208
|
||||
_COMPRESSION._serialized_start=8845
|
||||
_COMPRESSION._serialized_end=8929
|
||||
_DETECTORTYPE._serialized_start=8931
|
||||
_DETECTORTYPE._serialized_end=8970
|
||||
_DETECTORMODE._serialized_start=8972
|
||||
_DETECTORMODE._serialized_end=9062
|
||||
_FPGAFIFOSTATUS._serialized_start=9064
|
||||
_FPGAFIFOSTATUS._serialized_end=9114
|
||||
_STATE._serialized_start=9116
|
||||
_STATE._serialized_end=9210
|
||||
_PLOTTYPE._serialized_start=9212
|
||||
_PLOTTYPE._serialized_end=9316
|
||||
_EMPTY._serialized_start=32
|
||||
_EMPTY._serialized_end=39
|
||||
_UNITCELL._serialized_start=41
|
||||
@@ -108,32 +108,34 @@ if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
_FPGASTATUS_FIFOSTATUSENTRY._serialized_end=6523
|
||||
_DATAPROCESSINGSETTINGS._serialized_start=6526
|
||||
_DATAPROCESSINGSETTINGS._serialized_end=6872
|
||||
_PREVIEWFRAME._serialized_start=6875
|
||||
_PREVIEWFRAME._serialized_end=7144
|
||||
_MODULESTATISTICS._serialized_start=7147
|
||||
_MODULESTATISTICS._serialized_end=7384
|
||||
_IMAGE._serialized_start=7386
|
||||
_IMAGE._serialized_end=7459
|
||||
_MASKTOLOAD._serialized_start=7461
|
||||
_MASKTOLOAD._serialized_end=7507
|
||||
_MEASUREMENTSTATISTICS._serialized_start=7510
|
||||
_MEASUREMENTSTATISTICS._serialized_end=8123
|
||||
_BROKERSTATUS._serialized_start=8126
|
||||
_BROKERSTATUS._serialized_end=8341
|
||||
_BROKERFULLSTATUS._serialized_start=8344
|
||||
_BROKERFULLSTATUS._serialized_end=8508
|
||||
_DETECTORLISTELEMENT._serialized_start=8510
|
||||
_DETECTORLISTELEMENT._serialized_end=8582
|
||||
_DETECTORLIST._serialized_start=8584
|
||||
_DETECTORLIST._serialized_end=8702
|
||||
_DETECTORSELECTION._serialized_start=8704
|
||||
_DETECTORSELECTION._serialized_end=8735
|
||||
_GRPC_JFJOCHRECEIVER._serialized_start=9211
|
||||
_GRPC_JFJOCHRECEIVER._serialized_end=9978
|
||||
_GRPC_JFJOCHWRITER._serialized_start=9981
|
||||
_GRPC_JFJOCHWRITER._serialized_end=10183
|
||||
_GRPC_JFJOCHDETECTOR._serialized_start=10186
|
||||
_GRPC_JFJOCHDETECTOR._serialized_end=10572
|
||||
_GRPC_JFJOCHBROKER._serialized_start=10575
|
||||
_GRPC_JFJOCHBROKER._serialized_end=12264
|
||||
_PREVIEWFRAMESPOT._serialized_start=6874
|
||||
_PREVIEWFRAMESPOT._serialized_end=6931
|
||||
_PREVIEWFRAME._serialized_start=6934
|
||||
_PREVIEWFRAME._serialized_end=7252
|
||||
_MODULESTATISTICS._serialized_start=7255
|
||||
_MODULESTATISTICS._serialized_end=7492
|
||||
_IMAGE._serialized_start=7494
|
||||
_IMAGE._serialized_end=7567
|
||||
_MASKTOLOAD._serialized_start=7569
|
||||
_MASKTOLOAD._serialized_end=7615
|
||||
_MEASUREMENTSTATISTICS._serialized_start=7618
|
||||
_MEASUREMENTSTATISTICS._serialized_end=8231
|
||||
_BROKERSTATUS._serialized_start=8234
|
||||
_BROKERSTATUS._serialized_end=8449
|
||||
_BROKERFULLSTATUS._serialized_start=8452
|
||||
_BROKERFULLSTATUS._serialized_end=8616
|
||||
_DETECTORLISTELEMENT._serialized_start=8618
|
||||
_DETECTORLISTELEMENT._serialized_end=8690
|
||||
_DETECTORLIST._serialized_start=8692
|
||||
_DETECTORLIST._serialized_end=8810
|
||||
_DETECTORSELECTION._serialized_start=8812
|
||||
_DETECTORSELECTION._serialized_end=8843
|
||||
_GRPC_JFJOCHRECEIVER._serialized_start=9319
|
||||
_GRPC_JFJOCHRECEIVER._serialized_end=10086
|
||||
_GRPC_JFJOCHWRITER._serialized_start=10089
|
||||
_GRPC_JFJOCHWRITER._serialized_end=10291
|
||||
_GRPC_JFJOCHDETECTOR._serialized_start=10294
|
||||
_GRPC_JFJOCHDETECTOR._serialized_end=10680
|
||||
_GRPC_JFJOCHBROKER._serialized_start=10683
|
||||
_GRPC_JFJOCHBROKER._serialized_end=12372
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -349,10 +349,12 @@ void JFJochReceiver::FrameTransformationThread() {
|
||||
|
||||
bool send_image = false; // We send image if at least one module was collected in full
|
||||
|
||||
if (GPUImageAnalysis::GPUPresent() && (spotfinder_stride > 0) && (image_number % spotfinder_stride == 0)) {
|
||||
calculate_spots = true;
|
||||
if (rad_int_mapping)
|
||||
send_bkg_estimate = true;
|
||||
if (GPUImageAnalysis::GPUPresent()) {
|
||||
if (((spotfinder_stride > 0) && (image_number % spotfinder_stride == 0)) || send_preview) {
|
||||
calculate_spots = true;
|
||||
if (rad_int_mapping)
|
||||
send_bkg_estimate = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (experiment.GetSummation() >= threaded_summation_threshold) {
|
||||
@@ -421,11 +423,6 @@ void JFJochReceiver::FrameTransformationThread() {
|
||||
if (send_bkg_estimate)
|
||||
spot_finder->RunRadialIntegration();
|
||||
|
||||
if (send_preview)
|
||||
preview_publisher->Publish(experiment,
|
||||
transformation.GetPreview16BitImage(),
|
||||
image_number);
|
||||
|
||||
if (calculate_spots) {
|
||||
spot_finder->GetSpotFinderResults(experiment, GetDataProcessingSettings(), spots);
|
||||
for (const auto &spot: spots)
|
||||
@@ -472,6 +469,11 @@ void JFJochReceiver::FrameTransformationThread() {
|
||||
spot_finder->GetRadialIntegrationCount());
|
||||
}
|
||||
|
||||
if (send_preview)
|
||||
preview_publisher->Publish(experiment,
|
||||
transformation.GetPreview16BitImage(),
|
||||
message);
|
||||
|
||||
if (push_images_to_writer) {
|
||||
message.receiver_available_send_buffers = GetAvailableSendBuffers();
|
||||
|
||||
|
||||
@@ -723,7 +723,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_with_preview", "[JFJochReceiver]") {
|
||||
JFJochWriterService writer(zmq_context, logger);
|
||||
|
||||
ZMQPreviewPublisher preview(zmq_context, "inproc://#2");
|
||||
fpga_receiver.PreviewPublisher(&preview);
|
||||
fpga_receiver.PreviewPublisher(&preview).NumThreads(1);
|
||||
|
||||
ZMQSocket rcv_preview_socket(zmq_context, ZMQSocketType::Sub);
|
||||
REQUIRE_NOTHROW(rcv_preview_socket.Connect("inproc://#2"));
|
||||
@@ -844,7 +844,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_with_preview_no_writer", "[JFJochReceiver]"
|
||||
JFJochWriterService writer(zmq_context, logger);
|
||||
|
||||
ZMQPreviewPublisher preview(zmq_context, "inproc://#2");
|
||||
fpga_receiver.PreviewPublisher(&preview);
|
||||
fpga_receiver.PreviewPublisher(&preview).NumThreads(1);
|
||||
|
||||
ZMQSocket rcv_preview_socket(zmq_context, ZMQSocketType::Sub);
|
||||
REQUIRE_NOTHROW(rcv_preview_socket.Connect("inproc://#2"));
|
||||
@@ -963,7 +963,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_with_preview_no_writer_binning2x2", "[JFJoc
|
||||
JFJochWriterService writer(zmq_context, logger);
|
||||
|
||||
ZMQPreviewPublisher preview(zmq_context, "inproc://#2");
|
||||
fpga_receiver.PreviewPublisher(&preview);
|
||||
fpga_receiver.PreviewPublisher(&preview).NumThreads(1);
|
||||
|
||||
ZMQSocket rcv_preview_socket(zmq_context, ZMQSocketType::Sub);
|
||||
REQUIRE_NOTHROW(rcv_preview_socket.Connect("inproc://#2"));
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "../common/ZMQPreviewPublisher.h"
|
||||
#include "../common/jsonToGrpc.h"
|
||||
|
||||
TEST_CASE("ZMQPreviewPublisher","[ZSTD]") {
|
||||
TEST_CASE("ZMQPreviewPublisher","[ZMQ]") {
|
||||
ZMQContext context;
|
||||
ZMQPreviewPublisher publisher(context, "inproc://#5");
|
||||
|
||||
@@ -26,7 +26,12 @@ TEST_CASE("ZMQPreviewPublisher","[ZSTD]") {
|
||||
for (auto &i: image)
|
||||
i = distribution(g1);
|
||||
|
||||
publisher.Publish(experiment, image.data(), 546);
|
||||
std::vector<SpotToSave> spots;
|
||||
spots.push_back(SpotToSave{.x = 7, .y = 8, .intensity = 34, .indexed = false});
|
||||
spots.push_back(SpotToSave{.x = 37, .y = 48, .intensity = 123, .indexed = true});
|
||||
|
||||
DataMessage message{.number = 564, .spots = spots};
|
||||
publisher.Publish(experiment, image.data(), message);
|
||||
|
||||
std::string s;
|
||||
|
||||
@@ -43,14 +48,70 @@ TEST_CASE("ZMQPreviewPublisher","[ZSTD]") {
|
||||
REQUIRE_NOTHROW(frame = jsonToGrpc<JFJochProtoBuf::PreviewFrame>(s));
|
||||
|
||||
REQUIRE(frame.pixel_depth() == 2);
|
||||
REQUIRE(frame.image_number() == 546);
|
||||
REQUIRE(frame.image_number() == 564);
|
||||
std::vector<char> image_out = {frame.data().begin(), frame.data().end()};
|
||||
|
||||
REQUIRE(memcmp(image.data(), image_out.data(), experiment.GetPixelsNum() * experiment.GetPixelDepth()) == 0);
|
||||
REQUIRE(frame.spots_size() == 2);
|
||||
REQUIRE(frame.spots(0).x() == 7);
|
||||
REQUIRE(!frame.spots(0).indexed());
|
||||
REQUIRE(frame.spots(1).y() == 48);
|
||||
REQUIRE(frame.spots(1).indexed());
|
||||
|
||||
REQUIRE(socket.Receive(s, false) < 0);
|
||||
}
|
||||
|
||||
TEST_CASE("ZMQPreviewPublisher_GetPreviewImage","[ZSTD]") {
|
||||
TEST_CASE("ZMQPreviewPublisher_FrameNumbers","[ZMQ]") {
|
||||
ZMQContext context;
|
||||
ZMQPreviewPublisher publisher(context, "inproc://#5");
|
||||
|
||||
ZMQSocket socket(context, ZMQSocketType::Sub);
|
||||
socket.Connect("inproc://#5");
|
||||
socket.SubscribeAll();
|
||||
|
||||
DiffractionExperiment experiment(DetectorGeometry(1, 1, 0, 0, false));
|
||||
experiment.PreviewPeriod(std::chrono::milliseconds(10)).ImageTimeUs(std::chrono::milliseconds(1));
|
||||
REQUIRE(experiment.GetPreviewStride() == 10);
|
||||
|
||||
JFCalibration calibration(experiment);
|
||||
publisher.Start(experiment, calibration);
|
||||
|
||||
std::vector<int16_t> image(experiment.GetPixelsNum());
|
||||
|
||||
publisher.Publish(experiment, image.data(), DataMessage{.number = 0});
|
||||
publisher.Publish(experiment, image.data(), DataMessage{.number = 9});
|
||||
publisher.Publish(experiment, image.data(), DataMessage{.number = 12});
|
||||
publisher.Publish(experiment, image.data(), DataMessage{.number = 10});
|
||||
publisher.Publish(experiment, image.data(), DataMessage{.number = 25});
|
||||
publisher.Publish(experiment, image.data(), DataMessage{.number = 20});
|
||||
publisher.Publish(experiment, image.data(), DataMessage{.number = 18});
|
||||
|
||||
std::string s;
|
||||
JFJochProtoBuf::PreviewFrame frame;
|
||||
|
||||
// Pixel mask
|
||||
REQUIRE(socket.Receive(s, false) > 0);
|
||||
|
||||
// Frame
|
||||
REQUIRE(socket.Receive(s, false) > 0);
|
||||
REQUIRE_NOTHROW(frame = jsonToGrpc<JFJochProtoBuf::PreviewFrame>(s));
|
||||
REQUIRE(frame.image_number() == 0);
|
||||
std::vector<char> image_out = {frame.data().begin(), frame.data().end()};
|
||||
|
||||
REQUIRE(socket.Receive(s, false) > 0);
|
||||
|
||||
REQUIRE_NOTHROW(frame = jsonToGrpc<JFJochProtoBuf::PreviewFrame>(s));
|
||||
REQUIRE(frame.image_number() == 12);
|
||||
|
||||
REQUIRE(socket.Receive(s, false) > 0);
|
||||
|
||||
REQUIRE_NOTHROW(frame = jsonToGrpc<JFJochProtoBuf::PreviewFrame>(s));
|
||||
REQUIRE(frame.image_number() == 25);
|
||||
|
||||
REQUIRE(socket.Receive(s, false) < 0);
|
||||
}
|
||||
|
||||
TEST_CASE("ZMQPreviewPublisher_GetPreviewImage","") {
|
||||
ZMQContext context;
|
||||
ZMQPreviewPublisher publisher(context, "inproc://#5");
|
||||
|
||||
@@ -67,12 +128,13 @@ TEST_CASE("ZMQPreviewPublisher_GetPreviewImage","[ZSTD]") {
|
||||
for (auto &i: image)
|
||||
i = distribution(g1);
|
||||
|
||||
publisher.Publish(experiment, image.data(), 546);
|
||||
DataMessage message{.number = 564};
|
||||
publisher.Publish(experiment, image.data(), message);
|
||||
|
||||
JFJochProtoBuf::PreviewFrame frame = publisher.GetPreviewImage();
|
||||
|
||||
REQUIRE(frame.pixel_depth() == 2);
|
||||
REQUIRE(frame.image_number() == 546);
|
||||
REQUIRE(frame.image_number() == 564);
|
||||
std::vector<char> image_out = {frame.data().begin(), frame.data().end()};
|
||||
|
||||
REQUIRE(memcmp(image.data(), image_out.data(), experiment.GetPixelsNum() * experiment.GetPixelDepth()) == 0);
|
||||
|
||||
Reference in new issue
Block a user