xcoll 0.5.7__tar.gz → 0.5.8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xcoll
-Version: 0.5.7
+Version: 0.5.8
 Summary: Xsuite collimation package
 Home-page: https://github.com/xsuite/xcoll
 License: Apache 2.0

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

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

{xcoll-0.5.7 → xcoll-0.5.8}/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);

{xcoll-0.5.7 → xcoll-0.5.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.5.7'
+__version__ = '0.5.8'
 # ======================

{xcoll-0.5.7 → xcoll-0.5.8}/xcoll/interaction_record/interaction_record.py

@@ -238,14 +238,14 @@ class InteractionRecord(xt.BeamElement):
                     'int':  [shortcuts[inter] for inter in self._inter[mask]],
                     'pid':  self.id_before[mask]
                 })
-            return df.groupby('pid', sort=False)['int'].agg(list)
+            return df.groupby('pid', sort=False, group_keys=False)['int'].agg(list)
         else:
             df = pd.DataFrame({
                     'int':   [shortcuts[inter] for inter in self._inter[mask]],
                     'turn':  self.at_turn[mask],
                     'pid':   self.id_before[mask]
                 })
-            return df.groupby(['pid', 'turn'], sort=False)['int'].apply(list)
+            return df.groupby(['pid', 'turn'], sort=False, group_keys=False)['int'].apply(list)
 
     def first_touch_per_turn(self, frame=None):
         n_rows = self._index.num_recorded
@@ -253,7 +253,8 @@ class InteractionRecord(xt.BeamElement):
                            'at_turn': self.at_turn[:n_rows],
                            'at_element': self.at_element[:n_rows]})
         mask = np.char.startswith(self.interaction_type[:n_rows], 'Enter Jaw')
-        idx_first = [group.at_element.idxmin() for _, group in df[mask].groupby(['at_turn', 'id_before'], sort=False)]
+        idx_first = [group.at_element.idxmin() for _, group in df[mask].groupby(
+                        ['at_turn', 'id_before'], sort=False, group_keys=False)]
         df_first = self.to_pandas(frame=frame).loc[idx_first]
         df_first.insert(2, "jaw", df_first.interaction_type.astype(str).str[-1])
         to_drop = ['interaction_type',

xcoll-0.5.7/xcoll/beam_elements/__init__.py.orig

@@ -1,34 +0,0 @@
-# copyright ############################### #
-# This file is part of the Xcoll package.   #
-# Copyright (c) CERN, 2024.                 #
-# ######################################### #
-
-from .base import BaseBlock, BaseCollimator, BaseCrystal
-from .absorber import BlackAbsorber, BlackCrystal
-from .everest import EverestBlock, EverestCollimator, EverestCrystal
-from .blowup import BlowUp
-from .monitor import EmittanceMonitor
-
-block_classes = tuple(v for v in globals().values()
-                      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 + (BlowUp, EmittanceMonitor)
-
-<<<<<<< HEAD
-# These should not go into any of the classes lists
-from .k2 import _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