JFJochServices: ProtoBuf JFJochFullBrokerStatus becomes C++ struct + remove writer stats
This commit is contained in:
leonarski_f committed
1 parent
13d22493c1
commit
3725ec5a73
7 files changed
+60
-110
No files matched your search
+12
-19
@@ -3,11 +3,6 @@
|
||||
#include "JFJochServices.h"
|
||||
#include "../common/JFJochException.h"
|
||||
|
||||
uint64_t current_time_ms() {
|
||||
auto curr_time = std::chrono::system_clock::now();
|
||||
return std::chrono::duration_cast<std::chrono::milliseconds>(curr_time.time_since_epoch()).count();
|
||||
}
|
||||
|
||||
JFJochServices::JFJochServices(Logger &in_logger) : logger(in_logger) {}
|
||||
|
||||
void JFJochServices::Start(const DiffractionExperiment& experiment, const JFCalibration &calibration) {
|
||||
@@ -46,24 +41,24 @@ void JFJochServices::On(const DiffractionExperiment &x) {
|
||||
logger.Info(" ... done");
|
||||
}
|
||||
|
||||
JFJochProtoBuf::BrokerFullStatus JFJochServices::Stop(const JFCalibration &calibration) {
|
||||
JFJochProtoBuf::BrokerFullStatus ret;
|
||||
JFJochServicesOutput JFJochServices::Stop(const JFCalibration &calibration) {
|
||||
JFJochServicesOutput ret;
|
||||
|
||||
std::unique_ptr<JFJochException> exception;
|
||||
|
||||
try {
|
||||
logger.Info("Wait for receiver done");
|
||||
*ret.mutable_receiver() = receiver.Stop();
|
||||
ret.receiver_output = receiver.Stop();
|
||||
|
||||
logger.Info(" ... Receiver efficiency: {} % Max delay: {} Compression ratio {}x",
|
||||
static_cast<int>(ret.receiver().efficiency()*100.0),
|
||||
ret.receiver().max_receive_delay(),
|
||||
static_cast<int>(std::round(ret.receiver().compressed_ratio())));
|
||||
if (ret.receiver().efficiency() < 1.0) {
|
||||
for (int i = 0; i < ret.receiver().received_packets_size(); i++) {
|
||||
if (ret.receiver().received_packets(i) != ret.receiver().expected_packets(i))
|
||||
static_cast<int>(ret.receiver_output.efficiency()*100.0),
|
||||
ret.receiver_output.max_receive_delay(),
|
||||
static_cast<int>(std::round(ret.receiver_output.compressed_ratio())));
|
||||
if (ret.receiver_output.efficiency() < 1.0) {
|
||||
for (int i = 0; i < ret.receiver_output.received_packets_size(); i++) {
|
||||
if (ret.receiver_output.received_packets(i) != ret.receiver_output.expected_packets(i))
|
||||
logger.Info(" ... Module: {} Packets received: {} out of {}", i,
|
||||
ret.receiver().received_packets(i), ret.receiver().expected_packets(i));
|
||||
ret.receiver_output.received_packets(i), ret.receiver_output.expected_packets(i));
|
||||
}
|
||||
}
|
||||
} catch (const JFJochException &e) {
|
||||
@@ -77,11 +72,9 @@ JFJochProtoBuf::BrokerFullStatus JFJochServices::Stop(const JFCalibration &calib
|
||||
try {
|
||||
auto stats = writer.Stop();
|
||||
logger.Info(" ... finished with success");
|
||||
for (int i = 0; i < stats.size(); i++) {
|
||||
*ret.add_writer() = stats[i];
|
||||
logger.Info("Writer {}: Images = {} Throughput = {:.0f} MB/s Frame rate = {:.0f} Hz",
|
||||
for (int i = 0; i < stats.size(); i++)
|
||||
logger.Info("Writer {}: Images = {} Throughput = {:.0f} MB/s Frame rate = {:.0f} Hz",
|
||||
i, stats[i].nimages(), stats[i].performance_mbs(), stats[i].performance_hz());
|
||||
}
|
||||
} catch (JFJochException &e) {
|
||||
logger.Error(" ... finished with error {}",e.what());
|
||||
exception = std::make_unique<JFJochException>(e);
|
||||
|
||||
@@ -10,6 +10,10 @@
|
||||
#include "../grpc/JFJochWriterGroupClient.h"
|
||||
#include "../grpc/JFJochDetectorClient.h"
|
||||
|
||||
struct JFJochServicesOutput {
|
||||
JFJochProtoBuf::ReceiverOutput receiver_output;
|
||||
};
|
||||
|
||||
class JFJochServices {
|
||||
JFJochReceiverClient receiver;
|
||||
JFJochWriterGroupClient writer;
|
||||
@@ -23,7 +27,7 @@ public:
|
||||
void On(const DiffractionExperiment& experiment);
|
||||
void Off();
|
||||
void Start(const DiffractionExperiment& experiment, const JFCalibration &calibration);
|
||||
JFJochProtoBuf::BrokerFullStatus Stop(const JFCalibration &calibration);
|
||||
JFJochServicesOutput Stop(const JFCalibration &calibration);
|
||||
void Abort();
|
||||
void Cancel();
|
||||
void Trigger();
|
||||
|
||||
@@ -109,7 +109,7 @@ void JFJochStateMachine::TakePedestalInternalG0(std::unique_lock<std::mutex> &ul
|
||||
ul.lock();
|
||||
|
||||
// SetFullMeasurementOutput(pedestal_output);
|
||||
ImportPedestalG0(pedestal_output.receiver());
|
||||
ImportPedestalG0(pedestal_output.receiver_output);
|
||||
}
|
||||
state = JFJochState::Idle;
|
||||
}
|
||||
@@ -134,7 +134,7 @@ void JFJochStateMachine::TakePedestalInternalG1(std::unique_lock<std::mutex> &ul
|
||||
ul.lock();
|
||||
|
||||
// SetFullMeasurementOutput(pedestal_output);
|
||||
ImportPedestal(pedestal_output.receiver(), 1, storage_cell);
|
||||
ImportPedestal(pedestal_output.receiver_output, 1, storage_cell);
|
||||
}
|
||||
state = JFJochState::Idle;
|
||||
}
|
||||
@@ -159,7 +159,7 @@ void JFJochStateMachine::TakePedestalInternalG2(std::unique_lock<std::mutex> &ul
|
||||
ul.lock();
|
||||
|
||||
// SetFullMeasurementOutput(pedestal_output);
|
||||
ImportPedestal(pedestal_output.receiver(), 2, storage_cell);
|
||||
ImportPedestal(pedestal_output.receiver_output, 2, storage_cell);
|
||||
}
|
||||
state = JFJochState::Idle;
|
||||
}
|
||||
@@ -329,14 +329,8 @@ JFJochStateMachine::~JFJochStateMachine() {
|
||||
} catch (...) {}
|
||||
}
|
||||
|
||||
JFJochProtoBuf::BrokerFullStatus JFJochStateMachine::GetFullMeasurementOutput() const {
|
||||
void JFJochStateMachine::SetFullMeasurementOutput(const JFJochServicesOutput &output) {
|
||||
std::unique_lock<std::mutex> ul(last_receiver_output_mutex);
|
||||
return last_receiver_output;
|
||||
}
|
||||
|
||||
void JFJochStateMachine::SetFullMeasurementOutput(JFJochProtoBuf::BrokerFullStatus &output) {
|
||||
std::unique_lock<std::mutex> ul(last_receiver_output_mutex);
|
||||
last_receiver_output = output;
|
||||
|
||||
auto tmp = JFJochProtoBuf::MeasurementStatistics(); // reset last measurement statistics
|
||||
|
||||
@@ -345,29 +339,14 @@ void JFJochStateMachine::SetFullMeasurementOutput(JFJochProtoBuf::BrokerFullStat
|
||||
tmp.set_detector_height(experiment.GetYPixelsNum());
|
||||
tmp.set_detector_pixel_depth(experiment.GetPixelDepth());
|
||||
|
||||
if (last_receiver_output.has_receiver()) {
|
||||
tmp.set_compression_ratio(output.receiver().compressed_ratio());
|
||||
tmp.set_collection_efficiency(output.receiver().efficiency());
|
||||
tmp.set_images_collected(output.receiver().images_sent());
|
||||
tmp.set_cancelled(output.receiver().cancelled());
|
||||
tmp.set_max_image_number_sent(output.receiver().max_image_number_sent());
|
||||
tmp.set_max_receive_delay(output.receiver().max_receive_delay());
|
||||
tmp.set_indexing_rate(output.receiver().indexing_rate());
|
||||
tmp.set_bkg_estimate(output.receiver().bkg_estimate());
|
||||
}
|
||||
|
||||
double writer_perf = 0.0;
|
||||
int64_t images_written = 0;
|
||||
if (last_receiver_output.writer_size() > 0) {
|
||||
for (const auto &i: output.writer()) {
|
||||
writer_perf += i.performance_mbs();
|
||||
images_written += i.nimages();
|
||||
for (const auto &f: i.file_statistics())
|
||||
*tmp.add_file_statistics() = f;
|
||||
}
|
||||
}
|
||||
tmp.set_writer_performance_mbs(writer_perf);
|
||||
tmp.set_images_written(images_written);
|
||||
tmp.set_compression_ratio(output.receiver_output.compressed_ratio());
|
||||
tmp.set_collection_efficiency(output.receiver_output.efficiency());
|
||||
tmp.set_images_collected(output.receiver_output.images_sent());
|
||||
tmp.set_cancelled(output.receiver_output.cancelled());
|
||||
tmp.set_max_image_number_sent(output.receiver_output.max_image_number_sent());
|
||||
tmp.set_max_receive_delay(output.receiver_output.max_receive_delay());
|
||||
tmp.set_indexing_rate(output.receiver_output.indexing_rate());
|
||||
tmp.set_bkg_estimate(output.receiver_output.bkg_estimate());
|
||||
|
||||
measurement_statistics = tmp;
|
||||
}
|
||||
|
||||
@@ -38,12 +38,10 @@ class JFJochStateMachine {
|
||||
JFJochProtoBuf::JFCalibrationStatistics calibration_statistics;
|
||||
|
||||
mutable std::mutex last_receiver_output_mutex;
|
||||
JFJochProtoBuf::BrokerFullStatus last_receiver_output;
|
||||
std::optional<JFJochProtoBuf::MeasurementStatistics> measurement_statistics;
|
||||
void SetFullMeasurementOutput(JFJochProtoBuf::BrokerFullStatus &output);
|
||||
void SetFullMeasurementOutput(const JFJochServicesOutput &output);
|
||||
void ClearMeasurementStatistics();
|
||||
void ClearAndSetMeasurementStatistics();
|
||||
JFJochProtoBuf::BrokerFullStatus GetFullMeasurementOutput() const;
|
||||
|
||||
mutable std::mutex data_processing_settings_mutex;
|
||||
DataProcessingSettings data_processing_settings;
|
||||
|
||||
@@ -388,17 +388,12 @@ message MeasurementStatistics {
|
||||
bool cancelled = 6;
|
||||
int64 max_receive_delay = 7;
|
||||
|
||||
float writer_performance_MBs = 8;
|
||||
int64 images_written = 9;
|
||||
|
||||
float indexing_rate = 10;
|
||||
|
||||
int64 detector_width = 12;
|
||||
int64 detector_height = 13;
|
||||
int64 detector_pixel_depth = 14;
|
||||
|
||||
repeated DataFileStatistics file_statistics = 15;
|
||||
|
||||
float bkg_estimate = 16;
|
||||
}
|
||||
|
||||
@@ -409,12 +404,6 @@ message BrokerStatus {
|
||||
float receiver_send_buffers_avail = 4;
|
||||
}
|
||||
|
||||
message BrokerFullStatus {
|
||||
ReceiverOutput receiver = 1;
|
||||
DetectorOutput detector = 2;
|
||||
repeated WriterOutput writer = 3;
|
||||
}
|
||||
|
||||
message DetectorListElement {
|
||||
string description = 1;
|
||||
int64 nmodules = 2;
|
||||
|
||||
+30
-32
@@ -13,25 +13,25 @@ _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\"\xb1\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12:\n\x11\x66pga_pixel_output\x18\x03 \x01(\x0e\x32\x1f.JFJochProtoBuf.FPGAPixelOutput\x12\x11\n\tsummation\x18\x04 \x01(\x03\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+\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCell\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12 \n\x18rad_int_solid_angle_corr\x18\x12 \x01(\x08\x12!\n\x19rad_int_polarization_corr\x18\x13 \x01(\x08\x12#\n\x1brad_int_polarization_factor\x18\x14 \x01(\x02\x12\x18\n\x10save_calibration\x18\x15 \x01(\x08\"\x90\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x15\n\rcount_time_us\x18\x02 \x01(\x03\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\x1a\n\x12pedestal_g0_frames\x18\x06 \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\x07 \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x08 \x01(\x03\x12\x1d\n\x15storage_cell_delay_ns\x18\n \x01(\x03\"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\"\xb2\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\x1b\n\x13udp_interface_count\x18\x07 \x01(\x03\"\xdf\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\x1d\n\x15storage_cell_delay_ns\x18\' \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*\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\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\x12\x18\n\x10\x64\x65\x62ug_pixel_mask\x18& \x01(\x08\"|\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\x18\x04 \x01(\x0c\x12;\n\x10gain_calibration\x18\x05 \x03(\x0b\x32!.JFJochProtoBuf.JFGainCalibration\"V\n\x17JFCalibrationStatistics\x12;\n\x11module_statistics\x18\x01 \x03(\x0b\x32 .JFJochProtoBuf.ModuleStatistics\"\x88\x01\n\rReceiveLine 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\"\xb1\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12:\n\x11\x66pga_pixel_output\x18\x03 \x01(\x0e\x32\x1f.JFJochProtoBuf.FPGAPixelOutput\x12\x11\n\tsummation\x18\x04 \x01(\x03\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+\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCell\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12 \n\x18rad_int_solid_angle_corr\x18\x12 \x01(\x08\x12!\n\x19rad_int_polarization_corr\x18\x13 \x01(\x08\x12#\n\x1brad_int_polarization_factor\x18\x14 \x01(\x02\x12\x18\n\x10save_calibration\x18\x15 \x01(\x08\"\x90\x02\n\x10\x44\x65tectorSettings\x12\x15\n\rframe_time_us\x18\x01 \x01(\x03\x12\x15\n\rcount_time_us\x18\x02 \x01(\x03\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\x1a\n\x12pedestal_g0_frames\x18\x06 \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\x07 \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x08 \x01(\x03\x12\x1d\n\x15storage_cell_delay_ns\x18\n \x01(\x03\"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\"\xb2\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\x1b\n\x13udp_interface_count\x18\x07 \x01(\x03\"\xdf\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\x1d\n\x15storage_cell_delay_ns\x18\' \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*\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\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\x12\x18\n\x10\x64\x65\x62ug_pixel_mask\x18& \x01(\x08\"|\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\x18\x04 \x01(\x0c\x12;\n\x10gain_calibration\x18\x05 \x03(\x0b\x32!.JFJochProtoBuf.JFGainCalibration\"V\n\x17JFCalibrationStatistics\x12;\n\x11module_statistics\x18\x01 \x03(\x0b\x32 .JFJochProtoBuf.ModuleStatistics\"\x88\x01\n\rReceiveLine truncated
|
||||
|
||||
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
|
||||
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jfjoch_pb2', globals())
|
||||
if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
|
||||
DESCRIPTOR._options = None
|
||||
_COMPRESSION._serialized_start=6600
|
||||
_COMPRESSION._serialized_end=6684
|
||||
_DETECTORMODE._serialized_start=6686
|
||||
_DETECTORMODE._serialized_end=6776
|
||||
_FPGAFIFOSTATUSENUM._serialized_start=6778
|
||||
_FPGAFIFOSTATUSENUM._serialized_end=6832
|
||||
_STATE._serialized_start=6834
|
||||
_STATE._serialized_end=6928
|
||||
_FPGAPIXELOUTPUT._serialized_start=6930
|
||||
_FPGAPIXELOUTPUT._serialized_end=7003
|
||||
_PLOTTYPE._serialized_start=7005
|
||||
_PLOTTYPE._serialized_end=7128
|
||||
_COMPRESSION._serialized_start=6316
|
||||
_COMPRESSION._serialized_end=6400
|
||||
_DETECTORMODE._serialized_start=6402
|
||||
_DETECTORMODE._serialized_end=6492
|
||||
_FPGAFIFOSTATUSENUM._serialized_start=6494
|
||||
_FPGAFIFOSTATUSENUM._serialized_end=6548
|
||||
_STATE._serialized_start=6550
|
||||
_STATE._serialized_end=6644
|
||||
_FPGAPIXELOUTPUT._serialized_start=6646
|
||||
_FPGAPIXELOUTPUT._serialized_end=6719
|
||||
_PLOTTYPE._serialized_start=6721
|
||||
_PLOTTYPE._serialized_end=6844
|
||||
_EMPTY._serialized_start=32
|
||||
_EMPTY._serialized_end=39
|
||||
_UNITCELL._serialized_start=41
|
||||
@@ -107,23 +107,21 @@ if _descriptor._USE_C_DESCRIPTORS == False:
|
||||
_MASKTOLOAD._serialized_start=5569
|
||||
_MASKTOLOAD._serialized_end=5615
|
||||
_MEASUREMENTSTATISTICS._serialized_start=5618
|
||||
_MEASUREMENTSTATISTICS._serialized_end=6064
|
||||
_BROKERSTATUS._serialized_start=6067
|
||||
_BROKERSTATUS._serialized_end=6204
|
||||
_BROKERFULLSTATUS._serialized_start=6207
|
||||
_BROKERFULLSTATUS._serialized_end=6371
|
||||
_DETECTORLISTELEMENT._serialized_start=6373
|
||||
_DETECTORLISTELEMENT._serialized_end=6445
|
||||
_DETECTORLIST._serialized_start=6447
|
||||
_DETECTORLIST._serialized_end=6565
|
||||
_DETECTORSELECTION._serialized_start=6567
|
||||
_DETECTORSELECTION._serialized_end=6598
|
||||
_GRPC_JFJOCHRECEIVER._serialized_start=7131
|
||||
_GRPC_JFJOCHRECEIVER._serialized_end=7824
|
||||
_GRPC_JFJOCHWRITER._serialized_start=7827
|
||||
_GRPC_JFJOCHWRITER._serialized_end=8029
|
||||
_GRPC_JFJOCHDETECTOR._serialized_start=8032
|
||||
_GRPC_JFJOCHDETECTOR._serialized_end=8418
|
||||
_GRPC_JFJOCHBROKER._serialized_start=8421
|
||||
_GRPC_JFJOCHBROKER._serialized_end=10041
|
||||
_MEASUREMENTSTATISTICS._serialized_end=5947
|
||||
_BROKERSTATUS._serialized_start=5950
|
||||
_BROKERSTATUS._serialized_end=6087
|
||||
_DETECTORLISTELEMENT._serialized_start=6089
|
||||
_DETECTORLISTELEMENT._serialized_end=6161
|
||||
_DETECTORLIST._serialized_start=6163
|
||||
_DETECTORLIST._serialized_end=6281
|
||||
_DETECTORSELECTION._serialized_start=6283
|
||||
_DETECTORSELECTION._serialized_end=6314
|
||||
_GRPC_JFJOCHRECEIVER._serialized_start=6847
|
||||
_GRPC_JFJOCHRECEIVER._serialized_end=7540
|
||||
_GRPC_JFJOCHWRITER._serialized_start=7543
|
||||
_GRPC_JFJOCHWRITER._serialized_end=7745
|
||||
_GRPC_JFJOCHDETECTOR._serialized_start=7748
|
||||
_GRPC_JFJOCHDETECTOR._serialized_end=8134
|
||||
_GRPC_JFJOCHBROKER._serialized_start=8137
|
||||
_GRPC_JFJOCHBROKER._serialized_end=9757
|
||||
# @@protoc_insertion_point(module_scope)
|
||||
@@ -90,14 +90,12 @@ TEST_CASE("JFJochIntegrationTest_ZMQ", "[JFJochReceiver]") {
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 1.0);
|
||||
REQUIRE(statistics.images_collected() == 5);
|
||||
REQUIRE(statistics.images_written() == 5);
|
||||
REQUIRE(statistics.max_image_number_sent() == 4);
|
||||
REQUIRE(!statistics.cancelled());
|
||||
REQUIRE(statistics.file_prefix() == "integration_test");
|
||||
REQUIRE(statistics.detector_width() == 2068);
|
||||
REQUIRE(statistics.detector_height() == 2164);
|
||||
REQUIRE(statistics.detector_pixel_depth() == 2);
|
||||
REQUIRE(statistics.file_statistics_size() == 2);
|
||||
fpga_receiver_server->Shutdown();
|
||||
writer_server->Shutdown();
|
||||
}
|
||||
@@ -182,14 +180,12 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_save_calibration", "[JFJochReceiver]") {
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 1.0);
|
||||
REQUIRE(statistics.images_collected() == 5);
|
||||
REQUIRE(statistics.images_written() == 5);
|
||||
REQUIRE(statistics.max_image_number_sent() == 4);
|
||||
REQUIRE(!statistics.cancelled());
|
||||
REQUIRE(statistics.file_prefix() == "integration_test_with_calibration");
|
||||
REQUIRE(statistics.detector_width() == 2068);
|
||||
REQUIRE(statistics.detector_height() == 2164);
|
||||
REQUIRE(statistics.detector_pixel_depth() == 2);
|
||||
REQUIRE(statistics.file_statistics_size() == 2);
|
||||
fpga_receiver_server->Shutdown();
|
||||
writer_server->Shutdown();
|
||||
}
|
||||
@@ -273,7 +269,6 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_2DataStreams_4Devices", "[JFJochReceiver]")
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 1.0);
|
||||
REQUIRE(statistics.images_collected() == 5);
|
||||
REQUIRE(statistics.images_written() == 5);
|
||||
REQUIRE(statistics.max_image_number_sent() == 4);
|
||||
REQUIRE(!statistics.cancelled());
|
||||
REQUIRE(statistics.file_prefix() == "integration_test");
|
||||
@@ -367,7 +362,6 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_RAW", "[JFJochReceiver]") {
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 1.0);
|
||||
REQUIRE(statistics.images_collected() == 5);
|
||||
REQUIRE(statistics.images_written() == 5);
|
||||
REQUIRE(statistics.file_prefix() == "integration_raw_test");
|
||||
REQUIRE(statistics.detector_width() == 1024);
|
||||
REQUIRE(statistics.detector_height() == 8 * 512);
|
||||
@@ -462,8 +456,6 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_3Writers", "[JFJochReceiver]") {
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 1.0);
|
||||
REQUIRE(statistics.images_collected() == nimages);
|
||||
REQUIRE(statistics.images_written() == nimages);
|
||||
REQUIRE(statistics.file_statistics_size() == 5);
|
||||
|
||||
fpga_receiver_server->Shutdown();
|
||||
writer_server_0->Shutdown();
|
||||
@@ -539,7 +531,6 @@ TEST_CASE("JFJochIntegrationTest_Cancel", "[JFJochReceiver]") {
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 0.5);
|
||||
REQUIRE(statistics.images_collected() == 5);
|
||||
REQUIRE(statistics.images_written() == 5);
|
||||
REQUIRE(statistics.max_image_number_sent() == 4);
|
||||
REQUIRE(statistics.cancelled());
|
||||
|
||||
@@ -645,7 +636,6 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_with_preview", "[JFJochReceiver]") {
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 1.0);
|
||||
REQUIRE(statistics.images_collected() == 5);
|
||||
REQUIRE(statistics.images_written() == 5);
|
||||
|
||||
fpga_receiver_server->Shutdown();
|
||||
writer_server->Shutdown();
|
||||
@@ -747,7 +737,6 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_with_preview_no_writer", "[JFJochReceiver]"
|
||||
|
||||
REQUIRE(statistics.collection_efficiency() == 1.0);
|
||||
REQUIRE(statistics.images_collected() == 5);
|
||||
REQUIRE(statistics.images_written() == 0);
|
||||
fpga_receiver_server->Shutdown();
|
||||
writer_server->Shutdown();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user