xcoll 0.5.0__tar.gz → 0.5.2__tar.gz

{xcoll-0.5.0 → xcoll-0.5.2}/PKG-INFO

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

{xcoll-0.5.0 → xcoll-0.5.2}/pyproject.toml

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

{xcoll-0.5.0 → xcoll-0.5.2}/xcoll/beam_elements/__init__.py

@@ -10,7 +10,8 @@ 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)
+                      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))
@@ -18,7 +19,7 @@ collimator_classes = tuple(v for v in globals().values()
 crystal_classes = tuple(v for v in globals().values()
                         if isinstance(v, type) and issubclass(v, BaseCrystal) and v != BaseCrystal)
 
-element_classes = block_classes + collimator_classes + (BlowUp, EmittanceMonitor)
+element_classes = block_classes + (BlowUp, EmittanceMonitor)
 
 _all_collimator_classes = collimator_classes
 _all_crystal_classes    = crystal_classes

{xcoll-0.5.0 → xcoll-0.5.2}/xcoll/beam_elements/base.py

@@ -629,7 +629,7 @@ class BaseCollimator(BaseBlock):
             raise ValueError("When using `twiss`, need to provide the name as well.")
         else:
             tw_up   = twiss.rows[name]
-            tw_down = twiss.rows[twiss.mask[[name]]+1]
+            tw_down = twiss.rows[twiss.rows.indices[[name]]+1]
         if not np.isclose(tw_up.s[0] + self.length, tw_down.s[0]):
             raise ValueError(f"Downstream twiss not compatible with length {self.length}m.")
         self._optics = {

{xcoll-0.5.0 → xcoll-0.5.2}/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.0'
+__version__ = '0.5.2'
 # ======================

{xcoll-0.5.0 → xcoll-0.5.2}/xcoll/initial_distribution.py

@@ -61,13 +61,13 @@ def generate_pencil_on_collimator(line, name, num_particles, *, side='+-', penci
     if is_converging:
         # pencil at front of jaw
         match_at_s = s_front
-        sigma = beam_sizes.rows[name:f'{name}%%1'][f'sigma_{plane}'][0]
-        sigma_transv = beam_sizes.rows[name:f'{name}%%1'][f'sigma_{transv_plane}'][0]
+        sigma = beam_sizes.rows[name:f'{name}>>1'][f'sigma_{plane}'][0]
+        sigma_transv = beam_sizes.rows[name:f'{name}>>1'][f'sigma_{transv_plane}'][0]
     else:
         # pencil at back of jaw
         match_at_s = s_back
-        sigma = beam_sizes.rows[name:f'{name}%%1'][f'sigma_{plane}'][1]
-        sigma_transv = beam_sizes.rows[name:f'{name}%%1'][f'sigma_{transv_plane}'][1]
+        sigma = beam_sizes.rows[name:f'{name}>>1'][f'sigma_{plane}'][1]
+        sigma_transv = beam_sizes.rows[name:f'{name}>>1'][f'sigma_{transv_plane}'][1]
     dr_sigmas = pencil_spread/sigma
 
     # Generate 4D coordinates
@@ -157,7 +157,7 @@ def generate_delta_from_dispersion(line, at_element, *, plane, position_mm, nemi
         twiss = line.twiss()
 
     beam_sizes = twiss.get_beam_covariance(nemitt_x=nemitt_x, nemitt_y=nemitt_y)
-    beam_sizes = beam_sizes.rows[at_element:f'{at_element}%%1'][f'sigma_{plane}']
+    beam_sizes = beam_sizes.rows[at_element:f'{at_element}>>1'][f'sigma_{plane}']
     sigma = beam_sizes[0] if match_at_front else beam_sizes[1]
     delta  = (position_mm - betatron_cut*sigma - twiss.rows[at_element][plane])
     delta /= twiss.rows[at_element][f'd{plane}']

{xcoll-0.5.0 → xcoll-0.5.2}/xcoll/interaction_record/interaction_record.py

@@ -264,7 +264,7 @@ class InteractionRecord(xt.BeamElement):
 
 
 def _get_xcoll_elements(line=None, elements=None, names=None):
-    from xcoll import element_classes
+    from xcoll.beam_elements import block_classes
     if names is not None and names is not False and \
     (not hasattr(names, '__iter__') or isinstance(names, str)):
         names = [names]
@@ -278,7 +278,7 @@ def _get_xcoll_elements(line=None, elements=None, names=None):
         if elements is not None and elements is not False:
             raise ValueError("Cannot provide both line and elements!")
         if names is None or names is True:
-            elements, names = line.get_elements_of_type(element_classes)
+            elements, names = line.get_elements_of_type(block_classes)
             if len(names) == 0:
                 raise ValueError("No Xcoll elements in line!")
         elif names is False:
@@ -291,7 +291,7 @@ def _get_xcoll_elements(line=None, elements=None, names=None):
                     raise ValueError(f"Element {name} not found in line!")
             elements = [line[name] for name in names]
     for idx, element in enumerate(elements):
-        if not isinstance(element, element_classes):
+        if not isinstance(element, block_classes):
             name = name[idx] if names is not None else element.__class__.__name__
             raise ValueError(f"Element {name} not an Xcoll element!")
     return elements, names

{xcoll-0.5.0 → xcoll-0.5.2}/xcoll/line_tools.py

@@ -26,9 +26,9 @@ def get_optics_at(names, *, twiss=None, line=None):
         twiss = line.twiss()
     if not hasattr(names, '__iter__') and not isinstance(names, str):
         names = [names]
-    coll_entry_mask = twiss.mask[names]
-    tw_entry = twiss.rows[coll_entry_mask]
-    tw_exit = twiss.rows[coll_entry_mask+1]
+    coll_entry_indices = twiss.rows.indices[names]
+    tw_entry = twiss.rows[coll_entry_indices]
+    tw_exit = twiss.rows[coll_entry_indices+1]
     tw_exit.name = tw_entry.name
     return tw_entry, tw_exit