xtrack 0.96.1__tar.gz → 0.97.0__tar.gz

{xtrack-0.96.1/xtrack.egg-info → xtrack-0.97.0}/PKG-INFO

@@ -1,14 +1,16 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: xtrack
-Version: 0.96.1
+Version: 0.97.0
 Summary: Tracking library for particle accelerators
-Home-page: https://xsuite.readthedocs.io/
-Download-URL: https://pypi.python.org/pypi/xtrack
 Author: G. Iadarola et al.
-License: Apache 2.0
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://xsuite.readthedocs.io/
 Project-URL: Bug Tracker, https://github.com/xsuite/xsuite/issues
 Project-URL: Documentation, https://xsuite.readthedocs.io/
 Project-URL: Source Code, https://github.com/xsuite/xtrack
+Project-URL: Download, https://pypi.python.org/pypi/xtrack
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.0
 Requires-Dist: pandas>=2.0
@@ -30,5 +32,8 @@ Provides-Extra: notebooks
 Requires-Dist: jupyter; extra == "notebooks"
 Requires-Dist: ipympl; extra == "notebooks"
 Requires-Dist: xplt; extra == "notebooks"
+Dynamic: license-file
 
-Tracking library for particle accelerators
+# xtrack
+
+Python package for tracking simulations in particle accelerators on CPU and GPU.

xtrack-0.97.0/pyproject.toml

@@ -0,0 +1,67 @@
+[build-system]
+build-backend = 'setuptools.build_meta'
+requires = [
+    'setuptools>=77.0.0',
+]
+
+[project]
+name = "xtrack"
+dynamic = ["version"]
+description = "Tracking library for particle accelerators"
+readme = "README.md"
+requires-python = ">=3.9"
+license = "Apache-2.0"
+authors = [
+  { name = "G. Iadarola et al." }
+]
+dependencies = [
+  "numpy>=1.0",
+  "pandas>=2.0",
+  "scipy",
+  "tqdm",
+  "requests",
+  "xobjects",
+  "xdeps",
+]
+
+[project.urls]
+"Homepage" = "https://xsuite.readthedocs.io/"
+"Bug Tracker" = "https://github.com/xsuite/xsuite/issues"
+"Documentation" = "https://xsuite.readthedocs.io/"
+"Source Code" = "https://github.com/xsuite/xtrack"
+"Download" = "https://pypi.python.org/pypi/xtrack"
+
+[project.optional-dependencies]
+tests = [
+  "cpymad",
+  "nafflib",
+  "PyHEADTAIL",
+  "pytest",
+  "pytest-mock",
+  "pymadng",
+  "requests-mock",
+  "tfs-pandas",
+]
+notebooks = [
+  "jupyter",
+  "ipympl",
+  "xplt"
+]
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["xtrack", "ducktrack"]
+
+[tool.setuptools.dynamic]
+version = { attr = "xtrack._version.__version__" }
+
+[tool.setuptools]
+include-package-data = true
+
+[project.entry-points.xobjects]
+include = "xtrack"
+
+[pytest]
+markers = [
+    "context_dependent: marks test as one that depends on the execution context",
+]

xtrack-0.97.0/setup.py

@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_aperture_table.py

