add support for SoftEdge SeparateEnergies

Author: ichinii

Intern/rayx-core/src/Shader/LightSources/EnergyDistributions/DatFile.cpp

@@ -50,15 +50,22 @@ RAYX_FN_ACC double selectEnergy(const SeparateEnergies& __restrict separateEnerg
 }
 
 RAYX_FN_ACC double selectEnergy(const EnergyDistributionList& __restrict energyDistributionList, Rand& __restrict rand) {
-    // TODO: implement all the other stuff from DayFile::selectEnergy
-    // TODO: implement continous
     const auto r    = rand.randomDouble() * energyDistributionList.weightSum;
     const int index = binarySearchPrefix(energyDistributionList.prefixWeights, energyDistributionList.size, r);
-    return energyDistributionList.energies[index];
+
+    if (energyDistributionList.continous) {
+        const auto centerEnergy = energyDistributionList.energies[index];
+        if (index < energyDistributionList.size - 1)
+            return rand.randomDoubleInRange(centerEnergy, energyDistributionList.energies[index + 1]);
+        else
+            return centerEnergy;
+    } else {
+        return energyDistributionList.energies[index];
+    }
 }
 
 RAYX_FN_ACC double selectEnergy(const EnergyDistributionDataVariant& __restrict energyDistribution, Rand& __restrict rand) {
-    return std::visit([&]<typename T>(const T& __restrict value) { return selectEnergy(value, rand); }, energyDistribution);
+    return energyDistribution.visit([&](const auto& __restrict value) { return selectEnergy(value, rand); });
 }
 
 }  // namespace rayx

Intern/rayx-core/src/Shader/LightSources/EnergyDistributions/DatFile.h

@@ -3,6 +3,7 @@
 #include "Beamline/EnergyDistribution.h"
 #include "Core.h"
 #include "Shader/Rand.h"
+#include "Variant.h"
 
 namespace rayx {
 
@@ -14,8 +15,14 @@ struct EnergyDistributionList {
     bool continous;
 };
 
-// TODO: use cuda::std::variant
-using EnergyDistributionDataVariant = std::variant<HardEdge, SoftEdge, SeparateEnergies, EnergyDistributionList>;
+struct EnergyDistributionDataBase {
+    using HardEdge        = rayx::HardEdge;
+    using SoftEdge        = rayx::SoftEdge;
+    using SeparateEnergies = rayx::SeparateEnergies;
+    using EnergyDistributionList = rayx::EnergyDistributionList;
+};
+
+using EnergyDistributionDataVariant = Variant<EnergyDistributionDataBase, EnergyDistributionDataBase::HardEdge, EnergyDistributionDataBase::SoftEdge, SeparateEnergies, EnergyDistributionDataBase::EnergyDistributionList>;
 
 RAYX_FN_ACC double selectEnergy(const HardEdge& __restrict hardEdge, Rand& __restrict rand);
 RAYX_FN_ACC double selectEnergy(const SoftEdge& __restrict softEdge, Rand& __restrict rand);

Intern/rayx-core/src/Shader/LightSources/EnergyDistributions/EnergyDistribution.cpp

@@ -154,6 +154,7 @@ struct GenRays {
                             weights.push_back(entry.m_weight);
                             energies.push_back(entry.m_energy);
                         }
+
                         std::vector<double> prefixWeights(weights.size());
                         std::inclusive_scan(weights.begin(), weights.end(), prefixWeights.begin());
                         const auto weightSum = weights.back() + prefixWeights.back();

Intern/rayx-core/src/Shader/LightSources/EnergyDistributions/EnergyDistribution.h

@@ -11,12 +11,18 @@ TEST_F(TestSuite, allBeamlineObjects) {
 TEST_F(TestSuite, loadDatFile) {
     const auto rays = traceRml("loadDatFile", RayAttrMask::Energy);
     writeCsvUsingFilename(rays, "loadDatFile.rayx");
-    expectEqualAny(rays.energy, {12.0, 15.0, 17.0});
+    using namespace testing;
+    EXPECT_THAT(rays.energy, Each(AnyOf(12, 15, 17)));
 }
 
 TEST_F(TestSuite, loadDatFile2) {
     const auto rays = traceRml("loadDatFile2", RayAttrMask::Energy);
-    expectEqualAny(rays.energy, {12.0, 15.0, 17.0});
+    writeCsvUsingFilename(rays, "loadDatFile2.rayx");
+    using namespace testing;
+    EXPECT_THAT(rays.energy, Each(AllOf(Ge(12), Le(18))));
+    EXPECT_THAT(rays.energy, Contains(AllOf(Ge(12), Le(13))));
+    EXPECT_THAT(rays.energy, Contains(AllOf(Ge(15), Le(16))));
+    EXPECT_THAT(rays.energy, Contains(AllOf(Ge(17), Le(18))));
 }
 
 TEST_F(TestSuite, loadGroups) {