add field3d passmethod

Author: Gabrielrezende-asc

include/trackcpp/accelerator.h

@@ -18,6 +18,7 @@
 #define _ACCELERATOR_H
 
 #include "kicktable.h"
+#include "field3d.h"
 #include "elements.h"
 #include <vector>
 #include <string>

include/trackcpp/elements.h

@@ -65,7 +65,7 @@ class Element {
   double        rescale_kicks = 1.0;  // for kickmaps
   double        ks = 0;       // [1/m]
   double        kx = 0;       // [1/m]
-  double        s_init = 0;   // [m]
+  double        s0 = 0;   // [m]
   std::vector<std::vector<double>> coefs = std::vector<std::vector<double>>(5, std::vector<double>(5, 0.0));;
 
   std::vector<double> polynom_a = default_polynom;

include/trackcpp/passmethods.h

@@ -66,6 +66,7 @@ template <typename T> Status::type pm_thinsext_pass              (Pos<T> &pos, c
 template <typename T> Status::type pm_kickmap_pass               (Pos<T> &pos, const Element &elem, const Accelerator& accelerator);
 template <typename T> Status::type pm_matrix_pass                (Pos<T> &pos, const Element &elem, const Accelerator& accelerator);
 template <typename T> Status::type pm_drift_g2l_pass             (Pos<T> &pos, const Element &elem, const Accelerator& accelerator);
+template <typename T> Status::type pm_field3d_pass               (Pos<T> &pos, const Element &elem, const Accelerator& accelerator);
 
 #include "passmethods.hpp"
 

include/trackcpp/passmethods.hpp

@@ -113,6 +113,7 @@ Status::type kicktablethinkick(Pos<T>& pos, const int& kicktable_idx,
   return status;
 }
 
+
 template <typename T>
 void matthinkick(Pos<T> &pos, const Matrix &m) {
 
@@ -468,6 +469,22 @@ Status::type pm_kickmap_pass(Pos<T> &pos, const Element &elem,
   return status;
 }
 
+template <typename T>
+Status::type pm_field3d_pass(Pos<T> &pos, const Element &elem,
+                            const Accelerator& accelerator) {
+
+  global_2_local(pos, elem);
+  const double brho = get_magnetic_rigidity(accelerator.energy);
+  const double gamma = energy / electron_rest_energy_eV;
+  const double beta0  = sqrt(1 - 1/(gamma*gamma));
+  double step   = elem.length / float(elem.nr_steps);
+  for (int i=0; i<elem.nr_steps; ++i){
+    prop_step(beta0, brho, elem.kx, elem.ks, elem.coefs, pos, elem.s0, step)
+  }
+  local_2_global(pos, elem);
+  return Status::success;
+}
+
 template <typename T>
 Status::type pm_matrix_pass(Pos<T> &pos, const Element &elem,
                             const Accelerator& accelerator) {

src/elements.cpp

@@ -321,5 +321,5 @@ void initialize_field3d(Element& element, const double& s0, const double& kx, co
     element.coefs = coefs;
     element.kx = kx;
     element.ks = ks;
-    element.s_init = s0;
+    element.s0 = s0;
 }