Merge branch 'development'

Author: Atraxus

.github/workflows/releaseDeploy.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1

Intern/RayCore/CMakeLists.txt

@@ -11,27 +11,24 @@ SET(SOURCE
     src/Data/DatFile.cpp
     src/Debug/Debug.cpp
     src/Debug/Instrumentor.cpp
-    src/Model/Beamline/Beamline.cpp
-    src/Model/Beamline/OpticalElement.cpp
-    src/Model/Beamline/LightSource.cpp
-    src/Model/Beamline/EnergyDistribution.cpp
-    src/Model/Beamline/Objects/ImagePlane.cpp
-    src/Model/Beamline/Objects/MatrixSource.cpp
-    src/Model/Beamline/Objects/PointSource.cpp
-    src/Model/Beamline/Objects/Ellipsoid.cpp
-    src/Model/Beamline/Objects/ReflectionZonePlate.cpp
-    src/Model/Beamline/Objects/Slit.cpp
-    src/Model/Beamline/Objects/SphereGrating.cpp
-    src/Model/Beamline/Objects/PlaneGrating.cpp
-    src/Model/Beamline/Objects/PlaneMirror.cpp
-    src/Model/Beamline/Objects/PointSource.cpp
-    src/Model/Beamline/Objects/SphereMirror.cpp
-    src/Model/Beamline/Objects/ToroidMirror.cpp
-    src/Model/Beamline/Objects/Cylinder.cpp
-    src/Model/Beamline/Objects/Cone.cpp
-    src/Model/Surface/Quadric.cpp
-    src/Model/Surface/Toroid.cpp
-    src/Model/Surface/Surface.cpp
+    src/Beamline/Beamline.cpp
+    src/Beamline/OpticalElement.cpp
+    src/Beamline/LightSource.cpp
+    src/Beamline/EnergyDistribution.cpp
+    src/Beamline/Objects/ImagePlane.cpp
+    src/Beamline/Objects/MatrixSource.cpp
+    src/Beamline/Objects/PointSource.cpp
+    src/Beamline/Objects/Ellipsoid.cpp
+    src/Beamline/Objects/ReflectionZonePlate.cpp
+    src/Beamline/Objects/Slit.cpp
+    src/Beamline/Objects/SphereGrating.cpp
+    src/Beamline/Objects/PlaneGrating.cpp
+    src/Beamline/Objects/PlaneMirror.cpp
+    src/Beamline/Objects/PointSource.cpp
+    src/Beamline/Objects/SphereMirror.cpp
+    src/Beamline/Objects/ToroidMirror.cpp
+    src/Beamline/Objects/Cylinder.cpp
+    src/Beamline/Objects/Cone.cpp
     src/Material/Material.cpp
     src/Material/NffTable.cpp
     src/Material/PalikTable.cpp

Intern/RayCore/src/Model/Beamline/Beamline.cpp renamed to Intern/RayCore/src/Beamline/Beamline.cpp

@@ -3,7 +3,7 @@
 #include <array>
 
 #include "Debug/Instrumentor.h"
-#include "Model/Beamline/Objects/Objects.h"
+#include "Beamline/Objects/Objects.h"
 
 namespace RAYX {
 Beamline::Beamline() = default;

Intern/RayCore/src/Model/Beamline/Beamline.h renamed to Intern/RayCore/src/Beamline/Beamline.h

@@ -48,7 +48,7 @@ class RAYX_API LightSource {
     uint32_t m_numberOfRays;
 
   protected:
-    // Geometric Parameters
+    // Geometric Params
     double m_sourceDepth;
     double m_sourceHeight;
     double m_sourceWidth;
@@ -63,7 +63,7 @@ class RAYX_API LightSource {
     // User/Design Parameter
     std::array<double, 6> m_misalignmentParams;  // x, y, psi, phi
 
-    // Physics Parameters
+    // Physics Params
     // point source & matrix source
     double m_linearPol_0;
     double m_linearPol_45;

Intern/RayCore/src/Model/Beamline/EnergyDistribution.cpp renamed to Intern/RayCore/src/Beamline/EnergyDistribution.cpp

@@ -1,8 +1,7 @@
 #include "Cone.h"
 
-#include "Constants.h"
 #include "Debug/Debug.h"
-#include "Model/Surface/Quadric.h"
+#include "Shared/Constants.h"
 
 namespace RAYX {
 Cone::Cone(const DesignObject& dobj) : OpticalElement(dobj) {
@@ -16,7 +15,7 @@ Cone::Cone(const DesignObject& dobj) : OpticalElement(dobj) {
 
     m_cm = pow((m_upstreamRadius_R - m_downstreamRadius_rho) / zl, 2);
 
-    double icurv = 0;
+    int icurv = 0;
     m_a11 = 1 - m_cm;
     m_a22 = 1 - 2 * m_cm;
     m_a23 = sqrt(m_cm - m_cm * m_cm);
@@ -27,7 +26,20 @@ Cone::Cone(const DesignObject& dobj) : OpticalElement(dobj) {
         m_a24 = -m_upstreamRadius_R;
     }
 
-    setSurface(std::make_unique<Quadric>(glm::dmat4x4{m_a11, 0, 0, 0, icurv, m_a22, m_a23, m_a24, 0, 0, 0, 0, 0, 0, 0, 0}));
+    m_surface = serializeQuadric({
+        .m_icurv = icurv,
+        .m_a11 = m_a11,
+        .m_a12 = 0,
+        .m_a13 = 0,
+        .m_a14 = 0,
+        .m_a22 = m_a22,
+        .m_a23 = m_a23,
+        .m_a24 = m_a24,
+        .m_a33 = 0,
+        .m_a34 = 0,
+        .m_a44 = 0,
+    });
+    m_behaviour = serializeMirror();
 }
 
 Cone::~Cone() = default;

Intern/RayCore/src/Model/Beamline/EnergyDistribution.h renamed to Intern/RayCore/src/Beamline/EnergyDistribution.h

@@ -1,13 +1,11 @@
 #pragma once
-#include "Model/Beamline/OpticalElement.h"
+#include "Beamline/OpticalElement.h"
 
 namespace RAYX {
 class RAYX_API Cone : public OpticalElement {
   public:
     Cone(const DesignObject&);
 
-    inline int getElementType() const { return TY_BASIC_MIRROR; }
-
     ~Cone();
     void calcConeParams(double zl);
     Rad getIncidenceAngle() const;