xcoll 0.6.5__py3-none-any.whl → 0.6.6__py3-none-any.whl

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.5'
+__version__ = '0.6.6'
 # ======================

{xcoll-0.6.5.dist-info → xcoll-0.6.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xcoll
-Version: 0.6.5
+Version: 0.6.6
 Summary: Xsuite collimation package
 License: Apache-2.0
 Author: Frederik F. Van der Veken
@@ -20,9 +20,9 @@ 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: xobjects (>=0.5.2)
+Requires-Dist: xobjects (>=0.5.3)
 Requires-Dist: xpart (>=0.23.1)
-Requires-Dist: xtrack (>=0.90.1)
+Requires-Dist: xtrack (>=0.90.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.5.dist-info → xcoll-0.6.6.dist-info}/RECORD

@@ -18,8 +18,7 @@ xcoll/beam_elements/monitor.py,sha256=baMYT_PNya8KX35ReeMwk5Cm04ePUqiDF_s69L5GTX
 xcoll/beam_elements/sweep.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xcoll/beam_elements/transparent.py,sha256=AZOWfH3dvsetL6DjQGejUgX7T18e_3omIIffG_1gwc0,2894
 xcoll/colldb.py,sha256=WaJC6gkDNVvxo65OhucTM6Fwo6pgRFHNnBnHSkiX7AQ,31054
-xcoll/general.py,sha256=RyE6HAGBJF0DRK5n4X3-2o4fbRQwBZIV-LRjUo5-n8A,534
-xcoll/general.py.orig,sha256=vIx4LhKIwbjcC8cyk6wtxrjuihDEF1THgzwb7_dpgJU,609
+xcoll/general.py,sha256=gBV-L5-jNV6jp-GHZBorNQ5sTKxbqKEZ4svcBweWyzA,534
 xcoll/geometry.md,sha256=AARDOk5lZWFBAllX75UYMRywSYSB04FIlYWE0ra1t5c,1623
 xcoll/headers/checks.h,sha256=qdXsOTBOK1MwW6bdFF93j4yE648mcDtEv5rGN1w9sfk,1582
 xcoll/headers/particle_states.py,sha256=N8ehLtg99358I4RGCJ3sjuKCk2LVdGqgVx2xGoHrRdM,1959
@@ -61,9 +60,9 @@ xcoll/scattering_routines/geometry/rotation.h,sha256=lO3RaQBys9r0ROMjR8T8Rr7UsIE
 xcoll/scattering_routines/geometry/segments.h,sha256=7nKnnin2ByxkKyaYwGvFaqgLQg5uBba4CdLHL7L3iQs,7667
 xcoll/scattering_routines/geometry/sort.h,sha256=b1MkFO2ddzv1fWGeQzsLuz46qo2pKyRSXHjoAEVU7Ts,5763
 xcoll/xaux.py,sha256=mh4E_jhaUFm2LOKawJ0b6X4zuz8JiJhx6w7GcnRgIXQ,2291
-xcoll-0.6.5.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-xcoll-0.6.5.dist-info/METADATA,sha256=3HdRmdvs2oyskur291fR-oZf2lbRZAIRoX6fNyY0iuA,2953
-xcoll-0.6.5.dist-info/NOTICE,sha256=6DO_E7WCdRKc42vUoVVBPGttvQi4mRt9fAcxj9u8zy8,74
-xcoll-0.6.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-xcoll-0.6.5.dist-info/entry_points.txt,sha256=fC9oojAU6WjKujnGBodo7ZcEeBGfSfeLPO5287echdY,26
-xcoll-0.6.5.dist-info/RECORD,,
+xcoll-0.6.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+xcoll-0.6.6.dist-info/METADATA,sha256=iMC5LKFX-eIW1dep7AnMhdSb_oOl8weeWYZARokc08w,2953
+xcoll-0.6.6.dist-info/NOTICE,sha256=6DO_E7WCdRKc42vUoVVBPGttvQi4mRt9fAcxj9u8zy8,74
+xcoll-0.6.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+xcoll-0.6.6.dist-info/entry_points.txt,sha256=fC9oojAU6WjKujnGBodo7ZcEeBGfSfeLPO5287echdY,26
+xcoll-0.6.6.dist-info/RECORD,,

xcoll/general.py.orig

@@ -1,21 +0,0 @@
-# copyright ############################### #
-# This file is part of the Xcoll package.   #
-# Copyright (c) CERN, 2025.                 #
-# ######################################### #
-
-from pathlib import Path
-
-_pkg_root = Path(__file__).parent.absolute()
-
-citation  = "F.F. Van der Veken, et al.: Recent Developments with the New Tools for Collimation "
-citation += "Simulations in Xsuite, Proceedings of HB2023, Geneva, Switzerland."
-
-# ======================
-# Do not change
-# ======================
-<<<<<<< HEAD
-__version__ = '0.7.0rc0'
-=======
-__version__ = '0.6.4'
->>>>>>> main
-# ======================