xtrack 0.88.5__tar.gz → 0.88.6__tar.gz

{xtrack-0.88.5/xtrack.egg-info → xtrack-0.88.6}/PKG-INFO

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

xtrack-0.88.6/xtrack/_version.py

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

{xtrack-0.88.5 → xtrack-0.88.6}/xtrack/base_element.py

@@ -341,21 +341,26 @@ class MetaBeamElement(xo.MetaHybridClass):
 
         data_in = data.copy()
         data = {}
-        is_old_thing = False
-        for bb in bases: # Patch to support old-style "beam element" inheritance used in xcoll
-            if bb.__name__ != 'BeamElement' and'BeamElement' in set(cc.__name__ for cc in bb.__mro__):
-                is_old_thing = True
-                break
-        if not is_old_thing: # Presently we assume that none of the parents is inheriting from BeamElement
-            for bb in bases:
-                if bb.__name__ == 'HybridClass':
+        for bb in bases:
+            if bb.__name__ == 'HybridClass':
+                continue
+            if bb.__name__ == 'BeamElement':
+                continue
+            for kk, vv in bb.__dict__.items():
+                if kk.startswith('__') or kk in data_in.keys():
                     continue
-                if bb.__name__ == 'BeamElement':
-                    continue
-                for kk, vv in bb.__dict__.items():
-                    if kk.startswith('__') or kk in data_in.keys():
-                        continue
-                    data[kk] = vv
+                data[kk] = vv
+
+        # If inheriting _extra_c_sources, remove get_record function
+        if '_extra_c_sources' in data:
+            ii_remove = None
+            for ii, ss in enumerate(data['_extra_c_sources']):
+                if isinstance(ss, str) and '/*---GENERATED GET RECORD FUNCTION---*/' in ss:
+                   ii_remove = ii
+                   break
+            if ii_remove is not None:
+                data['_extra_c_sources'].pop(ii_remove)
+
         data.update(data_in)
 
         # Take xofields from data['_xofields'] or from bases

{xtrack-0.88.5 → xtrack-0.88.6}/xtrack/internal_record.py

@@ -198,6 +198,7 @@ def stop_internal_logging_for_elements_of_type(tracker, element_type):
 
 def generate_get_record(ele_classname, record_classname):
     content = '''
+/*---GENERATED GET RECORD FUNCTION---*/
 /*gpufun*/
 RECORDCLASSNAME ELECLASSNAME_getp_internal_record(ELECLASSNAME el, LocalParticle* part){
     RecordIdentifier record_id = ELECLASSNAME_getp__internal_record_id(el);

{xtrack-0.88.5 → xtrack-0.88.6/xtrack.egg-info}/PKG-INFO

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

xtrack-0.88.5/xtrack/_version.py

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