Fix: shift_out Position Update

BLAST-ImpactX · Dec 23, 2023 · 28c6555 · 28c6555
1 parent 17a358a
commit 28c6555
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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. */