From a90c64f5080a705f6f5460227aee84efde25401a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 23 Dec 2023 22:48:41 +0100 Subject: [PATCH] Fix: `shift_out` Position Update Co-authored-by: Chad Mitchell --- src/particles/elements/Aperture.H | 2 +- src/particles/elements/Buncher.H | 2 +- src/particles/elements/CFbend.H | 2 +- src/particles/elements/ChrDrift.H | 2 +- src/particles/elements/ChrQuad.H | 2 +- src/particles/elements/ChrUniformAcc.H | 2 +- src/particles/elements/ConstF.H | 2 +- src/particles/elements/DipEdge.H | 2 +- src/particles/elements/Drift.H | 2 +- src/particles/elements/ExactDrift.H | 2 +- src/particles/elements/ExactSbend.H | 2 +- src/particles/elements/Kicker.H | 2 +- src/particles/elements/Multipole.H | 2 +- src/particles/elements/NonlinearLens.H | 2 +- src/particles/elements/Quad.H | 2 +- src/particles/elements/RFCavity.H | 2 +- src/particles/elements/Sbend.H | 2 +- src/particles/elements/ShortRF.H | 2 +- src/particles/elements/SoftQuad.H | 2 +- src/particles/elements/SoftSol.H | 2 +- src/particles/elements/Sol.H | 2 +- src/particles/elements/ThinDipole.H | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/particles/elements/Aperture.H b/src/particles/elements/Aperture.H index 485695a8c..f6924f531 100644 --- a/src/particles/elements/Aperture.H +++ b/src/particles/elements/Aperture.H @@ -114,7 +114,7 @@ namespace impactx } // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */ diff --git a/src/particles/elements/Buncher.H b/src/particles/elements/Buncher.H index 726bdc84f..2a23f0983 100644 --- a/src/particles/elements/Buncher.H +++ b/src/particles/elements/Buncher.H @@ -108,7 +108,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */ diff --git a/src/particles/elements/CFbend.H b/src/particles/elements/CFbend.H index 2dd436bd1..168379b08 100644 --- a/src/particles/elements/CFbend.H +++ b/src/particles/elements/CFbend.H @@ -167,7 +167,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ChrDrift.H b/src/particles/elements/ChrDrift.H index e50710c0c..480039404 100644 --- a/src/particles/elements/ChrDrift.H +++ b/src/particles/elements/ChrDrift.H @@ -122,7 +122,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ChrQuad.H b/src/particles/elements/ChrQuad.H index 205d7e1b9..6e4e7f673 100644 --- a/src/particles/elements/ChrQuad.H +++ b/src/particles/elements/ChrQuad.H @@ -180,7 +180,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ChrUniformAcc.H b/src/particles/elements/ChrUniformAcc.H index d63dc1ce2..5df706c15 100644 --- a/src/particles/elements/ChrUniformAcc.H +++ b/src/particles/elements/ChrUniformAcc.H @@ -167,7 +167,7 @@ namespace impactx pt = pt/bgf; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ConstF.H b/src/particles/elements/ConstF.H index 71fa45845..f8bb9fe19 100644 --- a/src/particles/elements/ConstF.H +++ b/src/particles/elements/ConstF.H @@ -117,7 +117,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/DipEdge.H b/src/particles/elements/DipEdge.H index 82cf59f86..8f905746a 100644 --- a/src/particles/elements/DipEdge.H +++ b/src/particles/elements/DipEdge.H @@ -110,7 +110,7 @@ namespace impactx py = py + R43*y; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */ diff --git a/src/particles/elements/Drift.H b/src/particles/elements/Drift.H index b1b9ba56c..824b92f02 100644 --- a/src/particles/elements/Drift.H +++ b/src/particles/elements/Drift.H @@ -108,7 +108,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ExactDrift.H b/src/particles/elements/ExactDrift.H index d35b46e3b..b7149dc1e 100644 --- a/src/particles/elements/ExactDrift.H +++ b/src/particles/elements/ExactDrift.H @@ -114,7 +114,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ExactSbend.H b/src/particles/elements/ExactSbend.H index 34d2f9286..247f8e7d9 100644 --- a/src/particles/elements/ExactSbend.H +++ b/src/particles/elements/ExactSbend.H @@ -140,7 +140,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/Kicker.H b/src/particles/elements/Kicker.H index 2f82d8ad3..66c32028c 100644 --- a/src/particles/elements/Kicker.H +++ b/src/particles/elements/Kicker.H @@ -121,7 +121,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */ diff --git a/src/particles/elements/Multipole.H b/src/particles/elements/Multipole.H index fa409ce96..da634664a 100644 --- a/src/particles/elements/Multipole.H +++ b/src/particles/elements/Multipole.H @@ -130,7 +130,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */ diff --git a/src/particles/elements/NonlinearLens.H b/src/particles/elements/NonlinearLens.H index bd6522da8..f4a5d692e 100644 --- a/src/particles/elements/NonlinearLens.H +++ b/src/particles/elements/NonlinearLens.H @@ -140,7 +140,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */ diff --git a/src/particles/elements/Quad.H b/src/particles/elements/Quad.H index 085e4e5b0..e595a2738 100644 --- a/src/particles/elements/Quad.H +++ b/src/particles/elements/Quad.H @@ -132,7 +132,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/RFCavity.H b/src/particles/elements/RFCavity.H index 65054d6dc..8cc20e16d 100644 --- a/src/particles/elements/RFCavity.H +++ b/src/particles/elements/RFCavity.H @@ -236,7 +236,7 @@ namespace RFCavityData pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/Sbend.H b/src/particles/elements/Sbend.H index f056a0863..2c8fdd184 100644 --- a/src/particles/elements/Sbend.H +++ b/src/particles/elements/Sbend.H @@ -125,7 +125,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ShortRF.H b/src/particles/elements/ShortRF.H index e82dcf162..022ef75ba 100644 --- a/src/particles/elements/ShortRF.H +++ b/src/particles/elements/ShortRF.H @@ -131,7 +131,7 @@ namespace impactx pt = pt/bgf; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */ diff --git a/src/particles/elements/SoftQuad.H b/src/particles/elements/SoftQuad.H index c73539148..047c4e110 100644 --- a/src/particles/elements/SoftQuad.H +++ b/src/particles/elements/SoftQuad.H @@ -241,7 +241,7 @@ namespace SoftQuadrupoleData pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/SoftSol.H b/src/particles/elements/SoftSol.H index b95d428ec..289ea319f 100644 --- a/src/particles/elements/SoftSol.H +++ b/src/particles/elements/SoftSol.H @@ -246,7 +246,7 @@ namespace SoftSolenoidData pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/Sol.H b/src/particles/elements/Sol.H index eec8f1d47..b5ac29cd7 100644 --- a/src/particles/elements/Sol.H +++ b/src/particles/elements/Sol.H @@ -137,7 +137,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. diff --git a/src/particles/elements/ThinDipole.H b/src/particles/elements/ThinDipole.H index 1942d7653..0c6d322af 100644 --- a/src/particles/elements/ThinDipole.H +++ b/src/particles/elements/ThinDipole.H @@ -120,7 +120,7 @@ namespace impactx pt = ptout; // undo shift due to alignment errors of the element - shift_out(x, y, px, py); + shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py); } /** This pushes the reference particle. */