DetectorSetup: Configure UDP interface count

This commit is contained in:
leonarski_f committed 2023-09-20 14:00:10 +02:00
1 parent aa3d9e5edb
commit 6cbd577824
9 files changed
+137 -103

No files matched your search

+1
View File
@@ -197,6 +197,7 @@ DetectorSetup ParseDetectorSetup(const nlohmann::json &j) {
if (!gain_files.empty())
setup.LoadGain(gain_files);
setup.UDPInterfaceCount(GET_I64(j, "udp_interface_count", 2));
return setup;
}
+9 -1
View File
@@ -47,6 +47,14 @@ void DetectorSetup::LoadGain(const std::vector<std::string> &filenames) {
gain_calibration.emplace_back(i);
}
DetectorSetup &DetectorSetup::UDPInterfaceCount(int64_t input) {
if ((input != 1) && (input != 2))
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Only 1 and 2 are supported as UDP interface count");
udp_interface_count = input;
return *this;
}
const std::vector<JFModuleGainCalibration> &DetectorSetup::GetGainCalibration() const {
return gain_calibration;
}
@@ -56,7 +64,7 @@ DetectorSetup::operator JFJochProtoBuf::Detector() const {
ret.set_nmodules(GetModulesNum());
ret.set_description(GetDescription());
ret.set_pixel_size_mm(GetPixelSize_mm());
ret.set_udp_interface_count(udp_interface_count);
for (const auto& iter: det_modules_hostname)
ret.add_module_hostname(iter);
+2
View File
@@ -11,6 +11,7 @@ class DetectorSetup {
DetectorGeometry geometry;
std::vector<std::string> det_modules_hostname;
std::vector<JFModuleGainCalibration> gain_calibration;
int64_t udp_interface_count = 2;
public:
DetectorSetup(const DetectorGeometry& geom);
DetectorSetup(const DetectorGeometry& geom,
@@ -19,6 +20,7 @@ public:
void LoadGain(const std::vector<std::string> &filenames);
DetectorSetup& UDPInterfaceCount(int64_t input);
[[nodiscard]] const DetectorGeometry& GetGeometry() const;
[[nodiscard]] const std::vector<std::string>& GetDetectorModuleHostname() const;
[[nodiscard]] uint64_t GetModulesNum() const;
+2
View File
@@ -858,6 +858,8 @@ JFJochProtoBuf::DetectorConfig DiffractionExperiment::DetectorConfig(const JFJoc
if (!internal.detector().module_hostname().empty())
*ret.mutable_module_hostname() = internal.detector().module_hostname();
ret.set_udp_interface_count(internal.detector().udp_interface_count());
for (int d = 0; d < GetDataStreamsNum(); d++) {
for (int m = 0; m < GetModulesNum(d); m++) {
auto mod_cfg = ret.add_modules();
+11 -6
View File
@@ -33,7 +33,10 @@ void DetectorWrapper::Configure(const JFJochProtoBuf::DetectorConfig &request) {
"Discrepancy in module number between DAQ and detector");
}
det.setNumberofUDPInterfaces(2);
if ((request.udp_interface_count() != 1) && (request.udp_interface_count() != 2))
throw JFJochException(JFJochExceptionCategory::InputParameterInvalid,
"Only 1 and 2 are supported as UDP interface count");
det.setNumberofUDPInterfaces(request.udp_interface_count());
for (int i = 0; i < request.modules_size(); i++) {
logger.Info("Configure network for module {}", i);
@@ -41,17 +44,19 @@ void DetectorWrapper::Configure(const JFJochProtoBuf::DetectorConfig &request) {
auto &cfg = request.modules(i);
det.setSourceUDPIP(sls::IpAddr(cfg.ipv4_src_addr_1()), {i});
det.setSourceUDPIP2(sls::IpAddr(cfg.ipv4_src_addr_2()), {i});
det.setSourceUDPMAC(sls::MacAddr(BASE_DETECTOR_MAC + i * 2), {i});
det.setSourceUDPMAC2(sls::MacAddr(BASE_DETECTOR_MAC + i * 2 + 1), {i});
det.setDestinationUDPPort (cfg.udp_dest_port_1(), i);
det.setDestinationUDPPort2(cfg.udp_dest_port_2(), i);
det.setDestinationUDPIP( sls::IpAddr(cfg.ipv4_dest_addr_1()), {i});
det.setDestinationUDPIP2( sls::IpAddr(cfg.ipv4_dest_addr_2()), {i});
det.setDestinationUDPMAC( sls::MacAddr(cfg.mac_addr_dest_1()), {i});
det.setDestinationUDPMAC2(sls::MacAddr(cfg.mac_addr_dest_2()), {i});
if (request.udp_interface_count() == 2) {
det.setSourceUDPIP2(sls::IpAddr(cfg.ipv4_src_addr_2()), {i});
det.setSourceUDPMAC2(sls::MacAddr(BASE_DETECTOR_MAC + i * 2 + 1), {i});
det.setDestinationUDPPort2(cfg.udp_dest_port_2(), i);
det.setDestinationUDPIP2( sls::IpAddr(cfg.ipv4_dest_addr_2()), {i});
det.setDestinationUDPMAC2(sls::MacAddr(cfg.mac_addr_dest_2()), {i});
}
uint32_t tmp = (cfg.module_id_in_data_stream() * 2) % UINT16_MAX;
uint32_t column_id_register = ((tmp + 1) << 16) | tmp;
+2
View File
@@ -147,6 +147,7 @@ message Detector {
repeated string module_hostname = 4;
DetectorGeometry geometry = 5;
DetectorType type = 6;
int64 udp_interface_count = 7;
}
message InternalSettings {
@@ -335,6 +336,7 @@ message DetectorModuleConfig {
message DetectorConfig {
repeated DetectorModuleConfig modules = 1;
repeated string module_hostname = 2;
int64 udp_interface_count = 3;
}
message DetectorInput {
+96 -96
View File
@@ -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\"E\n\x0cROIRectangle\x12\n\n\x02x0\x18\x01 \x01(\x05\x12\n\n\x02y0\x18\x02 \x01(\x05\x12\r\n\x05width\x18\x03 \x01(\x05\x12\x0e\n\x06height\x18\x04 \x01(\x05\"\xf2\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\x12\n\nbinning2x2\x18\x11 \x01(\x08\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\x12/\n\tuser_mask\x18\x16 \x03(\x0b\x32\x1c.JFJochProtoBuf.ROIRectangleB\x08\n\x06timingB\x0c\n\n_unit_cell\"\xb5\x03\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\x12\"\n\x15storage_cell_delay_ns\x18\n \x01(\x03H\x04\x88\x01\x01\x42\x10\n\x0e_count_time_usB\x15\n\x13_pedestal_g0_framesB\x15\n\x13_pedestal_g1_framesB\x15\n\x13_pedestal_g2_framesB\x18\n\x16_storage_cell_delay_ns\"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\"\xe2\x06\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\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\x12\x33\n\rroi_rectangle\x18$ \x03(\x0b\x32\x1c.JFJochProtoBuf.ROIRectangle\x12\x11\n\troi_apply\x18% \x01(\x08\x12\xLine 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\"E\n\x0cROIRectangle\x12\n\n\x02x0\x18\x01 \x01(\x05\x12\n\n\x02y0\x18\x02 \x01(\x05\x12\r\n\x05width\x18\x03 \x01(\x05\x12\x0e\n\x06height\x18\x04 \x01(\x05\"\xf2\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\x12\n\nbinning2x2\x18\x11 \x01(\x08\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\x12/\n\tuser_mask\x18\x16 \x03(\x0b\x32\x1c.JFJochProtoBuf.ROIRectangleB\x08\n\x06timingB\x0c\n\n_unit_cell\"\xb5\x03\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\x12\"\n\x15storage_cell_delay_ns\x18\n \x01(\x03H\x04\x88\x01\x01\x42\x10\n\x0e_count_time_usB\x15\n\x13_pedestal_g0_framesB\x15\n\x13_pedestal_g1_framesB\x15\n\x13_pedestal_g2_framesB\x18\n\x16_storage_cell_delay_ns\"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\"\xde\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\x12\x1b\n\x13udp_interface_count\x18\x07 \x01(\x03\"\xe2\x06\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\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\x12\x33\n\rroi_rectangle\x18$ \x03(\x0b\x32\x1c.JFJochProtoBuf.ROILine truncated
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jfjoch_pb2', globals())
if _descriptor._USE_C_DESCRIPTORS == False:
DESCRIPTOR._options = None
_COMPRESSION._serialized_start=9032
_COMPRESSION._serialized_end=9116
_DETECTORTYPE._serialized_start=9118
_DETECTORTYPE._serialized_end=9157
_DETECTORMODE._serialized_start=9159
_DETECTORMODE._serialized_end=9249
_FPGAFIFOSTATUSENUM._serialized_start=9251
_FPGAFIFOSTATUSENUM._serialized_end=9305
_STATE._serialized_start=9307
_STATE._serialized_end=9401
_PLOTTYPE._serialized_start=9403
_PLOTTYPE._serialized_end=9507
_COMPRESSION._serialized_start=9090
_COMPRESSION._serialized_end=9174
_DETECTORTYPE._serialized_start=9176
_DETECTORTYPE._serialized_end=9215
_DETECTORMODE._serialized_start=9217
_DETECTORMODE._serialized_end=9307
_FPGAFIFOSTATUSENUM._serialized_start=9309
_FPGAFIFOSTATUSENUM._serialized_end=9363
_STATE._serialized_start=9365
_STATE._serialized_end=9459
_PLOTTYPE._serialized_start=9461
_PLOTTYPE._serialized_end=9565
_EMPTY._serialized_start=32
_EMPTY._serialized_end=39
_UNITCELL._serialized_start=41
@@ -53,87 +53,87 @@ if _descriptor._USE_C_DESCRIPTORS == False:
_DETECTORGEOMETRY._serialized_start=1569
_DETECTORGEOMETRY._serialized_end=1691
_DETECTOR._serialized_start=1694
_DETECTOR._serialized_end=1887
_INTERNALSETTINGS._serialized_start=1890
_INTERNALSETTINGS._serialized_end=2756
_JUNGFRAUJOCHSETTINGS._serialized_start=2758
_JUNGFRAUJOCHSETTINGS._serialized_end=2882
_JFPEDESTAL._serialized_start=2884
_JFPEDESTAL._serialized_end=2914
_JFGAINCALIBRATION._serialized_start=2916
_JFGAINCALIBRATION._serialized_end=2961
_JFCALIBRATION._serialized_start=2964
_JFCALIBRATION._serialized_end=3142
_JFCALIBRATIONSTATISTICS._serialized_start=3144
_JFCALIBRATIONSTATISTICS._serialized_end=3230
_ACQUISITIONDEVICESTATISTICS._serialized_start=3233
_ACQUISITIONDEVICESTATISTICS._serialized_end=3506
_RECEIVERINPUT._serialized_start=3509
_RECEIVERINPUT._serialized_end=3645
_RECEIVEROUTPUT._serialized_start=3648
_RECEIVEROUTPUT._serialized_end=4118
_RECEIVERNETWORKCONFIGDEVICE._serialized_start=4120
_RECEIVERNETWORKCONFIGDEVICE._serialized_end=4204
_RECEIVERNETWORKCONFIG._serialized_start=4206
_RECEIVERNETWORKCONFIG._serialized_end=4290
_RECEIVERSTATUS._serialized_start=4293
_RECEIVERSTATUS._serialized_end=4496
_PLOTREQUEST._serialized_start=4498
_PLOTREQUEST._serialized_end=4568
_RADIALINTEGRATIONPROFILE._serialized_start=4570
_RADIALINTEGRATIONPROFILE._serialized_end=4647
_RADIALINTEGRATIONPROFILES._serialized_start=4649
_RADIALINTEGRATIONPROFILES._serialized_end=4736
_WRITERINPUT._serialized_start=4738
_WRITERINPUT._serialized_end=4800
_DATAFILESTATISTICS._serialized_start=4802
_DATAFILESTATISTICS._serialized_end=4853
_WRITEROUTPUT._serialized_start=4856
_WRITEROUTPUT._serialized_end=4997
_DETECTORMODULECONFIG._serialized_start=5000
_DETECTORMODULECONFIG._serialized_end=5258
_DETECTORCONFIG._serialized_start=5260
_DETECTORCONFIG._serialized_end=5356
_DETECTORINPUT._serialized_start=5359
_DETECTORINPUT._serialized_end=5611
_DETECTOROUTPUT._serialized_start=5613
_DETECTOROUTPUT._serialized_end=5629
_DETECTORSTATUS._serialized_start=5631
_DETECTORSTATUS._serialized_end=5729
_FPGAFIFOSTATUS._serialized_start=5731
_FPGAFIFOSTATUS._serialized_end=5812
_FPGASTATUS._serialized_start=5815
_FPGASTATUS._serialized_end=6710
_DATAPROCESSINGSETTINGS._serialized_start=6713
_DATAPROCESSINGSETTINGS._serialized_end=7059
_PREVIEWFRAMESPOT._serialized_start=7061
_PREVIEWFRAMESPOT._serialized_end=7118
_PREVIEWFRAME._serialized_start=7121
_PREVIEWFRAME._serialized_end=7439
_MODULESTATISTICS._serialized_start=7442
_MODULESTATISTICS._serialized_end=7679
_IMAGE._serialized_start=7681
_IMAGE._serialized_end=7754
_MASKTOLOAD._serialized_start=7756
_MASKTOLOAD._serialized_end=7802
_MEASUREMENTSTATISTICS._serialized_start=7805
_MEASUREMENTSTATISTICS._serialized_end=8418
_BROKERSTATUS._serialized_start=8421
_BROKERSTATUS._serialized_end=8636
_BROKERFULLSTATUS._serialized_start=8639
_BROKERFULLSTATUS._serialized_end=8803
_DETECTORLISTELEMENT._serialized_start=8805
_DETECTORLISTELEMENT._serialized_end=8877
_DETECTORLIST._serialized_start=8879
_DETECTORLIST._serialized_end=8997
_DETECTORSELECTION._serialized_start=8999
_DETECTORSELECTION._serialized_end=9030
_GRPC_JFJOCHRECEIVER._serialized_start=9510
_GRPC_JFJOCHRECEIVER._serialized_end=10277
_GRPC_JFJOCHWRITER._serialized_start=10280
_GRPC_JFJOCHWRITER._serialized_end=10482
_GRPC_JFJOCHDETECTOR._serialized_start=10485
_GRPC_JFJOCHDETECTOR._serialized_end=10871
_GRPC_JFJOCHBROKER._serialized_start=10874
_GRPC_JFJOCHBROKER._serialized_end=12563
_DETECTOR._serialized_end=1916
_INTERNALSETTINGS._serialized_start=1919
_INTERNALSETTINGS._serialized_end=2785
_JUNGFRAUJOCHSETTINGS._serialized_start=2787
_JUNGFRAUJOCHSETTINGS._serialized_end=2911
_JFPEDESTAL._serialized_start=2913
_JFPEDESTAL._serialized_end=2943
_JFGAINCALIBRATION._serialized_start=2945
_JFGAINCALIBRATION._serialized_end=2990
_JFCALIBRATION._serialized_start=2993
_JFCALIBRATION._serialized_end=3171
_JFCALIBRATIONSTATISTICS._serialized_start=3173
_JFCALIBRATIONSTATISTICS._serialized_end=3259
_ACQUISITIONDEVICESTATISTICS._serialized_start=3262
_ACQUISITIONDEVICESTATISTICS._serialized_end=3535
_RECEIVERINPUT._serialized_start=3538
_RECEIVERINPUT._serialized_end=3674
_RECEIVEROUTPUT._serialized_start=3677
_RECEIVEROUTPUT._serialized_end=4147
_RECEIVERNETWORKCONFIGDEVICE._serialized_start=4149
_RECEIVERNETWORKCONFIGDEVICE._serialized_end=4233
_RECEIVERNETWORKCONFIG._serialized_start=4235
_RECEIVERNETWORKCONFIG._serialized_end=4319
_RECEIVERSTATUS._serialized_start=4322
_RECEIVERSTATUS._serialized_end=4525
_PLOTREQUEST._serialized_start=4527
_PLOTREQUEST._serialized_end=4597
_RADIALINTEGRATIONPROFILE._serialized_start=4599
_RADIALINTEGRATIONPROFILE._serialized_end=4676
_RADIALINTEGRATIONPROFILES._serialized_start=4678
_RADIALINTEGRATIONPROFILES._serialized_end=4765
_WRITERINPUT._serialized_start=4767
_WRITERINPUT._serialized_end=4829
_DATAFILESTATISTICS._serialized_start=4831
_DATAFILESTATISTICS._serialized_end=4882
_WRITEROUTPUT._serialized_start=4885
_WRITEROUTPUT._serialized_end=5026
_DETECTORMODULECONFIG._serialized_start=5029
_DETECTORMODULECONFIG._serialized_end=5287
_DETECTORCONFIG._serialized_start=5289
_DETECTORCONFIG._serialized_end=5414
_DETECTORINPUT._serialized_start=5417
_DETECTORINPUT._serialized_end=5669
_DETECTOROUTPUT._serialized_start=5671
_DETECTOROUTPUT._serialized_end=5687
_DETECTORSTATUS._serialized_start=5689
_DETECTORSTATUS._serialized_end=5787
_FPGAFIFOSTATUS._serialized_start=5789
_FPGAFIFOSTATUS._serialized_end=5870
_FPGASTATUS._serialized_start=5873
_FPGASTATUS._serialized_end=6768
_DATAPROCESSINGSETTINGS._serialized_start=6771
_DATAPROCESSINGSETTINGS._serialized_end=7117
_PREVIEWFRAMESPOT._serialized_start=7119
_PREVIEWFRAMESPOT._serialized_end=7176
_PREVIEWFRAME._serialized_start=7179
_PREVIEWFRAME._serialized_end=7497
_MODULESTATISTICS._serialized_start=7500
_MODULESTATISTICS._serialized_end=7737
_IMAGE._serialized_start=7739
_IMAGE._serialized_end=7812
_MASKTOLOAD._serialized_start=7814
_MASKTOLOAD._serialized_end=7860
_MEASUREMENTSTATISTICS._serialized_start=7863
_MEASUREMENTSTATISTICS._serialized_end=8476
_BROKERSTATUS._serialized_start=8479
_BROKERSTATUS._serialized_end=8694
_BROKERFULLSTATUS._serialized_start=8697
_BROKERFULLSTATUS._serialized_end=8861
_DETECTORLISTELEMENT._serialized_start=8863
_DETECTORLISTELEMENT._serialized_end=8935
_DETECTORLIST._serialized_start=8937
_DETECTORLIST._serialized_end=9055
_DETECTORSELECTION._serialized_start=9057
_DETECTORSELECTION._serialized_end=9088
_GRPC_JFJOCHRECEIVER._serialized_start=9568
_GRPC_JFJOCHRECEIVER._serialized_end=10335
_GRPC_JFJOCHWRITER._serialized_start=10338
_GRPC_JFJOCHWRITER._serialized_end=10540
_GRPC_JFJOCHDETECTOR._serialized_start=10543
_GRPC_JFJOCHDETECTOR._serialized_end=10929
_GRPC_JFJOCHBROKER._serialized_start=10932
_GRPC_JFJOCHBROKER._serialized_end=12621
# @@protoc_insertion_point(module_scope)
+12
View File
@@ -21,6 +21,18 @@ TEST_CASE("DetectorSetup_ProtoBuf") {
REQUIRE(detector.geometry().module_geometry_size() == 4);
}
TEST_CASE("DetectorSetup_ProtoBuf_FullSpeed") {
DetectorSetup setup(DetectorGeometry(4), "JF", {"mx1","mx2","mx3","mx4"});
JFJochProtoBuf::Detector detector = setup;
REQUIRE(detector.udp_interface_count() == 2);
REQUIRE_NOTHROW(setup.UDPInterfaceCount(1));
REQUIRE_THROWS(setup.UDPInterfaceCount(0));
REQUIRE_THROWS(setup.UDPInterfaceCount(5));
REQUIRE_THROWS(setup.UDPInterfaceCount(-56));
detector = setup;
REQUIRE(detector.udp_interface_count() == 1);
}
TEST_CASE("DetectorSetup_LoadGainFile") {
DetectorSetup setup(DetectorGeometry(4), "JF", {"mx1","mx2","mx3","mx4"});
REQUIRE_THROWS(setup.LoadGain({}));
+2
View File
@@ -73,6 +73,7 @@ TEST_CASE("JFJochBrokerParser_DetectorSetup") {
"mirror_y": false
},
"description": "PSI JUNGFRAU 2M",
"udp_interface_count": 1,
"module_hostname": ["mx1", "mx2", "mx3", "mx4"],
"gain_files": [
"../../tests/test_data/gainMaps_M049.bin",
@@ -93,6 +94,7 @@ TEST_CASE("JFJochBrokerParser_DetectorSetup") {
REQUIRE(detector_pbuf.module_hostname_size() == 4);
REQUIRE(detector_pbuf.module_hostname(2) == "mx3");
REQUIRE(detector.GetGainCalibration().size() == 4);
REQUIRE(detector_pbuf.udp_interface_count() == 1);
}
TEST_CASE("JFJochBrokerParser_ParseFacilityConfiguration") {