xtrack 0.56.1__tar.gz → 0.57.0__tar.gz

{xtrack-0.56.1 → xtrack-0.57.0}/PKG-INFO

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

{xtrack-0.56.1 → xtrack-0.57.0}/ducktrack/base_classes.py

@@ -76,7 +76,8 @@ class Base(metaclass=_MetaElement):
     def from_dict(cls, dct, keepextra=True):
         self = cls()
         for kk in cls._base_fields:
-            setattr(self, kk, dct[kk])
+            if kk in dct:
+                setattr(self, kk, dct[kk])
         if keepextra:
             for kk in cls._extra_fields:
                 if kk in dct:

{xtrack-0.56.1 → xtrack-0.57.0}/ducktrack/be_beamfields/beambeam.py

@@ -51,9 +51,9 @@ class BeamBeam4D(Element):
     def from_dict(cls, dct):
         if 'other_beam_Sigma_11' in dct.keys():
             # Comes from xfields
-            assert dct['other_beam_Sigma_13'] == 0
-            assert dct['ref_shift_x'] == 0
-            assert dct['ref_shift_y'] == 0
+            assert dct.get('other_beam_Sigma_13', 0) == 0
+            assert dct.get('ref_shift_x', 0) == 0
+            assert dct.get('ref_shift_y', 0) == 0
 
             kwargs = {
             "charge": dct["other_beam_q0"]*dct['other_beam_num_particles'],

{xtrack-0.56.1 → xtrack-0.57.0}/tests/test_acceleration.py

@@ -64,7 +64,7 @@ def test_energy_program(test_context):
     t_s = t_s
 
     # Load mad model and apply element shifts
-    mad = Madx()
+    mad = Madx(stdout=False)
     mad.call(str(test_data_folder / 'psb_chicane/psb.seq'))
     mad.call(str(test_data_folder / 'psb_chicane/psb_fb_lhc.str'))
     mad.input('''

{xtrack-0.56.1 → xtrack-0.57.0}/tests/test_apertures.py

@@ -120,7 +120,7 @@ def test_mad_import():
 
     from cpymad.madx import Madx
 
-    mad = Madx()
+    mad = Madx(stdout=False)
 
     mad.input("""
         m_circle: marker, apertype="circle", aperture={.2};
@@ -249,3 +249,41 @@ def test_longitudinal_rect(test_context):
     aper_rect_longitudinal.track(particles)
     particles.move(_context=xo.ContextCpu())
     assert np.all(particles.state == -2)
+
+@for_all_test_contexts
+def test_aper_tilt(test_context):
+
+    n_part=300000
+
+    particles = xt.Particles(_context=test_context,
+            p0c=6500e9,
+            x=np.random.uniform(-0.25, 0.25, n_part),
+            px = np.zeros(n_part),
+            y=np.random.uniform(0, 0.1, n_part),
+            py = np.zeros(n_part))
+
+    tilt_deg = 10.
+    aper = xt.LimitRect(_context=test_context,
+                        min_x=-.1,
+                        max_x=.1,
+                        min_y=-0.001,
+                        max_y=0.001,
+                        shift_x=0.08,
+                        shift_y=0.04,
+                        rot_s_rad=np.deg2rad(tilt_deg))
+
+    aper.track(particles)
+
+    part_id = test_context.nparray_from_context_array(particles.particle_id)
+    part_state = test_context.nparray_from_context_array(particles.state)
+    part_x = test_context.nparray_from_context_array(particles.x)
+    part_y = test_context.nparray_from_context_array(particles.y)
+
+    x_alive = part_x[part_state>0]
+    y_alive = part_y[part_state>0]
+
+    assert_allclose = np.testing.assert_allclose
+    assert_allclose(np.mean(x_alive), 0.08, rtol=5e-2, atol=0)
+    assert_allclose(np.mean(y_alive), 0.04, rtol=5e-2, atol=0)
+    slope = np.polyfit(x_alive, y_alive, 1)[0]
+    assert_allclose(slope, np.tan(np.deg2rad(tilt_deg)), rtol=5e-2, atol=0)