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

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/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/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.dist-info → xcoll-0.6.8.dist-info}/METADATA

@@ -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.dist-info → xcoll-0.6.8.dist-info}/RECORD

@@ -10,16 +10,13 @@ xcoll/beam_elements/elements_src/emittance_monitor.h,sha256=vlHzQFoUjKQHWBmzpaSz
 xcoll/beam_elements/elements_src/everest_block.h,sha256=ITSzfiqwm8ZNIkAj_odQkAjKhPcdT8b0AUlq_uxtsqI,6562
 xcoll/beam_elements/elements_src/everest_collimator.h,sha256=fkD5GazVv2zlmqyb6s9zVNMq6baXeFb_pf7gg9TKjNc,9787
 xcoll/beam_elements/elements_src/everest_crystal.h,sha256=LISp_9NEWMIi5GvZ3LwPfeSbmsbXvHWcTqxW6eCCsiE,11951
-xcoll/beam_elements/elements_src/rf_sweep.h,sha256=eTPPSJvFrkoh9STI0hmmiozwMUL-TQVhz1mOZQhObWE,846
 xcoll/beam_elements/elements_src/transparent_collimator.h,sha256=pA_Fxx85N87iSbpHSjR2OSOx6JN9e38T1pOUKrC7zxs,4610
 xcoll/beam_elements/elements_src/transparent_crystal.h,sha256=DGX4uL0hpm4njOypoPuEWtMzYxnL9jQkf2ZrGaS0alI,4128
 xcoll/beam_elements/everest.py,sha256=iJva_S0OQnmG-qj7rIAiUCssu5WL_Qs5P_n6Qx-IWzo,9080
 xcoll/beam_elements/monitor.py,sha256=baMYT_PNya8KX35ReeMwk5Cm04ePUqiDF_s69L5GTX0,16968
-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=gBV-L5-jNV6jp-GHZBorNQ5sTKxbqKEZ4svcBweWyzA,534
-xcoll/geometry.md,sha256=AARDOk5lZWFBAllX75UYMRywSYSB04FIlYWE0ra1t5c,1623
+xcoll/colldb.py,sha256=4QwvWH-KYTa6xyaVS7Y8S473T6RHXOER8B2xZjeNahI,31213
+xcoll/general.py,sha256=GNj4NRQunkW8IlcM2w6l5kqCSHn5yGE3RhKPbKdAZEs,534
 xcoll/headers/checks.h,sha256=qdXsOTBOK1MwW6bdFF93j4yE648mcDtEv5rGN1w9sfk,1582
 xcoll/headers/particle_states.py,sha256=N8ehLtg99358I4RGCJ3sjuKCk2LVdGqgVx2xGoHrRdM,1959
 xcoll/initial_distribution.py,sha256=CHhqeCVjVOyaBWhfy2sDgLwIgtXZoqcTW-su-M2YByE,10989
@@ -28,7 +25,7 @@ xcoll/interaction_record/interaction_record.py,sha256=cCjfVCYUJaV0Y-pCljA2_u8GLy
 xcoll/interaction_record/interaction_record_src/interaction_record.h,sha256=0rNagnfSGc2i1jauOMIcDbj9QFic9dV_MOyqVx1kw5Q,6067
 xcoll/interaction_record/interaction_types.py,sha256=XTeg2dcImMpqhTqzkJKh6JYam2v9gUMhED-dDKLsilk,2894
 xcoll/line_tools.py,sha256=JBySkKKZ-RGumqAZF_8PSQ3OV0M87P78NeQgbXAdFc4,16699
-xcoll/lossmap.py,sha256=HLdhej9tUjk36T5BulVWurJtfiNa61L_1X7-8kT6JoQ,28407
+xcoll/lossmap.py,sha256=f2kMb0Md-F9rD7Ef0jQRAIjHArk6W0gE8v1koRL_T-U,28452
 xcoll/plot.py,sha256=27fYdXstPg3o8XyeBlPuD2yz0GR3dKkNWy4kO2BD9WA,4071
 xcoll/prebuilt_kernel_definitions/__init__.py,sha256=Dju9g0ME0F8FpFUZREyiEcd8rVyQqIro8_8LKqegTtk,291
 xcoll/prebuilt_kernel_definitions/element_inits.py,sha256=9Qm34JXN7F08inWzXP6g6DU57ypRbyqHYwPK9Oc9BC4,219
@@ -60,9 +57,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.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-0.6.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+xcoll-0.6.8.dist-info/METADATA,sha256=Vd4tt248o0zu1dCk3dxdO1FGuU8_7cNtVf3K8vVrRcQ,2953
+xcoll-0.6.8.dist-info/NOTICE,sha256=6DO_E7WCdRKc42vUoVVBPGttvQi4mRt9fAcxj9u8zy8,74
+xcoll-0.6.8.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+xcoll-0.6.8.dist-info/entry_points.txt,sha256=fC9oojAU6WjKujnGBodo7ZcEeBGfSfeLPO5287echdY,26
+xcoll-0.6.8.dist-info/RECORD,,

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/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