gRPC: Mask application during conversion is part of internal settings and is not part of easy accessible settings (to ensure it is always applied)

common/DiffractionExperiment.cpp

@@ -54,6 +54,8 @@ DiffractionExperiment::DiffractionExperiment(const DetectorSetup& det_setup) {
     dataset.set_rad_int_solid_angle_corr(false);
     dataset.set_save_calibration(false);
 
+    internal.set_debug_pixel_mask(false);
+
     internal.set_ndatastreams(1);
 
     internal.set_frame_time_us(MIN_FRAME_TIME_HALF_SPEED_IN_US);
@@ -921,7 +923,6 @@ void DiffractionExperiment::LoadDatasetSettings(const JFJochProtoBuf::DatasetSet
         if (settings.has_scattering_vector())
             ScatteringVector({0,0,1});
         Compression(settings.compression());
-        ApplyPixelMaskInFPGA(!settings.debug_pixel_mask());
         Binning2x2(settings.binning2x2());
     } catch (...) {
         dataset = tmp;
@@ -1083,13 +1084,13 @@ void DiffractionExperiment::FillMessage(StartMessage &message) const {
 }
 
 DiffractionExperiment &DiffractionExperiment::ApplyPixelMaskInFPGA(bool input) {
-    dataset.set_debug_pixel_mask(!input);
+    internal.set_debug_pixel_mask(!input);
     return *this;
 }
 
 bool DiffractionExperiment::GetApplyPixelMaskInFPGA() const {
     if (GetDetectorMode() == DetectorMode::Conversion)
-        return !dataset.debug_pixel_mask();
+        return !internal.debug_pixel_mask();
     else
         return false;
 }

grpc/jfjoch.proto

@@ -104,8 +104,6 @@ message DatasetSettings {
 
   optional Vector scattering_vector = 15;
 
-  bool debug_pixel_mask = 16;
-
   bool binning2x2 = 17;
 
   bool rad_int_solid_angle_corr = 18;
@@ -113,6 +111,8 @@ message DatasetSettings {
   float rad_int_polarization_factor = 20;
 
   bool save_calibration = 21;
+
+  repeated ROIRectangle user_mask = 22;
 }
 
 message DetectorSettings {
@@ -194,6 +194,8 @@ message InternalSettings {
 
   repeated ROIRectangle roi_rectangle = 36;
   bool roi_apply = 37;
+
+  bool debug_pixel_mask = 38;
 }
 
 

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\"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\"\xa9\x05\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\x64\x65\x62ug_pixel_mask\x18\x10 \x01(\x08\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\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\"\xa9\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\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\"|\n\x14JungfraujochSettings\x12\x30\n\x07Line 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\"\xc0\x05\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\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_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\"\xc3\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\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\x18\n\x10\x64\x65\x62ug_piLine truncated
 
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jfjoch_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
 
   DESCRIPTOR._options = None
-  _COMPRESSION._serialized_start=9031
-  _COMPRESSION._serialized_end=9115
-  _DETECTORTYPE._serialized_start=9117
-  _DETECTORTYPE._serialized_end=9156
-  _DETECTORMODE._serialized_start=9158
-  _DETECTORMODE._serialized_end=9248
-  _FPGAFIFOSTATUSENUM._serialized_start=9250
-  _FPGAFIFOSTATUSENUM._serialized_end=9304
-  _STATE._serialized_start=9306
-  _STATE._serialized_end=9400
-  _PLOTTYPE._serialized_start=9402
-  _PLOTTYPE._serialized_end=9506
+  _COMPRESSION._serialized_start=9080
+  _COMPRESSION._serialized_end=9164
+  _DETECTORTYPE._serialized_start=9166
+  _DETECTORTYPE._serialized_end=9205
+  _DETECTORMODE._serialized_start=9207
+  _DETECTORMODE._serialized_end=9297
+  _FPGAFIFOSTATUSENUM._serialized_start=9299
+  _FPGAFIFOSTATUSENUM._serialized_end=9353
+  _STATE._serialized_start=9355
+  _STATE._serialized_end=9449
+  _PLOTTYPE._serialized_start=9451
+  _PLOTTYPE._serialized_end=9555
   _EMPTY._serialized_start=32
   _EMPTY._serialized_end=39
   _UNITCELL._serialized_start=41
@@ -45,95 +45,95 @@ if _descriptor._USE_C_DESCRIPTORS == False:
   _ROIRECTANGLE._serialized_start=329
   _ROIRECTANGLE._serialized_end=398
   _DATASETSETTINGS._serialized_start=401
-  _DATASETSETTINGS._serialized_end=1082
-  _DETECTORSETTINGS._serialized_start=1085
-  _DETECTORSETTINGS._serialized_end=1460
-  _DETECTORMODULEGEOMETRY._serialized_start=1462
-  _DETECTORMODULEGEOMETRY._serialized_end=1560
-  _DETECTORGEOMETRY._serialized_start=1562
-  _DETECTORGEOMETRY._serialized_end=1684
-  _DETECTOR._serialized_start=1687
-  _DETECTOR._serialized_end=1880
-  _INTERNALSETTINGS._serialized_start=1883
-  _INTERNALSETTINGS._serialized_end=2692
-  _JUNGFRAUJOCHSETTINGS._serialized_start=2694
-  _JUNGFRAUJOCHSETTINGS._serialized_end=2818
-  _JFPEDESTAL._serialized_start=2820
-  _JFPEDESTAL._serialized_end=2850
-  _JFGAINCALIBRATION._serialized_start=2852
-  _JFGAINCALIBRATION._serialized_end=2897
-  _JFCALIBRATION._serialized_start=2900
-  _JFCALIBRATION._serialized_end=3078
-  _JFCALIBRATIONSTATISTICS._serialized_start=3080
-  _JFCALIBRATIONSTATISTICS._serialized_end=3166
-  _ACQUISITIONDEVICESTATISTICS._serialized_start=3169
-  _ACQUISITIONDEVICESTATISTICS._serialized_end=3442
-  _RECEIVERINPUT._serialized_start=3445
-  _RECEIVERINPUT._serialized_end=3581
-  _RECEIVEROUTPUT._serialized_start=3584
-  _RECEIVEROUTPUT._serialized_end=4054
-  _RECEIVERNETWORKCONFIGDEVICE._serialized_start=4056
-  _RECEIVERNETWORKCONFIGDEVICE._serialized_end=4140
-  _RECEIVERNETWORKCONFIG._serialized_start=4142
-  _RECEIVERNETWORKCONFIG._serialized_end=4226
-  _RECEIVERSTATUS._serialized_start=4229
-  _RECEIVERSTATUS._serialized_end=4432
-  _PLOTREQUEST._serialized_start=4434
-  _PLOTREQUEST._serialized_end=4504
-  _RADIALINTEGRATIONPROFILE._serialized_start=4506
-  _RADIALINTEGRATIONPROFILE._serialized_end=4583
-  _RADIALINTEGRATIONPROFILES._serialized_start=4585
-  _RADIALINTEGRATIONPROFILES._serialized_end=4672
-  _WRITERINPUT._serialized_start=4674
-  _WRITERINPUT._serialized_end=4736
-  _DATAFILESTATISTICS._serialized_start=4738
-  _DATAFILESTATISTICS._serialized_end=4789
-  _WRITEROUTPUT._serialized_start=4792
-  _WRITEROUTPUT._serialized_end=4933
-  _DETECTORMODULECONFIG._serialized_start=4936
-  _DETECTORMODULECONFIG._serialized_end=5194
-  _DETECTORCONFIG._serialized_start=5196
-  _DETECTORCONFIG._serialized_end=5292
-  _DETECTORINPUT._serialized_start=5295
-  _DETECTORINPUT._serialized_end=5544
-  _DETECTOROUTPUT._serialized_start=5546
-  _DETECTOROUTPUT._serialized_end=5562
-  _DETECTORSTATUS._serialized_start=5564
-  _DETECTORSTATUS._serialized_end=5662
-  _FPGAFIFOSTATUS._serialized_start=5664
-  _FPGAFIFOSTATUS._serialized_end=5745
-  _FPGASTATUS._serialized_start=5748
-  _FPGASTATUS._serialized_end=6709
-  _DATAPROCESSINGSETTINGS._serialized_start=6712
-  _DATAPROCESSINGSETTINGS._serialized_end=7058
-  _PREVIEWFRAMESPOT._serialized_start=7060
-  _PREVIEWFRAMESPOT._serialized_end=7117
-  _PREVIEWFRAME._serialized_start=7120
-  _PREVIEWFRAME._serialized_end=7438
-  _MODULESTATISTICS._serialized_start=7441
-  _MODULESTATISTICS._serialized_end=7678
-  _IMAGE._serialized_start=7680
-  _IMAGE._serialized_end=7753
-  _MASKTOLOAD._serialized_start=7755
-  _MASKTOLOAD._serialized_end=7801
-  _MEASUREMENTSTATISTICS._serialized_start=7804
-  _MEASUREMENTSTATISTICS._serialized_end=8417
-  _BROKERSTATUS._serialized_start=8420
-  _BROKERSTATUS._serialized_end=8635
-  _BROKERFULLSTATUS._serialized_start=8638
-  _BROKERFULLSTATUS._serialized_end=8802
-  _DETECTORLISTELEMENT._serialized_start=8804
-  _DETECTORLISTELEMENT._serialized_end=8876
-  _DETECTORLIST._serialized_start=8878
-  _DETECTORLIST._serialized_end=8996
-  _DETECTORSELECTION._serialized_start=8998
-  _DETECTORSELECTION._serialized_end=9029
-  _GRPC_JFJOCHRECEIVER._serialized_start=9509
-  _GRPC_JFJOCHRECEIVER._serialized_end=10276
-  _GRPC_JFJOCHWRITER._serialized_start=10279
-  _GRPC_JFJOCHWRITER._serialized_end=10481
-  _GRPC_JFJOCHDETECTOR._serialized_start=10484
-  _GRPC_JFJOCHDETECTOR._serialized_end=10870
-  _GRPC_JFJOCHBROKER._serialized_start=10873
-  _GRPC_JFJOCHBROKER._serialized_end=12562
+  _DATASETSETTINGS._serialized_end=1105
+  _DETECTORSETTINGS._serialized_start=1108
+  _DETECTORSETTINGS._serialized_end=1483
+  _DETECTORMODULEGEOMETRY._serialized_start=1485
+  _DETECTORMODULEGEOMETRY._serialized_end=1583
+  _DETECTORGEOMETRY._serialized_start=1585
+  _DETECTORGEOMETRY._serialized_end=1707
+  _DETECTOR._serialized_start=1710
+  _DETECTOR._serialized_end=1903
+  _INTERNALSETTINGS._serialized_start=1906
+  _INTERNALSETTINGS._serialized_end=2741
+  _JUNGFRAUJOCHSETTINGS._serialized_start=2743
+  _JUNGFRAUJOCHSETTINGS._serialized_end=2867
+  _JFPEDESTAL._serialized_start=2869
+  _JFPEDESTAL._serialized_end=2899
+  _JFGAINCALIBRATION._serialized_start=2901
+  _JFGAINCALIBRATION._serialized_end=2946
+  _JFCALIBRATION._serialized_start=2949
+  _JFCALIBRATION._serialized_end=3127
+  _JFCALIBRATIONSTATISTICS._serialized_start=3129
+  _JFCALIBRATIONSTATISTICS._serialized_end=3215
+  _ACQUISITIONDEVICESTATISTICS._serialized_start=3218
+  _ACQUISITIONDEVICESTATISTICS._serialized_end=3491
+  _RECEIVERINPUT._serialized_start=3494
+  _RECEIVERINPUT._serialized_end=3630
+  _RECEIVEROUTPUT._serialized_start=3633
+  _RECEIVEROUTPUT._serialized_end=4103
+  _RECEIVERNETWORKCONFIGDEVICE._serialized_start=4105
+  _RECEIVERNETWORKCONFIGDEVICE._serialized_end=4189
+  _RECEIVERNETWORKCONFIG._serialized_start=4191
+  _RECEIVERNETWORKCONFIG._serialized_end=4275
+  _RECEIVERSTATUS._serialized_start=4278
+  _RECEIVERSTATUS._serialized_end=4481
+  _PLOTREQUEST._serialized_start=4483
+  _PLOTREQUEST._serialized_end=4553
+  _RADIALINTEGRATIONPROFILE._serialized_start=4555
+  _RADIALINTEGRATIONPROFILE._serialized_end=4632
+  _RADIALINTEGRATIONPROFILES._serialized_start=4634
+  _RADIALINTEGRATIONPROFILES._serialized_end=4721
+  _WRITERINPUT._serialized_start=4723
+  _WRITERINPUT._serialized_end=4785
+  _DATAFILESTATISTICS._serialized_start=4787
+  _DATAFILESTATISTICS._serialized_end=4838
+  _WRITEROUTPUT._serialized_start=4841
+  _WRITEROUTPUT._serialized_end=4982
+  _DETECTORMODULECONFIG._serialized_start=4985
+  _DETECTORMODULECONFIG._serialized_end=5243
+  _DETECTORCONFIG._serialized_start=5245
+  _DETECTORCONFIG._serialized_end=5341
+  _DETECTORINPUT._serialized_start=5344
+  _DETECTORINPUT._serialized_end=5593
+  _DETECTOROUTPUT._serialized_start=5595
+  _DETECTOROUTPUT._serialized_end=5611
+  _DETECTORSTATUS._serialized_start=5613
+  _DETECTORSTATUS._serialized_end=5711
+  _FPGAFIFOSTATUS._serialized_start=5713
+  _FPGAFIFOSTATUS._serialized_end=5794
+  _FPGASTATUS._serialized_start=5797
+  _FPGASTATUS._serialized_end=6758
+  _DATAPROCESSINGSETTINGS._serialized_start=6761
+  _DATAPROCESSINGSETTINGS._serialized_end=7107
+  _PREVIEWFRAMESPOT._serialized_start=7109
+  _PREVIEWFRAMESPOT._serialized_end=7166
+  _PREVIEWFRAME._serialized_start=7169
+  _PREVIEWFRAME._serialized_end=7487
+  _MODULESTATISTICS._serialized_start=7490
+  _MODULESTATISTICS._serialized_end=7727
+  _IMAGE._serialized_start=7729
+  _IMAGE._serialized_end=7802
+  _MASKTOLOAD._serialized_start=7804
+  _MASKTOLOAD._serialized_end=7850
+  _MEASUREMENTSTATISTICS._serialized_start=7853
+  _MEASUREMENTSTATISTICS._serialized_end=8466
+  _BROKERSTATUS._serialized_start=8469
+  _BROKERSTATUS._serialized_end=8684
+  _BROKERFULLSTATUS._serialized_start=8687
+  _BROKERFULLSTATUS._serialized_end=8851
+  _DETECTORLISTELEMENT._serialized_start=8853
+  _DETECTORLISTELEMENT._serialized_end=8925
+  _DETECTORLIST._serialized_start=8927
+  _DETECTORLIST._serialized_end=9045
+  _DETECTORSELECTION._serialized_start=9047
+  _DETECTORSELECTION._serialized_end=9078
+  _GRPC_JFJOCHRECEIVER._serialized_start=9558
+  _GRPC_JFJOCHRECEIVER._serialized_end=10325
+  _GRPC_JFJOCHWRITER._serialized_start=10328
+  _GRPC_JFJOCHWRITER._serialized_end=10530
+  _GRPC_JFJOCHDETECTOR._serialized_start=10533
+  _GRPC_JFJOCHDETECTOR._serialized_end=10919
+  _GRPC_JFJOCHBROKER._serialized_start=10922
+  _GRPC_JFJOCHBROKER._serialized_end=12611
 # @@protoc_insertion_point(module_scope)

tests/DiffractionExperimentTest.cpp

@@ -736,7 +736,6 @@ TEST_CASE("DiffractionExperiment_LoadDatasetSettings", "[DiffractionExperiment]"
     settings.set_data_file_count(5);
     settings.set_space_group_number(45);
     settings.set_sample_name("lyso1");
-    settings.set_debug_pixel_mask(false);
     settings.set_binning2x2(true);
 
     REQUIRE_NOTHROW(x.LoadDatasetSettings(settings));
@@ -750,7 +749,6 @@ TEST_CASE("DiffractionExperiment_LoadDatasetSettings", "[DiffractionExperiment]"
     REQUIRE(x.GetSampleName() == "lyso1");
     REQUIRE(x.GetDataFileCount() == 5);
     REQUIRE(x.GetDetectorDistance_mm() == Approx(57.6));
-    REQUIRE(x.GetApplyPixelMaskInFPGA());
     REQUIRE(x.GetBinning2x2());
 }