From ff0981246f67c67a15d47c8f84f2f04cdab91682 Mon Sep 17 00:00:00 2001
From: ximenes <xresende@gmail.com>
Date: Fri, 15 Jul 2022 19:35:33 -0300
Subject: [PATCH 1/2] Code cleanup, initialize global accelerator variables

---
 include/trackcpp/accelerator.h |  8 ++++----
 include/trackcpp/tpsa.h        | 34 ++++++++++++++++------------------
 src/lattice.cpp                |  6 +++---
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/include/trackcpp/accelerator.h b/include/trackcpp/accelerator.h
index 6b0c4ba..9b220d4 100644
--- a/include/trackcpp/accelerator.h
+++ b/include/trackcpp/accelerator.h
@@ -27,10 +27,10 @@ class Accelerator {
   // energy < electron_rest_energy -> energy = electron_rest_energy:
   Accelerator(const double& energy=-1);
   double                  energy;              // [eV]
-  bool                    cavity_on;
-  bool                    radiation_on;
-  bool                    vchamber_on;
-  int                     harmonic_number;
+  bool                    cavity_on = false;
+  bool                    radiation_on = false;
+  bool                    vchamber_on = false;
+  int                     harmonic_number = 0;
   std::vector<Element>    lattice;
 
   bool operator==(const Accelerator& o) const;
diff --git a/include/trackcpp/tpsa.h b/include/trackcpp/tpsa.h
index c0b7116..0ac9669 100644
--- a/include/trackcpp/tpsa.h
+++ b/include/trackcpp/tpsa.h
@@ -199,7 +199,7 @@ Tpsa<V,N,TYPE>::Tpsa(const TYPE& a_, const unsigned int v_) {
 	//for(unsigned int i=1; i<get_size(); i++) c[i] = 0;
 	c[0] = a_;
 	if (v_<V) c[v_+1] = 1;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>::Tpsa(const Tpsa<V,N,TYPE>& a_)  {
@@ -216,38 +216,38 @@ Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator * (const TYPE& o_) const {
 	Tpsa<V,N,TYPE> r(*this);
 	for(unsigned int i=0; i<get_size(); i++) r.c[i] *= o_;
 	return r;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator / (const TYPE& o_) const {
 	Tpsa<V,N,TYPE> r(*this);
 	for(unsigned int i=0; i<get_size(); i++) r.c[i] /= o_;
 	return r;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator += (const TYPE& o_) {
 	c[0] += o_;
 	return *this;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator -= (const TYPE& o_) {
 	c[0] -= o_;
 	return *this;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator *= (const TYPE& o_) {
 	for(unsigned int i=0; i<get_size(); i++) c[i] *= o_;
 	return *this;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator /= (const TYPE& o_) {
 	for(unsigned int i=0; i<get_size(); i++) c[i] /= o_;
 	return *this;
-};
+}
 
 
 // Implementations: ALGEBRA OF CLASS ELEMENTS
@@ -258,21 +258,21 @@ Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator - () const {
 	Tpsa<V,N,TYPE> r(*this);
 	for(unsigned int i=0; i<get_size(); i++) r.c[i] = -r.c[i];
 	return r;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator + (const Tpsa<V,N,TYPE>& o_) const {
 	Tpsa<V,N,TYPE> r(*this);
 	for(unsigned int i=0; i<get_size(); i++) r.c[i] += o_.c[i];
 	return r;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator - (const Tpsa<V,N,TYPE>& o_) const {
 	Tpsa<V,N,TYPE> r(*this);
 	for(unsigned int i=0; i<get_size(); i++) r.c[i] -= o_.c[i];
 	return r;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator * (const Tpsa<V,N,TYPE>& o_) const {
@@ -289,7 +289,7 @@ Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator * (const Tpsa<V,N,TYPE>& o_) const {
 		}
 	}
 	return r;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::inverse() const {
@@ -307,31 +307,31 @@ Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::inverse() const {
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE> Tpsa<V,N,TYPE>::operator / (const Tpsa<V,N,TYPE>& o_) const {
 	return *this * o_.inverse();
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator += (const Tpsa<V,N,TYPE>& o_) {
 	for(unsigned int i=0; i<get_size(); i++) c[i] += o_.c[i];
 	return *this;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator -= (const Tpsa<V,N,TYPE>& o_) {
 	for(unsigned int i=0; i<get_size(); i++) c[i] -= o_.c[i];
 	return *this;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator *= (const Tpsa<V,N,TYPE>& o_) {
 	*this = *this * o_;
 	return *this;
-};
+}
 
 template <unsigned int V, unsigned int N, typename TYPE>
 Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator /= (const Tpsa<V,N,TYPE>& o_) {
 	*this = *this * o_.inverse();
 	return *this;
-};
+}
 
 
 // Implementation: BOOLEAN OPERATORS
@@ -711,6 +711,4 @@ bool isfinite(const Tpsa<V,N,TYPE>& a_) {
 }
 
 
-
-
 #endif
diff --git a/src/lattice.cpp b/src/lattice.cpp
index 53aed2b..910a841 100644
--- a/src/lattice.cpp
+++ b/src/lattice.cpp
@@ -98,7 +98,7 @@ std::vector<int> latt_findcells_fam_name(const std::vector<Element>& lattice, co
     }
   };
   return r;
-};
+}
 
 std::vector<int> latt_findcells_frequency(const std::vector<Element>& lattice, const double& value, bool reverse) {
   std::vector<int> r;
@@ -108,7 +108,7 @@ std::vector<int> latt_findcells_frequency(const std::vector<Element>& lattice, c
     }
   };
   return r;
-};
+}
 
 std::vector<int> latt_findcells_angle(const std::vector<Element>& lattice, const double& value, bool reverse) {
   std::vector<int> r;
@@ -118,7 +118,7 @@ std::vector<int> latt_findcells_angle(const std::vector<Element>& lattice, const
     }
   };
   return r;
-};
+}
 
 std::vector<int> latt_findcells_polynom_b(const std::vector<Element>& lattice, unsigned int n, const double& value, bool reverse) {
   std::vector<int> r;

From a582788abd872cf5f8b98bde859eeea41e1d231c Mon Sep 17 00:00:00 2001
From: ximenes <xresende@gmail.com>
Date: Fri, 15 Jul 2022 19:41:58 -0300
Subject: [PATCH 2/2] Code formatting

---
 include/trackcpp/tpsa.h | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/include/trackcpp/tpsa.h b/include/trackcpp/tpsa.h
index 0ac9669..15a7f68 100644
--- a/include/trackcpp/tpsa.h
+++ b/include/trackcpp/tpsa.h
@@ -22,10 +22,10 @@
 //
 // TPSA
 // ====
-// Author: 		  Ximenes R. Resende
-// email:  		  xresende@gmail.com, ximenes.resende@lnls.br
+// Author: 	    Ximenes R. Resende
+// email:  	    xresende@gmail.com, ximenes.resende@lnls.br
 // affiliation:	LNLS - Laboratorio Nacional de Luz Sincrotron
-// Date: 		    August 31st, 2006 @ LNLS
+// Date:        August 31st, 2006 @ LNLS
 //
 // Notes:
 //
@@ -189,6 +189,7 @@ template <unsigned int V, unsigned int N, typename TYPE> unsigned int Tpsa<V,N,T
 template <unsigned int V, unsigned int N, typename TYPE> unsigned int Tpsa<V,N,TYPE>::powers[et_osip<V,N,N>::val][V];
 
 
+
 // Implementations: CONSTRUCTORS
 // -----------------------------
 
@@ -250,6 +251,7 @@ Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator /= (const TYPE& o_) {
 }
 
 
+
 // Implementations: ALGEBRA OF CLASS ELEMENTS
 // ------------------------------------------
 
@@ -334,6 +336,7 @@ Tpsa<V,N,TYPE>& Tpsa<V,N,TYPE>::operator /= (const Tpsa<V,N,TYPE>& o_) {
 }
 
 
+
 // Implementation: BOOLEAN OPERATORS
 // ---------------------------------
 
@@ -403,6 +406,7 @@ bool Tpsa<V,N,TYPE>::operator >= (const Tpsa<V,N,TYPE>& o_) const {
 }
 
 
+
 // Implementation: AUXILIARY MEMBER FUNCTIONS
 // ------------------------------------------
 
@@ -461,6 +465,7 @@ void Tpsa<V,N,TYPE>::get_power(unsigned int idx_, unsigned int* power_) {
 }
 
 
+
 // Implementation: NON-MEMBER FUNCTIONS AND OPERATORS WITH ARGUMENTS OF CLASS TYPE
 // -------------------------------------------------------------------------------
 // Note: these functions are generating Stack Overflow at run-time for large N,V