version 1.0.0-rc.27

This commit is contained in:
2024-12-02 21:17:14 +01:00
parent c3d6c280b8
commit 71290f374a
180 changed files with 841 additions and 698 deletions
+26 -26
View File
@@ -419,9 +419,9 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range", "[FPGA][Full]") {
auto gain_from_file = GainCalibrationFromTestFile();
for (const auto energy : energy_values) {
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy);
x.GeometryTransformation(false);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -469,10 +469,10 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_HG0", "[FPGA][Full]") {
logger.Info("With HG0");
for (const auto energy : energy_values) {
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy);
x.GeometryTransformation(false);
REQUIRE(x.IsUsingGainHG0());
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -499,10 +499,10 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_HG0", "[FPGA][Full]") {
x.UsingGainHG0(false);
for (const auto energy : energy_values) {
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy);
x.GeometryTransformation(false);
REQUIRE(!x.IsUsingGainHG0());
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -551,9 +551,9 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_fixedG1", "[FPGA][Full]") {
for (const auto energy : energy_values) {
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy).GeometryTransformation(false);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy).GeometryTransformation(false);
REQUIRE(x.IsFixedGainG1());
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -601,10 +601,10 @@ 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)
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy)
.PixelSigned(true).BitDepthImage(32).GeometryTransformation(false);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -655,10 +655,10 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_sum4", "[FPGA][Full]") {
for (const auto energy : energy_values) {
logger.Info("Trying with {} keV", energy);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy).Summation(nsummation)
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy).Summation(nsummation)
.GeometryTransformation(false);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -708,10 +708,10 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_U16", "[FPGA][Full]") {
for (const auto energy : energy_values) {
logger.Info("Trying with {} keV", energy);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy)
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy)
.PixelSigned(false).BitDepthImage(16).GeometryTransformation(false);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -861,10 +861,10 @@ TEST_CASE("HLS_C_Simulation_check_convert_full_range_poisson", "[FPGA][Full]") {
for (const auto energy : energy_values) {
logger.Info("Trying with {} keV", energy);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).PhotonEnergy_keV(energy)
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).IncidentEnergy_keV(energy)
.PixelSigned(false).BitDepthImage(16).GeometryTransformation(false);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
JFCalibration c_in(x);
c_in.Pedestal(0,0) = pedestal_g0;
@@ -1021,9 +1021,9 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_convert_full_range", "[FPG
}
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).PhotonEnergy_keV(energy)
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).IncidentEnergy_keV(energy)
.GeometryTransformation(false);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
auto gain_from_file = GainCalibrationFromTestFile();
@@ -1069,9 +1069,9 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_mask", "[FPGA][Full]") {
data[i] = i % 7;
x.Raw();
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).PhotonEnergy_keV(energy)
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).IncidentEnergy_keV(energy)
.GeometryTransformation(false).PixelSigned(true).ApplyPixelMask(true);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
HLSSimulatedDevice test(0, 64);
@@ -1126,8 +1126,8 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_convert_full_range_adu_his
}
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).PhotonEnergy_keV(energy);
REQUIRE(x.GetPhotonEnergy_keV() == Catch::Approx(energy));
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(1).UseInternalPacketGenerator(true).IncidentEnergy_keV(energy);
REQUIRE(x.GetIncidentEnergy_keV() == Catch::Approx(energy));
auto gain_from_file = GainCalibrationFromTestFile();
@@ -1311,7 +1311,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_15_storage_cell_convert_G0
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(ntrigger).ImagesPerTrigger(nstoragecells).UseInternalPacketGenerator(true)
.PhotonEnergy_keV(10.0).StorageCells(nstoragecells);
.IncidentEnergy_keV(10.0).StorageCells(nstoragecells);
REQUIRE(x.GetImageNum() == ntrigger * nstoragecells);
@@ -1361,7 +1361,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_8_storage_cell_convert_G0"
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(ntrigger).ImagesPerTrigger(nstoragecells).UseInternalPacketGenerator(true)
.PhotonEnergy_keV(10.0).StorageCells(nstoragecells);
.IncidentEnergy_keV(10.0).StorageCells(nstoragecells);
REQUIRE(x.GetImageNum() == ntrigger * nstoragecells);
@@ -1412,7 +1412,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_16_storage_cell_convert_G0
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(ntrigger).ImagesPerTrigger(nstoragecells).UseInternalPacketGenerator(true)
.PhotonEnergy_keV(10.0).StorageCells(nstoragecells);
.IncidentEnergy_keV(10.0).StorageCells(nstoragecells);
REQUIRE(x.GetImageNum() == ntrigger * nstoragecells);
@@ -1458,7 +1458,7 @@ TEST_CASE("HLS_C_Simulation_internal_packet_generator_storage_cell_convert_G1",
x.Mode(DetectorMode::Conversion);
x.PedestalG0Frames(0).NumTriggers(1).ImagesPerTrigger(16).UseInternalPacketGenerator(true)
.PhotonEnergy_keV(10.0).StorageCells(16);
.IncidentEnergy_keV(10.0).StorageCells(16);
HLSSimulatedDevice test(0, 64);