src/AbsBeamline/Corrector.cpp

@@ -20,7 +20,7 @@
 
 #include "AbsBeamline/Corrector.h"
 #include "AbsBeamline/BeamlineVisitor.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 #include "Utilities/GeneralClassicException.h"
 #include "Utilities/Util.h"

src/AbsBeamline/Drift.cpp

@@ -20,7 +20,7 @@
 
 #include "AbsBeamline/Drift.h"
 #include "AbsBeamline/BeamlineVisitor.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 
 extern Inform *gmsg;
 

src/AbsBeamline/Monitor.cpp

@@ -19,7 +19,7 @@
 
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "AbstractObjects/OpalData.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Fields/Fieldmap.h"
 #include "Physics/Physics.h"
 #include "Structure/LossDataSink.h"
@@ -223,4 +223,4 @@ void Monitor::writeStatistics() {
     }
 
     statFileEntries_sm.clear();
-}
\ No newline at end of file
+}

src/AbsBeamline/Monitor.h

@@ -19,7 +19,7 @@
 #define CLASSIC_Monitor_HH
 
 #include "AbsBeamline/Component.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "BeamlineGeometry/StraightGeometry.h"
 #include "Structure/LossDataSink.h"
 
@@ -64,6 +64,10 @@ public:
     virtual bool apply(
         const size_t& i, const double& t, Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;
 
+    virtual bool apply(
+        const Vector_t<double, 3>& R, const Vector_t<double, 3>& P, const double& t,
+	Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;
+
     virtual bool applyToReferenceParticle(
         const Vector_t<double, 3>& R, const Vector_t<double, 3>& P, const double& t,
         Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;
@@ -119,4 +123,4 @@ inline bool Monitor::isInside(const Vector_t<double, 3>& r) const {
     return std::abs(r(2)) <= 0.5 * length && isInsideTransverse(r);
 }
 
-#endif  // CLASSIC_Monitor_HH
\ No newline at end of file
+#endif  // CLASSIC_Monitor_HH

src/AbsBeamline/Multipole.cpp

@@ -19,7 +19,7 @@
 
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "Fields/Fieldmap.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 #include "Utilities/GeneralClassicException.h"
 

src/AbsBeamline/PluginElement.cpp

@@ -19,7 +19,7 @@
 #include "AbsBeamline/PluginElement.h"
 
 #include "AbsBeamline/BeamlineVisitor.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 #include "Physics/Units.h"
 #include "Structure/LossDataSink.h"
@@ -77,6 +77,14 @@ bool PluginElement::apply(
     return false;
 }
 
+bool PluginElement::apply(
+        const Vector_t<double, 3>& R, const Vector_t<double, 3>& P, const double& t,
+        Vector_t<double, 3>& E, Vector_t<double, 3>& B) {
+    return false;
+}
+
+
+
 bool PluginElement::applyToReferenceParticle(
     const Vector_t<double, 3>&, const Vector_t<double, 3>&, const double&, Vector_t<double, 3>&,
     Vector_t<double, 3>&) {

src/AbsBeamline/PluginElement.h

@@ -47,6 +47,11 @@ public:
     virtual bool apply(
         const size_t& i, const double& t, Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;
 
+    virtual bool apply(
+        const Vector_t<double, 3>& R, const Vector_t<double, 3>& P, const double& t,
+        Vector_t<double, 3>& E, Vector_t<double, 3>& B);
+
+    
     virtual bool applyToReferenceParticle(
         const Vector_t<double, 3>& R, const Vector_t<double, 3>& P, const double& t,
         Vector_t<double, 3>& E, Vector_t<double, 3>& B) override;

src/AbsBeamline/Probe.cpp

@@ -17,7 +17,7 @@
 //
 #include "AbsBeamline/Probe.h"
 #include "AbsBeamline/BeamlineVisitor.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 #include "Physics/Units.h"
 #include "Structure/LossDataSink.h"

src/AbsBeamline/RFCavity.cpp

@@ -21,7 +21,7 @@
 #include <boost/filesystem.hpp>
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "Fields/Fieldmap.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Units.h"
 #include "Steppers/BorisPusher.h"
 #include "Utilities/GeneralClassicException.h"

src/AbsBeamline/Ring.cpp

@@ -35,7 +35,7 @@
 
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "Fields/EMField.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 #include "Structure/LossDataSink.h"
 

src/AbsBeamline/ScalingFFAMagnet.cpp

@@ -28,7 +28,7 @@
 #include <cmath>
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "AbsBeamline/ScalingFFAMagnet.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Units.h"
 ScalingFFAMagnet::ScalingFFAMagnet(const std::string& name)
     : Component(name), planarArcGeometry_m(1., 1.), dummy(), endField_m(nullptr) {

src/AbsBeamline/Solenoid.cpp

@@ -21,7 +21,7 @@
 #include "AbsBeamline/Solenoid.h"
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "Fields/Fieldmap.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Physics/Physics.h"
 
 #include <fstream>

src/AbsBeamline/TravelingWave.cpp

@@ -18,7 +18,7 @@
 #include "AbsBeamline/TravelingWave.h"
 
 #include "AbsBeamline/BeamlineVisitor.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Fields/Fieldmap.h"
 #include "Physics/Units.h"
 
@@ -235,6 +235,13 @@ void TravelingWave::initialise(PartBunch_t* bunch, double& startField, double& e
         - Physics::two_pi * ((numCells_m - 1) * mode_m - std::floor((numCells_m - 1) * mode_m));
 }
 
+void TravelingWave::initialise(PartBunch_t* bunch, std::shared_ptr<AbstractTimeDependence> freq_atd,
+                               std::shared_ptr<AbstractTimeDependence> ampl_atd,
+                               std::shared_ptr<AbstractTimeDependence> phase_atd) {
+    
+}
+
+
 void TravelingWave::finalise() {
 }
 

src/AbsBeamline/TravelingWave.h

@@ -68,6 +68,10 @@ public:
 
     virtual void initialise(PartBunch_t* bunch, double& startField, double& endField) override;
 
+    virtual void initialise(PartBunch_t* bunch, std::shared_ptr<AbstractTimeDependence> freq_atd,
+        std::shared_ptr<AbstractTimeDependence> ampl_atd,
+        std::shared_ptr<AbstractTimeDependence> phase_atd) override;
+    
     virtual void finalise() override;
 
     virtual bool bends() const override;

src/AbsBeamline/VerticalFFAMagnet.h

@@ -10,7 +10,7 @@
 #include "AbsBeamline/Component.h"
 #include "BeamlineGeometry/StraightGeometry.h"
 #include "Fields/BMultipoleField.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 
 #ifndef ABSBEAMLINE_VerticalFFAMagnet_H
 #define ABSBEAMLINE_VerticalFFAMagnet_H

src/AbstractObjects/Object.h

@@ -25,6 +25,29 @@
 #include <string>
 #include <vector>
 
+#ifdef __CUDACC__
+#pragma push_macro("__cpp_consteval")
+#pragma push_macro("_NODISCARD")
+#pragma push_macro("__builtin_LINE")
+
+#define __cpp_consteval 201811L
+
+#ifdef _NODISCARD
+    #undef _NODISCARD
+    #define _NODISCARD
+#endif
+
+#define consteval constexpr
+
+#include <source_location>
+
+#undef consteval
+#pragma pop_macro("__cpp_consteval")
+#pragma pop_macro("_NODISCARD")
+#else
+#include <source_location>
+#endif
+
 class Invalidator;
 class Parser;
 class Statement;
@@ -117,7 +140,7 @@ public:
 
     /// Print the object.
     //  Print a OPAL-readable image of [b]this[/b] on the given output stream.
-    virtual void print(std::ostream &) const;
+    virtual void print(std::ostream  &) const;
 
     virtual void printValue(std::ostream &) const;
 

src/AbstractObjects/OpalData.cpp

@@ -28,7 +28,7 @@
 #include "AbstractObjects/ObjectFunction.h"
 #include "AbstractObjects/Table.h"
 #include "AbstractObjects/ValueDefinition.h"
-#include "PartBunch/PartBunch.hpp"
+#include "PartBunch/PartBunch.h"
 #include "Attributes/Attributes.h"
 #include "OpalParser/FileStream.h"
 #include "OpalParser/OpalParser.h"
@@ -786,4 +786,4 @@ void OpalData::storeArguments(int argc, char* argv[]) {
 
 std::vector<std::string> OpalData::getArguments() {
     return p->arguments_m;
-}
\ No newline at end of file
+}