DiffractionExperiment: Remove DetectorMode::Raw

This commit is contained in:
2025-11-04 20:52:36 +01:00
parent 3096454e7d
commit 5431f9cefb
14 changed files with 123 additions and 160 deletions

View File

@@ -16,7 +16,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator", "[FPGA][Full]") {
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(4).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -50,7 +50,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_data_stream", "[FPGA][Full
DiffractionExperiment x(DetJF(nmodules));
x.DataStreams(4);
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(4).PedestalG0Frames(0);
HLSSimulatedDevice test(3, 64);
@@ -89,7 +89,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_custom_frame", "[FPGA][Ful
for (auto &i: test_frame)
i = dist(g1);
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(nframes).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 128);
@@ -126,7 +126,7 @@ TEST_CASE("HLS_C_Simulation_check_raw", "[FPGA][Full]") {
DiffractionExperiment x(DetJF(nmodules));
uint16_t data[4096];
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(1).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -160,7 +160,7 @@ TEST_CASE("HLS_C_Simulation_check_missing_modules", "[FPGA][Full]") {
std::vector<uint16_t> raw_frames(nframes * RAW_MODULE_SIZE, 0);
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(nframes).NumTriggers(1);
HLSSimulatedDevice test(0, nframes + 2);
@@ -188,7 +188,7 @@ TEST_CASE("HLS_C_Simulation_check_cancel", "[FPGA][Full]") {
uint16_t data[4096];
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(5).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -213,7 +213,6 @@ TEST_CASE("HLS_C_Simulation_check_cancel_conversion", "[FPGA][Full]") {
uint16_t data[4096];
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).ImagesPerTrigger(5).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -238,7 +237,7 @@ TEST_CASE("HLS_C_Simulation_check_delay", "[FPGA][Full]") {
uint16_t data[4096];
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(3).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -283,7 +282,7 @@ TEST_CASE("HLS_C_Simulation_check_lost_frame_raw", "[FPGA][Full]") {
uint16_t data[4096];
for (int i = 0; i < 4096; i++) data[i] = i;
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(3).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -314,7 +313,6 @@ TEST_CASE("HLS_C_Simulation_check_lost_frame_conversion", "[FPGA][Full]") {
uint16_t data[4096];
for (int i = 0; i < 4096; i++) data[i] = i;
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).ImagesPerTrigger(3).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -350,7 +348,7 @@ TEST_CASE("HLS_C_Simulation_check_single_packet_raw", "[FPGA][Full]") {
wrong[i] = UINT16_MAX;
}
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(3).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -414,7 +412,6 @@ TEST_CASE("HLS_C_Simulation_check_single_packet_conv", "[FPGA][Full]") {
wrong[i] = INT16_MIN;
}
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).ImagesPerTrigger(3).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -473,7 +470,6 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
HLSSimulatedDevice test(0, 64);
auto gain_from_file = GainCalibrationFromTestFile();
@@ -522,7 +518,7 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_HG0", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion).UsingGainHG0(true);
x.UsingGainHG0(true);
HLSSimulatedDevice test(0, 64);
auto gain_from_file = GainCalibrationFromTestFile();
@@ -604,7 +600,7 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_fixedG1", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion).FixedGainG1(true);
x.FixedGainG1(true);
HLSSimulatedDevice test(0, 64);
auto gain_from_file = GainCalibrationFromTestFile();
@@ -655,7 +651,6 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_I32", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
HLSSimulatedDevice test(0, 64);
auto gain_from_file = GainCalibrationFromTestFile();
@@ -706,7 +701,6 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_sum4", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
HLSSimulatedDevice test(0, 64);
auto gain_from_file = GainCalibrationFromTestFile();
@@ -761,7 +755,6 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_U16", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
HLSSimulatedDevice test(0, 64);
auto gain_from_file = GainCalibrationFromTestFile();
@@ -815,7 +808,7 @@ TEST_CASE("HLS_C_Simulation_check_poisson_full_range", "[FPGA][Full]") {
for (int sqrtmult: {1, 2,4,8}) {
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw).PixelSigned(true).BitDepthImage(16);
x.Raw().PixelSigned(true).BitDepthImage(16);
HLSSimulatedDevice test(0, 64);
x.NumTriggers(1).ImagesPerTrigger(1).LossyCompressionPoisson(sqrtmult);
@@ -862,7 +855,7 @@ TEST_CASE("HLS_C_Simulation_check_threshold_full_range", "[FPGA][Full]") {
for (int threshold: {1, 2, 4, 8}) {
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw).PixelSigned(true).BitDepthImage(16);
x.Raw().PixelSigned(true).BitDepthImage(16);
HLSSimulatedDevice test(0, 64);
x.NumTriggers(1).ImagesPerTrigger(1).PixelValueLowThreshold(threshold);
@@ -914,7 +907,6 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_poisson", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.LossyCompressionPoisson(2);
x.Mode(DetectorMode::Conversion);
HLSSimulatedDevice test(0, 64);
auto gain_from_file = GainCalibrationFromTestFile();
@@ -963,7 +955,7 @@ TEST_CASE("HLS_C_Simulation_no_conversion_U16", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion).JungfrauConvPhotonCnt(false);
x.JungfrauConvPhotonCnt(false);
HLSSimulatedDevice test(0, 64);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PixelSigned(false).BitDepthImage(16);
@@ -998,7 +990,7 @@ TEST_CASE("HLS_C_Simulation_no_conversion_U32", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion).JungfrauConvPhotonCnt(false);
x.JungfrauConvPhotonCnt(false);
HLSSimulatedDevice test(0, 64);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PixelSigned(false).BitDepthImage(32);
@@ -1034,7 +1026,7 @@ TEST_CASE("HLS_C_Simulation_no_conversion_I32", "[FPGA][Full]") {
const uint16_t nmodules = 1;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion).JungfrauConvPhotonCnt(false);
x.JungfrauConvPhotonCnt(false);
HLSSimulatedDevice test(0, 64);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PixelSigned(true).BitDepthImage(32);
@@ -1080,7 +1072,6 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_convert_full_range", "[FPG
data[i] = i % RAW_MODULE_SIZE;
}
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).IncidentEnergy_keV(energy)
.GeometryTransformation(false);
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
@@ -1185,7 +1176,6 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_convert_full_range_adu_his
data[i] = i % RAW_MODULE_SIZE;
}
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).IncidentEnergy_keV(energy);
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
@@ -1244,7 +1234,6 @@ TEST_CASE("HLS_C_Simulation_check_2_trigger_convert", "[FPGA][Full]") {
uint16_t data[4096];
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1);
HLSSimulatedDevice test(0, 64);
@@ -1301,7 +1290,6 @@ TEST_CASE("HLS_C_Simulation_check_detect_last_frame", "[FPGA][Full]") {
uint16_t data[4096];
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(2).ImagesPerTrigger(5);
HLSSimulatedDevice test(0, 64);
@@ -1324,7 +1312,6 @@ TEST_CASE("HLS_C_Simulation_check_wrong_packet_size", "[FPGA][Full]") {
uint16_t data[8192];
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(5);
HLSSimulatedDevice test(0, 64);
@@ -1369,7 +1356,6 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_15_storage_cell_convert_G0
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(ntrigger).ImagesPerTrigger(nstoragecells).UseInternalPacketGenerator(true)
.IncidentEnergy_keV(10.0).StorageCells(nstoragecells);
@@ -1419,7 +1405,6 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_8_storage_cell_convert_G0"
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(ntrigger).ImagesPerTrigger(nstoragecells).UseInternalPacketGenerator(true)
.IncidentEnergy_keV(10.0).StorageCells(nstoragecells);
@@ -1470,7 +1455,6 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_16_storage_cell_convert_G0
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(ntrigger).ImagesPerTrigger(nstoragecells).UseInternalPacketGenerator(true)
.IncidentEnergy_keV(10.0).StorageCells(nstoragecells);
@@ -1516,7 +1500,6 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_storage_cell_convert_G1",
const uint16_t nmodules = 2;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(16).UseInternalPacketGenerator(true)
.IncidentEnergy_keV(10.0).StorageCells(16);
@@ -1564,7 +1547,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_integration", "[FPGA][Full
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -1623,7 +1606,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_integration_mask", "[FPGA]
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0).ApplyPixelMask(false);
HLSSimulatedDevice test(0, 64);
@@ -1676,7 +1659,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_spot_finder_count_threshol
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -1728,7 +1711,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_spot_finder_mask", "[FPGA]
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0);
x.ApplyPixelMask(false);
@@ -1801,7 +1784,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_spot_finder_overload", "[F
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0).PixelSigned(true);
HLSSimulatedDevice test(0, 64);
@@ -1851,7 +1834,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_spot_finder_min_pix_per_sp
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -1913,7 +1896,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_spot_finder_d_min_max", "[
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -1969,7 +1952,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_spot_finder_snr_threshold"
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -2028,7 +2011,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_pixel_threshold_summation"
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0).Summation(4)
.PixelValueLowThreshold(4).AutoSummation(true).PixelSigned(true)
.PixelValueHighThreshold(500);
@@ -2070,7 +2053,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_summation_mask", "[FPGA][F
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(1).PedestalG0Frames(0).Summation(4)
.AutoSummation(true).ApplyPixelMask(true).BitDepthImage(16).PixelSigned(true);
@@ -2136,7 +2119,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_32bit", "[FPGA][Full]") {
for (auto &i: test_frame)
i = dist(g1);
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(nframes).PedestalG0Frames(0).PixelSigned(false).BitDepthImage(32);
HLSSimulatedDevice test(0, 64);
@@ -2186,7 +2169,6 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_summation", "[FPGA][Full]"
for (auto &i: test_frame)
i = dist(g1);
x.Mode(DetectorMode::Conversion);
x.UseInternalPacketGenerator(true).ImagesPerTrigger(nframes).PedestalG0Frames(0).Summation(nsummation)
.JungfrauConvPhotonCnt(false).PixelSigned(true).BitDepthImage(32);
@@ -2226,7 +2208,7 @@ TEST_CASE("HLS_C_Simulation_count_sat_and_err_pixels", "[FPGA][Full]") {
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(4).PedestalG0Frames(0).PixelSigned(true);
HLSSimulatedDevice test(0, 64);
@@ -2268,7 +2250,7 @@ TEST_CASE("HLS_C_Simulation_pixel_count_mask", "[FPGA][Full]") {
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(4).PedestalG0Frames(0).PixelSigned(true);
x.ApplyPixelMask(false);
@@ -2317,7 +2299,7 @@ TEST_CASE("HLS_C_Simulation_count_pixel_sum", "[FPGA][Full]") {
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(4).PedestalG0Frames(0).PixelSigned(true);
HLSSimulatedDevice test(0, 64);
@@ -2352,7 +2334,7 @@ TEST_CASE("HLS_C_Simulation_check_bunchid", "[FPGA][Full]") {
const uint16_t nmodules = 4;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(3).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
test.CreateXfelBunchIDPacket(bunchid, 0);
@@ -2380,7 +2362,7 @@ TEST_CASE("HLS_C_Simulation_check_raw_eiger", "[FPGA][Full]") {
DetectorSetup detector(DetEIGER(nmodules));
DiffractionExperiment x(detector);
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(1).NumTriggers(1);
HLSSimulatedDevice test(0, 64);
@@ -2430,7 +2412,7 @@ TEST_CASE("HLS_C_Simulation_check_raw_eiger_8bit", "[FPGA][Full]") {
DiffractionExperiment x(detector);
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(1).NumTriggers(1).EigerBitDepth(8).BitDepthImage(8);
REQUIRE(x.GetByteDepthImage() == 1);
@@ -2492,7 +2474,7 @@ TEST_CASE("HLS_C_Simulation_check_raw_eiger_32bit", "[FPGA][Full]") {
DiffractionExperiment x(detector);
x.Mode(DetectorMode::Raw);
x.Raw();
x.PedestalG0Frames(0).ImagesPerTrigger(1).NumTriggers(1).EigerBitDepth(32).BitDepthImage(32);
REQUIRE(x.GetByteDepthImage() == 4);
@@ -2554,7 +2536,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_eiger", "[FPGA][Full]") {
DiffractionExperiment x(DetEIGER(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(4).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -2593,7 +2575,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_eiger_8bit", "[FPGA][Full]
DiffractionExperiment x(DetEIGER(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(4).PedestalG0Frames(0);
x.EigerBitDepth(8);
@@ -2674,7 +2656,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_roi_calc", "[FPGA][Full]")
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(nimages).PedestalG0Frames(0);
HLSSimulatedDevice test(0, 64);
@@ -2741,7 +2723,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_4_images", "[FPGA][Full]")
const uint16_t nimages = 4;
DiffractionExperiment x(DetJF(nmodules));
x.Mode(DetectorMode::Raw);
x.Raw();
x.UseInternalPacketGenerator(true).ImagesPerTrigger(nimages).PedestalG0Frames(0).InternalPacketGeneratorImages(nimages);
HLSSimulatedDevice test(0, 64);