xcoll 0.6.6__tar.gz → 0.6.8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: xcoll
-Version: 0.6.6
+Version: 0.6.8
 Summary: Xsuite collimation package
 License: Apache-2.0
 Author: Frederik F. Van der Veken
@@ -19,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.90.2)
+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.6 → xcoll-0.6.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xcoll"
-version = "0.6.6"
+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.90.2",
+    "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.6"
+xaux = ">=0.3.8"
 
 [build-system]
 # Needed for pip install -e (BTW: need pip version 22)

{xcoll-0.6.6 → xcoll-0.6.8}/xcoll/colldb.py

@@ -36,7 +36,7 @@ def _dict_keys_to_lower(dct):
     else:
         return dct
 
-
+# TODO: need better handling of beam argument (not hardcoded 'b1' and 'b2' strings)
 def _get_coll_dct_by_beam(coll, beam):
     # The dictionary can be a CollimatorDatabase for a single beam (beam=None)
     # or for both beams (beam='b1' or beam='b2)
@@ -51,7 +51,7 @@ def _get_coll_dct_by_beam(coll, beam):
             raise ValueError("Need to specify a beam, because the given dict is for both beams!")
         return coll[beam]
 
-    elif len(beam_in_db) == 1:
+    elif len(beam_in_db) == 1 and beam_in_db[0].lower() in ['b1','b2']:
         if beam is None:
             beam = beam_in_db[0].lower()
         elif beam != beam_in_db[0].lower():
@@ -551,7 +551,8 @@ class CollimatorDatabase:
         prop_dict.update(kwargs)
         el = cls(**prop_dict)
         el.emittance = [self.nemitt_x, self.nemitt_y]
-        if 'family' in self[name] and self[name]['family'].lower() != 'unknown':
+        if 'family' in self[name] and self[name]['family'] \
+        and self[name]['family'].lower() != 'unknown':
             if self[name]['family'] == name:
                 raise ValueError(f"Collimator {name} has the same name as its family!")
             el.family = self[name]['family']

{xcoll-0.6.6 → 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.6'
+__version__ = '0.6.8'
 # ======================

{xcoll-0.6.6 → 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]}")

xcoll-0.6.6/xcoll/beam_elements/elements_src/rf_sweep.h

@@ -1,23 +0,0 @@
-// copyright ############################### #
-// This file is part of the Xcoll package.   #
-// Copyright (c) CERN, 2025.                 #
-// ######################################### #
-
-#ifndef XCOLL_RF_SWEEP_H
-#define XCOLL_RF_SWEEP_H
-
-/*gpufun*/
-void RFSweep_track_local_particle(RFSweepData el, LocalParticle* part0){
-    double  const step = RFSweepData_get__rf_sweep_df_step(el); // L*df/(f0 + df)
-    int64_t const start_turn = RFSweepData_get_start_turn(el);
-    int64_t const stop_turn = RFSweepData_get_stop_turn(el);
-
-    //start_per_particle_block (part0->part)
-        int64_t at_turn = LocalParticle_get_at_turn(part);
-        if (at_turn >= start_turn && at_turn <= stop_turn){
-            LocalParticle_add_to_zeta(part, -(at_turn - start_turn + 1)*step);
-        }
-    //end_per_particle_block
-}
-
-#endif /* XCOLL_RF_SWEEP_H */

xcoll-0.6.6/xcoll/geometry.md

@@ -1,42 +0,0 @@
-PSEUDOCODE for material interactions tracking in collimator
-===========================================================
-
-- create DriftTrajectory from particle
-- loop:
-    - find first crossing with collimator shape (segments)
-    - if distance larger than end of BeamElement -> move particle to exendit and break loop
-    - move particle to collimator impact point
-    - create MCSTrajectory from new particle
-    - loop:
-        - find first crossing with collimator shape (segments)
-        - do not move, but calculate path length
-        - compare to distance to nuclear interaction
-        - shortest wins (nuclear or exit)
-        - move to next point
-    - when at exit, create DriftTrajectory from particle
-
-
-
-PSEUDOCODE for material interactions tracking in crystal
-========================================================
-
-- create DriftTrajectory from particle
-- loop:
-    - find first crossing with crystal shape (segments)
-    - if distance larger than end of BeamElement -> move particle to end and break loop
-    - move particle to crystal impact point
-    - create MCSTrajectory (if amorphous) or CircularTrajectory (if channelling) from new particle
-    - loop:
-        - find first crossing with crystal shape (segments)
-        - do not move, but calculate path length
-        - compare to distance to nuclear interaction and dechannelling
-        - shortest wins (nuclear, dechannelling, or exit)
-        - move to next point
-    - when at exit, create DriftTrajectory from particle
-
-
-PSEUDOCODE for crossing finder
-==============================
-
-- if DriftTrajectory and any segment
-=> use analytical