Merge pull request #96 from xsuite/release/v0.5.1

Release 0.5.1

Author: freddieknets

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xcoll"
-version = "0.5.0"
+version = "0.5.1"
 description = "Xsuite collimation package"
 homepage = "https://github.com/xsuite/xcoll"
 repository = "https://github.com/xsuite/xcoll"

tests/test_version.py

@@ -6,5 +6,5 @@
 from xcoll import __version__
 
 def test_version():
-    assert __version__ == '0.5.0'
+    assert __version__ == '0.5.1'
 

xcoll/beam_elements/__init__.py

@@ -10,15 +10,16 @@
 from .monitor import EmittanceMonitor
 
 block_classes = tuple(v for v in globals().values()
-                      if isinstance(v, type) and issubclass(v, BaseBlock) and v != BaseBlock)
+                      if isinstance(v, type) and issubclass(v, BaseBlock) and v != BaseBlock
+                      and v != BaseCollimator and v != BaseCrystal)
 # Includes crystals
 collimator_classes = tuple(v for v in globals().values()
                            if isinstance(v, type) and (issubclass(v, BaseCollimator) or issubclass(v, BaseCrystal))
                            and v != BaseCollimator and v != BaseCrystal)
 crystal_classes = tuple(v for v in globals().values()
                         if isinstance(v, type) and issubclass(v, BaseCrystal) and v != BaseCrystal)
 
-element_classes = block_classes + collimator_classes + (BlowUp, EmittanceMonitor)
+element_classes = block_classes + (BlowUp, EmittanceMonitor)
 
 _all_collimator_classes = collimator_classes
 _all_crystal_classes    = crystal_classes

xcoll/general.py

@@ -12,5 +12,5 @@
 # ======================
 # Do not change
 # ======================
-__version__ = '0.5.0'
+__version__ = '0.5.1'
 # ======================

xcoll/interaction_record/interaction_record.py

@@ -264,7 +264,7 @@ def first_touch_per_turn(self, frame=None):
 
 
 def _get_xcoll_elements(line=None, elements=None, names=None):
-    from xcoll import element_classes
+    from xcoll.beam_elements import block_classes
     if names is not None and names is not False and \
     (not hasattr(names, '__iter__') or isinstance(names, str)):
         names = [names]
@@ -278,7 +278,7 @@ def _get_xcoll_elements(line=None, elements=None, names=None):
         if elements is not None and elements is not False:
             raise ValueError("Cannot provide both line and elements!")
         if names is None or names is True:
-            elements, names = line.get_elements_of_type(element_classes)
+            elements, names = line.get_elements_of_type(block_classes)
             if len(names) == 0:
                 raise ValueError("No Xcoll elements in line!")
         elif names is False:
@@ -291,7 +291,7 @@ def _get_xcoll_elements(line=None, elements=None, names=None):
                     raise ValueError(f"Element {name} not found in line!")
             elements = [line[name] for name in names]
     for idx, element in enumerate(elements):
-        if not isinstance(element, element_classes):
+        if not isinstance(element, block_classes):
             name = name[idx] if names is not None else element.__class__.__name__
             raise ValueError(f"Element {name} not an Xcoll element!")
     return elements, names