DetectorSettings: remove optional fields

common/DiffractionExperiment.cpp

@@ -866,7 +866,7 @@ void DiffractionExperiment::LoadDatasetSettings(const JFJochProtoBuf::DatasetSet
 void DiffractionExperiment::LoadDetectorSettings(const JFJochProtoBuf::DetectorSettings &settings) {
     auto tmp = internal;
     try {
-        if (settings.has_count_time_us())
+        if (settings.count_time_us() > 0)
             FrameTime(std::chrono::microseconds(settings.frame_time_us()),
                       std::chrono::microseconds(settings.count_time_us()));
         else
@@ -880,15 +880,12 @@ void DiffractionExperiment::LoadDetectorSettings(const JFJochProtoBuf::DetectorS
         else
             Mode(DetectorMode::Conversion);
 
-        if (settings.has_pedestal_g0_frames())
-            PedestalG0Frames(settings.pedestal_g0_frames());
+        PedestalG0Frames(settings.pedestal_g0_frames());
 
-        if (settings.has_pedestal_g1_frames())
-            PedestalG1Frames(settings.pedestal_g1_frames());
+        PedestalG1Frames(settings.pedestal_g1_frames());
 
-        if (settings.has_pedestal_g2_frames())
-            PedestalG2Frames(settings.pedestal_g2_frames());
-        if (settings.has_storage_cell_delay_ns())
+        PedestalG2Frames(settings.pedestal_g2_frames());
+        if (settings.storage_cell_delay_ns() > 0)
             StorageCellDelay(std::chrono::nanoseconds(settings.storage_cell_delay_ns()));
     } catch (...) {
         internal = tmp;

grpc/jfjoch.proto

@@ -92,7 +92,7 @@ message DatasetSettings {
   Compression compression = 11;
 
   string   sample_name = 12;
-  optional UnitCell unit_cell = 13;
+  UnitCell unit_cell = 13;
   int64    space_group_number = 14;
 
   bool rad_int_solid_angle_corr = 18;
@@ -104,17 +104,17 @@ message DatasetSettings {
 
 message DetectorSettings {
   int64 frame_time_us = 1;
-  optional int64 count_time_us = 2;
+  int64 count_time_us = 2;
 
   int64 storage_cell_count = 3;
   bool use_internal_packet_generator = 4;
   bool collect_raw_data = 5;
 
-  optional int64 pedestal_g0_frames = 6;
-  optional int64 pedestal_g1_frames = 7;
-  optional int64 pedestal_g2_frames = 8;
+  int64 pedestal_g0_frames = 6;
+  int64 pedestal_g1_frames = 7;
+  int64 pedestal_g2_frames = 8;
 
-  optional int64 storage_cell_delay_ns = 10;
+  int64 storage_cell_delay_ns = 10;
 }
 
 message DetectorModuleGeometry {

python/jfjoch_pb2.py

@@ -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\"\xc4\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\x30\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCellH\x00\x88\x01\x01\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\x42\x0c\n\n_unit_cell\"\x9a\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\"\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\"\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.JFJoLine 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=7178
-  _COMPRESSION._serialized_end=7262
-  _DETECTORMODE._serialized_start=7264
-  _DETECTORMODE._serialized_end=7354
-  _FPGAFIFOSTATUSENUM._serialized_start=7356
-  _FPGAFIFOSTATUSENUM._serialized_end=7410
-  _STATE._serialized_start=7412
-  _STATE._serialized_end=7506
-  _FPGAPIXELOUTPUT._serialized_start=7508
-  _FPGAPIXELOUTPUT._serialized_end=7581
-  _PLOTTYPE._serialized_start=7583
-  _PLOTTYPE._serialized_end=7706
+  _COMPRESSION._serialized_start=7021
+  _COMPRESSION._serialized_end=7105
+  _DETECTORMODE._serialized_start=7107
+  _DETECTORMODE._serialized_end=7197
+  _FPGAFIFOSTATUSENUM._serialized_start=7199
+  _FPGAFIFOSTATUSENUM._serialized_end=7253
+  _STATE._serialized_start=7255
+  _STATE._serialized_end=7349
+  _FPGAPIXELOUTPUT._serialized_start=7351
+  _FPGAPIXELOUTPUT._serialized_end=7424
+  _PLOTTYPE._serialized_start=7426
+  _PLOTTYPE._serialized_end=7549
   _EMPTY._serialized_start=32
   _EMPTY._serialized_end=39
   _UNITCELL._serialized_start=41
@@ -43,87 +43,87 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _PLOT._serialized_start=299
   _PLOT._serialized_end=327
   _DATASETSETTINGS._serialized_start=330
-  _DATASETSETTINGS._serialized_end=910
-  _DETECTORSETTINGS._serialized_start=913
-  _DETECTORSETTINGS._serialized_end=1323
-  _DETECTORMODULEGEOMETRY._serialized_start=1325
-  _DETECTORMODULEGEOMETRY._serialized_end=1423
-  _DETECTORGEOMETRY._serialized_start=1425
-  _DETECTORGEOMETRY._serialized_end=1547
-  _DETECTOR._serialized_start=1550
-  _DETECTOR._serialized_end=1728
-  _INTERNALSETTINGS._serialized_start=1731
-  _INTERNALSETTINGS._serialized_end=2466
-  _JUNGFRAUJOCHSETTINGS._serialized_start=2468
-  _JUNGFRAUJOCHSETTINGS._serialized_end=2592
-  _JFPEDESTAL._serialized_start=2594
-  _JFPEDESTAL._serialized_end=2624
-  _JFGAINCALIBRATION._serialized_start=2626
-  _JFGAINCALIBRATION._serialized_end=2671
-  _JFCALIBRATION._serialized_start=2674
-  _JFCALIBRATION._serialized_end=2852
-  _JFCALIBRATIONSTATISTICS._serialized_start=2854
-  _JFCALIBRATIONSTATISTICS._serialized_end=2940
-  _RECEIVERINPUT._serialized_start=2943
-  _RECEIVERINPUT._serialized_end=3079
-  _RECEIVEROUTPUT._serialized_start=3082
-  _RECEIVEROUTPUT._serialized_end=3532
-  _RECEIVERNETWORKCONFIGDEVICE._serialized_start=3534
-  _RECEIVERNETWORKCONFIGDEVICE._serialized_end=3618
-  _RECEIVERNETWORKCONFIG._serialized_start=3620
-  _RECEIVERNETWORKCONFIG._serialized_end=3704
-  _RECEIVERSTATUS._serialized_start=3707
-  _RECEIVERSTATUS._serialized_end=3861
-  _PLOTREQUEST._serialized_start=3863
-  _PLOTREQUEST._serialized_end=3933
-  _RADIALINTEGRATIONPROFILE._serialized_start=3935
-  _RADIALINTEGRATIONPROFILE._serialized_end=4012
-  _RADIALINTEGRATIONPROFILES._serialized_start=4014
-  _RADIALINTEGRATIONPROFILES._serialized_end=4101
-  _WRITERINPUT._serialized_start=4103
-  _WRITERINPUT._serialized_end=4165
-  _DATAFILESTATISTICS._serialized_start=4167
-  _DATAFILESTATISTICS._serialized_end=4218
-  _WRITEROUTPUT._serialized_start=4221
-  _WRITEROUTPUT._serialized_end=4362
-  _DETECTORMODULECONFIG._serialized_start=4365
-  _DETECTORMODULECONFIG._serialized_end=4623
-  _DETECTORCONFIG._serialized_start=4625
-  _DETECTORCONFIG._serialized_end=4750
-  _DETECTORINPUT._serialized_start=4753
-  _DETECTORINPUT._serialized_end=5005
-  _DETECTOROUTPUT._serialized_start=5007
-  _DETECTOROUTPUT._serialized_end=5023
-  _DETECTORSTATUS._serialized_start=5025
-  _DETECTORSTATUS._serialized_end=5123
-  _FPGAFIFOSTATUS._serialized_start=5125
-  _FPGAFIFOSTATUS._serialized_end=5206
-  _DATAPROCESSINGSETTINGS._serialized_start=5209
-  _DATAPROCESSINGSETTINGS._serialized_end=5585
-  _MODULESTATISTICS._serialized_start=5588
-  _MODULESTATISTICS._serialized_end=5825
-  _IMAGE._serialized_start=5827
-  _IMAGE._serialized_end=5900
-  _MASKTOLOAD._serialized_start=5902
-  _MASKTOLOAD._serialized_end=5948
-  _MEASUREMENTSTATISTICS._serialized_start=5951
-  _MEASUREMENTSTATISTICS._serialized_end=6564
-  _BROKERSTATUS._serialized_start=6567
-  _BROKERSTATUS._serialized_end=6782
-  _BROKERFULLSTATUS._serialized_start=6785
-  _BROKERFULLSTATUS._serialized_end=6949
-  _DETECTORLISTELEMENT._serialized_start=6951
-  _DETECTORLISTELEMENT._serialized_end=7023
-  _DETECTORLIST._serialized_start=7025
-  _DETECTORLIST._serialized_end=7143
-  _DETECTORSELECTION._serialized_start=7145
-  _DETECTORSELECTION._serialized_end=7176
-  _GRPC_JFJOCHRECEIVER._serialized_start=7709
-  _GRPC_JFJOCHRECEIVER._serialized_end=8402
-  _GRPC_JFJOCHWRITER._serialized_start=8405
-  _GRPC_JFJOCHWRITER._serialized_end=8607
-  _GRPC_JFJOCHDETECTOR._serialized_start=8610
-  _GRPC_JFJOCHDETECTOR._serialized_end=8996
-  _GRPC_JFJOCHBROKER._serialized_start=8999
-  _GRPC_JFJOCHBROKER._serialized_end=10619
+  _DATASETSETTINGS._serialized_end=891
+  _DETECTORSETTINGS._serialized_start=894
+  _DETECTORSETTINGS._serialized_end=1166
+  _DETECTORMODULEGEOMETRY._serialized_start=1168
+  _DETECTORMODULEGEOMETRY._serialized_end=1266
+  _DETECTORGEOMETRY._serialized_start=1268
+  _DETECTORGEOMETRY._serialized_end=1390
+  _DETECTOR._serialized_start=1393
+  _DETECTOR._serialized_end=1571
+  _INTERNALSETTINGS._serialized_start=1574
+  _INTERNALSETTINGS._serialized_end=2309
+  _JUNGFRAUJOCHSETTINGS._serialized_start=2311
+  _JUNGFRAUJOCHSETTINGS._serialized_end=2435
+  _JFPEDESTAL._serialized_start=2437
+  _JFPEDESTAL._serialized_end=2467
+  _JFGAINCALIBRATION._serialized_start=2469
+  _JFGAINCALIBRATION._serialized_end=2514
+  _JFCALIBRATION._serialized_start=2517
+  _JFCALIBRATION._serialized_end=2695
+  _JFCALIBRATIONSTATISTICS._serialized_start=2697
+  _JFCALIBRATIONSTATISTICS._serialized_end=2783
+  _RECEIVERINPUT._serialized_start=2786
+  _RECEIVERINPUT._serialized_end=2922
+  _RECEIVEROUTPUT._serialized_start=2925
+  _RECEIVEROUTPUT._serialized_end=3375
+  _RECEIVERNETWORKCONFIGDEVICE._serialized_start=3377
+  _RECEIVERNETWORKCONFIGDEVICE._serialized_end=3461
+  _RECEIVERNETWORKCONFIG._serialized_start=3463
+  _RECEIVERNETWORKCONFIG._serialized_end=3547
+  _RECEIVERSTATUS._serialized_start=3550
+  _RECEIVERSTATUS._serialized_end=3704
+  _PLOTREQUEST._serialized_start=3706
+  _PLOTREQUEST._serialized_end=3776
+  _RADIALINTEGRATIONPROFILE._serialized_start=3778
+  _RADIALINTEGRATIONPROFILE._serialized_end=3855
+  _RADIALINTEGRATIONPROFILES._serialized_start=3857
+  _RADIALINTEGRATIONPROFILES._serialized_end=3944
+  _WRITERINPUT._serialized_start=3946
+  _WRITERINPUT._serialized_end=4008
+  _DATAFILESTATISTICS._serialized_start=4010
+  _DATAFILESTATISTICS._serialized_end=4061
+  _WRITEROUTPUT._serialized_start=4064
+  _WRITEROUTPUT._serialized_end=4205
+  _DETECTORMODULECONFIG._serialized_start=4208
+  _DETECTORMODULECONFIG._serialized_end=4466
+  _DETECTORCONFIG._serialized_start=4468
+  _DETECTORCONFIG._serialized_end=4593
+  _DETECTORINPUT._serialized_start=4596
+  _DETECTORINPUT._serialized_end=4848
+  _DETECTOROUTPUT._serialized_start=4850
+  _DETECTOROUTPUT._serialized_end=4866
+  _DETECTORSTATUS._serialized_start=4868
+  _DETECTORSTATUS._serialized_end=4966
+  _FPGAFIFOSTATUS._serialized_start=4968
+  _FPGAFIFOSTATUS._serialized_end=5049
+  _DATAPROCESSINGSETTINGS._serialized_start=5052
+  _DATAPROCESSINGSETTINGS._serialized_end=5428
+  _MODULESTATISTICS._serialized_start=5431
+  _MODULESTATISTICS._serialized_end=5668
+  _IMAGE._serialized_start=5670
+  _IMAGE._serialized_end=5743
+  _MASKTOLOAD._serialized_start=5745
+  _MASKTOLOAD._serialized_end=5791
+  _MEASUREMENTSTATISTICS._serialized_start=5794
+  _MEASUREMENTSTATISTICS._serialized_end=6407
+  _BROKERSTATUS._serialized_start=6410
+  _BROKERSTATUS._serialized_end=6625
+  _BROKERFULLSTATUS._serialized_start=6628
+  _BROKERFULLSTATUS._serialized_end=6792
+  _DETECTORLISTELEMENT._serialized_start=6794
+  _DETECTORLISTELEMENT._serialized_end=6866
+  _DETECTORLIST._serialized_start=6868
+  _DETECTORLIST._serialized_end=6986
+  _DETECTORSELECTION._serialized_start=6988
+  _DETECTORSELECTION._serialized_end=7019
+  _GRPC_JFJOCHRECEIVER._serialized_start=7552
+  _GRPC_JFJOCHRECEIVER._serialized_end=8245
+  _GRPC_JFJOCHWRITER._serialized_start=8248
+  _GRPC_JFJOCHWRITER._serialized_end=8450
+  _GRPC_JFJOCHDETECTOR._serialized_start=8453
+  _GRPC_JFJOCHDETECTOR._serialized_end=8839
+  _GRPC_JFJOCHBROKER._serialized_start=8842
+  _GRPC_JFJOCHBROKER._serialized_end=10462
 # @@protoc_insertion_point(module_scope)

tests/DiffractionExperimentTest.cpp

@@ -756,6 +756,7 @@ TEST_CASE("DiffractionExperiment_LoadDetectorSettings", "[DiffractionExperiment]
     settings.set_pedestal_g0_frames(5000);
     settings.set_pedestal_g1_frames(100);
     settings.set_pedestal_g2_frames(150);
+
     REQUIRE_NOTHROW(x.LoadDetectorSettings(settings));
 
     REQUIRE(x.GetFrameTime().count() == 600);
@@ -823,9 +824,6 @@ TEST_CASE("DiffractionExperiment_LoadDetectorSettings_inferred", "[DiffractionEx
     REQUIRE(!x.IsUsingInternalPacketGen());
     REQUIRE(x.GetStorageCellNumber() == 1);
     REQUIRE(x.GetDetectorMode() == DetectorMode::Conversion);
-    REQUIRE(x.GetPedestalG0Frames() == 456);
-    REQUIRE(x.GetPedestalG1Frames() == 1234);
-    REQUIRE(x.GetPedestalG2Frames() == 123);
 }
 
 TEST_CASE("DiffractionExperiment_DefaultDataProcessingSettings","[DiffractionExperiment]") {