xtrack 0.48.2__tar.gz → 0.50.0__tar.gz

{xtrack-0.48.2/xtrack.egg-info → xtrack-0.50.0}/PKG-INFO

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

{xtrack-0.48.2 → xtrack-0.50.0}/ducktrack/elements.py

@@ -636,10 +636,10 @@ class LinearTransferMatrix(Element):
         ("Q_s","","",0.0),
         ("chroma_x","","",0.0),
         ("chroma_y","","",0.0),
-        ("detx_x","","",0.0),
-        ("detx_y","","",0.0),
-        ("dety_y","","",0.0),
-        ("dety_x","","",0.0),
+        ("det_xx","","",0.0),
+        ("det_xy","","",0.0),
+        ("det_yy","","",0.0),
+        ("det_yx","","",0.0),
         ("energy_ref_increment","","",0.0),
         ("energy_increment","","",0.0),
         ("x_ref_0","","",0.0),
@@ -694,10 +694,10 @@ class LinearTransferMatrix(Element):
                 (1.0 + self.alpha_y_0*self.alpha_y_0)/self.beta_y_0 * p.y*p.y
                 + 2*self.alpha_y_0 * p.y*p.py
                 + self.beta_y_0 * p.py*p.py)
-        phase = 2*np.pi*(self.Q_x+self.chroma_x*p.delta+self.detx_x*J_x+self.detx_y*J_y)
+        phase = 2*np.pi*(self.Q_x+self.chroma_x*p.delta+self.det_xx*J_x+self.det_xy*J_y)
         cos_x = cos(phase)
         sin_x = sin(phase)
-        phase = 2*np.pi*(self.Q_y+self.chroma_y*p.delta+self.dety_y*J_y+self.dety_x*J_x)
+        phase = 2*np.pi*(self.Q_y+self.chroma_y*p.delta+self.det_yy*J_y+self.det_yx*J_x)
         cos_y = cos(phase)
         sin_y = sin(phase)
 

{xtrack-0.48.2 → xtrack-0.50.0}/setup.py

@@ -41,12 +41,13 @@ setup(
     include_package_data=True,
     install_requires=[
         'numpy>=1.0',
+        "pandas>=2.0",
         'scipy',
         'xobjects',
         'xpart',
         'xdeps'
         ],
     extras_require={
-        'tests': ['cpymad', 'PyHEADTAIL', 'pytest', 'pytest-mock'],
+        'tests': ['cpymad', 'NAFFlib', 'PyHEADTAIL', 'pytest', 'pytest-mock'],
         },
     )

{xtrack-0.48.2 → xtrack-0.50.0}/xtrack/__init__.py

@@ -36,15 +36,14 @@ from .footprint import Footprint, LinearRescale
 # Flags and test functions
 from .line import _is_drift, _behaves_like_drift, _is_aperture, _is_thick, _allow_backtrack
 from .line import _lines_equal, _apertures_equal
+
+from .slicing import Strategy, Uniform, Teapot
 from .loss_location_refinement import _skip_in_loss_location_refinement
 
-from xdeps import Table
+from xdeps import Table, FunctionPieceWiseLinear
 
 from ._version import __version__
 
-from xpart import Particles, PROTON_MASS_EV, ELECTRON_MASS_EV
+from xpart import(Particles, PROTON_MASS_EV, ELECTRON_MASS_EV,
+                  enable_pyheadtail_interface, disable_pyheadtail_interface)
 
-def enable_pyheadtail_interface(*args, **kwargs):
-    raise ValueError(
-    "\n`xtrack.enable_pyheadtail_interface` not available anymore,"
-    "\nplease use `xpart.enable_pyheadtail_interface`")

{xtrack-0.48.2 → xtrack-0.50.0}/xtrack/_temp/lhc_match/lhc_match.py

@@ -41,21 +41,21 @@ def get_arc_periodic_solution(collider, line_name=None, arc_name=None):
     line = collider[line_name]
 
     twinit_cell = line.twiss(
-                ele_start=start_cell,
-                ele_stop=end_cell,
-                twiss_init='periodic',
+                start=start_cell,
+                end=end_cell,
+                init='periodic',
                 only_twiss_init=True)
 
     tw_to_end_arc = line.twiss(
-        ele_start=twinit_cell.element_name,
-        ele_stop=end_arc,
-        twiss_init=twinit_cell,
+        start=twinit_cell.element_name,
+        end=end_arc,
+        init=twinit_cell,
         )
 
     tw_to_start_arc = line.twiss(
-        ele_start=start_arc,
-        ele_stop=twinit_cell.element_name,
-        twiss_init=twinit_cell)
+        start=start_arc,
+        end=twinit_cell.element_name,
+        init=twinit_cell)
 
     res = xt.TwissTable.concatenate([tw_to_start_arc, tw_to_end_arc])
     res['mux'] = res['mux'] - res['mux', start_arc]
@@ -162,7 +162,7 @@ def compute_ats_phase_advances_for_auxiliary_irs(line_name,
 
 def propagate_optics_from_beta_star(collider, ip_name, line_name,
                                     beta_star_x, beta_star_y,
-                                    ele_start, ele_stop):
+                                    start, end):
 
     assert collider.lhcb1.twiss_default.get('reverse', False) is False
     assert collider.lhcb2.twiss_default['reverse'] is True
