From 11de4ef0777e7ceb5c1d0b1c85d576ec2929664f Mon Sep 17 00:00:00 2001
From: F Zotter <fanny.zotter@helmholtz-berlin.de>
Date: Tue, 24 Sep 2024 16:21:13 +0200
Subject: [PATCH] load energy dat file earlier and catch faulty file, rename
 Folder Data->Rml

---
 .../src/{Data => Beamline}/DatFile.cpp        |  86 +++++++++---------
 .../src/{Data => Beamline}/DatFile.h          |   0
 .../src/Beamline/EnergyDistribution.h         |   2 +-
 Intern/rayx-core/src/Beamline/LightSource.h   |   4 +-
 .../src/Beamline/Objects/CircleSource.cpp     |   2 +-
 .../src/Beamline/Objects/DipoleSource.cpp     |   2 +-
 .../src/Beamline/Objects/MatrixSource.cpp     |   2 +-
 .../src/Beamline/Objects/PixelSource.cpp      |   2 +-
 .../src/Beamline/Objects/PointSource.h        |   2 +-
 .../Objects/SimpleUndulatorSource.cpp         |   2 +-
 Intern/rayx-core/src/Design/DesignSource.cpp  |   5 +-
 Intern/rayx-core/src/Design/DesignSource.h    |   2 +
 Intern/rayx-core/src/Design/Value.h           |   4 +-
 Intern/rayx-core/src/Element/Element.h        |   2 +-
 .../src/{Data => Element}/Strings.cpp         |   0
 .../rayx-core/src/{Data => Element}/Strings.h |   0
 Intern/rayx-core/src/Material/NffTable.cpp    |   2 +-
 Intern/rayx-core/src/Material/PalikTable.cpp  |   2 +-
 .../src/{Data => Rml}/DesignElementWriter.h   |   0
 .../src/{Data => Rml}/DesignSourceWriter.h    |  10 +-
 .../rayx-core/src/{Data => Rml}/Importer.cpp  |   4 +-
 Intern/rayx-core/src/{Data => Rml}/Importer.h |   0
 Intern/rayx-core/src/{Data => Rml}/Locate.cpp |   0
 Intern/rayx-core/src/{Data => Rml}/Locate.h   |   0
 Intern/rayx-core/src/{Data => Rml}/xml.cpp    |   2 +-
 Intern/rayx-core/src/{Data => Rml}/xml.h      |   0
 Intern/rayx-core/src/Shader/Behave.cpp        |   2 +-
 Intern/rayx-core/tests/input/loadDatFile.h5   | Bin 0 -> 34058 bytes
 Intern/rayx-core/tests/input/loadDatFile.rml  |   2 +-
 Intern/rayx-core/tests/setupTests.h           |   2 +-
 Intern/rayx-ui/src/Application.cpp            |   2 +-
 Intern/rayx-ui/src/GraphicsCore/Texture.cpp   |   2 +-
 .../src/RenderSystem/GridRenderSystem.cpp     |   2 +-
 .../src/RenderSystem/ObjectRenderSystem.cpp   |   2 +-
 .../src/RenderSystem/RayRenderSystem.cpp      |   2 +-
 .../UserInterface/BeamlineDesignHandler.cpp   |   4 +-
 .../src/UserInterface/BeamlineOutliner.cpp    |   2 +-
 .../rayx-ui/src/UserInterface/UIHandler.cpp   |   2 +-
 Intern/rayx/src/TerminalApp.cpp               |   4 +-
 39 files changed, 87 insertions(+), 78 deletions(-)
 rename Intern/rayx-core/src/{Data => Beamline}/DatFile.cpp (53%)
 rename Intern/rayx-core/src/{Data => Beamline}/DatFile.h (100%)
 rename Intern/rayx-core/src/{Data => Element}/Strings.cpp (100%)
 rename Intern/rayx-core/src/{Data => Element}/Strings.h (100%)
 rename Intern/rayx-core/src/{Data => Rml}/DesignElementWriter.h (100%)
 rename Intern/rayx-core/src/{Data => Rml}/DesignSourceWriter.h (93%)
 rename Intern/rayx-core/src/{Data => Rml}/Importer.cpp (99%)
 rename Intern/rayx-core/src/{Data => Rml}/Importer.h (100%)
 rename Intern/rayx-core/src/{Data => Rml}/Locate.cpp (100%)
 rename Intern/rayx-core/src/{Data => Rml}/Locate.h (100%)
 rename Intern/rayx-core/src/{Data => Rml}/xml.cpp (99%)
 rename Intern/rayx-core/src/{Data => Rml}/xml.h (100%)
 create mode 100644 Intern/rayx-core/tests/input/loadDatFile.h5

