DiffractionExperiment: Remove indexing period (indexing works at the same pace as spot finding)

This commit is contained in:
leonarski_f committed 2023-04-13 15:30:25 +02:00
1 parent 94e6254746
commit ae44b2eedf
11 files changed
+90 -127

No files matched your search

-1
View File
@@ -224,7 +224,6 @@ void ParseFacilityConfiguration(const nlohmann::json &input, const std::string&
experiment.FrameTime(GET_TIME(j, "frame_time_us"), GET_TIME(j, "count_time_us"));
experiment.IndexingPeriod(GET_TIME(j, "indexing_period_us"));
experiment.SpotFindingPeriod(GET_TIME(j, "spot_finding_period_us"));
experiment.PreviewPeriod(GET_TIME(j, "preview_period_us"));
-15
View File
@@ -62,7 +62,6 @@ DiffractionExperiment::DiffractionExperiment(const DetectorSetup& det_setup) {
internal.set_preview_period_us(1000*1000); // 1s / 1 Hz
internal.set_spot_finding_period_us(5*1000); // 5 ms / 200 Hz
internal.set_indexing_period_us(50*1000); // 50 ms / 20 Hz
internal.set_low_q(0.1);
internal.set_high_q(5.0);
@@ -360,12 +359,6 @@ DiffractionExperiment &DiffractionExperiment::SpotFindingPeriod(std::chrono::mic
return *this;
}
DiffractionExperiment &DiffractionExperiment::IndexingPeriod(std::chrono::microseconds input) {
check_min("Indexing period", input.count(), 0);
internal.set_indexing_period_us(input.count());
return *this;
}
DiffractionExperiment &DiffractionExperiment::SpaceGroupNumber(int64_t input) {
check_min("Space group number", input, 0);
check_max("Space group number", input, 230);
@@ -703,10 +696,6 @@ std::chrono::microseconds DiffractionExperiment::GetSpotFindingPeriod() const {
return std::chrono::microseconds(internal.spot_finding_period_us());
}
std::chrono::microseconds DiffractionExperiment::GetIndexingPeriod() const {
return std::chrono::microseconds(internal.indexing_period_us());
}
int64_t DiffractionExperiment::GetPreviewStride() const {
return GetPreviewStride(GetPreviewPeriod());
}
@@ -720,10 +709,6 @@ int64_t DiffractionExperiment::GetSpotFindingStride() const {
}
}
int64_t DiffractionExperiment::GetIndexingStride() const {
return GetPreviewStride(GetIndexingPeriod());
}
int64_t DiffractionExperiment::GetSpotFindingBin() const {
if (GetSpotFindingPeriod().count() <= 0)
return 100;
-3
View File
@@ -67,7 +67,6 @@ public:
DiffractionExperiment& Compression(JFJochProtoBuf::Compression input);
DiffractionExperiment& PreviewPeriod(std::chrono::microseconds input);
DiffractionExperiment& SpotFindingPeriod(std::chrono::microseconds input);
DiffractionExperiment& IndexingPeriod(std::chrono::microseconds input);
DiffractionExperiment& UseInternalPacketGenerator(bool input);
DiffractionExperiment& IPv4Subnet(std::string input); // requires 255.255.255.0 subnet
@@ -171,8 +170,6 @@ public:
int64_t GetPreviewStride() const;
std::chrono::microseconds GetSpotFindingPeriod() const;
int64_t GetSpotFindingStride() const;
std::chrono::microseconds GetIndexingPeriod() const;
int64_t GetIndexingStride() const;
int64_t GetSpotFindingBin() const;
-1
View File
@@ -32,7 +32,6 @@
"pedestal_g2_frames": 300,
"frame_time_us": "1000 us",
"count_time_us": "980 us",
"indexing_period_us": "5 ms",
"spot_finding_period_us": "5 ms",
"preview_period_us": "1 s",
"ipv4_subnet": "10.10.85.0"
-1
View File
@@ -158,7 +158,6 @@ message InternalSettings {
int64 preview_period_us = 15;
int64 spot_finding_period_us = 16;
int64 indexing_period_us = 17;
DetectorMode mode = 19;
bool mask_module_edges = 20;
+84 -84
View File
@@ -13,7 +13,7 @@ _sym_db = _symbol_database.Default()
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xa5\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12\x13\n\tsummation\x18\x03 \x01(\x03H\x00\x12\x17\n\rimage_time_us\x18\x04 \x01(\x03H\x00\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12\x30\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCellH\x01\x88\x01\x01\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12\x36\n\x11scattering_vector\x18\x0f \x01(\x0b\x32\x16.JFJochProtoBuf.VectorH\x02\x88\x01\x01\x12\x18\n\x10\x61pply_pixel_mask\x18\x10 \x01(\x08\x12\x12\n\nbinning2x2\x18\x11 \x01(\x08\x42\x08\n\x06timingB\x0c\n\n_unit_cellB\x14\n\x12_scattering_vector\"\xf6\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\x19\n\x11use_storage_cells\x18\x03 \x01(\x08\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\"\x91\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\x1a\n\x12indexing_period_us\x18\x11 \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\x13\n\x0bipv4_subnet\x18\x16 \x01(\x03\x12\x15\n\rbase_udp_port\x18\x17 \x01(\x03\x12\r\n\x05low_q\x18\x1a \x01(\x02\x12\x0e\n\x06high_q\x18\x1b \x01(\x02\x12\x11\n\tq_spacing\x18\x1c \x01(\x02\x12\x10\n\x08git_sha1\x18\x1d \x01(\t\x12\x10\n\x08git_date\x18\x1e \x01(\t\x12\x19\n\x11\x63onversion_on_cpu\x18\x1f \x01(\x08\x12\x13\n\x0bsource_name\x18 \x01(\t\x12\x19\n\x11source_name_short\x18! \x01(\t\x12\x17\n\x0finstrument_name\x18\" \x01(\t\x12\x1d\n\x15instrument_name_short\x18# \x01(\t\"|\n\x14JungfraujochSettings\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x1f.JFJochProtoBuf.DatasetSettings\x12\x32\n\x08internal\x18\x02 \x01(\x0b\x32 .JFJochProtoBuf.InternalSettings\"\x1e\n\nJFPedestal\x12\x10\n\x08pedestal\x18\x01 \x01(\x0c\"-\n\x11JFGainCalibration\x12\x18\n\x10gain_calibration\x18\x01 \x01(\x0c\"\xb2\x01\n\rJFCalibration\x12\x10\n\x08nmodules\x18\x01 \x01(\x04\x12\x16\n\x0enstorage_cells\x18\x02 \x01(\x04\x12Line truncated
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0cjfjoch.proto\x12\x0eJFJochProtoBuf\"\x07\n\x05\x45mpty\"W\n\x08UnitCell\x12\t\n\x01\x61\x18\x01 \x01(\x02\x12\t\n\x01\x62\x18\x02 \x01(\x02\x12\t\n\x01\x63\x18\x03 \x01(\x02\x12\r\n\x05\x61lpha\x18\x04 \x01(\x02\x12\x0c\n\x04\x62\x65ta\x18\x05 \x01(\x02\x12\r\n\x05gamma\x18\x06 \x01(\x02\")\n\x06Vector\x12\t\n\x01x\x18\x01 \x01(\x02\x12\t\n\x01y\x18\x02 \x01(\x02\x12\t\n\x01z\x18\x03 \x01(\x02\"|\n\x10RotationSettings\x12\x17\n\x0fstart_angle_deg\x18\x01 \x01(\x02\x12 \n\x18\x61ngle_incr_per_image_deg\x18\x02 \x01(\x02\x12-\n\rrotation_axis\x18\x03 \x01(\x0b\x32\x16.JFJochProtoBuf.Vector\"\x1c\n\x04Plot\x12\t\n\x01x\x18\x01 \x03(\x02\x12\t\n\x01y\x18\x02 \x03(\x02\"\xa5\x04\n\x0f\x44\x61tasetSettings\x12\x1a\n\x12images_per_trigger\x18\x01 \x01(\x03\x12\x10\n\x08ntrigger\x18\x02 \x01(\x03\x12\x13\n\tsummation\x18\x03 \x01(\x03H\x00\x12\x17\n\rimage_time_us\x18\x04 \x01(\x03H\x00\x12\x12\n\nbeam_x_pxl\x18\x05 \x01(\x02\x12\x12\n\nbeam_y_pxl\x18\x06 \x01(\x02\x12\x1c\n\x14\x64\x65tector_distance_mm\x18\x07 \x01(\x02\x12\x19\n\x11photon_energy_keV\x18\x08 \x01(\x02\x12\x13\n\x0b\x66ile_prefix\x18\t \x01(\t\x12\x17\n\x0f\x64\x61ta_file_count\x18\n \x01(\x03\x12\x30\n\x0b\x63ompression\x18\x0b \x01(\x0e\x32\x1b.JFJochProtoBuf.Compression\x12\x13\n\x0bsample_name\x18\x0c \x01(\t\x12\x30\n\tunit_cell\x18\r \x01(\x0b\x32\x18.JFJochProtoBuf.UnitCellH\x01\x88\x01\x01\x12\x1a\n\x12space_group_number\x18\x0e \x01(\x03\x12\x36\n\x11scattering_vector\x18\x0f \x01(\x0b\x32\x16.JFJochProtoBuf.VectorH\x02\x88\x01\x01\x12\x18\n\x10\x61pply_pixel_mask\x18\x10 \x01(\x08\x12\x12\n\nbinning2x2\x18\x11 \x01(\x08\x42\x08\n\x06timingB\x0c\n\n_unit_cellB\x14\n\x12_scattering_vector\"\xf6\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\x19\n\x11use_storage_cells\x18\x03 \x01(\x08\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\"\xf5\x05\n\x10InternalSettings\x12\"\n\x1a\x66rame_time_pedestalG1G2_us\x18\x01 \x01(\x03\x12\x15\n\rframe_time_us\x18\x03 \x01(\x03\x12\x15\n\rcount_time_us\x18\x04 \x01(\x03\x12*\n\x08\x64\x65tector\x18\x05 \x01(\x0b\x32\x18.JFJochProtoBuf.Detector\x12\x14\n\x0cndatastreams\x18\x06 \x01(\x03\x12&\n\x1einternal_fpga_packet_generator\x18\t \x01(\x08\x12\x15\n\rstorage_cells\x18\n \x01(\x03\x12\x1a\n\x12storage_cell_start\x18\x0b \x01(\x03\x12\x1a\n\x12pedestal_g0_frames\x18\x0c \x01(\x03\x12\x1a\n\x12pedestal_g1_frames\x18\r \x01(\x03\x12\x1a\n\x12pedestal_g2_frames\x18\x0e \x01(\x03\x12\x19\n\x11preview_period_us\x18\x0f \x01(\x03\x12\x1e\n\x16spot_finding_period_us\x18\x10 \x01(\x03\x12*\n\x04mode\x18\x13 \x01(\x0e\x32\x1c.JFJochProtoBuf.DetectorMode\x12\x19\n\x11mask_module_edges\x18\x14 \x01(\x08\x12\x17\n\x0fmask_chip_edges\x18\x15 \x01(\x08\x12\x13\n\x0bipv4_subnet\x18\x16 \x01(\x03\x12\x15\n\rbase_udp_port\x18\x17 \x01(\x03\x12\r\n\x05low_q\x18\x1a \x01(\x02\x12\x0e\n\x06high_q\x18\x1b \x01(\x02\x12\x11\n\tq_spacing\x18\x1c \x01(\x02\x12\x10\n\x08git_sha1\x18\x1d \x01(\t\x12\x10\n\x08git_date\x18\x1e \x01(\t\x12\x19\n\x11\x63onversion_on_cpu\x18\x1f \x01(\x08\x12\x13\n\x0bsource_name\x18 \x01(\t\x12\x19\n\x11source_name_short\x18! \x01(\t\x12\x17\n\x0finstrument_name\x18\" \x01(\t\x12\x1d\n\x15instrument_name_short\x18# \x01(\t\"|\n\x14JungfraujochSettings\x12\x30\n\x07\x64\x61taset\x18\x01 \x01(\x0b\x32\x1f.JFJochProtoBuf.DatasetSettings\x12\x32\n\x08internal\x18\x02 \x01(\x0b\x32 .JFJochProtoBuf.InternalSettings\"\x1e\n\nJFPedestal\x12\x10\n\x08pedestal\x18\x01 \x01(\x0c\"-\n\x11JFGainCalibration\x12\x18\n\x10gain_calibration\x18\x01 \x01(\x0c\"\xb2\x01\n\rJFCalibration\x12\x10\n\x08nmodules\x18\x01 \x01(\x04\x12\x16\n\x0enstorage_cells\x18\x02 \x01(\x04\x12,\n\x08pedestal\x18\x03 \x03(\x0b\x32\x1a.JFJochPrLine truncated
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'jfjoch_pb2', globals())
@@ -22,16 +22,16 @@ if _descriptor._USE_C_DESCRIPTORS == False:
DESCRIPTOR._options = None
_FPGASTATUS_FIFOSTATUSENTRY._options = None
_FPGASTATUS_FIFOSTATUSENTRY._serialized_options = b'8\001'
_COMPRESSION._serialized_start=8412
_COMPRESSION._serialized_end=8496
_DETECTORTYPE._serialized_start=8498
_DETECTORTYPE._serialized_end=8537
_DETECTORMODE._serialized_start=8539
_DETECTORMODE._serialized_end=8629
_FPGAFIFOSTATUS._serialized_start=8631
_FPGAFIFOSTATUS._serialized_end=8681
_STATE._serialized_start=8683
_STATE._serialized_end=8777
_COMPRESSION._serialized_start=8384
_COMPRESSION._serialized_end=8468
_DETECTORTYPE._serialized_start=8470
_DETECTORTYPE._serialized_end=8509
_DETECTORMODE._serialized_start=8511
_DETECTORMODE._serialized_end=8601
_FPGAFIFOSTATUS._serialized_start=8603
_FPGAFIFOSTATUS._serialized_end=8653
_STATE._serialized_start=8655
_STATE._serialized_end=8749
_EMPTY._serialized_start=32
_EMPTY._serialized_end=39
_UNITCELL._serialized_start=41
@@ -53,77 +53,77 @@ if _descriptor._USE_C_DESCRIPTORS == False:
_DETECTOR._serialized_start=1483
_DETECTOR._serialized_end=1676
_INTERNALSETTINGS._serialized_start=1679
_INTERNALSETTINGS._serialized_end=2464
_JUNGFRAUJOCHSETTINGS._serialized_start=2466
_JUNGFRAUJOCHSETTINGS._serialized_end=2590
_JFPEDESTAL._serialized_start=2592
_JFPEDESTAL._serialized_end=2622
_JFGAINCALIBRATION._serialized_start=2624
_JFGAINCALIBRATION._serialized_end=2669
_JFCALIBRATION._serialized_start=2672
_JFCALIBRATION._serialized_end=2850
_JFCALIBRATIONSTATISTICS._serialized_start=2852
_JFCALIBRATIONSTATISTICS._serialized_end=2938
_ACQUISITIONDEVICESTATISTICS._serialized_start=2941
_ACQUISITIONDEVICESTATISTICS._serialized_end=3422
_RECEIVERINPUT._serialized_start=3425
_RECEIVERINPUT._serialized_end=3561
_RECEIVEROUTPUT._serialized_start=3564
_RECEIVEROUTPUT._serialized_end=3990
_RECEIVERNETWORKCONFIG._serialized_start=3992
_RECEIVERNETWORKCONFIG._serialized_end=4038
_RECEIVERSTATUS._serialized_start=4041
_RECEIVERSTATUS._serialized_end=4188
_RECEIVERDATAPROCESSINGPLOTS._serialized_start=4191
_RECEIVERDATAPROCESSINGPLOTS._serialized_end=4401
_WRITERINPUT._serialized_start=4403
_WRITERINPUT._serialized_end=4465
_WRITEROUTPUT._serialized_start=4467
_WRITEROUTPUT._serialized_end=4547
_DETECTORMODULECONFIG._serialized_start=4550
_DETECTORMODULECONFIG._serialized_end=4774
_DETECTORCONFIG._serialized_start=4776
_DETECTORCONFIG._serialized_end=4872
_DETECTORINPUT._serialized_start=4875
_DETECTORINPUT._serialized_end=5124
_DETECTOROUTPUT._serialized_start=5126
_DETECTOROUTPUT._serialized_end=5142
_DETECTORSTATUS._serialized_start=5144
_DETECTORSTATUS._serialized_end=5242
_FPGASTATUS._serialized_start=5245
_FPGASTATUS._serialized_end=6315
_FPGASTATUS_FIFOSTATUSENTRY._serialized_start=6234
_FPGASTATUS_FIFOSTATUSENTRY._serialized_end=6315
_INDEXERDATAPROCESSINGPLOTS._serialized_start=6317
_INDEXERDATAPROCESSINGPLOTS._serialized_end=6390
_DATAPROCESSINGSETTINGS._serialized_start=6393
_DATAPROCESSINGSETTINGS._serialized_end=6787
_PREVIEWFRAME._serialized_start=6790
_PREVIEWFRAME._serialized_end=7059
_MODULESTATISTICS._serialized_start=7062
_MODULESTATISTICS._serialized_end=7299
_IMAGE._serialized_start=7301
_IMAGE._serialized_end=7374
_MASKTOLOAD._serialized_start=7376
_MASKTOLOAD._serialized_end=7422
_MEASUREMENTSTATISTICS._serialized_start=7425
_MEASUREMENTSTATISTICS._serialized_end=7933
_BROKERSTATUS._serialized_start=7936
_BROKERSTATUS._serialized_end=8077
_BROKERFULLSTATUS._serialized_start=8080
_BROKERFULLSTATUS._serialized_end=8244
_DETECTORLISTELEMENT._serialized_start=8246
_DETECTORLISTELEMENT._serialized_end=8306
_DETECTORLIST._serialized_start=8308
_DETECTORLIST._serialized_end=8377
_DETECTORSELECTION._serialized_start=8379
_DETECTORSELECTION._serialized_end=8410
_GRPC_JFJOCHRECEIVER._serialized_start=8780
_GRPC_JFJOCHRECEIVER._serialized_end=9464
_GRPC_JFJOCHWRITER._serialized_start=9467
_GRPC_JFJOCHWRITER._serialized_end=9669
_GRPC_JFJOCHDETECTOR._serialized_start=9672
_GRPC_JFJOCHDETECTOR._serialized_end=10058
_GRPC_JFJOCHBROKER._serialized_start=10061
_GRPC_JFJOCHBROKER._serialized_end=11667
_INTERNALSETTINGS._serialized_end=2436
_JUNGFRAUJOCHSETTINGS._serialized_start=2438
_JUNGFRAUJOCHSETTINGS._serialized_end=2562
_JFPEDESTAL._serialized_start=2564
_JFPEDESTAL._serialized_end=2594
_JFGAINCALIBRATION._serialized_start=2596
_JFGAINCALIBRATION._serialized_end=2641
_JFCALIBRATION._serialized_start=2644
_JFCALIBRATION._serialized_end=2822
_JFCALIBRATIONSTATISTICS._serialized_start=2824
_JFCALIBRATIONSTATISTICS._serialized_end=2910
_ACQUISITIONDEVICESTATISTICS._serialized_start=2913
_ACQUISITIONDEVICESTATISTICS._serialized_end=3394
_RECEIVERINPUT._serialized_start=3397
_RECEIVERINPUT._serialized_end=3533
_RECEIVEROUTPUT._serialized_start=3536
_RECEIVEROUTPUT._serialized_end=3962
_RECEIVERNETWORKCONFIG._serialized_start=3964
_RECEIVERNETWORKCONFIG._serialized_end=4010
_RECEIVERSTATUS._serialized_start=4013
_RECEIVERSTATUS._serialized_end=4160
_RECEIVERDATAPROCESSINGPLOTS._serialized_start=4163
_RECEIVERDATAPROCESSINGPLOTS._serialized_end=4373
_WRITERINPUT._serialized_start=4375
_WRITERINPUT._serialized_end=4437
_WRITEROUTPUT._serialized_start=4439
_WRITEROUTPUT._serialized_end=4519
_DETECTORMODULECONFIG._serialized_start=4522
_DETECTORMODULECONFIG._serialized_end=4746
_DETECTORCONFIG._serialized_start=4748
_DETECTORCONFIG._serialized_end=4844
_DETECTORINPUT._serialized_start=4847
_DETECTORINPUT._serialized_end=5096
_DETECTOROUTPUT._serialized_start=5098
_DETECTOROUTPUT._serialized_end=5114
_DETECTORSTATUS._serialized_start=5116
_DETECTORSTATUS._serialized_end=5214
_FPGASTATUS._serialized_start=5217
_FPGASTATUS._serialized_end=6287
_FPGASTATUS_FIFOSTATUSENTRY._serialized_start=6206
_FPGASTATUS_FIFOSTATUSENTRY._serialized_end=6287
_INDEXERDATAPROCESSINGPLOTS._serialized_start=6289
_INDEXERDATAPROCESSINGPLOTS._serialized_end=6362
_DATAPROCESSINGSETTINGS._serialized_start=6365
_DATAPROCESSINGSETTINGS._serialized_end=6759
_PREVIEWFRAME._serialized_start=6762
_PREVIEWFRAME._serialized_end=7031
_MODULESTATISTICS._serialized_start=7034
_MODULESTATISTICS._serialized_end=7271
_IMAGE._serialized_start=7273
_IMAGE._serialized_end=7346
_MASKTOLOAD._serialized_start=7348
_MASKTOLOAD._serialized_end=7394
_MEASUREMENTSTATISTICS._serialized_start=7397
_MEASUREMENTSTATISTICS._serialized_end=7905
_BROKERSTATUS._serialized_start=7908
_BROKERSTATUS._serialized_end=8049
_BROKERFULLSTATUS._serialized_start=8052
_BROKERFULLSTATUS._serialized_end=8216
_DETECTORLISTELEMENT._serialized_start=8218
_DETECTORLISTELEMENT._serialized_end=8278
_DETECTORLIST._serialized_start=8280
_DETECTORLIST._serialized_end=8349
_DETECTORSELECTION._serialized_start=8351
_DETECTORSELECTION._serialized_end=8382
_GRPC_JFJOCHRECEIVER._serialized_start=8752
_GRPC_JFJOCHRECEIVER._serialized_end=9436
_GRPC_JFJOCHWRITER._serialized_start=9439
_GRPC_JFJOCHWRITER._serialized_end=9641
_GRPC_JFJOCHDETECTOR._serialized_start=9644
_GRPC_JFJOCHDETECTOR._serialized_end=10030
_GRPC_JFJOCHBROKER._serialized_start=10033
_GRPC_JFJOCHBROKER._serialized_end=11639
# @@protoc_insertion_point(module_scope)
+4 -8
View File
@@ -63,10 +63,9 @@ JFJochReceiver::JFJochReceiver(const JFJochProtoBuf::ReceiverInput &settings,
preview_stride = experiment.GetPreviewStride();
spotfinder_stride = experiment.GetSpotFindingStride();
indexing_stride = experiment.GetIndexingStride();
logger.Info("Image stride for data analysis: preview {}, spot finding/radial integration {}, indexing {}",
preview_stride, spotfinder_stride, indexing_stride);
logger.Info("Image stride for data analysis: preview {}, spot finding/radial integration {}",
preview_stride, spotfinder_stride);
if (experiment.GetDetectorMode() == DetectorMode::Conversion) {
if (preview_publisher != nullptr)
preview_publisher->Start(experiment, calib.value());
@@ -313,11 +312,8 @@ int64_t JFJochReceiver::FrameTransformationThread() {
calculate_spots = true;
if (rad_int_mapping)
send_bkg_estimate = true;
}
if (indexer && (indexing_stride > 0) && (image_number % indexing_stride == 0)) {
calculate_spots = true;
index = true;
if (indexer)
index = true;
}
for (int j = 0; j < experiment.GetSummation(); j++) {
-1
View File
@@ -85,7 +85,6 @@ class JFJochReceiver {
int64_t preview_stride;
int64_t spotfinder_stride;
int64_t indexing_stride;
int64_t max_image_number_sent = 0;
std::mutex max_image_number_sent_mutex;
-9
View File
@@ -681,15 +681,6 @@ TEST_CASE("DiffractionExperiment_RadialIntegration_QSpacing","[DiffractionExperi
REQUIRE(y.GetQSpacingForRadialInt_recipA() == Approx(0.456));
}
TEST_CASE("DiffractionExperiment_IndexingPeriod","[DiffractionExperiment]") {
DiffractionExperiment x(DetectorGeometry(8, 2, 8, 36));
x.DetectorDistance_mm(75).PhotonEnergy_keV(WVL_1A_IN_KEV);
x.FrameTime(1ms).Summation(3);
x.IndexingPeriod(9ms);
REQUIRE(x.GetIndexingPeriod() == std::chrono::milliseconds(9));
REQUIRE(x.GetIndexingStride() == 3);
}
TEST_CASE("DiffractionExperiment_StorageCells","[DiffractionExperiment]") {
const int64_t num_triggers = 20;
DiffractionExperiment x;
-2
View File
@@ -110,7 +110,6 @@ TEST_CASE("JFJochBrokerParser_ParseFacilityConfiguration") {
"pedestal_g2_frames": 333,
"frame_time_us": 0.0012,
"count_time_us": "950 us",
"indexing_period_us": "5 ms",
"spot_finding_period_us": " 2 ms",
"preview_period_us": "1 s",
"ipv4_subnet": "10.10.25.0"
@@ -131,7 +130,6 @@ TEST_CASE("JFJochBrokerParser_ParseFacilityConfiguration") {
REQUIRE(x.GetFrameTime().count() == 1200);
REQUIRE(x.GetImageCountTime().count() == 950);
REQUIRE(x.GetIndexingPeriod().count() == 5000);
REQUIRE(x.GetSpotFindingPeriod().count() == 2000);
REQUIRE(x.GetPreviewPeriod().count() == 1000*1000);
}
+2 -2
View File
@@ -960,7 +960,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index", "[JFJochReceiver]
state_machine.NotThreadSafe_Experiment().DataStreams(ndatastream);
state_machine.NotThreadSafe_Experiment().PedestalG0Frames(0).PedestalG1Frames(0).PedestalG2Frames(0)
.SpotFindingPeriod(10ms).IndexingPeriod(10ms);
.SpotFindingPeriod(10ms);
services.Writer("unix:writer_test", "inproc://#1").Receiver("unix:fpga_receiver_test");
logger.Verbose(true);
@@ -1081,7 +1081,7 @@ TEST_CASE("JFJochIntegrationTest_ZMQ_lysozyme_spot_and_index_sum", "[JFJochRecei
state_machine.NotThreadSafe_Experiment().DataStreams(ndatastream);
state_machine.NotThreadSafe_Experiment().PedestalG0Frames(0).PedestalG1Frames(0).PedestalG2Frames(0)
.SpotFindingPeriod(10ms).IndexingPeriod(10ms);
.SpotFindingPeriod(10ms);
services.Writer("unix:writer_test", "inproc://#1").Receiver("unix:fpga_receiver_test");
logger.Verbose(true);