@@ -178,13 +178,13 @@ def propagate_optics_from_beta_star(collider, ip_name, line_name,
         ele_stop_left = ip_name
         ele_start_right = ip_name
 
-    tw_left = collider[line_name].twiss(ele_start=ele_start, ele_stop=ele_stop_left,
-                    twiss_init=xt.TwissInit(line=collider[line_name],
+    tw_left = collider[line_name].twiss(start=start, end=ele_stop_left,
+                    init=xt.TwissInit(line=collider[line_name],
                                             element_name=ele_stop_left,
                                             betx=beta_star_x,
                                             bety=beta_star_y))
-    tw_right = collider[line_name].twiss(ele_start=ele_start_right, ele_stop=ele_stop,
-                        twiss_init=xt.TwissInit(line=collider[line_name],
+    tw_right = collider[line_name].twiss(start=ele_start_right, end=end,
+                        init=xt.TwissInit(line=collider[line_name],
                                                 element_name=ele_start_right,
                                                 betx=beta_star_x,
                                                 bety=beta_star_y))
@@ -384,9 +384,9 @@ def rematch_ir2(collider, line_name,
     opt = collider[f'lhc{bn}'].match(
         solve=False,
         default_tol=default_tol,
-        ele_start=f's.ds.l2.{bn}', ele_stop=f'e.ds.r2.{bn}',
+        start=f's.ds.l2.{bn}', end=f'e.ds.r2.{bn}',
         # Left boundary
-        twiss_init='preserve_start', table_for_twiss_init=boundary_conditions_left,
+        init=boundary_conditions_left, init_at=xt.START,
         targets=[
             xt.TargetSet(at=xt.END,
                     tars=('betx', 'bety', 'alfx', 'alfy', 'dx', 'dpx'),
@@ -444,8 +444,8 @@ def rematch_ir3(collider, line_name,
     opt = collider[f'lhc{bn}'].match(
         solve=False,
         default_tol=default_tol,
-        ele_start=f's.ds.l3.{bn}', ele_stop=f'e.ds.r3.{bn}',
-        twiss_init='preserve_start', table_for_twiss_init=boundary_conditions_left,
+        start=f's.ds.l3.{bn}', end=f'e.ds.r3.{bn}',
+        init=boundary_conditions_left, init_at=xt.START,
         targets=[
             xt.TargetSet(at='ip3',
                     alfx=alfx_ip3, alfy=alfy_ip3, betx=betx_ip3, bety=bety_ip3,
@@ -491,8 +491,8 @@ def rematch_ir4(collider, line_name,
     opt = collider[f'lhc{bn}'].match(
         solve=False,
         default_tol=default_tol,
-        ele_start=f's.ds.l4.{bn}', ele_stop=f'e.ds.r4.{bn}',
-        twiss_init='preserve_start', table_for_twiss_init=boundary_conditions_left,
+        start=f's.ds.l4.{bn}', end=f'e.ds.r4.{bn}',
+        init=boundary_conditions_left, init_at=xt.START,
         targets=[
             xt.TargetSet(at='ip4',
                     alfx=alfx_ip4, alfy=alfy_ip4, betx=betx_ip4, bety=bety_ip4,
@@ -540,9 +540,9 @@ def rematch_ir6(collider, line_name,
     opt = collider[f'lhc{bn}'].match(
         solve=False,
         default_tol=default_tol,
-        ele_start=f's.ds.l6.{bn}', ele_stop=f'e.ds.r6.{bn}',
+        start=f's.ds.l6.{bn}', end=f'e.ds.r6.{bn}',
         # Left boundary
-        twiss_init='preserve_start', table_for_twiss_init=boundary_conditions_left,
+        init=boundary_conditions_left, init_at=xt.START,
         targets=[
             xt.TargetSet(at='ip6',
                     alfx=alfx_ip6, alfy=alfy_ip6, betx=betx_ip6, bety=bety_ip6,
@@ -583,9 +583,9 @@ def rematch_ir7(collider, line_name,
     opt = collider[f'lhc{bn}'].match(
         solve=False,
         default_tol=default_tol,
-        ele_start=f's.ds.l7.{bn}', ele_stop=f'e.ds.r7.{bn}',
+        start=f's.ds.l7.{bn}', end=f'e.ds.r7.{bn}',
         # Left boundary
-        twiss_init='preserve_start', table_for_twiss_init=boundary_conditions_left,
+        init=boundary_conditions_left, init_at=xt.START,
         targets=[
             xt.TargetSet(at='ip7',
                     alfx=alfx_ip7, alfy=alfy_ip7, betx=betx_ip7, bety=bety_ip7,
@@ -633,9 +633,9 @@ def rematch_ir8(collider, line_name,
     opt = collider[f'lhc{bn}'].match(
         solve=False,
         default_tol=default_tol,
-        ele_start=f's.ds.l8.{bn}', ele_stop=f'e.ds.r8.{bn}',
+        start=f's.ds.l8.{bn}', end=f'e.ds.r8.{bn}',
         # Left boundary
-        twiss_init='preserve_start', table_for_twiss_init=boundary_conditions_left,
+        init=boundary_conditions_left, init_at=xt.START,
         targets=[
             xt.TargetSet(at='ip8',
                     alfx=alfx_ip8, alfy=alfy_ip8, betx=betx_ip8, bety=bety_ip8,
@@ -709,12 +709,12 @@ def match_orbit_knobs_ip2_ip8(collider):
     ]
 
     bump_range_ip2 = {
-        'ele_start': ['s.ds.l2.b1', 's.ds.l2.b2'],
-        'ele_stop': ['e.ds.r2.b1', 'e.ds.r2.b2'],
+        'start': ['s.ds.l2.b1', 's.ds.l2.b2'],
+        'end': ['e.ds.r2.b1', 'e.ds.r2.b2'],
     }
     bump_range_ip8 = {
-        'ele_start': ['s.ds.l8.b1', 's.ds.l8.b2'],
-        'ele_stop': ['e.ds.r8.b1', 'e.ds.r8.b2'],
+        'start': ['s.ds.l8.b1', 's.ds.l8.b2'],
+        'end': ['e.ds.r8.b1', 'e.ds.r8.b2'],
     }
 
     correctors_ir2_single_beam_h = [
@@ -760,7 +760,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip2', y=offset_match, py=0),
         ]),
         vary=xt.VaryList(correctors_ir2_single_beam_v),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
     opt_o2v.solve()
     opt_o2v.generate_knob()
@@ -774,7 +774,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip2', x=offset_match, px=0),
         ]),
         vary=xt.VaryList(correctors_ir2_single_beam_h),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
     opt_o2h.solve()
     opt_o2h.generate_knob()
@@ -788,7 +788,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip8', y=offset_match, py=0),
         ]),
         vary=xt.VaryList(correctors_ir8_single_beam_v),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
     opt_o8v.solve()
     opt_o8v.generate_knob()
@@ -802,7 +802,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip8', x=offset_match, px=0),
         ]),
         vary=xt.VaryList(correctors_ir8_single_beam_h),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
     opt_o8h.solve()
     opt_o8h.generate_knob()
@@ -822,7 +822,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip2', x=0, px=ang_offset_match),
         ]),
         vary=xt.VaryList(correctors_ir2_single_beam_h),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
 
     opt_a2h.solve()
@@ -837,7 +837,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip2', y=0, py=ang_offset_match),
         ]),
         vary=xt.VaryList(correctors_ir2_single_beam_v),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
 
     opt_a2v.solve()
@@ -852,7 +852,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip8', x=0, px=ang_offset_match),
         ]),
         vary=xt.VaryList(correctors_ir8_single_beam_h),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
 
     opt_a8h.solve()
@@ -867,7 +867,7 @@ def match_orbit_knobs_ip2_ip8(collider):
             xt.TargetSet(line='lhcb2', at='ip8', y=0, py=ang_offset_match),
         ]),
         vary=xt.VaryList(correctors_ir8_single_beam_v),
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
 
     opt_a8v.solve()
@@ -891,7 +891,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir2_single_beam_h),
             xt.VaryList(correctors_ir2_common_h, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
     # Set mcbx by hand
     testkqx2=abs(collider.varval['kqx.l2'])*7000./0.3
@@ -915,7 +915,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir2_single_beam_v),
             xt.VaryList(correctors_ir2_common_v, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
     # Set mcbx by hand
     testkqx2=abs(collider.varval['kqx.l2'])*7000./0.3
@@ -939,7 +939,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir8_single_beam_h),
             xt.VaryList(correctors_ir8_common_h, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
 
     # Set mcbx by hand (reduce value by 10, to test matching algorithm)
@@ -985,7 +985,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir8_single_beam_v),
             xt.VaryList(correctors_ir8_common_v, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
 
     # Set mcbx by hand
@@ -1022,7 +1022,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir2_single_beam_h),
             xt.VaryList(correctors_ir2_common_h, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
 
     # Set mcbx by hand
@@ -1049,7 +1049,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir2_single_beam_v),
             xt.VaryList(correctors_ir2_common_v, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip2,
+        run=False, init=twinit_zero_orbit, **bump_range_ip2,
     )
 
     # Set mcbx by hand
@@ -1076,7 +1076,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir8_single_beam_h),
             xt.VaryList(correctors_ir8_common_h, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
 
     # Set mcbx by hand
@@ -1103,7 +1103,7 @@ def match_orbit_knobs_ip2_ip8(collider):
         vary=[
             xt.VaryList(correctors_ir8_single_beam_v),
             xt.VaryList(correctors_ir8_common_v, tag='mcbx')],
-        run=False, twiss_init=twinit_zero_orbit, **bump_range_ip8,
+        run=False, init=twinit_zero_orbit, **bump_range_ip8,
     )
 
     # Set mcbx by hand

xtrack-0.50.0/xtrack/_version.py

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