xcoll 0.5.12__py3-none-any.whl → 0.6.1__py3-none-any.whl

xcoll/scattering_routines/everest/multiple_coulomb_scattering.h

@@ -107,7 +107,7 @@ double* scamcs(LocalParticle* part, double x0, double xp0, double s) {
 
 
 /*gpufun*/
-void mcs(EverestData restrict everest, LocalParticle* part, double length, double p, int edge_check){
+void mcs(EverestData restrict everest, LocalParticle* part, double length, double pc, int edge_check){
     InteractionRecordData record = everest->coll->record;
     RecordIndex record_index     = everest->coll->record_index;
     int8_t sc = everest->coll->record_scatterings;
@@ -118,7 +118,7 @@ void mcs(EverestData restrict everest, LocalParticle* part, double length, doubl
 
     double const radl = everest->coll->radl;
     double s;
-    double theta = 13.6e-3/p;
+    double theta = 13.6e-3/pc;
     double h   = 0.001;
     double dh  = 0.0001;
     double bn0 = 0.4330127019;

xcoll/scattering_routines/everest/nuclear_interaction.h

@@ -27,23 +27,29 @@ double nuclear_interaction(EverestData restrict everest, LocalParticle* part, do
         ichoix += 1;
     }
 
-    //Do the interaction
+    // Do the interaction
+    // Scattered angle is cos theta = 1 + t / (2p^2) for elastic scattering
+    //    from Mandelstam t = (p1-p3)^2) = 2m^2 - 2E1E3 + 2p1.p3
+    //    if elastic, p1 = p3, and hence t = 2m^2 - 2(m^2 + p^2) + 2p^2 cos(theta)
     int64_t i_slot = -1;
     if (ichoix==1) {
         if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_ABSORBED);
         LocalParticle_set_state(part, XC_LOST_ON_EVEREST_COLL);
 
     } else {
-        double teta;
-        if (ichoix==2) { // p-n elastic
+        double sqrt_t_p;
+        if (ichoix==2) {
+            // p-n elastic
             if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_PN_ELASTIC);
-            teta  = sqrt(RandomExponential_generate(part)/everest->bn)/pc;
+            sqrt_t_p = sqrt(RandomExponential_generate(part)/everest->bn)/pc;
 
-        } else if (ichoix==3) { // p-p elastic
+        } else if (ichoix==3) {
+            // p-p elastic
             if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_PP_ELASTIC);
-            teta  = sqrt(RandomExponential_generate(part)/everest->bpp)/pc;
+            sqrt_t_p = sqrt(RandomExponential_generate(part)/everest->bpp)/pc;
 
-        } else if (ichoix==4) { // Single diffractive
+        } else if (ichoix==4) {
+            // Single diffractive
             if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_SINGLE_DIFFRACTIVE);
             double xm2 = exp(RandomUniform_generate(part)*everest->xln15s);
             double bsd;
@@ -56,25 +62,35 @@ double nuclear_interaction(EverestData restrict everest, LocalParticle* part, do
             }
             double pc_in = pc;
             pc = pc*(1 - xm2/everest->ecmsq);
-            // Corrected 1/p into 1/sqrt(pp')
-            teta = sqrt(RandomExponential_generate(part)/bsd)/sqrt(pc_in*pc);
+            if (pc <= 1.e-9 || pc != pc) {
+                // Very small (<1eV) or NaN
+                if (sc) InteractionRecordData_log(record, record_index, part, XC_ABSORBED);
+                LocalParticle_set_state(part, XC_LOST_ON_EVEREST_COLL);
+                pc = 1.e-9;
+                sqrt_t_p = 0;
+            } else {
+                // Corrected 1/p into 1/sqrt(pp')
+                sqrt_t_p = sqrt(RandomExponential_generate(part)/bsd)/sqrt(pc_in*pc);
+            }
 
-        } else { // Coulomb
+        } else {
+            // Coulomb
             if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_COULOMB);
-            teta = sqrt(RandomRutherford_generate(everest->coll->rng, part))/pc;
+            sqrt_t_p = sqrt(RandomRutherford_generate(everest->coll->rng, part))/pc;
         }
 
-        // TODO: I am not convinced that we can just sample two independent random numbers
-        // I believe it should be tan(tx) = cos(phi) * tan(teta)    and    tan(ty) = sin(phi) * tan(teta)
-        // with phi uniformly sampled between 0 and 2 pi
-        double tx = teta*RandomNormal_generate(part);
-        double tz = teta*RandomNormal_generate(part);
+        // theta = arccos(1 + t/(2p^2))  =>  tan(theta) = sqrt( -t/p^2 * (1 + t/(4p^2)) ) / (1 + t/(2p^2))
+        // Note that in elastic scattering, t < 0, but we sampled t > 0 so we need to flip the sign
+        double tan_theta = sqrt_t_p * sqrt(1 - sqrt_t_p*sqrt_t_p/4)/(1 - sqrt_t_p*sqrt_t_p/2);
+        double alpha = 2*M_PI*RandomUniform_generate(part);
+        double tan_theta_x = tan_theta*cos(alpha);
+        double tan_theta_y = tan_theta*sin(alpha);
 
-        //Change the angles
+        // Change the angles
 #ifdef XCOLL_USE_EXACT
-        LocalParticle_add_to_exact_xp_yp(part, tx, tz);
+        LocalParticle_add_to_exact_xp_yp(part, tan_theta_x, tan_theta_y);
 #else
-        LocalParticle_add_to_xp_yp(part, tx, tz);
+        LocalParticle_add_to_xp_yp(part, tan_theta_x, tan_theta_y);
 #endif
 
         if (sc) InteractionRecordData_log_child(record, i_slot, part);

xcoll/scattering_routines/everest/properties.h

@@ -11,7 +11,7 @@
 
 
 /*gpufun*/
-void calculate_scattering(EverestData restrict everest, double p) {
+void calculate_scattering(EverestData restrict everest, double pc) {
     if (everest->coll->only_mcs){   // TODO: this should be done smarter
         return;
     }
@@ -26,7 +26,7 @@ void calculate_scattering(EverestData restrict everest, double p) {
 
     double csect[6];
 
-    everest->ecmsq = 2*XC_PROTON_MASS*1.0e-3*p;
+    everest->ecmsq = 2*XC_PROTON_MASS*1.0e-3*pc;
     double ecmsq = everest->ecmsq;
     everest->xln15s = log(0.15*ecmsq);
 
@@ -93,76 +93,7 @@ void calculate_scattering(EverestData restrict everest, double p) {
 
 
 /*gpufun*/
-void calculate_ionisation_properties(EverestData restrict everest, double pc) {
-    if (everest->coll->only_mcs){   // TODO: this should be done smarter
-        return;
-    }
-
-    // Material properties
-    double const exenergy = everest->coll->exenergy;
-    double const rho      = everest->coll->rho;
-    double const anuc     = everest->coll->anuc;
-    double const zatom    = everest->coll->zatom;
-
-    // Energy variables
-    double momentum = pc*1.0e3;   // [MeV]
-    double energy   = sqrt(pow(momentum, 2.) + pow(XC_PROTON_MASS, 2.)); // [MeV]
-    double gammar   = energy/XC_PROTON_MASS;
-    double betar    = momentum/energy;
-    double bgr      = betar*gammar;
-    double mep      = XC_ELECTRON_MASS/XC_PROTON_MASS;  // Electron/proton
-
-    // tmax is max energy loss from kinematics
-    double tmax = 2.*XC_ELECTRON_MASS*pow(bgr, 2.)/ (1. + 2.*gammar*mep + pow(mep, 2.));  // [MeV]
-    double plen = sqrt(rho*zatom/anuc)*28.816e-6; // [MeV]
-
-    everest->energy_loss = 0.5*log(2.*XC_ELECTRON_MASS*bgr*bgr*tmax/pow(exenergy, 2.)) + 0.5;
-    everest->energy_loss -= pow(betar, 2.);
-    everest->energy_loss -= log(plen/exenergy);
-    everest->energy_loss -= log(bgr);
-    everest->energy_loss *= XC_BETHE_BLOCH*zatom/(anuc* pow(betar, 2.))*rho*1.0e-1; // [GeV/m]
-
-    everest->energy_loss_tail = 0.5*log(2*XC_ELECTRON_MASS*bgr*bgr*tmax/pow(exenergy, 2.)) + 0.5;
-    everest->energy_loss_tail -= pow(betar, 2.);
-    everest->energy_loss_tail -= log(plen/exenergy);
-    everest->energy_loss_tail -= log(bgr);
-    everest->energy_loss_tail += pow(tmax, 2.)/(8.*pow(energy, 2.));
-    everest->energy_loss_tail *= XC_BETHE_BLOCH*zatom/(anuc*pow(betar, 2.))*rho*1.0e-1; // [GeV/m]
-
-    double Tt = everest->energy_loss*1.0e3 + XC_BETHE_BLOCH*zatom*4.0e2*rho/(anuc*pow(betar, 2.)); // [MeV/m]
-
-    // Calculate different coefficients for terms in dz (length) to get the tail probability
-    double const prob_factor = rho*1.e2*XC_BETHE_BLOCH*zatom/(anuc*pow(betar, 2.));
-    everest->prob_tail_c1 = prob_factor * 0.5 / Tt;
-    everest->prob_tail_c2 = prob_factor * (
-                        tmax/(4.*pow(energy, 2.)) - 0.5/tmax
-                        - log(tmax/Tt)*pow(betar,2.)/(2.*tmax)
-                   );  // * dz
-    everest->prob_tail_c3 = prob_factor * pow(betar,2.)/(2.*tmax);  // * dz * log(dz)
-    everest->prob_tail_c4 = -prob_factor * Tt/(4.*pow(energy, 2.));  // * dz * dz
-}
-
-
-/*gpufun*/
-double calcionloss(EverestData restrict everest, LocalParticle* part, double length) {
-
-#ifdef XCOLL_REFINE_ENERGY
-    calculate_ionisation_properties(everest, pc);
-#endif
-
-    double prob_tail = everest->prob_tail_c1 + everest->prob_tail_c2 * length
-                     + everest->prob_tail_c3 * length * log(length) + everest->prob_tail_c4 * length * length;
-
-    if (RandomUniform_generate(part) < prob_tail) {
-        return everest->energy_loss_tail;
-    } else {
-        return everest->energy_loss;
-    }
-}
-
-
-/*gpufun*/
-double calculate_dechanneling_length(EverestData restrict everest, double pc) {
+double calculate_dechannelling_length(EverestData restrict everest, double pc) {
     // Material properties
     double const exenergy = everest->coll->exenergy;
 

xcoll/xaux.py

@@ -1,117 +1,73 @@
 # copyright ############################### #
 # This file is part of the Xcoll Package.   #
-# Copyright (c) CERN, 2024.                 #
+# Copyright (c) CERN, 2025.                 #
 # ######################################### #
 
-import functools
-from pathlib import Path
-
-FsPath = Path
-
-
-def singleton(cls):
-    # Store the original __new__ method if it exists
-    original_new = cls.__new__ if hasattr(cls, '__new__') else None
-
-    # Define a new __new__ method for the singleton
-    def singleton_new(cls, *args, **kwargs):
-        if not hasattr(cls, 'instance'):
-            cls.instance = (original_new(cls, *args, **kwargs)
-                            if original_new
-                            else super(cls, cls).__new__(cls))
-            cls.instance._initialised = False
-        return cls.instance
-    cls.__new__ = singleton_new
-
-    # Define the get_self method
-    @classmethod
-    def get_self(cls, **kwargs):
-        # Filter kwargs to include only ClassProperty attributes
-        filtered_kwargs = {key: value for key, value in kwargs.items()
-                           if key in ClassProperty.get_properties(cls) or
-                           key in getattr(cls, '_xofields', {})}
-        return cls(**filtered_kwargs)
-    cls.get_self = get_self
-
-    return cls
-
-
-
-class ClassPropertyMeta(type):
-    def __setattr__(cls, key, value):
-        # Check if the attribute is a ClassProperty
-        for parent in cls.__mro__:
-            if key in parent.__dict__ and isinstance(parent.__dict__[key], ClassProperty):
-                return parent.__dict__[key].__set__(cls, value)
-        return super(ClassPropertyMeta, cls).__setattr__(key, value)
+# Tenporary file that defines xaux tools - to be used until xaux is in main Xsuite release cycle
 
+import os
+import base64
+import shutil
+import inspect
+import functools
+import numpy as np
+from pathlib import PosixPath
 
-class ClassProperty:
-    _registry = {}  # Registry to store ClassProperty names for each class
 
-    @classmethod
-    def get_properties(cls, owner, parents=True):
-        if not parents:
-            return cls._registry.get(owner, [])
+class FsPath(PosixPath):
+    def copy_to(self, other, **kwargs):
+        if self.is_dir():
+            shutil.copytree(self, other / self.name, dirs_exist_ok=True)
         else:
-            return [prop for parent in owner.__mro__
-                         for prop in cls._registry.get(parent, [])]
-
-    def __init__(self, fget=None, fset=None, fdel=None, doc=None):
-        functools.update_wrapper(self, fget)
-        self.fget = fget
-        self.fset = fset
-        self.fdel = fdel
-        if doc is None and fget is not None:
-            doc = fget.__doc__
-        self.__doc__ = doc
-
-    def __set_name__(self, owner, name):
-        self.name = name
-        # Verify that the class is a subclass of ClassPropertyMeta
-        if ClassPropertyMeta not in type(owner).__mro__:
-            raise AttributeError(f"Class `{owner.__name__}` must be a subtype of ClassPropertyMeta!")
-        # Add the property name to the registry for the class
-        if owner not in ClassProperty._registry:
-            ClassProperty._registry[owner] = []
-        ClassProperty._registry[owner].append(name)
-        # Create default getter, setter, and deleter
-        if self.fget is None:
-            def _getter(*args, **kwargs):
-                raise AttributeError(f"Unreadable attribute `{name}` for class {owner.__name__}!")
-            self.fget = _getter
-        if self.fset is None:
-            def _setter(self, *args, **kwargs):
-                raise AttributeError(f"Can't set attribute `{name}` for class {owner.__name__}!")
-            self.fset = _setter
-        if self.fdel is None:
-            def _deleter(*args, **kwargs):
-                raise AttributeError(f"Can't delete attribute `{name}` for class {owner.__name__}!")
-            self.fdel = _deleter
-
-    def __get__(self, instance, owner):
-        if owner is None:
-            owner = type(instance)
-        try:
-            return self.fget(owner)
-        except ValueError:
-            # Return a fallback if initialization fails
-            return None
-
-    def __set__(self, cls, value):
-        self.fset(cls, value)
-
-    def __delete__(self, instance):
-        self.fdel(instance.__class__)
-
-    def getter(self, fget):
-        self.fget = fget
-        return self
-
-    def setter(self, fset):
-        self.fset = fset
-        return self
-
-    def deleter(self, fdel):
-        self.fdel = fdel
-        return self
+            shutil.copy(self, other)
+    def move_to(self, other, **kwargs):
+        shutil.move(self, other)
+    def rmtree(self, *args, **kwargs):
+        shutil.rmtree(self, *args, **kwargs)
+
+
+
+def ranID(*, length=12, size=1, only_alphanumeric=False):
+    """Base64 encoded random ID.
+    Args:
+        length (int): Length of the ID string, rounded up to
+            the closest multiple of 4. Default 12.
+        size (int): Number of random IDs to generate.
+            Default 1.
+        only_alphanumeric (bool): If True, only alphanumeric
+            characters are used. Default False.
+    Returns:
+        str: Random ID string.
+    """
+    if length < 1:
+        raise ValueError("Length must be greater than 0!")
+    if size < 1:
+        raise ValueError("Size must be greater than 0!")
+    if size > 1:
+        return [ranID(length=length, only_alphanumeric=only_alphanumeric)
+                for _ in range(size)]
+    length = int(np.ceil(length/4))
+    if only_alphanumeric:
+        ran = ''
+        for _ in range(length):
+            while True:
+                this_ran = ranID(length=4, only_alphanumeric=False)
+                if this_ran.isalnum():
+                    break
+            ran += this_ran
+        return ran
+    else:
+        random_bytes = os.urandom(3*length)
+        return base64.urlsafe_b64encode(random_bytes).decode('utf-8')
+
+
+
+def count_required_arguments(func):
+    i = 0
+    sig = inspect.signature(func)
+    for param in sig.parameters.values():
+        if (param.kind == inspect.Parameter.POSITIONAL_ONLY \
+        or param.kind == inspect.Parameter.POSITIONAL_OR_KEYWORD) \
+        and param.default == inspect.Parameter.empty:
+            i += 1
+    return i

{xcoll-0.5.12.dist-info → xcoll-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xcoll
-Version: 0.5.12
+Version: 0.6.1
 Summary: Xsuite collimation package
 Home-page: https://github.com/xsuite/xcoll
 License: Apache 2.0
@@ -18,10 +18,10 @@ Provides-Extra: tests
 Requires-Dist: numpy (>=1.0)
 Requires-Dist: pandas (>=1.4)
 Requires-Dist: ruamel-yaml (>=0.17.31,<0.18.0) ; extra == "tests"
-Requires-Dist: xdeps (>=0.8.4)
-Requires-Dist: xobjects (>=0.4.6)
-Requires-Dist: xpart (>=0.19.3)
-Requires-Dist: xtrack (>=0.72.2)
+Requires-Dist: xdeps (>=0.10.5)
+Requires-Dist: xobjects (>=0.5.0)
+Requires-Dist: xpart (>=0.23.0)
+Requires-Dist: xtrack (>=0.84.6)
 Project-URL: Repository, https://github.com/xsuite/xcoll
 Description-Content-Type: text/markdown
 

xcoll-0.6.1.dist-info/RECORD

@@ -0,0 +1,138 @@
+LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+NOTICE,sha256=6DO_E7WCdRKc42vUoVVBPGttvQi4mRt9fAcxj9u8zy8,74
+xcoll/__init__.py,sha256=wEk3szUGeeN2Bg7_nx2D2pCgzRR0zcbEcWCP33p-e3I,854
+xcoll/__init__.py.orig,sha256=h9YXS-ZlmC-ZWLoLoAe8V175f2xc6E9gfoe_VjRYwBw,1172
+xcoll/beam_elements/__init__.py,sha256=qu2-LefWfEKZHfALGqZo97DTrwdZVh7Sp97V-3XokJU,1189
+xcoll/beam_elements/absorber.py,sha256=Gw1l1ng1MqF0dRTk7YhkiPAoinS5xsTASMxMDWGsmTw,2842
+xcoll/beam_elements/base.py,sha256=mjnzLbZ-GC56N56Eq5r5oQB8cLmeaqR5oEH1-FnS_H4,57816
+xcoll/beam_elements/blowup.py,sha256=0jfuxaIwXsEY4e6DlzGmv29OY7DGRKhbb2L-qKJwImQ,8079
+xcoll/beam_elements/elements_src/black_absorber.h,sha256=AXs_bNLaK8xBl8IeLJvGz7AfFaasruPMtYz8lbRtqG4,4705
+xcoll/beam_elements/elements_src/black_crystal.h,sha256=ZlLkJec4_naeoS3jEx-vQVAKBI0dInzMZq06pzKQOn0,4355
+xcoll/beam_elements/elements_src/blowup.h,sha256=YlTt7YxswLM0ZjPuEjuE7xzjQ3hMt6FX9V3MbqVYmN4,1564
+xcoll/beam_elements/elements_src/emittance_monitor.h,sha256=vlHzQFoUjKQHWBmzpaSzRbILtxSWqEasMtxHC-FFoAc,7078
+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/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/transparent.py,sha256=AZOWfH3dvsetL6DjQGejUgX7T18e_3omIIffG_1gwc0,2894
+xcoll/colldb.py,sha256=WaJC6gkDNVvxo65OhucTM6Fwo6pgRFHNnBnHSkiX7AQ,31054
+xcoll/general.py,sha256=mXL1LaNUxbgXm4AthRJ_7j5oA48cgPDtksQwYmPzLXY,534
+xcoll/general.py.orig,sha256=AvtA-RygKcKCRLDkldzzwG7Q7GlBI49df3aNWe-rr_Y,603
+xcoll/headers/checks.h,sha256=qdXsOTBOK1MwW6bdFF93j4yE648mcDtEv5rGN1w9sfk,1582
+xcoll/headers/particle_states.py,sha256=N8ehLtg99358I4RGCJ3sjuKCk2LVdGqgVx2xGoHrRdM,1959
+xcoll/initial_distribution.py,sha256=CHhqeCVjVOyaBWhfy2sDgLwIgtXZoqcTW-su-M2YByE,10989
+xcoll/initial_distribution.py.orig,sha256=PRZwBtQ2qY_2g6f879IEhUxmNu1tpTArt-qKYNqpjSI,11223
+xcoll/interaction_record/__init__.py,sha256=UFoLiKa-z2oX7YoszP-7Vgdt1nM6kT382v1CaIu8_u0,50
+xcoll/interaction_record/interaction_record.py,sha256=cCjfVCYUJaV0Y-pCljA2_u8GLyhHt7zNjbSXkE7cRO4,13299
+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/plot.py,sha256=27fYdXstPg3o8XyeBlPuD2yz0GR3dKkNWy4kO2BD9WA,4071
+xcoll/rf_sweep.py,sha256=hMgW15uTp7qPprdlHCZBjOOe8Emdm-R0TfxPDoRXnJU,9021
+xcoll/scattering_routines/engine.py,sha256=1VCBEZLMd5orFo3sZqK51NrqbqELBVrbsz6bB2SXsFQ,22962
+xcoll/scattering_routines/environment.py,sha256=xZ8A7XfvSfpe8vYbM5oD5qbcp8Tuag5qWAI6VqgGUlA,12033
+xcoll/scattering_routines/everest/__init__.py,sha256=7lkkeZ1liBjXVHCuRpgzZI6ohzHVMj5uJBO792147XY,286
+xcoll/scattering_routines/everest/amorphous.h,sha256=8v_5P94LDxeLp1xI2nvwdbEPJNDY6LTB1CwXv4AwjZs,11806
+xcoll/scattering_routines/everest/channelling.h,sha256=WrYBcvGWP2Da47__AGbbKsT8yvZmHhVZd5F1gku--GU,10941
+xcoll/scattering_routines/everest/constants.h,sha256=_y9QqKAUSwPOkk8A4BF8ILNdDDJf66eINJwda8skwZM,1380
+xcoll/scattering_routines/everest/crystal_parameters.h,sha256=QtmSQM4qzVXfjdkxs0ns8utqtqZ_u-Ej_y6m7UOKITo,6001
+xcoll/scattering_routines/everest/everest.h,sha256=T9mESIy_oC86WJSsU7LY_A0iqHT2PKl5MmhnKQaGVSg,3200
+xcoll/scattering_routines/everest/everest.py,sha256=aKy5d7HGiqEphFZDZE4RnYbxh0j10Boc04EZ0By9WdM,1542
+xcoll/scattering_routines/everest/ionisation_loss.h,sha256=QIujj_qrKOY7L7CVFNSyexjlDJ94sfilvakhfWVfe44,6108
+xcoll/scattering_routines/everest/jaw.h,sha256=4Ml9FofWPkGlvw6oWNdbZQIYV4K1xhfbEkNwwfDcITc,2069
+xcoll/scattering_routines/everest/materials.py,sha256=pKQfrMNrqU3sitICTRjqfvwsvHrBDSUf3jfmOEE5Kls,10292
+xcoll/scattering_routines/everest/multiple_coulomb_scattering.h,sha256=oX_ZN32eLcZX3VdYn4kAnT5wMKVTe4fLudPgbX9w37Y,5434
+xcoll/scattering_routines/everest/nuclear_interaction.h,sha256=07yg9AD3jAfPetFVSY6cXT0iN5tBCrXXmYWvGMTaUDI,3892
+xcoll/scattering_routines/everest/properties.h,sha256=AJf7Q_iPsiXTavnguzsNozdoH4NYGdDvyqP3iXychKU,3845
+xcoll/scattering_routines/fluka/flukaio/.git,sha256=5ZxurpwP1waJk2Zu2AstENGOp4rXU8-C-oU4CypmIVI,73
+xcoll/scattering_routines/fluka/flukaio/.gitignore,sha256=bhrpWiAnKChkcwIaIPX_zKxyG2nCtNzNgQAHnIJa8Fw,12
+xcoll/scattering_routines/fluka/flukaio/CMakeLists.txt,sha256=iWWqTC26UqcuQWQj_JCKtX6iiOb7arnhQ9kOo1fDVkE,591
+xcoll/scattering_routines/fluka/flukaio/ComponentMakefile,sha256=JgZVBFGEe1NtNWoCFBQQQuqUU63CuUsJ01y7C8yoR8c,5951
+xcoll/scattering_routines/fluka/flukaio/Makefile,sha256=2RMI62VExb2Wx7J031hHIVhhv6p8mfUc7_vynGcskrw,3404
+xcoll/scattering_routines/fluka/flukaio/README,sha256=jn-0UQ7MOjy9xXbw5VTkOjgq2j1W7B2zE35DRspHhRA,611
+xcoll/scattering_routines/fluka/flukaio/doc/Doxyfile,sha256=jo47N7f4AR-KPiL36Jj9Za5F1Frp8eRL845F6siC3jc,65455
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO.asciidoc,sha256=vvEaZ7SI3wit3OjNPEDDqjOWD8u3SzFzJrPrG_eQhzg,45517
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO.epub,sha256=msmaZhUq_iaUvfT4wMiKXwzcJwleeFb77qD_ioX7cqE,138089
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO.html,sha256=lxRW82DbktTH3wCm8DACwyeSD7pb3VIW6QnTdS75hsc,74567
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO.pdf,sha256=xsOPD4gFpe7PnQyEQIfxk0PekjK4YJtxTvrF_aX-Xag,233955
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO__1.png,sha256=RjuZmNCDHSryVvqGaVTHBGOnxocNgIGMnkwjTT2kPmA,36021
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO__2.png,sha256=YXtIj92Obu-Tml4ScibCJbfNo3egjIGoe7mSP7FXMdY,2904
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO__3.png,sha256=jsRi-MYzLU8TCcMrilp20dDZ8cZYWRL3AebGts0D-UU,23826
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO__4.png,sha256=v1_945h1-oEps38VyOdfIJLKcJEledckzFB_JXfagso,3956
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO__5.png,sha256=dD0qouz9OBy8LNAeNrc_SyBJdNlEw9Y9S7GGftMZoXk,7017
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO__6.png,sha256=_w_PLC7SbmfFC-yXuuw-wJdBPlZOsyCbA84Q9yHY0Mg,33614
+xcoll/scattering_routines/fluka/flukaio/doc/FlukaIO__7.png,sha256=sOPu0rKPsKtb9-zJmP0APMl1Swf6DQzvOwa2Wd3balU,51182
+xcoll/scattering_routines/fluka/flukaio/doc/Makefile,sha256=HzLTLkzE4v-fkZH_q139T9KGm5jqDlDUanm4T-NrAh8,146
+xcoll/scattering_routines/fluka/flukaio/doc/docbook.xsl,sha256=C5fAdTixTP0Y1AgxEGuhXfBMHRKQUfu4_8HkGUaDT08,74068
+xcoll/scattering_routines/fluka/flukaio/include/Connection.h,sha256=gAlJAJoi0DV7OrRDlnc2yxf9EE1m1TNY1Tx3UC7UVDk,2793
+xcoll/scattering_routines/fluka/flukaio/include/FlukaIO.h,sha256=ROly1bNu8vAMRSSHCA1w3Ffe8EUttu5g_WusKyVbKVY,1976
+xcoll/scattering_routines/fluka/flukaio/include/FlukaIOServer.h,sha256=81_z_od7Iu-kZIy3uKa4Qaoiz7HXzF8mBdAgEZN7CNE,757
+xcoll/scattering_routines/fluka/flukaio/include/FortranFlukaIO.h,sha256=7e18HlHpPzcfbuVtw5YcvGCmCWcZ6PIZw1j8Ao-u32s,5954
+xcoll/scattering_routines/fluka/flukaio/include/Message.h,sha256=7UWWjCGwNEcVjee2c32CYDXPKAGvds-JFv7P-Penmqc,1731
+xcoll/scattering_routines/fluka/flukaio/include/ParticleInfo.h,sha256=9-LEorFn0_uTxH7cnN8VS_B1m4C0Jokj1S--5I9mJ24,1328
+xcoll/scattering_routines/fluka/flukaio/lib/libFlukaIO64.a,sha256=EyPMYXw-gGyro22gbMzHVQ2x2otddQhlqadP_b45XNA,82884
+xcoll/scattering_routines/fluka/flukaio/lib/libFlukaIO64.so,sha256=RhlyKPX_KqxlOlxd0mllVtxCCFXwHgzhHVAnDIugdaE,66688
+xcoll/scattering_routines/fluka/flukaio/samples/ClientTest.c,sha256=tm-xzz169gsbAC6OWIYcngZeNpc3RhxHlvPYNCoiA6Y,2907
+xcoll/scattering_routines/fluka/flukaio/samples/ServerTest.c,sha256=s-x2KbssquSUda4yLAb0pRLqUOfdsS3US_enedCpiVA,2330
+xcoll/scattering_routines/fluka/flukaio/samples/fclient.f,sha256=lF7G0xgpdteRSNtNWiZVG4kkeiKduwrk-WufFb8EtXc,3629
+xcoll/scattering_routines/fluka/flukaio/samples/fserver.f,sha256=SO1bkHvlw52GC1mw17G0k05XfhosdHiXkq4qYaNAPp0,2995
+xcoll/scattering_routines/fluka/flukaio/src/Connection.c,sha256=WlQpBki9bIausYuZyZqXNnyDfTyVFTO4iSFVutn7gFU,5769
+xcoll/scattering_routines/fluka/flukaio/src/Connection.d,sha256=w1ijLCfHpVGm7UNvORrezmjgVyBQPn4GifiOWXaYb4s,5882
+xcoll/scattering_routines/fluka/flukaio/src/Connection.o,sha256=qyEuE5B-L2awz6KWdU1ER4mptA1n-qpYh72-4k6js5o,13008
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIO.c,sha256=yRKw5BizRyS_G2dnD61HH2ManwYqoAEfMEkZhEPV7MI,4804
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIO.d,sha256=CUaHIRw5C7_SptwLSJBOML33XvE7lZWhJzfuBXKirw8,3829
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIO.o,sha256=SZuNUlyt0fVb0k7_ypbTRlSX7bsbtyEN14VsBFb93vg,12440
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOHandshake.c,sha256=GMsE2lk32f5K-8bbYC7fJYZU5C_sMxTa6zkqNR215XM,1541
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOHandshake.d,sha256=fSxhMLdzngyIK6WgIySYL4dZzWQRDAlb4FEHMwIZmA0,2445
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOHandshake.h,sha256=S6ksRwhjGPJ2CxRagP43pXsXnJV90tGVVt7lEREXoFE,288
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOHandshake.o,sha256=uKzcFMpTnR-6ZQt77vkNGS9HhMIIQWL12VjvCEA-YNE,7664
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOServer.c,sha256=EQV_XaZ6iqCBkguX-3ojtyBw3zKjAqksIqr9djd6hnU,1925
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOServer.d,sha256=QXDFEiuImczHPlhBm1CceKLKRjqCnH7514L2t-1Vh-0,5905
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOServer.o,sha256=q89-SL6XaZx76XSZ6Vq8yvJqY_YQtOeXlb5fFuwjctE,7536
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIOServer_private.h,sha256=VZpGHBS5bLuN7j_WRxCye1cNgxK6LPfo6gW7X47T-QE,396
+xcoll/scattering_routines/fluka/flukaio/src/FlukaIO_private.h,sha256=t459fyfh8KTW2y2kVAjzBKUDzppnypkBE0IjLKxkEzs,421
+xcoll/scattering_routines/fluka/flukaio/src/FortranFlukaIO.c,sha256=2lHLmtFYvITsuFbJ9_OU11ry3IPkOmmKQIorZQ4XyR0,11512
+xcoll/scattering_routines/fluka/flukaio/src/FortranFlukaIO.d,sha256=fdq8pRR-0ulVlvanaiTCLQPBKLNTxj9hOkqNADcqjcI,3240
+xcoll/scattering_routines/fluka/flukaio/src/FortranFlukaIO.o,sha256=1HwWdEr_g2E3Fc6p8DZuiBWJOAA52PDwP5TpzZOENB8,23400
+xcoll/scattering_routines/fluka/flukaio/src/NetIO.c,sha256=tZwvJEA1fuoOC54i6E0GISEaiRMJt3HgqXKTqtxFeuc,6361
+xcoll/scattering_routines/fluka/flukaio/src/NetIO.d,sha256=p9yB2w56mNwi9-XgF69YXF9pJyEiQQYo6D99Y9aFbv8,5716
+xcoll/scattering_routines/fluka/flukaio/src/NetIO.h,sha256=hv0-sQ9aMcOyBh6QfKgR3ibIe37k8szm8dc1-45UG_U,902
+xcoll/scattering_routines/fluka/flukaio/src/NetIO.o,sha256=eZUZ5JzAXijE4IhRnWU5BUnHJhA97XNRhL70-mX452I,16816
+xcoll/scattering_routines/fluka/flukaio/src/tags,sha256=nXICMFzoWSyZKssmB6uviGaI3cLd_u4gBku2NNTNWNU,14484
+xcoll/scattering_routines/fluka/flukaio/tests/AllTests.cpp,sha256=4ChxFO2TpNmwNiMEI-UHMYLg62y6K5iEBGcoKZiCDpI,166
+xcoll/scattering_routines/fluka/flukaio/tests/CommonTest.h,sha256=CZtIENoRY_D_BVRuS3eIiii1G-EPKpxHUh4E4cwfqmg,152
+xcoll/scattering_routines/fluka/flukaio/tests/ConnectionTest.cpp,sha256=Z9MQu0R7xRQEBnAA9rG7b-EqJnyiawBlGkhz-pATvEM,2464
+xcoll/scattering_routines/fluka/flukaio/tests/FlukaIOServerTest.cpp,sha256=GJMyEcJ2E9XtvbQx3Huxr7h_bsEqfqSMaoSU0Mw-MV8,1851
+xcoll/scattering_routines/fluka/flukaio/tests/FlukaIOTest.cpp,sha256=9iOsTJlR8BmDeOn16bb4Zk_Pwxyem6hhi6jdKS7TGPo,11293
+xcoll/scattering_routines/fluka/flukaio/tests/FortranFlukaIOTest.cpp,sha256=28aX0J-63kzuwDsB5KrrQ9-m_KE4FE9cVMJk6GKQGyg,14331
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeConnection.c,sha256=w1ggaUuolcg_5IwP_iY2ZV7FMHjrdOTfhj_k-ReRpCQ,526
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeConnection.h,sha256=fXR8m7OhG4QwYyyb0vFrXyXVg6F37ooSED8LkIj2Ieo,226
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeFlukaIO.c,sha256=o6Nh82ILb4qY_g3hdoM2_J8saffeBnOLzCeQrugwcxg,2244
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeFlukaIO.h,sha256=_cKsqrwvMstieLWdxsUfStsXhm_TcnwtoGUxp2AE-As,1660
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeFlukaIOHandshake.c,sha256=Kv89mqdpYJabbjbDNESpsCZgWhb-D7NB1ktoNxVMmrw,549
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeFlukaIOHandshake.h,sha256=GWX3oySTSnd_K84hmT1WqAKBmViaohmd_18Ii7uhlX4,395
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeFlukaIOServer.c,sha256=dfZVteG9cKqtvEefROUWWcdXnhYDqEyNoc4OyisrUzA,360
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeFlukaIOServer.h,sha256=0yKRoJmJwoFpjLWatgi_WaWgPwKb0UHNdA7AQzv9PMY,280
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeFortranFlukaIO.h,sha256=WxAjG2SPlWqMG38iHBM8GQwh5yp031jAGeyPi4y9G4c,330
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeNetIO.c,sha256=JcgCWxbT-ZOeG0c9mz1kk3PfXjaazaUk2P_ROtoBKaY,1452
+xcoll/scattering_routines/fluka/flukaio/tests/fakes/FakeNetIO.h,sha256=JTMU9FtCBJkitsnHp7kWKUbPSN4rviRfJgVHK26AuPY,906
+xcoll/scattering_routines/geometry/__init__.py,sha256=a2DFji3U6Msj-aJE2Dt5Il8FgesfICJHeK9yQj4zHa4,221
+xcoll/scattering_routines/geometry/collimator_geometry.h,sha256=0gHiSEALJtQdW0mUav7GmES4JCAvq-xmch_ZRPkCfUI,7819
+xcoll/scattering_routines/geometry/crystal_geometry.h,sha256=DHuQPMKq_Q0uK0WW2YRd7oxxhMwRPWtNUUn5fBW4Cxc,4968
+xcoll/scattering_routines/geometry/geometry.py,sha256=bF8v7aEP09E4_EMkN0KEJFU-PQrBSOB0Xv699VBUzRY,1102
+xcoll/scattering_routines/geometry/get_s.h,sha256=TWxZ-GjCcLrOV1wota7ltE53Nit0LQASoXmsqn-N0LQ,2947
+xcoll/scattering_routines/geometry/methods.h,sha256=I8ik46SgkCHHtZ99anbdb3ZC7A_5Q809fgpeWMajdkY,3747
+xcoll/scattering_routines/geometry/objects.h,sha256=A5ktGvVlSkC4hUsI_PQFsE80CuDwYbcioxKGRmEf2I0,5499
+xcoll/scattering_routines/geometry/rotation.h,sha256=lO3RaQBys9r0ROMjR8T8Rr7UsIEm-H9_C_70Nwz4MXY,701
+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.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+xcoll-0.6.1.dist-info/METADATA,sha256=qZ6WjBbpMtmyC5jeyM39MTNXw779decuHpGDHOShgpY,2676
+xcoll-0.6.1.dist-info/NOTICE,sha256=6DO_E7WCdRKc42vUoVVBPGttvQi4mRt9fAcxj9u8zy8,74
+xcoll-0.6.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+xcoll-0.6.1.dist-info/RECORD,,

xcoll/_manager.py

@@ -1,22 +0,0 @@
-# copyright ############################### #
-# This file is part of the Xcoll package.   #
-# Copyright (c) CERN, 2024.                 #
-# ######################################### #
-
-
-class CollimatorManager:
-
-    def __init__(self, **kwargs):
-        raise ValueError("`CollimatorManager` is deprecated. Use `CollimatorDatabase` instead.")
-
-    @classmethod
-    def from_yaml(cls, file, **kwargs):
-        raise ValueError("`CollimatorManager` is deprecated. Use `CollimatorDatabase` instead.")
-
-    @classmethod
-    def from_json(cls, file, **kwargs):
-        raise ValueError("`CollimatorManager` is deprecated. Use `CollimatorDatabase` instead.")
-
-    @classmethod
-    def from_dict(cls, file, **kwargs):
-        raise ValueError("`CollimatorManager` is deprecated. Use `CollimatorDatabase` instead.")

xcoll/headers/particle_states.h

@@ -1,25 +0,0 @@
-// copyright ############################### #
-// This file is part of the Xcoll package.   #
-// Copyright (c) CERN, 2024.                 #
-// ######################################### #
-
-#ifndef XCOLL_STATES_H
-#define XCOLL_STATES_H
-
-#define  XC_LOST_ON_EVEREST_BLOCK   -330
-#define  XC_LOST_ON_EVEREST_COLL    -331
-#define  XC_LOST_ON_EVEREST_CRYSTAL -332
-#define  XC_LOST_ON_FLUKA_BLOCK     -333
-#define  XC_LOST_ON_FLUKA_COLL      -334
-#define  XC_LOST_ON_FLUKA_CRYSTAL   -335
-#define  XC_LOST_ON_GEANT4_BLOCK    -336
-#define  XC_LOST_ON_GEANT4_COLL     -337
-#define  XC_LOST_ON_GEANT4_CRYSTAL  -338
-#define  XC_LOST_ON_ABSORBER        -340
-
-#define  XC_ERR_INVALID_TRACK       -390
-#define  XC_ERR_NOT_IMPLEMENTED     -391
-#define  XC_ERR_INVALID_XOFIELD     -392
-#define  XC_ERR                     -399
-
-#endif /* XCOLL_STATES_H */

xcoll/install.py

@@ -1,35 +0,0 @@
-# copyright ############################### #
-# This file is part of the Xcoll package.   #
-# Copyright (c) CERN, 2024.                 #
-# ######################################### #
-
-from warnings import warn
-
-# This file is deprecated and will be removed in the future.
-
-
-def install_elements(line, names, elements, *, at_s=None, apertures=None, need_apertures=False, s_tol=1.e-6):
-    warn("The function xcoll.install_elements() is deprecated and will be removed in the future. "
-       + "Please use line.collimators.install() instead.", FutureWarning)
-    line.collimators.install(names=names, elements=elements, at_s=at_s, apertures=apertures,
-                             need_apertures=need_apertures, s_tol=s_tol)
-
-def check_element_position(line, name, s_start, s_end, at_s, length=None, s_tol=1.e-6):
-    warn("The function xcoll.check_element_position() is deprecated and will be removed "
-       + "in the future. Please use line.collimators.check_position() instead.", FutureWarning)
-    return line.collimators.check_position(name, s_start, s_end, at_s, length=length, s_tol=s_tol)
-
-def get_apertures_at_s(tab, s, s_tol=1.e-6):
-    warn("The function xcoll.get_apertures_at_s() is deprecated and will be removed in the future. "
-       + "Please use line.collimators.get_apertures_at_s() instead.", FutureWarning)
-    return get_apertures_at_s(s, s_tol=s_tol)
-
-def get_aperture_for_element(line, name, s_start, s_end, aperture=None, tab=None, s_tol=1.e-6):
-    warn("The function xcoll.get_aperture_for_element() is deprecated and will be removed in the future. "
-       + "Please use line.collimators.get_aperture() instead.", FutureWarning)
-    return line.get_aperture(name, s_start, s_end, aperture=aperture, tab=tab, s_tol=s_tol)
-
-def prepare_space_for_element(line, name, s_start, s_end, tab=None, s_tol=1.e-6):
-    warn("The function xcoll.prepare_space_for_element() is deprecated and will be removed in the future. "
-       + "Please use line.collimators.prepare_space() instead.", FutureWarning)
-    return line.collimators.prepare_space(name, s_start, s_end, tab=tab, s_tol=s_tol)

xcoll/scattering_routines/geant4/collimasim/.git

@@ -1 +0,0 @@
-gitdir: ../../../../.git/modules/xcoll/scattering_routines/geant4/collimasim