Merge pull request #270 from fnalacceleratormodeling/json_update

json updates
fnalacceleratormodeling · Apr 26, 2024 · ee24758 · ee24758
2 parents 3fda105 + 5cd1d93
commit ee24758
Show file tree

Hide file tree

Showing 5 changed files with 4,710 additions and 2,282 deletions.
diff --git a/.github/workflows/macos-clang.yml b/.github/workflows/macos-clang.yml
@@ -26,7 +26,7 @@ env:
 
 jobs:
  build-and-test:
- runs-on: macos-latest
+ runs-on: macos-13
 
  steps:
  - name: Cancel Previous runs

diff --git a/.github/workflows/macos-gcc.yml b/.github/workflows/macos-gcc.yml
@@ -16,7 +16,7 @@ env:
 
 jobs:
  build-and-test:
- runs-on: macos-latest
+ runs-on: macos-13
 
  steps:
  - name: Cancel Previous runs

diff --git a/src/synergia/foundation/foundation_pywrap.cc b/src/synergia/foundation/foundation_pywrap.cc
@@ -3,14 +3,12 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "synergia/utils/cereal_files.h"
-#include "synergia/utils/pybind11_json.hpp"
-
 #include "distribution.h"
 #include "four_momentum.h"
 #include "pcg_distribution.h"
 #include "physical_constants.h"
 #include "reference_particle.h"
+#include "synergia/utils/cereal_files.h"
 
 #include "normal_form.h"
 #include "trigon.h"
@@ -483,19 +481,19 @@ PYBIND11_MODULE(foundation, m)
  "s"_a)
 
  .def("set_bunch_abs_time",
- &Reference_particle::set_bunch_abs_time,
- "Set the bunch absolute time in [s].",
- "t"_a)
+  &Reference_particle::set_bunch_abs_time,
+  "Set the bunch absolute time in [s].",
+  "t"_a)
 
  .def("increment_bunch_abs_time",
- &Reference_particle::increment_bunch_abs_time,
- "Increment the bunch absolute time dt in [s].",
- "dt"_a)
+  &Reference_particle::increment_bunch_abs_time,
+  "Increment the bunch absolute time dt in [s].",
+  "dt"_a)
 
  .def("set_bunch_abs_offset",
- &Reference_particle::set_bunch_abs_offset,
- "Set the bunch absolute offset time in [s].",
- "toffset"_a)
+  &Reference_particle::set_bunch_abs_offset,
+  "Set the bunch absolute offset time in [s].",
+  "toffset"_a)
 
  .def("get_charge",
  &Reference_particle::get_charge,