Fix: shift_out Position Update

ax3l · ax3l · commit 28c6555d9457 · 2023-12-23T22:48:41.000+01:00
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. */

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ namespace impactx`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`// undo shift due to alignment errors of the element`
`117`		`- shift_out(x, y, px, py);`
	`117`	`+ shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`/** This pushes the reference particle. */`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ namespace impactx`
`108`	`108`	`pt = ptout;`
`109`	`109`
`110`	`110`	`// undo shift due to alignment errors of the element`
`111`		`- shift_out(x, y, px, py);`
	`111`	`+ shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`/** This pushes the reference particle. */`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ namespace impactx`
`167`	`167`	`pt = ptout;`
`168`	`168`
`169`	`169`	`// undo shift due to alignment errors of the element`
`170`		`- shift_out(x, y, px, py);`
	`170`	`+ shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`/** This pushes the reference particle.`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ namespace impactx`
`122`	`122`	`pt = ptout;`
`123`	`123`
`124`	`124`	`// undo shift due to alignment errors of the element`
`125`		`- shift_out(x, y, px, py);`
	`125`	`+ shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/** This pushes the reference particle.`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ namespace impactx`
`180`	`180`	`pt = ptout;`
`181`	`181`
`182`	`182`	`// undo shift due to alignment errors of the element`
`183`		`- shift_out(x, y, px, py);`
	`183`	`+ shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/** This pushes the reference particle.`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ namespace impactx`
`117`	`117`	`pt = ptout;`
`118`	`118`
`119`	`119`	`// undo shift due to alignment errors of the element`
`120`		`- shift_out(x, y, px, py);`
	`120`	`+ shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`/** This pushes the reference particle.`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ namespace impactx`
`110`	`110`	`py = py + R43*y;`
`111`	`111`
`112`	`112`	`// undo shift due to alignment errors of the element`
`113`		`- shift_out(x, y, px, py);`
	`113`	`+ shift_out(p.pos(RealAoS::x), p.pos(RealAoS::y), px, py);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`/** This pushes the reference particle. */`