diff --git a/Intern/rayx-core/src/Data/DatFile.cpp b/Intern/rayx-core/src/Beamline/DatFile.cpp
similarity index 53%
rename from Intern/rayx-core/src/Data/DatFile.cpp
rename to Intern/rayx-core/src/Beamline/DatFile.cpp
index d98dd1cb1..7f989913e 100644
--- a/Intern/rayx-core/src/Data/DatFile.cpp
+++ b/Intern/rayx-core/src/Beamline/DatFile.cpp
@@ -9,46 +9,53 @@
 
 namespace RAYX {
 bool DatFile::load(const std::filesystem::path& filename, DatFile* out) {
-    std::ifstream s(filename);
-    RAYX_VERB << filename;
-    std::string line;
-
-    // line 1
-    std::getline(s, out->m_title);
-
-    // line 2
-    std::getline(s, line);
-#if defined(WIN32)
-    if (sscanf_s(line.c_str(), "%u %le %le %le", &out->m_lineCount, &out->m_start, &out->m_end, &out->m_step) != 4) {
-#else
-    if (sscanf(line.c_str(), "%u %le %le %le", &out->m_lineCount, &out->m_start, &out->m_end, &out->m_step) != 4) {
-#endif
-        RAYX_EXIT << "Failed to parse DatFile \"" << filename << "\", at line 2: \"" << line << "\"";
-        return false;
-    }
-    out->m_Lines.reserve(out->m_lineCount);
-
-    // line 3..EOF
-    out->m_weightSum = 0;
-    for (uint32_t lineidx = 3; std::getline(s, line); lineidx++) {
-        if (line.empty()) {
-            continue;
+    try
+    {   
+        std::ifstream s(filename);
+        RAYX_VERB << filename;
+        std::string line;
+
+        // line 1
+        std::getline(s, out->m_title);
+
+        // line 2
+        std::getline(s, line);
+    #if defined(WIN32)
+        if (sscanf_s(line.c_str(), "%u %le %le %le", &out->m_lineCount, &out->m_start, &out->m_end, &out->m_step) != 4) {
+    #else
+        if (sscanf(line.c_str(), "%u %le %le %le", &out->m_lineCount, &out->m_start, &out->m_end, &out->m_step) != 4) {
+    #endif
+            RAYX_D_ERR << "Failed to parse DatFile \"" << filename << "\", at line 2: \"" << line << "\"";
+            return false;
         }
+        out->m_Lines.reserve(out->m_lineCount);
 
-        DatEntry e{};
-#if defined(WIN32)
-        if (sscanf_s(line.c_str(), "%le %le", &e.m_energy, &e.m_weight) != 2) {
-#else
-        if (sscanf(line.c_str(), "%le %le", &e.m_energy, &e.m_weight) != 2) {
-#endif
-            RAYX_EXIT << "Failed to parse DatFile \"" << filename << "\", at line " << lineidx << ": \"" << line << "\"";
-            return false;
+        // line 3..EOF
+        out->m_weightSum = 0;
+        for (uint32_t lineidx = 3; std::getline(s, line); lineidx++) {
+            if (line.empty()) {
+                continue;
+            }
+
+            DatEntry e{};
+    #if defined(WIN32)
+            if (sscanf_s(line.c_str(), "%le %le", &e.m_energy, &e.m_weight) != 2) {
+    #else
+            if (sscanf(line.c_str(), "%le %le", &e.m_energy, &e.m_weight) != 2) {
+    #endif
+                RAYX_D_ERR << "Failed to parse DatFile \"" << filename << "\", at line " << lineidx << ": \"" << line << "\"";
+                return false;
+            }
+            out->m_Lines.push_back(e);
+            out->m_weightSum += e.m_weight;
         }
-        out->m_Lines.push_back(e);
-        out->m_weightSum += e.m_weight;
-    }
 
-    return true;
+        return true;
+
+    } catch (const std::exception& e) {
+        RAYX_D_ERR << "Exception caught while loading DatFile \"" << filename << "\": " << e.what();
+        return false;
+    }
 }
 
 [[maybe_unused]] std::string DatFile::dump() {
@@ -64,12 +71,7 @@ bool DatFile::load(const std::filesystem::path& filename, DatFile* out) {
 
 double DatFile::selectEnergy() const {
     // runs either continuous Energydistribution from DataFile or just the specific energies
-    // provisionally set to true because EnergyDistibution ended support for this choice
-    // TODO: Fanny find a way to get a choise for DataFile Distribution back
     if (m_continuous) {
-        if (m_Lines.size() == 1) {  // weird edge case, which would crash the code below
-            return m_Lines[0].m_energy;
-        }
         // find the index `idx`, s.t.
         // we will return an energy between lines[idx].energy and
         // lines[idx+1].energy
@@ -79,7 +81,7 @@ double DatFile::selectEnergy() const {
         double counter = 0;
         uint32_t idx = 0;
 
-        for (; idx < m_Lines.size() - 2; idx++) {
+        for (; idx <= m_Lines.size() - 1; idx++) {
             counter += (m_Lines[idx].m_weight + m_Lines[idx + 1].m_weight) / 2;
             if (counter >= w) {
                 break;
diff --git a/Intern/rayx-core/src/Data/DatFile.h b/Intern/rayx-core/src/Beamline/DatFile.h
similarity index 100%
rename from Intern/rayx-core/src/Data/DatFile.h
rename to Intern/rayx-core/src/Beamline/DatFile.h
diff --git a/Intern/rayx-core/src/Beamline/EnergyDistribution.h b/Intern/rayx-core/src/Beamline/EnergyDistribution.h
index 95bff0a4a..a18c2ab55 100644
--- a/Intern/rayx-core/src/Beamline/EnergyDistribution.h
+++ b/Intern/rayx-core/src/Beamline/EnergyDistribution.h
@@ -3,7 +3,7 @@
 #include <variant>
 
 #include "Core.h"
-#include "Data/DatFile.h"
+#include "DatFile.h"
 
 namespace RAYX {
 
diff --git a/Intern/rayx-core/src/Beamline/LightSource.h b/Intern/rayx-core/src/Beamline/LightSource.h
index f267f29c8..70087835d 100644
--- a/Intern/rayx-core/src/Beamline/LightSource.h
+++ b/Intern/rayx-core/src/Beamline/LightSource.h
@@ -7,8 +7,8 @@
 #include <vector>
 
 #include "Core.h"
-#include "Data/Strings.h"
-#include "Data/xml.h"
+#include "Element/Strings.h"
+#include "Rml/xml.h"
 #include "EnergyDistribution.h"
 #include "Shader/Ray.h"
 
diff --git a/Intern/rayx-core/src/Beamline/Objects/CircleSource.cpp b/Intern/rayx-core/src/Beamline/Objects/CircleSource.cpp
index 8f6c53bcd..7063fae8c 100644
--- a/Intern/rayx-core/src/Beamline/Objects/CircleSource.cpp
+++ b/Intern/rayx-core/src/Beamline/Objects/CircleSource.cpp
@@ -1,7 +1,7 @@
 
 #include "CircleSource.h"
 
-#include "Data/xml.h"
+#include "Rml/xml.h"
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "Design/DesignSource.h"
diff --git a/Intern/rayx-core/src/Beamline/Objects/DipoleSource.cpp b/Intern/rayx-core/src/Beamline/Objects/DipoleSource.cpp
index c51caec25..e61d18041 100644
--- a/Intern/rayx-core/src/Beamline/Objects/DipoleSource.cpp
+++ b/Intern/rayx-core/src/Beamline/Objects/DipoleSource.cpp
@@ -2,7 +2,7 @@
 
 #include <fstream>
 
-#include "Data/xml.h"
+#include "Rml/xml.h"
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "Design/DesignSource.h"
diff --git a/Intern/rayx-core/src/Beamline/Objects/MatrixSource.cpp b/Intern/rayx-core/src/Beamline/Objects/MatrixSource.cpp
index 968a476ec..391381c5a 100644
--- a/Intern/rayx-core/src/Beamline/Objects/MatrixSource.cpp
+++ b/Intern/rayx-core/src/Beamline/Objects/MatrixSource.cpp
@@ -1,6 +1,6 @@
 #include "MatrixSource.h"
 
-#include "Data/xml.h"
+#include "Rml/xml.h"
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "Design/DesignSource.h"
diff --git a/Intern/rayx-core/src/Beamline/Objects/PixelSource.cpp b/Intern/rayx-core/src/Beamline/Objects/PixelSource.cpp
index 8ab3063c3..3e1b4b429 100644
--- a/Intern/rayx-core/src/Beamline/Objects/PixelSource.cpp
+++ b/Intern/rayx-core/src/Beamline/Objects/PixelSource.cpp
@@ -1,6 +1,6 @@
 #include "PixelSource.h"
 
-#include "Data/xml.h"
+#include "Rml/xml.h"
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "Design/DesignElement.h"
diff --git a/Intern/rayx-core/src/Beamline/Objects/PointSource.h b/Intern/rayx-core/src/Beamline/Objects/PointSource.h
index 798c7a038..eab3d2078 100644
--- a/Intern/rayx-core/src/Beamline/Objects/PointSource.h
+++ b/Intern/rayx-core/src/Beamline/Objects/PointSource.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Beamline/LightSource.h"
-#include "Data/xml.h"
+#include "Rml/xml.h"
 
 namespace RAYX {
 struct DesignSource;
diff --git a/Intern/rayx-core/src/Beamline/Objects/SimpleUndulatorSource.cpp b/Intern/rayx-core/src/Beamline/Objects/SimpleUndulatorSource.cpp
index 3a0d61d1b..befe70608 100644
--- a/Intern/rayx-core/src/Beamline/Objects/SimpleUndulatorSource.cpp
+++ b/Intern/rayx-core/src/Beamline/Objects/SimpleUndulatorSource.cpp
@@ -1,6 +1,6 @@
 #include "SimpleUndulatorSource.h"
 
-#include "Data/xml.h"
+#include "Rml/xml.h"
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "Design/DesignSource.h"
diff --git a/Intern/rayx-core/src/Design/DesignSource.cpp b/Intern/rayx-core/src/Design/DesignSource.cpp
index 10550a424..9f2ea225c 100644
--- a/Intern/rayx-core/src/Design/DesignSource.cpp
+++ b/Intern/rayx-core/src/Design/DesignSource.cpp
@@ -194,6 +194,8 @@ void DesignSource::setEnergySpreadUnit(EnergySpreadUnit value) { m_elementParame
 EnergySpreadUnit DesignSource::getEnergySpreadUnit() const { return m_elementParameters["energySpreadUnit"].as_energySpreadUnit(); }
 
 void DesignSource::setEnergyDistributionType(EnergyDistributionType value) { m_elementParameters["energyDistributionType"] = value; }
+EnergyDistributionType DesignSource::getEnergyDistributionType() const { return m_elementParameters["energyDistributionType"].as_energyDistributionType(); }
+
 void DesignSource::setEnergyDistributionFile(std::string value) { m_elementParameters["photonEnergyDistributionFile"] = value; }
 
 void DesignSource::setEnergySpreadType(SpreadType value) { m_elementParameters["energyDistribution"] = value; }
@@ -207,12 +209,11 @@ double DesignSource::getPhotonFlux() const { return m_elementParameters["photonF
 EnergyDistribution DesignSource::getEnergyDistribution() const {
     EnergyDistribution en;
     SpreadType spreadType = m_elementParameters["energyDistribution"].as_energySpreadType();
-    EnergyDistributionType energyDistributionType = m_elementParameters["energyDistributionType"].as_energyDistType();
+    EnergyDistributionType energyDistributionType = m_elementParameters["energyDistributionType"].as_energyDistributionType();
 
     if (energyDistributionType == EnergyDistributionType::File) {
         std::string filename = m_elementParameters["photonEnergyDistributionFile"].as_string();
 
-        std::cout << std::filesystem::current_path() << std::endl;
         DatFile df;
         DatFile::load(filename, &df);
 
diff --git a/Intern/rayx-core/src/Design/DesignSource.h b/Intern/rayx-core/src/Design/DesignSource.h
index bd04f04e1..fc8026ae0 100644
--- a/Intern/rayx-core/src/Design/DesignSource.h
+++ b/Intern/rayx-core/src/Design/DesignSource.h
@@ -59,6 +59,8 @@ struct RAYX_API DesignSource {
     SpreadType getEnergySpreadType() const;
 
     void setEnergyDistributionType(EnergyDistributionType value);
+    EnergyDistributionType getEnergyDistributionType() const;
+
     void setEnergyDistributionFile(std::string value);
 
     void setEnergySpreadUnit(EnergySpreadUnit value);
diff --git a/Intern/rayx-core/src/Design/Value.h b/Intern/rayx-core/src/Design/Value.h
index 7acf62fe9..b432f08a3 100644
--- a/Intern/rayx-core/src/Design/Value.h
+++ b/Intern/rayx-core/src/Design/Value.h
@@ -254,9 +254,9 @@ class DesignMap {
         return *x;
     }
 
-    inline EnergyDistributionType as_energyDistType() const {
+    inline EnergyDistributionType as_energyDistributionType() const {
         auto* x = std::get_if<EnergyDistributionType>(&m_variant);
-        if (!x) throw std::runtime_error("as_energyDistType() called on non-energyDistType!");
+        if (!x) throw std::runtime_error("as_energyDistributionType() called on non-energyDistributionType!");
         return *x;
     }
 
diff --git a/Intern/rayx-core/src/Element/Element.h b/Intern/rayx-core/src/Element/Element.h
index 5858d33cb..f9828a1fe 100644
--- a/Intern/rayx-core/src/Element/Element.h
+++ b/Intern/rayx-core/src/Element/Element.h
@@ -7,7 +7,7 @@
 #include "Behaviour.h"
 #include "Core.h"
 #include "Cutout.h"
-#include "Data/xml.h"
+#include "Rml/xml.h"
 #include "Shader/SlopeError.h"
 #include "Surface.h"
 
diff --git a/Intern/rayx-core/src/Data/Strings.cpp b/Intern/rayx-core/src/Element/Strings.cpp
similarity index 100%
rename from Intern/rayx-core/src/Data/Strings.cpp
rename to Intern/rayx-core/src/Element/Strings.cpp
diff --git a/Intern/rayx-core/src/Data/Strings.h b/Intern/rayx-core/src/Element/Strings.h
similarity index 100%
rename from Intern/rayx-core/src/Data/Strings.h
rename to Intern/rayx-core/src/Element/Strings.h
diff --git a/Intern/rayx-core/src/Material/NffTable.cpp b/Intern/rayx-core/src/Material/NffTable.cpp
index 00b3d82e5..dbb87a272 100644
--- a/Intern/rayx-core/src/Material/NffTable.cpp
+++ b/Intern/rayx-core/src/Material/NffTable.cpp
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <fstream>
 
-#include "Data/Locate.h"
+#include "Rml/Locate.h"
 #include "Debug/Debug.h"
 
 namespace RAYX {
diff --git a/Intern/rayx-core/src/Material/PalikTable.cpp b/Intern/rayx-core/src/Material/PalikTable.cpp
index bc0ba5d3d..5db83d4a2 100644
--- a/Intern/rayx-core/src/Material/PalikTable.cpp
+++ b/Intern/rayx-core/src/Material/PalikTable.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <fstream>
 
-#include "Data/Locate.h"
+#include "Rml/Locate.h"
 #include "Debug/Debug.h"
 
 namespace RAYX {
diff --git a/Intern/rayx-core/src/Data/DesignElementWriter.h b/Intern/rayx-core/src/Rml/DesignElementWriter.h
similarity index 100%
rename from Intern/rayx-core/src/Data/DesignElementWriter.h
rename to Intern/rayx-core/src/Rml/DesignElementWriter.h
diff --git a/Intern/rayx-core/src/Data/DesignSourceWriter.h b/Intern/rayx-core/src/Rml/DesignSourceWriter.h
similarity index 93%
rename from Intern/rayx-core/src/Data/DesignSourceWriter.h
rename to Intern/rayx-core/src/Rml/DesignSourceWriter.h
index 44cc122c7..68c42bad8 100644
--- a/Intern/rayx-core/src/Data/DesignSourceWriter.h
+++ b/Intern/rayx-core/src/Rml/DesignSourceWriter.h
@@ -23,11 +23,15 @@ void setAllMandatory(xml::Parser parser, DesignSource* ds) {
 }
 
 void setDefaultEnergy(xml::Parser parser, DesignSource* ds) {
-    ds->setEnergy(parser.parsePhotonEnergy());
-    ds->setEnergyDistributionFile(parser.parseEnergyDistributionFile().generic_string());
     ds->setEnergyDistributionType(parser.parseEnergyDistributionType());
-    ds->setEnergySpread(parser.parseEnergySpread());
     ds->setEnergySpreadType(parser.parseEnergySpreadType());
+
+    if (ds->getEnergyDistributionType() == EnergyDistributionType::File) {
+        ds->setEnergyDistributionFile(parser.parseEnergyDistributionFile().generic_string());
+    } else {
+        ds->setEnergy(parser.parsePhotonEnergy());
+        ds->setEnergySpread(parser.parseEnergySpread());
+    }
 }
 
 void setDefaultOrientation(xml::Parser parser, DesignSource* ds) {
diff --git a/Intern/rayx-core/src/Data/Importer.cpp b/Intern/rayx-core/src/Rml/Importer.cpp
similarity index 99%
rename from Intern/rayx-core/src/Data/Importer.cpp
rename to Intern/rayx-core/src/Rml/Importer.cpp
index 481c15835..77197c2ba 100644
--- a/Intern/rayx-core/src/Data/Importer.cpp
+++ b/Intern/rayx-core/src/Rml/Importer.cpp
@@ -8,13 +8,13 @@
 
 #include "Beamline/Beamline.h"
 #include "Beamline/Objects/Objects.h"
-#include "Data/xml.h"
+#include "Rml/xml.h"
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "Design/DesignElement.h"
 #include "DesignElementWriter.h"
 #include "DesignSourceWriter.h"
-#include "Strings.h"
+#include "Element/Strings.h"
 
 using RAYX::ElementType;
 
diff --git a/Intern/rayx-core/src/Data/Importer.h b/Intern/rayx-core/src/Rml/Importer.h
similarity index 100%
rename from Intern/rayx-core/src/Data/Importer.h
rename to Intern/rayx-core/src/Rml/Importer.h
diff --git a/Intern/rayx-core/src/Data/Locate.cpp b/Intern/rayx-core/src/Rml/Locate.cpp
similarity index 100%
rename from Intern/rayx-core/src/Data/Locate.cpp
rename to Intern/rayx-core/src/Rml/Locate.cpp
diff --git a/Intern/rayx-core/src/Data/Locate.h b/Intern/rayx-core/src/Rml/Locate.h
similarity index 100%
rename from Intern/rayx-core/src/Data/Locate.h
rename to Intern/rayx-core/src/Rml/Locate.h
diff --git a/Intern/rayx-core/src/Data/xml.cpp b/Intern/rayx-core/src/Rml/xml.cpp
similarity index 99%
rename from Intern/rayx-core/src/Data/xml.cpp
rename to Intern/rayx-core/src/Rml/xml.cpp
index b4b979508..fd611b96f 100644
--- a/Intern/rayx-core/src/Data/xml.cpp
+++ b/Intern/rayx-core/src/Rml/xml.cpp
@@ -10,7 +10,7 @@
 #include "Beamline/LightSource.h"
 #include "Debug/Debug.h"
 #include "Shader/Constants.h"
-#include "Strings.h"
+#include "Element/Strings.h"
 
 namespace RAYX::xml {
 
diff --git a/Intern/rayx-core/src/Data/xml.h b/Intern/rayx-core/src/Rml/xml.h
similarity index 100%
rename from Intern/rayx-core/src/Data/xml.h
rename to Intern/rayx-core/src/Rml/xml.h
diff --git a/Intern/rayx-core/src/Shader/Behave.cpp b/Intern/rayx-core/src/Shader/Behave.cpp
index 3b35e0b8a..4635158e3 100644
--- a/Intern/rayx-core/src/Shader/Behave.cpp
+++ b/Intern/rayx-core/src/Shader/Behave.cpp
@@ -136,4 +136,4 @@ Ray behaveImagePlane(Ray r, [[maybe_unused]] int id, [[maybe_unused]] Collision
     return r;
 }
 
-}  // namespace RAYX
+}  // namespace RAYX
\ No newline at end of file
diff --git a/Intern/rayx-core/tests/input/loadDatFile.h5 b/Intern/rayx-core/tests/input/loadDatFile.h5
new file mode 100644
index 0000000000000000000000000000000000000000..93a000f2bbc1a1c20a80c063389887f2c6ec3817
GIT binary patch
literal 34058
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

literal 0
HcmV?d00001

diff --git a/Intern/rayx-core/tests/input/loadDatFile.rml b/Intern/rayx-core/tests/input/loadDatFile.rml
index 03e60f79f..24234e2bc 100644
--- a/Intern/rayx-core/tests/input/loadDatFile.rml
+++ b/Intern/rayx-core/tests/input/loadDatFile.rml
@@ -20,7 +20,7 @@
     <param id="rotationXerror" enabled="F">0</param>
     <param id="rotationYerror" enabled="F">0</param>
     <param id="energyDistributionType" comment="File" enabled="T">0</param>
-    <param id="photonEnergyDistributionFile" relative="loadDatFile.DAT" enabled="T">loadDatFile.DAT</param>
+    <param id="photonEnergyDistributionFile" relative="loadDatFile.DAT" enabled="T">loadDatFie.DAT</param>
     <param id="photonEnergy" enabled="F">100</param>
     <param id="energySpreadType" comment="white band" enabled="F">0</param>
     <param id="energySpreadUnit" comment="eV" enabled="F">0</param>
diff --git a/Intern/rayx-core/tests/setupTests.h b/Intern/rayx-core/tests/setupTests.h
index 35d284774..880bc2ee1 100644
--- a/Intern/rayx-core/tests/setupTests.h
+++ b/Intern/rayx-core/tests/setupTests.h
@@ -8,7 +8,7 @@
 #include "Beamline/Objects/Objects.h"
 #include "CanonicalizePath.h"
 #include "Core.h"
-#include "Data/Importer.h"
+#include "Rml/Importer.h"
 #include "Debug/Debug.h"
 #include "Design/DesignElement.h"
 #include "Design/DesignSource.h"
diff --git a/Intern/rayx-ui/src/Application.cpp b/Intern/rayx-ui/src/Application.cpp
index 302103a46..f9d411e53 100644
--- a/Intern/rayx-ui/src/Application.cpp
+++ b/Intern/rayx-ui/src/Application.cpp
@@ -5,7 +5,7 @@
 
 #include "CanonicalizePath.h"
 #include "Colors.h"
-#include "Data/Importer.h"
+#include "Rml/Importer.h"
 #include "Debug/Debug.h"
 #include "Debug/Instrumentor.h"
 #include "FrameInfo.h"
diff --git a/Intern/rayx-ui/src/GraphicsCore/Texture.cpp b/Intern/rayx-ui/src/GraphicsCore/Texture.cpp
index 62250ea7b..10a236eba 100644
--- a/Intern/rayx-ui/src/GraphicsCore/Texture.cpp
+++ b/Intern/rayx-ui/src/GraphicsCore/Texture.cpp
@@ -8,7 +8,7 @@
 #include <utility>
 
 #include "Buffer.h"
-#include "Data/Locate.h"
+#include "Rml/Locate.h"
 #include "Debug/Instrumentor.h"
 
 Texture::Texture(const Device& device)
diff --git a/Intern/rayx-ui/src/RenderSystem/GridRenderSystem.cpp b/Intern/rayx-ui/src/RenderSystem/GridRenderSystem.cpp
index 5957bf202..74b048624 100644
--- a/Intern/rayx-ui/src/RenderSystem/GridRenderSystem.cpp
+++ b/Intern/rayx-ui/src/RenderSystem/GridRenderSystem.cpp
@@ -1,6 +1,6 @@
 #include "GridRenderSystem.h"
 
-#include "Data/Locate.h"
+#include "Rml/Locate.h"
 
 GridRenderSystem::GridRenderSystem(Device& device, VkRenderPass renderPass, const std::vector<VkDescriptorSetLayout>& setLayouts)
     : RenderSystem(device, fillInput(renderPass), setLayouts) {}
diff --git a/Intern/rayx-ui/src/RenderSystem/ObjectRenderSystem.cpp b/Intern/rayx-ui/src/RenderSystem/ObjectRenderSystem.cpp
index cd0b7028d..9892621c9 100644
--- a/Intern/rayx-ui/src/RenderSystem/ObjectRenderSystem.cpp
+++ b/Intern/rayx-ui/src/RenderSystem/ObjectRenderSystem.cpp
@@ -2,7 +2,7 @@
 
 #include <filesystem>
 
-#include "Data/Locate.h"
+#include "Rml/Locate.h"
 #include "Vertex.h"
 
 ObjectRenderSystem::ObjectRenderSystem(Device& device, VkRenderPass renderPass, const std::vector<VkDescriptorSetLayout>& setLayouts)
diff --git a/Intern/rayx-ui/src/RenderSystem/RayRenderSystem.cpp b/Intern/rayx-ui/src/RenderSystem/RayRenderSystem.cpp
index b9553926f..77880a29e 100644
--- a/Intern/rayx-ui/src/RenderSystem/RayRenderSystem.cpp
+++ b/Intern/rayx-ui/src/RenderSystem/RayRenderSystem.cpp
@@ -1,6 +1,6 @@
 #include "RayRenderSystem.h"
 
-#include "Data/Locate.h"
+#include "Rml/Locate.h"
 #include "RenderObject.h"
 #include "Vertex.h"
 
diff --git a/Intern/rayx-ui/src/UserInterface/BeamlineDesignHandler.cpp b/Intern/rayx-ui/src/UserInterface/BeamlineDesignHandler.cpp
index 652014ebc..f98b5429f 100644
--- a/Intern/rayx-ui/src/UserInterface/BeamlineDesignHandler.cpp
+++ b/Intern/rayx-ui/src/UserInterface/BeamlineDesignHandler.cpp
@@ -10,7 +10,7 @@
 #include <unordered_set>
 
 #include "Beamline/StringConversion.h"
-#include "Data/Strings.cpp"
+#include "Element/Strings.cpp"
 #include "Debug/Instrumentor.h"
 
 void BeamlineDesignHandler::showBeamlineDesignWindow(UIBeamlineInfo& uiBeamlineInfo) {
@@ -321,7 +321,7 @@ void BeamlineDesignHandler::createInputField(const std::string& key, RAYX::Desig
                 break;
             }
             case RAYX::ValueType::EnergyDistributionType: {
-                auto currentValue = element.as_energyDistType();
+                auto currentValue = element.as_energyDistributionType();
                 if (ImGui::BeginCombo("##energydisttype", RAYX::EnergyDistributionTypeToString.at(currentValue).c_str())) {
                     for (const auto& [value, name] : RAYX::EnergyDistributionTypeToString) {
                         bool isSelected = (currentValue == value);
diff --git a/Intern/rayx-ui/src/UserInterface/BeamlineOutliner.cpp b/Intern/rayx-ui/src/UserInterface/BeamlineOutliner.cpp
index 6852b1018..404caf933 100644
--- a/Intern/rayx-ui/src/UserInterface/BeamlineOutliner.cpp
+++ b/Intern/rayx-ui/src/UserInterface/BeamlineOutliner.cpp
@@ -4,7 +4,7 @@
 
 #include <fstream>
 
-#include "Data/Strings.h"
+#include "Element/Strings.h"
 
 BeamlineOutliner::BeamlineOutliner(/* args */) {}
 
diff --git a/Intern/rayx-ui/src/UserInterface/UIHandler.cpp b/Intern/rayx-ui/src/UserInterface/UIHandler.cpp
index f2bb6a9ad..f9ed5ff56 100644
--- a/Intern/rayx-ui/src/UserInterface/UIHandler.cpp
+++ b/Intern/rayx-ui/src/UserInterface/UIHandler.cpp
@@ -9,7 +9,7 @@
 #include <fstream>
 #include <rapidxml.hpp>
 
-#include "Data/Locate.h"
+#include "Rml/Locate.h"
 #include "Colors.h"
 #include "Debug/Instrumentor.h"
 #include "RayProcessing.h"
diff --git a/Intern/rayx/src/TerminalApp.cpp b/Intern/rayx/src/TerminalApp.cpp
index 6da1987be..7a6074ec1 100644
--- a/Intern/rayx/src/TerminalApp.cpp
+++ b/Intern/rayx/src/TerminalApp.cpp
@@ -5,8 +5,8 @@
 #include <stdexcept>
 
 #include "Debug/Debug.h"
-#include "Data/Importer.h"
-#include "Data/Locate.h"
+#include "Rml/Importer.h"
+#include "Rml/Locate.h"
 #include "Random.h"
 #include "Tracer/Tracer.h"
 #include "Writer/Writer.h"