xcoll 0.5.7__tar.gz → 0.5.9__tar.gz

{xcoll-0.5.7 → xcoll-0.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xcoll
-Version: 0.5.7
+Version: 0.5.9
 Summary: Xsuite collimation package
 Home-page: https://github.com/xsuite/xcoll
 License: Apache 2.0
@@ -18,11 +18,10 @@ Provides-Extra: tests
 Requires-Dist: numpy (>=1.0)
 Requires-Dist: pandas (>=1.4)
 Requires-Dist: ruamel-yaml (>=0.17.31,<0.18.0) ; extra == "tests"
-Requires-Dist: xdeps (>=0.1.1)
-Requires-Dist: xfields (>=0.12.1)
-Requires-Dist: xobjects (>=0.2.6)
-Requires-Dist: xpart (>=0.15.0)
-Requires-Dist: xtrack (>=0.36.5)
+Requires-Dist: xdeps (>=0.7.3)
+Requires-Dist: xobjects (>=0.4.5)
+Requires-Dist: xpart (>=0.19.1)
+Requires-Dist: xtrack (>=0.69.7)
 Project-URL: Repository, https://github.com/xsuite/xcoll
 Description-Content-Type: text/markdown
 

{xcoll-0.5.7 → xcoll-0.5.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "xcoll"
-version = "0.5.7"
+version = "0.5.9"
 description = "Xsuite collimation package"
 homepage = "https://github.com/xsuite/xcoll"
 repository = "https://github.com/xsuite/xcoll"
@@ -25,14 +25,14 @@ python = ">=3.8"
 ruamel-yaml = { version = "^0.17.31", optional = true }
 numpy = ">=1.0"
 pandas = ">=1.4"
-xobjects = ">=0.2.6"
-xdeps = ">=0.1.1"
-xpart = ">=0.15.0"
-xtrack = ">=0.36.5"
-xfields = ">=0.12.1"
+xobjects = ">=0.4.5"
+xdeps = ">=0.7.3"
+xpart = ">=0.19.1"
+xtrack = ">=0.69.7"
 
 [tool.poetry.dev-dependencies]
 pytest = ">=7.3"
+xaux = ">=0.2.1"
 
 [tool.poetry.extras]
 tests = ["pytest", "ruamel-yaml"]

{xcoll-0.5.7 → xcoll-0.5.9}/xcoll/beam_elements/__init__.py.orig

@@ -20,15 +20,13 @@ crystal_classes = tuple(v for v in globals().values()
                         if isinstance(v, type) and issubclass(v, BaseCrystal) and v != BaseCrystal)
 
 element_classes = block_classes + (BlowUp, EmittanceMonitor)
-
 <<<<<<< HEAD
+
 # These should not go into any of the classes lists
+# but are added for compatibility with _K2
 from .k2 import _K2Collimator, _K2Crystal
+_all_block_classes      = block_classes + (_K2Collimator, _K2Crystal)
 _all_collimator_classes = collimator_classes + (_K2Collimator, _K2Crystal)
 _all_crystal_classes    = crystal_classes + (_K2Crystal,)
 =======
-# For compatibility with _K2Collimators
-_all_block_classes      = block_classes
-_all_collimator_classes = collimator_classes
-_all_crystal_classes    = crystal_classes
 >>>>>>> release/v0.6.0

{xcoll-0.5.7 → xcoll-0.5.9}/xcoll/beam_elements/elements_src/everest_crystal.h

@@ -138,6 +138,7 @@ EverestCollData EverestCrystal_init(EverestCrystalData el, LocalParticle* part0,
         coll->csref[0] = CrystalMaterialData_get_cross_section(material, 0);
         coll->csref[1] = CrystalMaterialData_get_cross_section(material, 1);
         coll->csref[5] = CrystalMaterialData_get_cross_section(material, 5);
+        coll->only_mcs = CrystalMaterialData_get__only_mcs(material);
         coll->dlri     = CrystalMaterialData_get_crystal_radiation_length(material);
         coll->dlyi     = CrystalMaterialData_get_crystal_nuclear_length(material);
         coll->ai       = CrystalMaterialData_get_crystal_plane_distance(material);