port signal calculation to using DistributedWeightingField; compiles …

…but may not run yet
eisvogel-project · Jan 26, 2024 · c5825f0 · c5825f0
1 parent a0b9361
commit c5825f0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 27 deletions.
diff --git a/include/Eisvogel/DistributedWeightingField.hh b/include/Eisvogel/DistributedWeightingField.hh
@@ -26,9 +26,9 @@ public:
   void RegisterChunk(const chunk_t& chunk_E_r, const chunk_t& chunk_E_z, const chunk_t& chunk_E_phi,
 		     const IndexVector start_ind);
 
-  const storage_t& E_r() const {return *m_E_r;};
-  const storage_t& E_z() const {return *m_E_z;};
-  const storage_t& E_phi() const {return *m_E_phi;};
+  storage_t& E_r() const {return *m_E_r;};
+  storage_t& E_z() const {return *m_E_z;};
+  storage_t& E_phi() const {return *m_E_phi;};
 
   static inline CoordVector FracIndsToCoord(const CoordVector& frac_inds, const CoordVector& start_coords, const CoordVector& end_coords, 
 					    const CoordVector& shape) {

diff --git a/include/Eisvogel/Integrator.hh b/include/Eisvogel/Integrator.hh
@@ -3,7 +3,7 @@
 
 #include <memory>
 #include "Common.hh"
-#include "WeightingField.hh"
+#include "DistributedWeightingField.hh"
 #include "Interpolator.hh"
 #include "Current0D.hh"
 #include "SparseCurrentDensity3D.hh"
@@ -12,16 +12,16 @@ class Integrator {
 
 public:
 
-  void SetGeometry(std::shared_ptr<WeightingField> wf, std::shared_ptr<Kernel> kernel);
+  void SetGeometry(std::shared_ptr<DistributedWeightingField> dwf, std::shared_ptr<Kernel> kernel);
   scalar_t integrate(scalar_t t, const Current0D& curr, scalar_t os_factor = 1.0) const;
   scalar_t integrate(scalar_t t, const SparseCurrentDensity3D& current_distribution) const;
 
 private:
 
   std::shared_ptr<Kernel> m_kernel;
-  std::shared_ptr<WeightingField> m_wf;
+  std::shared_ptr<DistributedWeightingField> m_dwf;
 
-  using interpolator_t = Interpolator<DenseNDArray, scalar_t, 3>;
+  using interpolator_t = Interpolator<DistributedNDArray, scalar_t, 3>;
 
   std::unique_ptr<interpolator_t> m_itpl_E_r;
   std::unique_ptr<interpolator_t> m_itpl_E_z;

diff --git a/include/Eisvogel/Interpolator.hh b/include/Eisvogel/Interpolator.hh
@@ -14,7 +14,7 @@ class Interpolator {
 
 public:
 
-  Interpolator(const ArrayT<ValueT, dims>& data, const Kernel& kernel) : 
+  Interpolator(ArrayT<ValueT, dims>& data, const Kernel& kernel) : 
     m_data(data), m_kernel(kernel) { };
 
   template <typename... FracInds>
@@ -64,7 +64,7 @@ public:
 
 private:
 
-  const ArrayT<ValueT, dims>& m_data;
+  ArrayT<ValueT, dims>& m_data;
   const Kernel& m_kernel;  
 };
 

diff --git a/include/Eisvogel/SignalCalculator.hh b/include/Eisvogel/SignalCalculator.hh
@@ -5,7 +5,7 @@
 #include <memory>
 #include "Eisvogel/Common.hh"
 #include "Eisvogel/Integrator.hh"
-#include "Eisvogel/WeightingField.hh"
+#include "Eisvogel/DistributedWeightingField.hh"
 #include "Eisvogel/Current0D.hh"
 #include "Eisvogel/SparseCurrentDensity3D.hh"
 
@@ -19,7 +19,6 @@ public:
 private:
   std::string m_geometry_path;
   Integrator m_integrator;
-  static std::shared_ptr<WeightingField> load_wf(const std::string& path);
 };
 
 #endif
diff --git a/src/Integrator.cxx b/src/Integrator.cxx
@@ -9,14 +9,14 @@
 
 namespace CU = CoordUtils;
 
-void Integrator::SetGeometry(std::shared_ptr<WeightingField> wf, 
+void Integrator::SetGeometry(std::shared_ptr<DistributedWeightingField> dwf, 
 			     std::shared_ptr<Kernel> kernel) {
   m_kernel = kernel;
-  m_wf = wf;
+  m_dwf = dwf;
 
-  m_itpl_E_r = std::make_unique<interpolator_t>(m_wf -> E_r(), *m_kernel);
-  m_itpl_E_z = std::make_unique<interpolator_t>(m_wf -> E_z(), *m_kernel);
-  m_itpl_E_phi = std::make_unique<interpolator_t>(m_wf -> E_phi(), *m_kernel);
+  m_itpl_E_r = std::make_unique<interpolator_t>(m_dwf -> E_r(), *m_kernel);
+  m_itpl_E_z = std::make_unique<interpolator_t>(m_dwf -> E_z(), *m_kernel);
+  m_itpl_E_phi = std::make_unique<interpolator_t>(m_dwf -> E_phi(), *m_kernel);
 }
 
 scalar_t Integrator::integrate(scalar_t t, const Current0D& curr, scalar_t os_factor) const {
@@ -28,7 +28,7 @@ scalar_t Integrator::integrate(scalar_t t, const Current0D& curr, scalar_t os_fa
     velocities.AddPoint(deltas(pt_ind) / CU::getT(deltas(pt_ind)));
   }
 
-  DeltaVector wf_sampling_intervals = m_wf -> getSamplingIntervals(); 
+  DeltaVector wf_sampling_intervals = m_dwf -> getSamplingIntervals(); 
 
   // Main signal integration loop
   scalar_t signal = 0;
@@ -63,7 +63,7 @@ scalar_t Integrator::integrate(scalar_t t, const Current0D& curr, scalar_t os_fa
       CoordVector cur_pos_trz = CU::TXYZ_to_TRZ(cur_pos_txyz);
       CoordVector wf_eval_pos = CU::MakeCoordVectorTRZ(t - cur_t, CU::getR(cur_pos_trz), CU::getZ(cur_pos_trz));
 
-      CoordVector wf_eval_frac_inds = m_wf -> getFracInds(wf_eval_pos);
+      CoordVector wf_eval_frac_inds = m_dwf -> getFracInds(wf_eval_pos);
 
       FieldVector wf_rzphi = CU::MakeFieldVectorRZPHI(m_itpl_E_r -> Interpolate(wf_eval_frac_inds),
 						      m_itpl_E_z -> Interpolate(wf_eval_frac_inds),
@@ -99,7 +99,7 @@ scalar_t Integrator::integrate(scalar_t t, const SparseCurrentDensity3D& current
     CoordVector cur_pos_trz = CU::TXYZ_to_TRZ(cur_pos_txyz);
     CoordVector wf_eval_pos = CU::MakeCoordVectorTRZ(t - cur_t, CU::getR(cur_pos_trz), CU::getZ(cur_pos_trz));
 
-    CoordVector wf_eval_frac_inds = m_wf -> getFracInds(wf_eval_pos);
+    CoordVector wf_eval_frac_inds = m_dwf -> getFracInds(wf_eval_pos);
 
     FieldVector wf_rzphi = CU::MakeFieldVectorRZPHI(m_itpl_E_r -> Interpolate(wf_eval_frac_inds),
 						    m_itpl_E_z -> Interpolate(wf_eval_frac_inds),

diff --git a/src/SignalCalculator.cxx b/src/SignalCalculator.cxx
@@ -3,20 +3,14 @@
 #include <iostream>
 #include <fstream>
 
-std::shared_ptr<WeightingField> SignalCalculator::load_wf(const std::string& path) {
-  std::fstream ifs; 
-  ifs.open(path, std::ios::in | std::ios::binary);
-  stor::Serializer iser(ifs);
-  return std::make_shared<WeightingField>(iser.deserialize<WeightingField>());
-}
-
 SignalCalculator::SignalCalculator(const std::string& geometry_path) :
   m_geometry_path(geometry_path), m_integrator()
 { 
   // For now, simply load the weighting field and set it
   // Later, loading the weighting field will be removed here ...
   std::shared_ptr<Kernel> kernel = std::make_shared<KeysCubicInterpolationKernel>();
-  m_integrator.SetGeometry(load_wf(m_geometry_path), kernel);
+  std::shared_ptr<DistributedWeightingField> dwf = std::make_shared<DistributedWeightingField>(m_geometry_path);
+  m_integrator.SetGeometry(dwf, kernel);
 }
 
 scalar_t SignalCalculator::ComputeSignal(const Current0D& track, scalar_t t_sig) {