xtrack 0.38.0__tar.gz → 0.38.2__tar.gz

{xtrack-0.38.0/xtrack.egg-info → xtrack-0.38.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.38.0
+Version: 0.38.2
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack

xtrack-0.38.2/xtrack/_version.py

@@ -0,0 +1 @@
+__version__ = '0.38.2'

{xtrack-0.38.0 → xtrack-0.38.2}/xtrack/beam_elements/elements.py

@@ -1234,7 +1234,7 @@ class SimpleThinBend(BeamElement):
             return
 
         if len(knl) != 1:
-            raise ValueError("For a quadrupole, len(knl) must be 1.")
+            raise ValueError("For a SimpleThinBend, len(knl) must be 1.")
 
         kwargs["knl"] = knl
         self.xoinitialize(**kwargs)

{xtrack-0.38.0 → xtrack-0.38.2}/xtrack/beam_elements/elements_src/dipoleedge.h

@@ -58,7 +58,7 @@ void DipoleEdge_track_local_particle(DipoleEdgeData el, LocalParticle* part0){
                 //end_per_particle_block
             }
             //start_per_particle_block (part0->part)
-                MadNG_Fringe_single_particle(part, fint, hgap, k);
+                Fringe_single_particle(part, fint, hgap, k);
             //end_per_particle_block
             if (sin_ > -99.){
                 //start_per_particle_block (part0->part)
@@ -73,7 +73,7 @@ void DipoleEdge_track_local_particle(DipoleEdgeData el, LocalParticle* part0){
                 //end_per_particle_block
             }
             //start_per_particle_block (part0->part)
-                MadNG_Fringe_single_particle(part, fint, hgap, -k);
+                Fringe_single_particle(part, fint, hgap, -k);
             //end_per_particle_block
             if (sin_ > -99.){
                 //start_per_particle_block (part0->part)

{xtrack-0.38.0 → xtrack-0.38.2}/xtrack/beam_elements/elements_src/fringe_track.h

@@ -11,11 +11,13 @@
 #define POW4(X) ((X)*(X)*(X)*(X))
 
 
-// From MAD-NG:
+#ifndef XTRACK_FRINGE_FROM_PTC
+
+// MAD-NG implementation
 // https://github.com/MethodicalAcceleratorDesign/MAD/blob/d3cabd9cdebde62ebedb51bab61ac033b9159489/src/madl_dynmap.mad#L1864
 
 /*gpufun*/
-void MadNG_Fringe_single_particle(
+void Fringe_single_particle(
         LocalParticle* part,  // LocalParticle to track
         const double fint,    // Fringe field integral
         const double hgap,    // Half gap
@@ -24,7 +26,7 @@ void MadNG_Fringe_single_particle(
     if (fabs(k0) < 10e-10) {
         return;
     }
-    const double rvv = LocalParticle_get_rvv(part);
+
     const double beta0 = LocalParticle_get_beta0(part);
 
     // Particle coordinates
@@ -34,15 +36,16 @@ void MadNG_Fringe_single_particle(
     const double py = LocalParticle_get_py(part);
     const double t = LocalParticle_get_zeta(part) / beta0;
     const double pt = LocalParticle_get_ptau(part);
+    const double delta = LocalParticle_get_delta(part);
 
     const double fh = hgap * fint;
     const double fsad = (fh > 10e-10) ? 1./(72 * fh) : 0;
     const double k0w = k0;
 
-    const double _beta = 1. / (beta0 * rvv);
-    const double b0 = k0w * LocalParticle_get_charge_ratio(part) * LocalParticle_get_q0(part);
+    const double _beta = 1. / beta0 ;
+    const double b0 = k0w; // MAD does something with the charge (to be checked)
 
-    const double dpp = 1. + 2*_beta*pt + POW2(pt);
+    const double dpp = POW2(1. + delta);
     const double pz = sqrt(dpp - POW2(px) - POW2(py));
     const double _pz = 1./pz;
     const double relp = 1./sqrt(dpp);
@@ -71,13 +74,11 @@ void MadNG_Fringe_single_particle(
     const double ky = fi1*xyp*_pz       + fi2*yp2*_pz       - fi3*yp;
     const double kz = fi1*tfac*xp*POW2(_pz) + fi2*tfac*yp*POW2(_pz) - fi3*tfac*_pz;
 
-    // printf("ky = %e\n", ky);
-    // printf("k0*fi0 = %e\n", fi0);
-
     const double new_y = 2 * y / (1 + sqrt(1 - 2 * ky * y));
-    const double new_x  = x  + 0.5*kx*POW2(new_y);
-    const double new_py = py              - 4*c3*POW3(y)             - b0*tan(fi0)*new_y;
-    const double new_t = t + 0.5*kz*POW2(y) +   c3*POW4(new_y)*POW2(relp)*tfac;
+    const double new_x  = x  + 0.5 * kx * POW2(new_y);
+    const double new_py = py - 4 * c3 * POW3(new_y) - b0 * tan(fi0) * new_y;
+    const double new_t = t + 0.5 * kz * POW2(new_y) + c3 * POW4(new_y) * POW2(relp) * tfac;
+
     const double new_zeta = new_t * beta0;
 
     LocalParticle_set_x(part, new_x);
@@ -86,104 +87,97 @@ void MadNG_Fringe_single_particle(
     LocalParticle_set_zeta(part, new_zeta);
 }
 
+#endif // no XTRACK_FRINGE_FROM_PTC
 
 
+#ifdef XTRACK_FRINGE_FROM_PTC
 // The following is ported from PTC:
+//https://github.com/MethodicalAcceleratorDesign/MAD-X/blob/master/libs/ptc/src/Sh_def_kind.f90#L4936
 
-// /*gpufun*/
-// void PTC_Fringe_single_particle(
-//         LocalParticle* part,  // LocalParticle to track
-//         const double fint,    // Fringe field integral
-//         const double hgap,    // Half gap
-//         const double k0       // Dipole strength
-// ) {
-//     if (fabs(k0) < 10e-10) {
-//         return;
-//     }
-
-//     const double b = k0; // PTC naming convention
-
-//     double fsad=0.0;
-//     if(fint*hgap != 0.){
-//       fsad=1./(fint*hgap*2)/36.0;
-//     }
-
-//     // Particle coordinates
-//     const double x = LocalParticle_get_x(part);
-//     const double px = LocalParticle_get_px(part);
-//     const double y = LocalParticle_get_y(part);
-//     const double py = LocalParticle_get_py(part);
-//     const double zeta = LocalParticle_get_zeta(part);
-//     const double delta = LocalParticle_get_delta(part);
-//     const double rvv = LocalParticle_get_rvv(part);
-
-//     const double el = zeta * rvv;
-
-//     // if(k%TIME) then
-//     //    PZ=sqrt(1.0_dp+2.0_dp*X(5)/el%beta0+x(5)**2-X(2)**2-X(4)**2)
-//     //    TIME_FAC=1.0_dp/el%beta0+X(5)
-//     //    rel_p=sqrt(1.0_dp+2.0_dp*X(5)/el%beta0+x(5)**2)
-//     // else
-//     const double pz = sqrt((1.0 + delta)*(1.0 + delta) - px * px - py * py);
-//     const double time_fac = 1.0 + delta;
-//     const double rel_p = time_fac;
-//     const double c3 = b * b * fsad / rel_p;
-
-//     const double xp = px / pz;
-//     const double yp = py / pz;
-
-
-//     const double D_1_1 = (1.0 + xp * xp) / pz;
-//     const double D_2_1 =  xp * yp / pz;
-//     const double D_3_1 = -xp;
-//     const double D_1_2 = xp * yp / pz;
-//     const double D_2_2 = (1.0 + yp * yp)/pz;
-//     const double D_3_2 = -yp;
-//     const double D_1_3 = -time_fac * xp / (pz * pz);
-//     const double D_2_3 = -time_fac * yp / (pz * pz);
-//     const double D_3_3 =  time_fac / pz;
-
-//     double fi0 = atan((xp / (1.0 + yp * yp)))-b * fint * hgap * 2.0 * ( 1.0 + xp * xp *(2.0 + yp * yp)) * pz;
-//     const double co2 = b / cos(fi0) / cos(fi0);
-//     const double co1 = co2 / (1.0 + (xp / POW2(1.0 + yp * yp)));
-
-//     const double fi_1 = co1 / (1.0 + yp*yp) - co2 * b * fint * hgap * 2.0*(2.0 * xp * (2.0 + yp * yp) * pz);
-//     const double fi_2 = -co1 * 2.0 * xp * yp / POW2(1.0 + yp * yp) - co2 * b * fint * hgap * 2.0 * (2.0 * xp* xp * yp) * pz;
-//     const double fi_3 = -co2 * b * fint * hgap * 2.0 * (1.0 + xp * xp * (2.0 + yp*yp));
-
-//     fi0 = b * tan(fi0);
-
-//     double BB = 0;
-//     BB = fi_1 * D_1_2 + BB;
-//     BB = fi_2 * D_2_2 + BB;
-//     BB = fi_3 * D_3_2 + BB;
-
-//     const double new_y = 2.0 * y / (1.0 + sqrt(1.0 - 2.0 * BB * y));
-//     double new_py = py - fi0 * new_y;
-//     // printf("fi0 = %e\n", fi0);
-//     // printf("BBy = %e\n", BB);
-
-//     BB = 0;
-//     BB = fi_1 * D_1_1 + BB;
-//     BB = fi_2 * D_2_1 + BB;
-//     BB = fi_3 * D_3_1 + BB;
-//     const double new_x = x + 0.5 * BB * new_y * new_y;
+/*gpufun*/
+void Fringe_single_particle(
+        LocalParticle* part,  // LocalParticle to track
+        const double fint,    // Fringe field integral
+        const double hgap,    // Half gap
+        const double k0       // Dipole strength
+) {
+    if (fabs(k0) < 10e-10) {
+        return;
+    }
 
-//     BB = 0;
-//     BB = fi_1 * D_1_3 + BB;
-//     BB = fi_2 * D_2_3 + BB;
-//     BB = fi_3 * D_3_3 + BB;
-//     double new_el = el - 0.5 * BB * new_y * new_y;
+    const double b = k0; // PTC naming convention
 
+    double fsad=0.0;
+    if(fint*hgap != 0.){
+      fsad=1./(fint*hgap*2)/36.0;
+    }
 
-//     new_py = new_py - 4 * c3 * POW3(new_y);
-//     new_el = new_el + c3 * POW4(new_y) / POW2(rel_p) * time_fac;
+    // Particle coordinates
+    const double beta0 = LocalParticle_get_beta0(part);
+    const double x = LocalParticle_get_x(part);
+    const double px = LocalParticle_get_px(part);
+    const double y = LocalParticle_get_y(part);
+    const double py = LocalParticle_get_py(part);
+    const double ptau = LocalParticle_get_ptau(part);
+    const double delta = LocalParticle_get_delta(part);
+
+    const double pz = sqrt((1.0 + delta)*(1.0 + delta) - px * px - py * py);
+    const double time_fac = 1/beta0 + ptau;
+    const double rel_p = sqrt(1. + 2*ptau/beta0 + POW2(ptau));
+    const double c3 = b * b * fsad / rel_p;
+
+    const double xp = px / pz;
+    const double yp = py / pz;
+
+    const double D_1_1 = (1.0 + xp * xp) / pz;
+    const double D_2_1 =  xp * yp / pz;
+    const double D_3_1 = -xp;
+    const double D_1_2 = xp * yp / pz;
+    const double D_2_2 = (1.0 + yp * yp)/pz;
+    const double D_3_2 = -yp;
+    const double D_1_3 = -time_fac * xp / (pz * pz);
+    const double D_2_3 = -time_fac * yp / (pz * pz);
+    const double D_3_3 =  time_fac / pz;
+
+    double fi0 = atan((xp / (1.0 + yp * yp)))-b * fint * hgap * 2.0 * ( 1.0 + xp * xp *(2.0 + yp * yp)) * pz;
+    const double co2 = b / cos(fi0) / cos(fi0);
+    const double co1 = co2 / (1.0 + POW2(xp / POW2(1.0 + yp * yp)));
+
+    const double fi_1 = co1 / (1.0 + yp*yp) - co2 * b * fint * hgap * 2.0*(2.0 * xp * (2.0 + yp * yp) * pz);
+    const double fi_2 = -co1 * 2.0 * xp * yp / POW2(1.0 + yp * yp) - co2 * b * fint * hgap * 2.0 * (2.0 * xp* xp * yp) * pz;
+    const double fi_3 = -co2 * b * fint * hgap * 2.0 * (1.0 + xp * xp * (2.0 + yp*yp));
+
+    fi0 = b * tan(fi0);
+
+    double BB = 0;
+    BB = fi_1 * D_1_2 + BB;
+    BB = fi_2 * D_2_2 + BB;
+    BB = fi_3 * D_3_2 + BB;
+
+    const double new_y = 2.0 * y / (1.0 + sqrt(1.0 - 2.0 * BB * y));
+    double new_py = py - fi0 * new_y;
+
+    BB = 0;
+    BB = fi_1 * D_1_1 + BB;
+    BB = fi_2 * D_2_1 + BB;
+    BB = fi_3 * D_3_1 + BB;
+    const double new_x = x + 0.5 * BB * new_y * new_y;
+
+    BB = 0;
+    BB = fi_1 * D_1_3 + BB;
+    BB = fi_2 * D_2_3 + BB;
+    BB = fi_3 * D_3_3 + BB;
+    double d_tau = -0.5 * BB * new_y * new_y;
+
+    new_py = new_py - 4 * c3 * POW3(new_y);
+    d_tau = d_tau + c3 * POW4(new_y) / POW2(rel_p) * time_fac;
 
-//     LocalParticle_set_x(part, new_x);
-//     LocalParticle_set_y(part, new_y);
-//     LocalParticle_set_py(part, new_py);
-//     LocalParticle_set_zeta(part, new_el / rvv);
-// }
+    LocalParticle_set_x(part, new_x);
+    LocalParticle_set_y(part, new_y);
+    LocalParticle_set_py(part, new_py);
+    LocalParticle_add_to_zeta(part, -d_tau * beta0); // PTC uses tau = ct
+}
+#endif // XTRACK_FRINGE_FROM_PTC
 
 
 // The following is derived from https://cds.cern.ch/record/2857004

{xtrack-0.38.0 → xtrack-0.38.2}/xtrack/beam_elements/elements_src/track_thick_cfd.h

@@ -9,6 +9,8 @@
 #define POW2(X) ((X)*(X))
 #define NONZERO(X) ((X) != 0.0)
 
+// From madx: https://github.com/MethodicalAcceleratorDesign/MAD-X/blob/8695bd422dc403a01aa185e9fea16603bbd5b3e1/src/trrun.f90#L4320
+
 /*gpufun*/
 void track_thick_cfd(
         LocalParticle* part,  // LocalParticle to track
@@ -29,12 +31,11 @@ void track_thick_cfd(
     const double px = LocalParticle_get_px(part);
     const double py = LocalParticle_get_py(part);
     const double pt = LocalParticle_get_ptau(part);
+    const double rvv = LocalParticle_get_rvv(part);
 
-    const double beti = 1.0 / (LocalParticle_get_rvv(part) * beta0);
     // In MAD-X (delta + 1) is computed:
     // const double delta_plus_1 = sqrt(pt*pt + 2.0*pt*beti + 1.0);
     const double delta_plus_1 = LocalParticle_get_delta(part) + 1;
-    const double bet = delta_plus_1 / (beti + pt);
 
     const double k0 = k0_ / delta_plus_1;
     const double k1 = k1_ / delta_plus_1;
@@ -127,13 +128,14 @@ void track_thick_cfd(
     else {
         length_ += 0.5 * POW2(D) * length;
     }
-    z_ = length * beti - length_ / bet;
+
+    const double dzeta = length - length_ / rvv;
 
     LocalParticle_set_x(part, x_);
     LocalParticle_set_px(part, px_);
     LocalParticle_set_y(part, y_);
     LocalParticle_set_py(part, py_);
-    LocalParticle_add_to_zeta(part, z_ * beta0);
+    LocalParticle_add_to_zeta(part, dzeta);
     LocalParticle_add_to_s(part, length);
 }
 

xtrack-0.38.2/xtrack/beam_elements/elements_src/zetashift.h

@@ -0,0 +1,26 @@
+// copyright ############################### //
+// This file is part of the Xtrack Package.  //
+// Copyright (c) CERN, 2021.                 //
+// ######################################### //
+
+#ifndef XTRACK_ZETASHIFT_H
+#define XTRACK_ZETASHIFT_H
+
+/*gpufun*/
+void ZetaShift_track_local_particle(ZetaShiftData el, LocalParticle* part0){
+
+
+    double dzeta = ZetaShiftData_get_dzeta(el);
+    #ifdef XSUITE_BACKTRACK
+        dzeta = -dzeta;
+    #endif
+
+    //start_per_particle_block (part0->part)
+
+        LocalParticle_add_to_zeta(part, -dzeta);
+
+    //end_per_particle_block
+
+}
+
+#endif

{xtrack-0.38.0 → xtrack-0.38.2}/xtrack/line.py

@@ -2334,7 +2334,7 @@ class Line:
         for name, element in self.element_dict.items():
             if _is_simple_quadrupole(element):
                 fast_quad = beam_elements.SimpleThinQuadrupole(
-                    knl=element.knl,
+                    knl=element.knl[:2],
                     _context=element._context,
                 )
                 self.element_dict[name] = fast_quad
@@ -2350,7 +2350,7 @@ class Line:
         for name, element in self.element_dict.items():
             if _is_simple_dipole(element):
                 fast_di = beam_elements.SimpleThinBend(
-                    knl=element.knl,
+                    knl=element.knl[:1],
                     hxl=element.hxl,
                     length=element.length,
                     _context=element._context,

{xtrack-0.38.0 → xtrack-0.38.2}/xtrack/mad_loader.py

@@ -1413,11 +1413,9 @@ class MadLoader:
         el_transverse = self.Builder(
             ee.name, self.classes.XYShift, dx=ee.dx, dy=ee.dy
         )
-        dzeta = ee.ds*self.sequence.beam.beta
-        el_longitudinal = self.Builder(
-            ee.name, self.classes.ZetaShift, dzeta=dzeta
-        )
+        if ee.ds:
+            raise NotImplementedError # Need to implement ShiftS element
         ee.dx = 0
         ee.dy = 0
         ee.ds = 0
-        return self.make_compound_elem([el_transverse,el_longitudinal], ee)
+        return self.make_compound_elem([el_transverse], ee)

{xtrack-0.38.0 → xtrack-0.38.2}/xtrack/match.py

@@ -152,6 +152,9 @@ class TargetInequality(Target):
         self.ineq_sign = ineq_sign
         self.rhs = rhs
 
+    def __repr__(self):
+        return f'TargetInequality({self.tar} {self.ineq_sign} {self.rhs}, tol={self.tol}, weight={self.weight})'
+
     def eval(self, tw):
         val = super().eval(tw)
         if self.ineq_sign == '<' and val < self.rhs:

{xtrack-0.38.0 → xtrack-0.38.2/xtrack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtrack
-Version: 0.38.0
+Version: 0.38.2
 Summary: Tracking library for particle accelerators
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xtrack

xtrack-0.38.0/xtrack/_version.py

@@ -1 +0,0 @@
-__version__ = '0.38.0'

xtrack-0.38.0/xtrack/beam_elements/elements_src/zetashift.h

@@ -1,42 +0,0 @@
-// copyright ############################### //
-// This file is part of the Xtrack Package.  //
-// Copyright (c) CERN, 2021.                 //
-// ######################################### //
-
-#ifndef XTRACK_ZETASHIFT_H
-#define XTRACK_ZETASHIFT_H
-
-/*gpufun*/
-void ZetaShift_track_local_particle(ZetaShiftData el, LocalParticle* part0){
-
-
-    double dzeta = ZetaShiftData_get_dzeta(el);
-    #ifdef XSUITE_BACKTRACK
-        dzeta = -dzeta;
-    #endif
-
-    //start_per_particle_block (part0->part)
-
-        double const beta0 = LocalParticle_get_beta0(part);
-        double const beta = LocalParticle_get_rvv(part)*beta0;
-    	double const x  = LocalParticle_get_x(part);
-    	double const y  = LocalParticle_get_y(part);
-    	double const px = LocalParticle_get_px(part);
-    	double const py = LocalParticle_get_py(part);
-    	double const zeta = LocalParticle_get_zeta(part);
-    	double const pt = LocalParticle_get_pzeta(part)*beta0;
-
-        double pz = sqrt(1.0 + 2.0*pt/beta + pt*pt - px*px - py*py);
-        double x_hat = x + dzeta*px/pz;
-        double y_hat = y + dzeta*py/pz;
-        double zeta_hat = zeta - dzeta*(1.0/beta+pt)/pz;
-
-    	LocalParticle_set_x(part, x_hat);
-    	LocalParticle_set_y(part, y_hat);
-        LocalParticle_set_zeta(part,zeta_hat);
-
-    //end_per_particle_block
-
-}
-
-#endif