@@ -61,9 +61,9 @@ def test_aperture_table():
     aper_check = aper.rows['veba.20250.a_aper' : 'vebb.20270.b_aper']
 
     assert np.all(aper_check.name == np.array(
-        ['veba.20250.a_aper', '||drift_979', 'mba.20250', '||drift_991',
-       'veba.20250.b_aper', '||drift_671', 'vebb.20270.a_aper',
-       '||drift_992', 'mbb.20270', '||drift_993', 'vebb.20270.b_aper']))
+        ['veba.20250.a_aper', '||drift_976', 'mba.20250', '||drift_988',
+       'veba.20250.b_aper', '||drift_668', 'vebb.20270.a_aper',
+       '||drift_989', 'mbb.20270', '||drift_990', 'vebb.20270.b_aper']))
     xo.assert_allclose(aper_check.s, np.array([
        1225.8247   , 1225.8247   , 1226.0176907, 1232.2777093,
        1232.4827   , 1232.4827   , 1232.4847   , 1232.4847   ,

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_element_internal_record.py

@@ -26,7 +26,9 @@ def test_record_single_table(test_context):
     extra_src = []
 
     extra_src.append(r'''
-        /*gpufun*/
+        #include "xtrack/headers/track.h"
+
+        GPUFUN
         void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
 
             // Extract the record and record_index
@@ -39,8 +41,7 @@ def test_record_single_table(test_context):
             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);
                     LocalParticle_add_to_px(part, rr);
@@ -61,9 +62,7 @@ def test_record_single_table(test_context):
                         }
                     }
                 }
-
-
-            //end_per_particle_block
+            END_PER_PARTICLE_BLOCK;
         }
         ''')
 
@@ -205,7 +204,9 @@ def test_record_with_twiss(test_context):
     extra_src = []
 
     extra_src.append(r'''
-        /*gpufun*/
+        #include "xtrack/headers/track.h"
+        
+        GPUFUN
         void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
 
             // Extract the record and record_index
@@ -218,8 +219,7 @@ def test_record_with_twiss(test_context):
             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++) {
                     // We don't apply the kick, otherwise the twiss fails
                     double rr = 1e-6 * RandomUniform_generate(part);
@@ -240,9 +240,7 @@ def test_record_with_twiss(test_context):
                         }
                     }
                 }
-
-
-            //end_per_particle_block
+            END_PER_PARTICLE_BLOCK;
         }
         ''')
 
@@ -308,7 +306,9 @@ def test_record_multiple_tables(test_context):
     extra_src = []
 
     extra_src.append(r'''
-        /*gpufun*/
+        #include "xtrack/headers/track.h"
+
+        GPUFUN
         void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
 
             // Extract the record and record_index
@@ -327,8 +327,7 @@ def test_record_multiple_tables(test_context):
             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){
                     // Get a slot in table1
@@ -372,8 +371,7 @@ def test_record_multiple_tables(test_context):
                         }
                     }
                 }
-
-            //end_per_particle_block
+            END_PER_PARTICLE_BLOCK;
         }
         ''')
 
@@ -565,7 +563,9 @@ def test_record_standalone_mode(test_context):
     extra_src = []
 
     extra_src.append(r'''
-        /*gpufun*/
+        #include "xtrack/headers/track.h"
+
+        GPUFUN
         void TestElement_track_local_particle(TestElementData el, LocalParticle* part0){
 
             // Extract the record and record_index
@@ -584,8 +584,7 @@ def test_record_standalone_mode(test_context):
             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){
                     // Get a slot in table1
@@ -629,8 +628,7 @@ def test_record_standalone_mode(test_context):
                         }
                     }
                 }
-
-            //end_per_particle_block
+            END_PER_PARTICLE_BLOCK;
         }
         ''')
 

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_elements.py

@@ -542,34 +542,36 @@ def test_exciter(test_context):
 
 
 test_source = r"""
-/*gpufun*/
+#include "xtrack/headers/track.h"
+
+GPUFUN
 void test_function(TestElementData el,
                 LocalParticle* part0,
-                /*gpuglmem*/ double* b){
+                GPUGLMEM double* b){
 
     double const a = TestElementData_get_a(el);
 
-    //start_per_particle_block (part0->part)
+    START_PER_PARTICLE_BLOCK(part0, part);
 
         const int64_t ipart = part->ipart;
         double const val = b[ipart];
 
         LocalParticle_add_to_s(part, val + a);
 
-    //end_per_particle_block
+    END_PER_PARTICLE_BLOCK;
 }
 
-/*gpufun*/
+GPUFUN
 void TestElement_track_local_particle(TestElementData el,
                 LocalParticle* part0){
 
     double const a = TestElementData_get_a(el);
 
-    //start_per_particle_block (part0->part)
+    START_PER_PARTICLE_BLOCK(part0, part);
 
         LocalParticle_set_s(part, a);
 
-    //end_per_particle_block
+    END_PER_PARTICLE_BLOCK;
 }
 
 """

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_environment.py

@@ -482,7 +482,7 @@ def test_assemble_ring():
                    == np.array([nn+'.cell.2' for nn in tt_cell.name[:-1]
                                 if not nn.startswith('||drift')]))
     assert np.all(tt_cell2.s == tt_cell.s)
-    tt_cell2_nodrift = tt_cell2.rows[~tt_cell2.rows.mask['\|\|drift.*']]
+    tt_cell2_nodrift = tt_cell2.rows[~tt_cell2.rows.mask[r'\|\|drift.*']]
     assert tt_cell2_nodrift.isreplica[:-1].all()
     assert tt_cell2['parent_name', 'mq.d.l.cell.2'] == 'mq.d.l'
     assert tt_cell2['parent_name', 'mq.f.l.cell.2'] == 'mq.f.l'
@@ -907,7 +907,7 @@ def test_assemble_ring_builders():
     assert np.all([nn for nn in tt_cell2.name[:-1] if not nn.startswith('||drift')]
                   == np.array([nn + '.cell.2' for nn in tt_cell.name[:-1] if not nn.startswith('||drift')]))
     assert np.all(tt_cell2.s == tt_cell.s)
-    tt_cell2_nodrift = tt_cell2.rows[~tt_cell2.rows.mask['\|\|drift.*']]
+    tt_cell2_nodrift = tt_cell2.rows[~tt_cell2.rows.mask[r'\|\|drift.*']]
     assert tt_cell2_nodrift.isreplica[:-1].all()
     assert tt_cell2['parent_name', 'mq.d.l.cell.2'] == 'mq.d.l'
     assert tt_cell2['parent_name', 'mq.f.l.cell.2'] == 'mq.f.l'

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_native_madloader_sps.py

@@ -115,5 +115,5 @@ def test_native_madloader_sps():
     xo.assert_allclose(twtest.wy_chrom[-1], twref.wy_chrom[-1], rtol=1e-4, atol=0)
     xo.assert_allclose(twtest.ax_chrom[-1], twref.ax_chrom[-1], rtol=1e-4, atol=0)
     xo.assert_allclose(twtest.ay_chrom[-1], twref.ay_chrom[-1], rtol=1e-4, atol=0)
-    xo.assert_allclose(twtest.dqx, twref.dqx, rtol=1e-4, atol=0)
-    xo.assert_allclose(twtest.dqy, twref.dqy, rtol=1e-4, atol=0)
+    xo.assert_allclose(twtest.dqx, twref.dqx, rtol=2e-4, atol=0)
+    xo.assert_allclose(twtest.dqy, twref.dqy, rtol=2e-4, atol=0)

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_particles.py

@@ -20,18 +20,19 @@ def test_check_is_active_sorting_openmp():
         }
 
         _extra_c_sources = ["""
+            #include "xtrack/headers/track.h"
             #define XT_OMP_SKIP_REORGANIZE
 
-            /*gpufun*/
+            GPUFUN
             void TestElement_track_local_particle(
                 TestElementData el,
                 LocalParticle* part0
             ) {
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     int64_t state = check_is_active(part);
                     int64_t id = LocalParticle_get_particle_id(part);
                     TestElementData_set_states(el, id, state);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
         """]
 
@@ -96,16 +97,18 @@ def test_check_is_active_sorting_cpu_default(test_context):
         }
 
         _extra_c_sources = ["""
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+
+            GPUFUN
             void TestElement_track_local_particle(
                 TestElementData el,
                 LocalParticle* part0
             ) {
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     int64_t state = check_is_active(part);
                     int64_t id = LocalParticle_get_particle_id(part);
                     TestElementData_set_states(el, id, state);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
         """]
 

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_particles_basics.py

