Release/0.97.0

examples/element_internal_record/000_internal_record.py

@@ -36,20 +36,22 @@ class TestElementRecord(xo.HybridClass):
 # element number.
 
 track_method_source = r'''
-/*gpufun*/
-void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
+#include "xtrack/headers/track.h"
 
+GPUFUN
+void TestElement_track_local_particle(TestElementData el, LocalParticle* part0)
+{
     // Extract the record and record_index
     TestElementRecordData record = TestElementData_getp_internal_record(el, part0);
     RecordIndex record_index = NULL;
-    if (record){
+    if (record) {
         record_index = TestElementRecordData_getp__index(record);
     }
 
     int64_t n_kicks = TestElementData_get_n_kicks(el);
     printf("n_kicks %d\n", (int)n_kicks);
 
-    //start_per_particle_block (part0->part)
+    START_PER_PARTICLE_BLOCK(part0, part);
 
         for (int64_t i = 0; i < n_kicks; i++) {
             double rr = 1e-6 * RandomUniform_generate(part);
@@ -72,8 +74,7 @@ class TestElementRecord(xo.HybridClass):
             }
         }
 
-
-    //end_per_particle_block
+    END_PER_PARTICLE_BLOCK;
 }
 '''
 

examples/element_internal_record/001_multirecord.py

@@ -41,7 +41,9 @@ class TestElementRecord(xo.HybridClass):
 # code of the beam element.
 
 TestElement_track_method_source = r'''
-    /*gpufun*/
+    #include "xtrack/headers/track.h"
+
+    GPUFUN
     void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
 
         // Extract the record and record_index
@@ -60,7 +62,7 @@ class TestElementRecord(xo.HybridClass):
         int64_t n_kicks = TestElementData_get_n_kicks(el);
         printf("n_kicks %d\n", (int)n_kicks);
 
-        //start_per_particle_block (part0->part)
+        START_PER_PARTICLE_BLOCK(part0, part);
 
             // Record in table1 info about the ingoing particle
             if (record){
@@ -106,7 +108,7 @@ class TestElementRecord(xo.HybridClass):
                 }
             }
 
-        //end_per_particle_block
+        END_PER_PARTICLE_BLOCK;
     }
     '''
 

examples/element_internal_record/002_record_in_individual_element.py

@@ -40,7 +40,9 @@ class TestElementRecord(xo.HybridClass):
 # code of the beam element.
 
 TestElement_track_method_source = r'''
-    /*gpufun*/
+    #include "xtrack/headers/track.h"
+
+    GPUFUN
     void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
 
         // Extract the record and record_index
@@ -59,7 +61,7 @@ class TestElementRecord(xo.HybridClass):
         int64_t n_kicks = TestElementData_get_n_kicks(el);
         // printf("n_kicks %d\n", (int)n_kicks);
 
-        //start_per_particle_block (part0->part)
+        START_PER_PARTICLE_BLOCK(part0, part);
 
             // Record in table1 info about the ingoing particle
             if (record){
@@ -105,7 +107,7 @@ class TestElementRecord(xo.HybridClass):
                 }
             }
 
-        //end_per_particle_block
+        END_PER_PARTICLE_BLOCK;
     }
     '''
 

examples/random_number_generator/001_usage_in_beam_element.py

@@ -27,12 +27,15 @@ class TestElement(xt.BeamElement):
 
     _extra_c_sources = [
         '''
-        /*gpufun*/
-        void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
-            //start_per_particle_block (part0->part)
+        #include "xtrack/headers/track.h"
+
+        GPUFUN
+        void TestElement_track_local_particle(TestElementData el, LocalParticle* part0)
+        {
+            START_PER_PARTICLE_BLOCK(part0, part);
                 double rr = !!GENERATOR!!_generate(part);
                 LocalParticle_set_x(part, rr);
-            //end_per_particle_block
+            END_PER_PARTICLE_BLOCK;
         }
         '''.replace('!!GENERATOR!!', generator_to_test)
         ]

examples/spin_lep/chirp_kicker.py

