DiffractionExperiment: Move internal variables to a C++ structure

This commit is contained in:
2023-11-14 13:17:58 +01:00
parent e85988dfa2
commit f778a35e6f
19 changed files with 490 additions and 511 deletions
+3 -3
View File
@@ -410,7 +410,7 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_I32", "[FPGA][Full]") {
auto gain_from_file = GainCalibrationFromTestFile();
for (const auto energy : energy_values) {
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy).FPGAOutputMode(JFJochProtoBuf::INT32);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy).FPGAOutputMode(FPGAPixelOutput::Int32);
REQUIRE(x.GetPhotonEnergy_keV() == Approx(energy));
@@ -511,7 +511,7 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_U16", "[FPGA][Full]") {
auto gain_from_file = GainCalibrationFromTestFile();
for (const auto energy : energy_values) {
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy).FPGAOutputMode(JFJochProtoBuf::UINT16);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy).FPGAOutputMode(FPGAPixelOutput::Uint16);
REQUIRE(x.GetPhotonEnergy_keV() == Approx(energy));
@@ -1381,7 +1381,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_32bit", "[FPGA][Full]") {
i = dist(g1);
x.Mode(DetectorMode::Raw);
x.UseInternalPacketGenerator(true).ImagesPerTrigger(nframes).PedestalG0Frames(0).FPGAOutputMode(JFJochProtoBuf::INT32);
x.UseInternalPacketGenerator(true).ImagesPerTrigger(nframes).PedestalG0Frames(0).FPGAOutputMode(FPGAPixelOutput::Int32);
HLSSimulatedDevice test(0, 64);
test.SetInternalGeneratorFrame(test_frame);