Merge pull request #162 from xsuite/release/v0.6.8

Release 0.6.8

Author: freddieknets

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xcoll"
-version = "0.6.7"
+version = "0.6.8"
 description = "Xsuite collimation package"
 authors = [
     {name="Frederik F. Van der Veken", email="[email protected]"},
@@ -23,9 +23,9 @@ dependencies = [
     "numpy>=1.0",
     "pandas>=1.4",
     "xobjects>=0.5.3",
-    "xdeps>=0.10.6",
+    "xdeps>=0.10.7",
     "xpart>=0.23.1",
-    "xtrack>=0.93.0",
+    "xtrack>=0.93.2",
 ]
 
 [project.optional-dependencies]
@@ -46,7 +46,7 @@ exclude = ["xcoll/lib", "xcoll/config"]
 
 [poetry.group.dev.dependencies]
 pytest = ">=7.3"
-xaux = ">=0.3.7"
+xaux = ">=0.3.8"
 
 [build-system]
 # Needed for pip install -e (BTW: need pip version 22)

tests/test_version.py

@@ -6,4 +6,4 @@
 from xcoll import __version__
 
 def test_version():
-    assert __version__ == '0.6.7'
+    assert __version__ == '0.6.8'

xcoll/general.py

@@ -12,5 +12,5 @@
 # ======================
 # Do not change
 # ======================
-__version__ = '0.6.7'
+__version__ = '0.6.8'
 # ======================

xcoll/lossmap.py

@@ -254,7 +254,8 @@ def _correct_absorbed(self, part, line, verbose=True):
                     prev_elem = len(line.element_names) - 1
                 else:
                     prev_elem = elem - 1
-                if line.element_names[prev_elem] in coll_elements:
+                if line.element_names[prev_elem] in coll_elements \
+                and line[prev_elem].active:
                     if verbose:
                         print(f"Found at {line.element_names[elem]}, "
                             + f"moved to {line.element_names[elem-1]}")