@@ -19,22 +19,22 @@ class VerticalChirpKicker(xt.BeamElement):
 
     _extra_c_sources =['''
 
-        #include <headers/track.h>
-        #include <beam_elements/elements_src/track_magnet.h>
+        #include "xtrack/headers/track.h"
+        #include "xtrack/beam_elements/elements_src/track_magnet.h"
 
-        /*gpufun*/
+        GPUFUN
         void VerticalChirpKicker_track_local_particle(
-                VerticalChirpKickerData el, LocalParticle* part0){
-
+                VerticalChirpKickerData el, LocalParticle* part0)
+        {
             double const k0sl = VerticalChirpKickerData_get_k0sl(el);
             double const q_start = VerticalChirpKickerData_get_q_start(el);
             double const q_end = q_start + VerticalChirpKickerData_get_q_span(el);
             double const num_turns = VerticalChirpKickerData_get_num_turns(el);
             double const length = VerticalChirpKickerData_get_length(el);
 
-            //start_per_particle_block (part0->part)
+            START_PER_PARTICLE_BLOCK(part0, part);
                 double const at_turn = LocalParticle_get_at_turn(part);
-                if (at_turn < num_turns){
+                if (at_turn < num_turns) {
                     // integrating to get the instantaneous phase
                     double const phi = 2 * PI * q_start * at_turn
                        + PI * (q_end - q_start) / ((double) num_turns) * ((double) at_turn * at_turn);
@@ -60,9 +60,9 @@ class VerticalChirpKicker(xt.BeamElement):
                         0, // frame curvature
                         length,
                         length // lpath - same for a thin element
-                       );
-                    #endif
+                    );
+                #endif
                 }
-            //end_per_particle_block
+            END_PER_PARTICLE_BLOCK;
         }
         ''']

examples/true_rbend/000a_check_edge_full.py

@@ -12,14 +12,15 @@
 l_ref = xt.Line([b_ref])
 l_ref.append('end', xt.Marker())
 l_ref.particle_ref = xt.Particles(p0c=10e9)
-tw_ref0 = l_ref.twiss(betx=1, bety=1)
+tw_ref0 = l_ref.twiss(betx=1, bety=1, strengths=True)
 tw_ref = l_ref.twiss(betx=1, bety=1, x=2e-3, px=1e-3, y=2e-3, py=2e-3, delta=1e-3)
 
 b_test = xt.RBend(
     angle=0.1, k0_from_h=True, length_straight=3)
 b_test.rbend_model = 'straight-body'
 b_test.model = 'bend-kick-bend'
 b_test.num_multipole_kicks = 100
+b_test.rbend_compensate_sagitta = True
 b_test.edge_entry_model = edge_model
 b_test.edge_exit_model = edge_model
 l_test = xt.Line([b_test])

examples/true_rbend/000c_check_edge_full_angle._diff.py

