mx/Jungfraujoch
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 53 Wiki Activity

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

Browse Source
This commit is contained in:
leonarski_f
2023-04-13 15:30:25 +02:00
parent 94e6254746
commit ae44b2eedf
11 changed files with 90 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/DiffractionExperimentTest.cpp
-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;
tests/JFJochBrokerParserTest.cpp
-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);
}
tests/JFJochFullIntegrationTest.cpp
+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);