Merge branch 'release/v0.50.1' of github.com:xsuite/xtrack into relea…

…se/v0.50.1

xtrack/base_element.py

@@ -17,20 +17,20 @@
 
 start_per_part_block = """
     {
-    const int64_t start_idx = part0->ipart; //only_for_context cpu_openmp
-    const int64_t end_idx = part0->endpart; //only_for_context cpu_openmp
+    const int64_t XT_part_block_start_idx = part0->ipart; //only_for_context cpu_openmp
+    const int64_t XT_part_block_end_idx = part0->endpart; //only_for_context cpu_openmp
 
-    const int64_t start_idx = 0;                                            //only_for_context cpu_serial
-    const int64_t end_idx = LocalParticle_get__num_active_particles(part0); //only_for_context cpu_serial
+    const int64_t XT_part_block_start_idx = 0;                                            //only_for_context cpu_serial
+    const int64_t XT_part_block_end_idx = LocalParticle_get__num_active_particles(part0); //only_for_context cpu_serial
 
     //#pragma omp simd // TODO: currently does not work, needs investigating
-    for (int64_t ii=start_idx; ii<end_idx; ii++) { //only_for_context cpu_openmp cpu_serial
+    for (int64_t XT_part_block_ii=XT_part_block_start_idx; XT_part_block_ii<XT_part_block_end_idx; XT_part_block_ii++) { //only_for_context cpu_openmp cpu_serial
 
-        LocalParticle lpart = *part0;  //only_for_context cpu_serial cpu_openmp
-        LocalParticle* part = &lpart;  //only_for_context cpu_serial cpu_openmp
-        part->ipart = ii;              //only_for_context cpu_serial cpu_openmp
+        LocalParticle lpart = *part0;    //only_for_context cpu_serial cpu_openmp
+        LocalParticle* part = &lpart;    //only_for_context cpu_serial cpu_openmp
+        part->ipart = XT_part_block_ii;  //only_for_context cpu_serial cpu_openmp
 
-        LocalParticle* part = part0;   //only_for_context opencl cuda
+        LocalParticle* part = part0;     //only_for_context opencl cuda
 
         if (LocalParticle_get_state(part) > 0) {  //only_for_context cpu_openmp
 """

xtrack/tracker.py

@@ -1486,14 +1486,18 @@ def _element_classes_from_track_kernel(kernel):
 
 def _element_ref_data_class_from_element_classes(element_classes):
 
-    # exctrace XoStruct if needed
+    # extract XoStruct if needed
     element_classes_xostruct = []
     for cc in element_classes:
         if issubclass(cc, xo.Struct):
             element_classes_xostruct.append(cc)
         else:
             element_classes_xostruct.append(cc._XoStruct)
 
+    # We sort the element classes by name for consistency
+    # This is needed for reproducibility in Xboinc
+    element_classes_xostruct = sorted(element_classes_xostruct, key=lambda s: s._DressingClass.__name__)
+
     class ElementRefClass(xo.UnionRef):
         _reftypes = element_classes_xostruct