@@ -0,0 +1,72 @@
+import xtrack as xt
+import numpy as np
+import xobjects as xo
+
+edge_model = 'full'
+
+b_ref = xt.RBend(angle=0.1, k0_from_h=True, length_straight=3., rbend_angle_diff=0.1)
+b_ref.edge_entry_model = edge_model
+b_ref.edge_exit_model = edge_model
+b_ref.model = 'rot-kick-rot'
+b_ref.num_multipole_kicks = 100
+l_ref = xt.Line([b_ref])
+l_ref.append('end', xt.Marker())
+l_ref.particle_ref = xt.Particles(p0c=10e9)
+tw_ref0 = l_ref.twiss(betx=1, bety=1, strengths=True)
+tw_ref = l_ref.twiss(betx=1, bety=1, x=2e-3, px=1e-3, y=2e-3, py=2e-3, delta=1e-3)
+
+b_test = xt.RBend(
+    angle=0.1, k0_from_h=True, length_straight=3, rbend_angle_diff=0.1,
+    rbend_shift=0, rbend_compensate_sagitta=False)
+b_test.rbend_model = 'straight-body'
+b_test.model = 'bend-kick-bend'
+b_test.num_multipole_kicks = 100
+b_test.edge_entry_model = edge_model
+b_test.edge_exit_model = edge_model
+
+b_test.rbend_shift += b_test._x0_in
+
+l_test = xt.Line([b_test])
+l_test.append('end', xt.Marker())
+l_test.particle_ref = xt.Particles(p0c=10e9)
+tw_test0 = l_test.twiss(betx=1, bety=1)
+tw_test = l_test.twiss(betx=1, bety=1, x=2e-3, px=1e-3, y=2e-3, py=2e-3, delta=1e-3)
+
+xo.assert_allclose(tw_ref0.betx, tw_test0.betx, rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_ref0.bety, tw_test0.bety, rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_ref0.x,    tw_test0.x, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.y,    tw_test0.y, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.s,    tw_test0.s, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.zeta, tw_test0.zeta, rtol=0, atol=1e-11)
+xo.assert_allclose(tw_ref0.px,   tw_test0.px, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.py,   tw_test0.py, rtol=0, atol=1e-12)
+
+xo.assert_allclose(tw_ref.betx, tw_test.betx, rtol=5e-9, atol=0.0)
+xo.assert_allclose(tw_ref.bety, tw_test.bety, rtol=5e-9, atol=0.0)
+xo.assert_allclose(tw_ref.x,    tw_test.x, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref.y,    tw_test.y, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref.s,    tw_test.s, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref.zeta, tw_test.zeta, rtol=0, atol=1e-1)
+xo.assert_allclose(tw_ref.px,   tw_test.px, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref.py,   tw_test.py, rtol=0, atol=1e-12)
+
+l_sliced = l_test.copy(shallow=True)
+l_sliced.cut_at_s(np.linspace(0, l_test.get_length(), 100))
+tw_test_sliced0 = l_sliced.twiss(betx=1, bety=1)
+
+xo.assert_allclose(tw_test_sliced0.betx[-1], tw_test0.betx[-1], rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_test_sliced0.bety[-1], tw_test0.bety[-1], rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_test_sliced0.x[-1],    tw_test0.x[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.y[-1],    tw_test0.y[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.s[-1],    tw_test0.s[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.zeta[-1], tw_test0.zeta[-1], rtol=0, atol=1e-11)
+xo.assert_allclose(tw_test_sliced0.px[-1],   tw_test0.px[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.py[-1],   tw_test0.py[-1], rtol=0, atol=1e-12)
+
+import matplotlib.pyplot as plt
+plt.close('all')
+
+tw_test_sliced0.plot('x')
+plt.xlim(-0.1, 3.1)
+
+plt.show()

examples/true_rbend/000d_check_edge_linear_angle_diff.py

@@ -0,0 +1,96 @@
+import xtrack as xt
+import numpy as np
+import xobjects as xo
+
+edge_model = 'linear'
+
+b_ref = xt.RBend(angle=0.1, k0_from_h=True, length_straight=3., rbend_angle_diff=0.1)
+b_ref.edge_entry_model = edge_model
+b_ref.edge_exit_model = edge_model
+b_ref.model = 'rot-kick-rot'
+b_ref.num_multipole_kicks = 100
+l_ref = xt.Line([b_ref])
+l_ref.append('end', xt.Marker())
+l_ref.particle_ref = xt.Particles(p0c=10e9)
+tw_ref0 = l_ref.twiss(betx=1, bety=1)
+tw_ref = l_ref.twiss(betx=1, bety=1, x=2e-3, px=1e-3, y=2e-3, py=2e-3, delta=1e-3)
+
+b_test = xt.RBend(
+    angle=0.1, k0_from_h=True, length_straight=3, rbend_angle_diff=0.1,
+    rbend_shift=0, rbend_compensate_sagitta=False)
+b_test.rbend_model = 'straight-body'
+b_test.model = 'bend-kick-bend'
+b_test.num_multipole_kicks = 100
+b_test.edge_entry_model = edge_model
+b_test.edge_exit_model = edge_model
+
+b_test.rbend_shift += b_test._x0_in
+
+l_test = xt.Line([b_test])
+l_test.append('end', xt.Marker())
+l_test.particle_ref = xt.Particles(p0c=10e9)
+tw_test0 = l_test.twiss(betx=1, bety=1)
+tw_test = l_test.twiss(betx=1, bety=1, x=2e-3, px=1e-3, y=2e-3, py=2e-3, delta=1e-3)
+
+xo.assert_allclose(tw_ref0.betx, tw_test0.betx, rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_ref0.bety, tw_test0.bety, rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_ref0.x,    tw_test0.x, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.y,    tw_test0.y, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.s,    tw_test0.s, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.zeta, tw_test0.zeta, rtol=0, atol=1e-11)
+xo.assert_allclose(tw_ref0.px,   tw_test0.px, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_ref0.py,   tw_test0.py, rtol=0, atol=1e-12)
+
+xo.assert_allclose(tw_ref.betx, tw_test.betx, rtol=5e-6, atol=0.0)
+xo.assert_allclose(tw_ref.bety, tw_test.bety, rtol=5e-6, atol=0.0)
+xo.assert_allclose(tw_ref.x,    tw_test.x, rtol=0, atol=2e-8)
+xo.assert_allclose(tw_ref.y,    tw_test.y, rtol=0, atol=2e-8)
+xo.assert_allclose(tw_ref.s,    tw_test.s, rtol=0, atol=2e-12)
+xo.assert_allclose(tw_ref.zeta, tw_test.zeta, rtol=0, atol=1e-1)
+xo.assert_allclose(tw_ref.px,   tw_test.px, rtol=0, atol=5e-9)
+xo.assert_allclose(tw_ref.py,   tw_test.py, rtol=0, atol=5e-9)
+
+tw_back = l_test.twiss(init=tw_test, init_at='end')
+
+assert tw_back.orientation == 'backward'
+xo.assert_allclose(tw_back.betx, tw_test.betx, rtol=5e-6, atol=0.0)
+xo.assert_allclose(tw_back.bety, tw_test.bety, rtol=5e-6, atol=0.0)
+xo.assert_allclose(tw_back.x,    tw_test.x, rtol=0, atol=1e-8)
+xo.assert_allclose(tw_back.y,    tw_test.y, rtol=0, atol=1e-8)
+xo.assert_allclose(tw_back.s,    tw_test.s, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_back.zeta, tw_test.zeta, rtol=0, atol=1e-1)
+xo.assert_allclose(tw_back.px,   tw_test.px, rtol=0, atol=1e-9)
+xo.assert_allclose(tw_back.py,   tw_test.py, rtol=0, atol=1e-9)
+
+l_sliced = l_test.copy(shallow=True)
+l_sliced.cut_at_s(np.linspace(0, l_test.get_length(), 100))
+tw_test_sliced0 = l_sliced.twiss(betx=1, bety=1)
+
+xo.assert_allclose(tw_test_sliced0.betx[-1], tw_test0.betx[-1], rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_test_sliced0.bety[-1], tw_test0.bety[-1], rtol=1e-9, atol=0.0)
+xo.assert_allclose(tw_test_sliced0.x[-1],    tw_test0.x[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.y[-1],    tw_test0.y[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.s[-1],    tw_test0.s[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.zeta[-1], tw_test0.zeta[-1], rtol=0, atol=1e-11)
+xo.assert_allclose(tw_test_sliced0.px[-1],   tw_test0.px[-1], rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced0.py[-1],   tw_test0.py[-1], rtol=0, atol=1e-12)
+
+tw_test_sliced_back = l_sliced.twiss(init=tw_test_sliced0, init_at='end')
+
+assert tw_test_sliced_back.orientation == 'backward'
+xo.assert_allclose(tw_test_sliced_back.betx, tw_test_sliced0.betx, rtol=5e-9, atol=0.0)
+xo.assert_allclose(tw_test_sliced_back.bety, tw_test_sliced0.bety, rtol=5e-9, atol=0.0)
+xo.assert_allclose(tw_test_sliced_back.x,    tw_test_sliced0.x, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced_back.y,    tw_test_sliced0.y, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced_back.s,    tw_test_sliced0.s, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced_back.zeta, tw_test_sliced0.zeta, rtol=0, atol=1e-11)
+xo.assert_allclose(tw_test_sliced_back.px,   tw_test_sliced0.px, rtol=0, atol=1e-12)
+xo.assert_allclose(tw_test_sliced_back.py,   tw_test_sliced0.py, rtol=0, atol=1e-12)
+
+import matplotlib.pyplot as plt
+plt.close('all')
+
+tw_test_sliced0.plot('x')
+plt.xlim(-0.1, 3.1)
+
+plt.show()