From 9a5e9a84989987313507e093a219101ef0b2c879 Mon Sep 17 00:00:00 2001 From: murilobalves Date: Fri, 6 Jan 2023 17:35:00 -0300 Subject: [PATCH 1/3] BUG: Fix makefile to add local include folder before mamba_files --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ad5c2e4..560aee1 100644 --- a/Makefile +++ b/Makefile @@ -65,8 +65,8 @@ AUXFILES = VERSION LIBS = $(shell gsl-config --libs) LIBS += -lpthread -INC = $(shell gsl-config --cflags) -INC += -I./include +INC = -I./include +INC += $(shell gsl-config --cflags) ifeq ($(CONDA_PREFIX),) PREFIX = /usr/local From 2e22090e53ade2ca005841a8b7a409f4c94a7f2f Mon Sep 17 00:00:00 2001 From: murilobalves Date: Fri, 6 Jan 2023 17:35:28 -0300 Subject: [PATCH 2/3] Add lattice_version in accelerator and flat_file --- include/trackcpp/accelerator.h | 2 ++ src/accelerator.cpp | 2 ++ src/flat_file.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/include/trackcpp/accelerator.h b/include/trackcpp/accelerator.h index 0c4424f..906bc81 100644 --- a/include/trackcpp/accelerator.h +++ b/include/trackcpp/accelerator.h @@ -20,6 +20,7 @@ #include "kicktable.h" #include "elements.h" #include +#include //struct Accelerator { class Accelerator { @@ -32,6 +33,7 @@ class Accelerator { bool vchamber_on = false; int harmonic_number = 0; std::vector lattice; + std::string lattice_version = ""; bool operator==(const Accelerator& o) const; bool operator!=(const Accelerator& o) const { return !(*this == o); }; diff --git a/src/accelerator.cpp b/src/accelerator.cpp index b90fc79..cd56331 100644 --- a/src/accelerator.cpp +++ b/src/accelerator.cpp @@ -35,6 +35,7 @@ bool Accelerator::operator==(const Accelerator& o) const { if (this->vchamber_on != o.vchamber_on) return false; if (this->harmonic_number != o.harmonic_number) return false; if (this->lattice != o.lattice) return false; + if (this->lattice_version != o.lattice_version) return false; return true; @@ -48,5 +49,6 @@ std::ostream& operator<< (std::ostream &out, const Accelerator& a) { out << std::endl << "vchamber_on : " << a.vchamber_on; out << std::endl << "harmonic_number: " << a.harmonic_number; out << std::endl << "lattice : " << a.lattice.size() << " elements"; + out << std::endl << "lattice_version: " << a.lattice_version; return out; } diff --git a/src/flat_file.cpp b/src/flat_file.cpp index 6eff44a..7b869d3 100644 --- a/src/flat_file.cpp +++ b/src/flat_file.cpp @@ -87,6 +87,7 @@ void write_flat_file_trackcpp(std::ostream& fp, const Accelerator& accelerator) fp << std::setw(hw) << "% cavity_on" << get_boolean_string(accelerator.cavity_on) << "\n"; fp << std::setw(hw) << "% radiation_on" << accelerator.radiation_on << "\n"; fp << std::setw(hw) << "% vchamber_on" << get_boolean_string(accelerator.vchamber_on) << "\n"; + fp << std::setw(hw) << "% lattice_version" << accelerator.lattice_version << "\n"; fp << '\n'; fp.setf(std::ios_base::showpos); @@ -187,6 +188,7 @@ Status::type read_flat_file_trackcpp(std::istream& fp, Accelerator& accelerator) // radiation_on needs its own processing function due backward compatibility if (cmd.compare("radiation_on") == 0){ accelerator.radiation_on = process_rad_property(ss); continue; } if (cmd.compare("vchamber_on") == 0) { accelerator.vchamber_on = read_boolean_string(ss); continue; } + if (cmd.compare("lattice_version") == 0) { ss >> accelerator.lattice_version; continue; } continue; } if (cmd.compare("fam_name") == 0) { From 36819b53681e29a21730234d1e9e508182e0e81c Mon Sep 17 00:00:00 2001 From: murilobalves Date: Wed, 11 Jan 2023 17:22:44 -0300 Subject: [PATCH 3/3] Update VERSION --- python_package/trackcpp/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_package/trackcpp/VERSION b/python_package/trackcpp/VERSION index 88f1811..6ed7776 100644 --- a/python_package/trackcpp/VERSION +++ b/python_package/trackcpp/VERSION @@ -1 +1 @@ -4.8.0 +4.9.0