Update and centralize the C constants (#691)

* Centralize constants * Adjusted constants to the one used in PhysConstant.m * Updated test_physics for the new constants Co-authored-by: Laurent Farvacque <laurent.farvacque@esrf.fr>
atcollab · Nov 16, 2023 · 0301367 · 0301367
1 parent 1e32037
commit 0301367
Show file tree

Hide file tree

Showing 29 changed files with 134 additions and 310 deletions.
diff --git a/atintegrators/BeamLoadingCavityPass.c b/atintegrators/BeamLoadingCavityPass.c
@@ -1,3 +1,4 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atimplib.c"
 #include "attrackfunc.c"
@@ -6,8 +7,6 @@
  * BeamLoadingCavity pass method by Simon White.  
  *
  */
-
-#define C0     2.99792458e8 
 
 struct elem
 {

diff --git a/atintegrators/BndMPoleSymplectic4E2Pass.c b/atintegrators/BndMPoleSymplectic4E2Pass.c
@@ -1,12 +1,8 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "atphyslib.c"
 
-#define DRIFT1    0.6756035959798286638
-#define DRIFT2   -0.1756035959798286639
-#define KICK1     1.351207191959657328
-#define KICK2    -1.702414383919314656
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/BndMPoleSymplectic4E2RadPass.c b/atintegrators/BndMPoleSymplectic4E2RadPass.c
@@ -1,12 +1,8 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "atphyslib.c"
 
-#define DRIFT1    0.6756035959798286638
-#define DRIFT2   -0.1756035959798286639
-#define KICK1     1.351207191959657328
-#define KICK2    -1.702414383919314656
-
 #define SQR(X) ((X)*(X))
 
 struct elem
@@ -44,10 +40,6 @@ struct elem
  Last modified on 8/26/2009
  */
 
-
-#define TWOPI     6.28318530717959
-#define CGAMMA    8.846056192e-05
-
 static double B2perp(double bx, double by, double irho, 
                             double x, double xpr, double y, double ypr)
 /* Calculates sqr(|e x B|) , where e is a unit vector in the direction of velocity  */    

diff --git a/atintegrators/BndMPoleSymplectic4Pass.c b/atintegrators/BndMPoleSymplectic4Pass.c
@@ -1,14 +1,10 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "atphyslib.c"
 #include "driftkick.c"		/* fastdrift and bndthinkick */
 #include "quadfringe.c"		/* QuadFringePassP, QuadFringePassN */
 
-#define DRIFT1    0.6756035959798286638
-#define DRIFT2   -0.1756035959798286639
-#define KICK1     1.351207191959657328
-#define KICK2    -1.702414383919314656
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/BndMPoleSymplectic4QuantPass.c b/atintegrators/BndMPoleSymplectic4QuantPass.c
@@ -1,3 +1,4 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "atphyslib.c"
@@ -6,11 +7,6 @@
 #include "quadfringe.c"		/* QuadFringePassP, QuadFringePassN */
 #include <math.h>
 
-#define DRIFT1    0.6756035959798286638
-#define DRIFT2   -0.1756035959798286639
-#define KICK1     1.351207191959657328
-#define KICK2    -1.702414383919314656
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/BndMPoleSymplectic4RadPass.c b/atintegrators/BndMPoleSymplectic4RadPass.c
@@ -1,14 +1,10 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "atphyslib.c"
 #include "driftkickrad.c"	/* bndthinkickrad.c */
 #include "quadfringe.c"		/* QuadFringePassP, QuadFringePassN */
 
-#define DRIFT1    0.6756035959798286638
-#define DRIFT2   -0.1756035959798286639
-#define KICK1     1.351207191959657328
-#define KICK2    -1.702414383919314656
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/BndStrMPoleSymplectic4Pass.c b/atintegrators/BndStrMPoleSymplectic4Pass.c
@@ -1,13 +1,9 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "atphyslib.c"
 #include "driftkick.c"  /* strthinkick.c */
 
-#define DRIFT1    0.6756035959798286638
-#define DRIFT2   -0.1756035959798286639
-#define KICK1     1.351207191959657328
-#define KICK2    -1.702414383919314656
-
 /* Straight dipole w/ multipole using Symplectic Integration and rotation at
  * dipole faces.
  * Created by Xiaobiao Huang, 7/31/2018 */

diff --git a/atintegrators/CavityPass.c b/atintegrators/CavityPass.c
@@ -4,12 +4,9 @@
  * Revision 3/10/04
  * A.Terebilo
  */
-
+#include "atconstants.h"
 #include "atelem.c"
 
-#define TWOPI  6.28318530717959
-#define C0  	2.99792458e8
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/DeltaQPass.c b/atintegrators/DeltaQPass.c
@@ -1,8 +1,7 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 
-#define TWOPI		6.28318530717959
-
 struct elem 
 {
   double Alphax;

diff --git a/atintegrators/ExactMultipolePass.c b/atintegrators/ExactMultipolePass.c
@@ -1,26 +1,10 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "driftkick.c"  /* fastdrift.c, strthinkick.c */
 #include "exactdrift.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem {
   double Length;
   double *PolynomA;

diff --git a/atintegrators/ExactMultipoleRadPass.c b/atintegrators/ExactMultipoleRadPass.c
@@ -1,26 +1,10 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "exactdrift.c"
 #include "exactkickrad.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem {
   double Length;
   double *PolynomA;

diff --git a/atintegrators/ExactRectBendPass.c b/atintegrators/ExactRectBendPass.c
@@ -1,27 +1,11 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "driftkick.c"  /* strthinkick.c */
 #include "exactbend.c"
 #include "exactbendfringe.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/ExactRectBendRadPass.c b/atintegrators/ExactRectBendRadPass.c
@@ -1,27 +1,11 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "exactkickrad.c"
 #include "exactbend.c"
 #include "exactbendfringe.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/ExactRectangularBendPass.c b/atintegrators/ExactRectangularBendPass.c
@@ -1,27 +1,11 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "exactdrift.c"
 #include "driftkick.c"  /* strthinkick.c */
 #include "exactbendfringe.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/ExactRectangularBendRadPass.c b/atintegrators/ExactRectangularBendRadPass.c
@@ -1,27 +1,11 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "exactdrift.c"
 #include "exactkickrad.c"
 #include "exactbendfringe.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/ExactSectorBendPass.c b/atintegrators/ExactSectorBendPass.c
@@ -1,27 +1,11 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "driftkick.c"  /* strthinkick.c */
 #include "exactbend.c"
 #include "exactbendfringe.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/ExactSectorBendRadPass.c b/atintegrators/ExactSectorBendRadPass.c
@@ -1,27 +1,11 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "exactkickrad.c"
 #include "exactbend.c"
 #include "exactbendfringe.c"
 #include "exactmultipolefringe.c"
 
-/* Generated by:
-
-#!/usr/bin/env python
-c1 = 1.0/(2.0*(2.0-2.0**(1.0/3.0)))
-c2 = (1-2**(1.0/3.0))/(2.0*(2.0-2.0**(1.0/3.0)))
-d1 = 1.0/(2.0-2.0**(1.0/3.0))
-d2 = -(2**(1.0/3.0)/(2.0-2.0**(1.0/3.0)))
-print(f"#define DRIFT1 {c1: .18}")
-print(f"#define DRIFT2 {c2: .18}")
-print(f"#define KICK1  {d1: .18}")
-print(f"#define KICK2  {d2: .18}")
-*/
-#define DRIFT1  0.675603595979828886
-#define DRIFT2 -0.17560359597982883
-#define KICK1   1.35120719195965777
-#define KICK2  -1.70241438391931532
-
 struct elem
 {
     double Length;

diff --git a/atintegrators/RFCavityPass.c b/atintegrators/RFCavityPass.c
@@ -5,6 +5,7 @@
  *  Nicola Carmignani
  */
 
+#include "atconstants.h"
 #include "attrackfunc.c"
 
 

diff --git a/atintegrators/StrMPoleSymplectic4Pass.c b/atintegrators/StrMPoleSymplectic4Pass.c
@@ -1,13 +1,9 @@
+#include "atconstants.h"
 #include "atelem.c"
 #include "atlalib.c"
 #include "driftkick.c"  	/* fastdrift.c, strthinkick.c */
 #include "quadfringe.c"		/* QuadFringePassP, QuadFringePassN */
 
-#define DRIFT1    0.6756035959798286638
-#define DRIFT2   -0.1756035959798286639
-#define KICK1     1.351207191959657328
-#define KICK2    -1.702414383919314656
-
 struct elem
 {
     double Length;