@@ -345,14 +345,16 @@ def test_LocalParticle_add_to_energy(test_context):
             'pz_only': xo.Int64,
             }
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void TestElement_track_local_particle(
                     TestElementData el, LocalParticle* part0){
                 double const value = TestElementData_get_value(el);
                 int const pz_only = (int) TestElementData_get_pz_only(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_add_to_energy(part, value, pz_only);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -419,13 +421,15 @@ def test_LocalParticle_update_delta(test_context):
             }
 
         _extra_c_sources =['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void TestElement_track_local_particle(
                     TestElementData el, LocalParticle* part0){
                 double const value = TestElementData_get_value(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_update_delta(part, value);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -460,13 +464,15 @@ def test_LocalParticle_update_ptau(test_context):
             }
 
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void TestElement_track_local_particle(
                     TestElementData el, LocalParticle* part0){
                 double const value = TestElementData_get_value(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_update_ptau(part, value);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -500,14 +506,16 @@ def test_LocalParticle_update_pzeta(test_context):
             'value': xo.Float64,
             }
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void TestElement_track_local_particle(
                     TestElementData el, LocalParticle* part0){
                 double const value = TestElementData_get_value(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     double const pzeta = LocalParticle_get_pzeta(part);
                     LocalParticle_update_pzeta(part, pzeta+value);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -543,13 +551,15 @@ def test_LocalParticle_update_p0c(test_context):
             'value': xo.Float64,
             }
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void TestElement_track_local_particle(
                     TestElementData el, LocalParticle* part0){
                 double const value = TestElementData_get_value(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_update_p0c(part, value);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -590,18 +600,20 @@ def test_LocalParticle_angles(test_context):
             'scale_y2':  xo.Float64,
             }
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void ScaleAng_track_local_particle(
                     ScaleAngData el, LocalParticle* part0){
                 double const scale_x = ScaleAngData_get_scale_x(el);
                 double const scale_y = ScaleAngData_get_scale_y(el);
                 double const scale_x2 = ScaleAngData_get_scale_x2(el);
                 double const scale_y2 = ScaleAngData_get_scale_y2(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_scale_xp(part, scale_x);
                     LocalParticle_scale_yp(part, scale_y);
                     LocalParticle_scale_xp_yp(part, scale_x2, scale_y2);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -613,18 +625,20 @@ def test_LocalParticle_angles(test_context):
             'kick_y2': xo.Float64,
             }
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void KickAng_track_local_particle(
                     KickAngData el, LocalParticle* part0){
                 double const kick_x = KickAngData_get_kick_x(el);
                 double const kick_y = KickAngData_get_kick_y(el);
                 double const kick_x2 = KickAngData_get_kick_x2(el);
                 double const kick_y2 = KickAngData_get_kick_y2(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_add_to_xp(part, kick_x);
                     LocalParticle_add_to_yp(part, kick_y);
                     LocalParticle_add_to_xp_yp(part, kick_x2, kick_y2);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -648,18 +662,20 @@ def test_LocalParticle_angles(test_context):
             'scale_y2':  xo.Float64,
             }
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void ScaleAngExact_track_local_particle(
                     ScaleAngExactData el, LocalParticle* part0){
                 double const scale_x = ScaleAngExactData_get_scale_x(el);
                 double const scale_y = ScaleAngExactData_get_scale_y(el);
                 double const scale_x2 = ScaleAngExactData_get_scale_x2(el);
                 double const scale_y2 = ScaleAngExactData_get_scale_y2(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_scale_exact_xp(part, scale_x);
                     LocalParticle_scale_exact_yp(part, scale_y);
                     LocalParticle_scale_exact_xp_yp(part, scale_x2, scale_y2);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 
@@ -671,18 +687,20 @@ def test_LocalParticle_angles(test_context):
             'kick_y2': xo.Float64,
             }
         _extra_c_sources = ['''
-            /*gpufun*/
+            #include "xtrack/headers/track.h"
+            
+            GPUFUN
             void KickAngExact_track_local_particle(
                     KickAngExactData el, LocalParticle* part0){
                 double const kick_x = KickAngExactData_get_kick_x(el);
                 double const kick_y = KickAngExactData_get_kick_y(el);
                 double const kick_x2 = KickAngExactData_get_kick_x2(el);
                 double const kick_y2 = KickAngExactData_get_kick_y2(el);
-                //start_per_particle_block (part0->part)
+                START_PER_PARTICLE_BLOCK(part0, part);
                     LocalParticle_add_to_exact_xp(part, kick_x);
                     LocalParticle_add_to_exact_yp(part, kick_y);
                     LocalParticle_add_to_exact_xp_yp(part, kick_x2, kick_y2);
-                //end_per_particle_block
+                END_PER_PARTICLE_BLOCK;
             }
             ''']
 

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_radial_steering.py

@@ -35,7 +35,7 @@ def test_radial_steering(test_context):
 
     dzeta = tw.circumference * df_hz / f_rf
 
-    line.unfreeze()
+    line.discard_tracker()
     line.append_element(element=xt.ZetaShift(dzeta=dzeta), name='zeta_shift')
     line.build_tracker()
 

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_random_gen.py

@@ -31,13 +31,15 @@ def test_random_generation(test_context, generator):
 
         _extra_c_sources = [
             '''
-                /*gpufun*/
+                #include "xtrack/headers/track.h"
+
+                GPUFUN
                 void TestElement_track_local_particle(
                         TestElementData el, LocalParticle* part0){
-                    //start_per_particle_block (part0->part)
+                    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)
         ]

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_random_gen_exp.py

@@ -29,13 +29,15 @@ def test_random_generation(test_context):
 
         _extra_c_sources = [
             '''
-                /*gpufun*/
+                #include "xtrack/headers/track.h"
+
+                GPUFUN
                 void TestElement_track_local_particle(
                         TestElementData el, LocalParticle* part0){
-                    //start_per_particle_block (part0->part)
+                    START_PER_PARTICLE_BLOCK(part0, part);
                         double rr = RandomExponential_generate(part);
                         LocalParticle_set_x(part, rr);
-                    //end_per_particle_block
+                    END_PER_PARTICLE_BLOCK;
                 }
             '''
         ]

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_random_gen_gauss.py

@@ -28,13 +28,15 @@ def test_random_generation(test_context):
 
         _extra_c_sources = [
             '''
-                /*gpufun*/
+                #include "xtrack/headers/track.h"
+
+                GPUFUN
                 void TestElement_track_local_particle(
                         TestElementData el, LocalParticle* part0){
-                    //start_per_particle_block (part0->part)
+                    START_PER_PARTICLE_BLOCK(part0, part);
                         double rr = RandomNormal_generate(part);
                         LocalParticle_set_x(part, rr);
-                    //end_per_particle_block
+                    END_PER_PARTICLE_BLOCK;
                 }
             '''
         ]

{xtrack-0.96.1 → xtrack-0.97.0}/tests/test_random_gen_ruth.py

@@ -36,14 +36,16 @@ def test_random_generation(test_context):
 
         _extra_c_sources = [
             '''
-                /*gpufun*/
+                #include "xtrack/headers/track.h"
+                
+                GPUFUN
                 void TestElement_track_local_particle(
                         TestElementData el, LocalParticle* part0){
                     RandomRutherfordData rng = TestElementData_getp_rng(el);
-                    //start_per_particle_block (part0->part)
+                    START_PER_PARTICLE_BLOCK(part0, part);
                         double rr = RandomRutherford_generate(rng, part);
                         LocalParticle_set_x(part, rr);
-                    //end_per_particle_block
+                    END_PER_PARTICLE_BLOCK;
                 }
             '''
         ]