xcoll 0.6.7__tar.gz → 0.6.8__tar.gz

{xcoll-0.6.7 → xcoll-0.6.8}/PKG-INFO

@@ -1,10 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: xcoll
-Version: 0.6.7
+Version: 0.6.8
 Summary: Xsuite collimation package
 License: Apache-2.0
-License-File: LICENSE
-License-File: NOTICE
 Author: Frederik F. Van der Veken
 Author-email: frederik@cern.ch
 Requires-Python: >=3.10
@@ -14,7 +12,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: tests
 Requires-Dist: numpy (>=1.0)
 Requires-Dist: pandas (>=1.4)
@@ -22,10 +19,10 @@ Requires-Dist: pytest ; extra == "tests"
 Requires-Dist: pytest-html ; extra == "tests"
 Requires-Dist: pytest-xdist ; extra == "tests"
 Requires-Dist: ruamel-yaml (>=0.17.31,<0.18.15)
-Requires-Dist: xdeps (>=0.10.6)
+Requires-Dist: xdeps (>=0.10.7)
 Requires-Dist: xobjects (>=0.5.3)
 Requires-Dist: xpart (>=0.23.1)
-Requires-Dist: xtrack (>=0.93.0)
+Requires-Dist: xtrack (>=0.93.2)
 Project-URL: Bug Tracker, https://github.com/xsuite/xsuite/issues
 Project-URL: Documentation, https://xsuite.readthedocs.io/
 Project-URL: Homepage, https://github.com/xsuite/xcoll

{xcoll-0.6.7 → xcoll-0.6.8}/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="frederik@cern.ch"},
@@ -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)

{xcoll-0.6.7 → xcoll-0.6.8}/xcoll/general.py

@@ -12,5 +12,5 @@ citation = "F.F. Van der Veken, et al.: Recent Developments with the New Tools f
 # ======================
 # Do not change
 # ======================
-__version__ = '0.6.7'
+__version__ = '0.6.8'
 # ======================

{xcoll-0.6.7 → xcoll-0.6.8}/xcoll/lossmap.py

@@ -254,7 +254,8 @@ class LossMap:
                     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]}")