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

xcoll/scattering_routines/environment.py

@@ -0,0 +1,297 @@
+# copyright ############################### #
+# This file is part of the Xcoll Package.   #
+# Copyright (c) CERN, 2025.                 #
+# ######################################### #
+
+import os
+import sys
+import json
+import tempfile
+from subprocess import run, PIPE
+# from platformdirs import user_config_dir, user_data_dir
+
+from ..general import _pkg_root
+try:
+    from xaux import FsPath  # TODO: once xaux is in Xsuite keep only this
+except (ImportError, ModuleNotFoundError):
+    from ..xaux import FsPath
+
+
+class BaseEnvironment:
+    _pkg_root
+    _config_dir = (_pkg_root / 'config').resolve()
+    _data_dir   = (_pkg_root / 'lib').resolve()
+    # _config_dir = FsPath(user_config_dir('xcoll')).resolve()
+    # _data_dir   = FsPath(user_data_dir('xcoll')).resolve()
+    _paths = {} # The value is the parent depth that needs to be brute-forced (0 = file itself, None = no brute-force)
+    _read_only_paths = {}
+
+    def __init__(self, *args, **kwargs):
+        self._old_sys_path = None
+        self._old_os_env = None
+        self._temp_dir = None
+        for path in self._paths.keys():
+            setattr(self, f'_{path}', None)
+        self._config_file = self._config_dir / f'{self.__class__.__name__[:-11].lower()}.config.json'
+        sys.path.append(self._data_dir.as_posix())
+        self._in_constructor = True
+        self.load()
+        self._in_constructor = False
+
+    def __del__(self):
+        self.restore_environment()
+        if self._temp_dir:
+            self._temp_dir.cleanup()
+
+    def __repr__(self):
+        return f"<{self.__class__.__name__} at {hex(id(self))} (use .show() to see the paths)>"
+
+    def __str__(self):
+        res = ["XcollEnvironment"]
+        res.append(f"    Configuration file:  {self._config_file.as_posix()}")
+        res.append(f"    Configuration dir:   {self._config_dir.as_posix()}")
+        res.append(f"    Data dir:            {self._data_dir.as_posix()}")
+        if self._temp_dir:
+            res.append(f"    Temporary dir:       {self._temp_dir.name}")
+        if self.__class__ is not BaseEnvironment:
+            res.append("")
+            res.append(f"{self.__class__.__name__}")
+            for path in self._paths.keys():
+                value = getattr(self, f'_{path}', None)
+                path = f'{path}:'
+                if value is None:
+                    res.append(f"    {path:<20} None")
+                else:
+                    res.append(f"    {path:<20} {value.as_posix()}")
+            for path in self._read_only_paths.keys():
+                value = getattr(self, path)
+                path = f'{path} (read-only):'
+                res.append(f"    {path:<20} {value.as_posix()}")
+            if self._old_sys_path and self._old_os_env:
+                res.append("")
+                res.append("Custom environment stored:")
+                res.append(f"    sys.path: {self._old_sys_path}")
+                res.append(f"    os.environ: {self._old_os_env}")
+        return "\n".join(res)
+
+    @property
+    def config_file(self):
+        """The environment configuration file."""
+        return self._config_file
+
+    @property
+    def config_dir(self):
+        """The directory where the configuration files are stored."""
+        return self._config_dir
+
+    @property
+    def data_dir(self):
+        """The directory where the data files are stored."""
+        return self._data_dir
+
+    @property
+    def initialised(self):
+        return all(getattr(self, path, None) is not None and getattr(self, path, None).exists()
+                   for path in self._paths.keys())
+
+    @property
+    def compiled(self):
+        raise NotImplementedError("This property should be implemented in the subclass.")
+
+    @property
+    def temp_dir(self):
+        if not self._temp_dir:
+            self._temp_dir = tempfile.TemporaryDirectory()
+        return FsPath(self._temp_dir.name)
+
+    @temp_dir.setter
+    def temp_dir(self, value):
+        if value is None:
+            if self._temp_dir:
+                self._temp_dir.cleanup()
+                self._temp_dir = None
+            return
+        if self._temp_dir:
+            self._temp_dir.cleanup()
+            self._temp_dir = None
+        if isinstance(value, FsPath):
+            value = value.resolve()
+        elif isinstance(value, str):
+            value = FsPath(value).resolve()
+        else:
+            raise TypeError("temp_dir must be a string or FsPath.")
+        if not value.exists():
+            raise FileNotFoundError(f"Provided temp_dir {value} does not exist!")
+        self._temp_dir = tempfile.TemporaryDirectory(dir=value)
+
+    @temp_dir.deleter
+    def temp_dir(self):
+        self.temp_dir = None
+
+    def show(self):
+        """Print the environment paths."""
+        print(self)
+
+    def save(self):
+        if not self._config_dir.exists():
+            self._config_dir.mkdir(parents=True, exist_ok=True)
+        data = {}
+        for path in self._paths.keys():
+            value = getattr(self, path, None)
+            if value:
+                value = FsPath(value).as_posix()
+            data[path] = value
+        with open(self._config_file, 'w') as fid:
+            json.dump(data, fid, indent=4)
+
+    def load(self):
+        if not self._config_file.exists():
+            self.save()
+        with open(self._config_file, 'r') as fid:
+            data = json.load(fid)
+        for key, value in data.items():
+            setattr(self, key, FsPath(value) if value else None)
+
+    def store_environment(self):
+        self._old_sys_path = sys.path.copy()
+        self._old_os_env = os.environ.copy()
+
+    def restore_environment(self):
+        if self._old_sys_path:
+            sys.path = self._old_sys_path
+            self._old_sys_path = None
+        if self._old_os_env:
+            os.environ = self._old_os_env
+            self._old_os_env = None
+
+    def brute_force_path(self, path):
+        num_parents = 0
+        if path in self._paths:
+            num_parents = self._paths[path]
+            path = getattr(self, path)
+        if path in self._read_only_paths:
+            num_parents = self._read_only_paths[path]
+            path = getattr(self, path)
+        if path is None:
+            return
+        path = FsPath(path).resolve()
+        if num_parents > 0:
+            path = path.parents[num_parents-1]
+        if not path.exists():
+            raise FileNotFoundError(f"Could not find path {path}!")
+        try:
+            cmd = run(['tree', path.as_posix()], stdout=PIPE, stderr=PIPE)
+        except FileNotFoundError:
+            # No tree executable. Return as no more can be done. TODO: alternatives for mac and windows?
+            return
+        if cmd.returncode != 0:
+            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+            raise RuntimeError(f"Could not resolve {path} tree!\nError given is:\n{stderr}")
+
+    def __getattr__(self, key):
+        if key in self._paths.keys():
+            value = getattr(self, f'_{key}', None)
+            if value:
+                return FsPath(value)
+        else:
+            raise AttributeError(f"{self.__class__.__name__} has no attribute '{key}'")
+
+    def __setattr__(self, key, value):
+        if key in self._paths.keys():
+            if value:
+                value = FsPath(value)
+                if not self._in_constructor:
+                    self.brute_force_path(value)
+            setattr(self, f'_{key}', value)
+            if not self._in_constructor:
+                self.save()
+        elif key in self._read_only_paths.keys():
+            raise AttributeError(f"Attribute '{key}' of {self.__class__.__name__} "
+                               + f"is read-only!")
+        else:
+            super().__setattr__(key, value)
+
+    def __delattr__(self, item):
+        if item in self._paths.keys():
+            self.__setattr__(self, f'_{item}', None)
+            self.save()
+
+    def assert_make_installed(self, verbose=False):
+        if hasattr(self, '_make_installed') and hasattr(self, '_cmake_installed'):
+            return self._make_installed and self._cmake_installed
+        try:
+            cmd = run(["make", "--version"], stdout=PIPE, stderr=PIPE)
+        except FileNotFoundError:
+            self._make_installed = False
+            raise RuntimeError("Could not find make installation!")
+        if cmd.returncode == 0:
+            self._make_installed = True
+        else:
+            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+            self._make_installed = False
+            raise RuntimeError(f"Could not run make! Verify its installation.\nError given is:\n{stderr}")
+        try:
+            cmd = run(["cmake", "--version"], stdout=PIPE, stderr=PIPE)
+        except FileNotFoundError:
+            self._cmake_installed = False
+            raise RuntimeError("Could not find cmake installation!")
+        if cmd.returncode == 0:
+            self._cmake_installed = True
+        else:
+            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+            self._cmake_installed = False
+            raise RuntimeError(f"Could not run cmake! Verify its installation.\nError given is:\n{stderr}")
+
+    def assert_gcc_isntalled(self, verbose=False):
+        if hasattr(self, '_gcc_installed'):
+            return self._gcc_installed
+        try:
+            cmd = run(["gcc", "-dumpversion"], stdout=PIPE, stderr=PIPE)
+        except FileNotFoundError:
+            self._gcc_installed = False
+            raise RuntimeError("Could not find gcc installation! Need gcc 9 or higher.")
+        if cmd.returncode == 0:
+            version = cmd.stdout.decode('UTF-8').strip().split('\n')[0]
+            if int(version.split('.')[0]) < 9:
+                self._gcc_installed = False
+                raise RuntimeError(f"Need gcc 9 or higher, but found gcc {version}!")
+            self._gcc_installed = True
+            if verbose:
+                cmd2 = run(["which", "gcc"], stdout=PIPE, stderr=PIPE)
+                if cmd2.returncode == 0:
+                    file = cmd2.stdout.decode('UTF-8').strip().split('\n')[0]
+                    print(f"Found gcc {version} in {file}", flush=True)
+                else:
+                    stderr = cmd2.stderr.decode('UTF-8').strip().split('\n')
+                    raise RuntimeError(f"Could not run `which gcc`!\nError given is:\n{stderr}")
+        else:
+            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+            self._gcc_installed = False
+            raise RuntimeError(f"Could not run gcc! Verify its installation.\nError given is:\n{stderr}")
+
+    def assert_gfortran_installed(self, verbose=False):
+        if hasattr(self, '_gfortran_installed'):
+            return self._gfortran_installed
+        try:
+            cmd = run(["gfortran", "-dumpversion"], stdout=PIPE, stderr=PIPE)
+        except FileNotFoundError:
+            self._gfortran_installed = False
+            raise RuntimeError("Could not find gfortran installation! Need gfortran 9 or higher.")
+        if cmd.returncode == 0:
+            version = cmd.stdout.decode('UTF-8').strip().split('\n')[0]
+            if int(version.split('.')[0]) < 9:
+                self._gfortran_installed = False
+                raise RuntimeError(f"Need gfortran 9 or higher, but found gfortran {version}!")
+            self._gfortran_installed = True
+            if verbose:
+                cmd2 = run(["which", "gfortran"], stdout=PIPE, stderr=PIPE)
+                if cmd2.returncode == 0:
+                    file = cmd2.stdout.decode('UTF-8').strip().split('\n')[0]
+                    print(f"Found gfortran {version} in {file}", flush=True)
+                else:
+                    stderr = cmd2.stderr.decode('UTF-8').strip().split('\n')
+                    raise RuntimeError(f"Could not run `which gfortran`!\nError given is:\n{stderr}")
+        else:
+            stderr = cmd.stderr.decode('UTF-8').strip().split('\n')
+            self._gfortran_installed = False
+            raise RuntimeError(f"Could not run gfortran! Verify its installation.\nError given is:\n{stderr}")

xcoll/scattering_routines/everest/amorphous.h

@@ -18,9 +18,10 @@ void volume_reflection(EverestData restrict everest, LocalParticle* part, int8_t
     int8_t sc = everest->coll->record_scatterings;
     int64_t i_slot = -1;
 
-
     double Ang_avr = everest->Ang_avr;
-    double Ang_rms = everest->Ang_rms;
+    double Ang_rms = everest->Ang_rms * RandomNormal_generate(part);
+    // TODO: Use standard MCS
+    // TODO: should we automatically channel after VC? Now it will still roll a dice, and do VRCH if failed. Many VR are missed this way
 
     if (transition == XC_VOLUME_REFLECTION_TRANS_CH){
         // We are in transition from CH to VR
@@ -31,22 +32,13 @@ void volume_reflection(EverestData restrict everest, LocalParticle* part, int8_t
         if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_VOLUME_REFLECTION_TRANS_CH);
 
     } else if (transition == XC_VOLUME_REFLECTION_TRANS_MCS){
-        // We are in transition from VR to MCS
-//         double t_c = everest->t_c;
-//         double t_P = everest->t_P;
-//         double xp_rel = LocalParticle_get_xp(part) - everest->t_I;
-//         // TODO: where does 3 come from
-//         Ang_rms *= -3.*(xp_rel-t_P)/(2.*t_c); // TODO: why no random number?
-        Ang_rms *= RandomNormal_generate(part);
         if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_VOLUME_REFLECTION_TRANS_MCS);
 
     } else {
-        Ang_rms *= RandomNormal_generate(part);
         if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_VOLUME_REFLECTION);
-    }
 
-    double t_VR = Ang_avr + Ang_rms;
-    LocalParticle_add_to_xp(part, t_VR);
+    }
+    LocalParticle_add_to_xp(part, Ang_avr + Ang_rms);
     if (sc) InteractionRecordData_log_child(record, i_slot, part);
 }
 
@@ -69,10 +61,6 @@ double amorphous_transport(EverestData restrict everest, LocalParticle* part, do
     if (transition == XC_MULTIPLE_COULOMB_TRANS_VR){
         // Transition MCS
         if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_MULTIPLE_COULOMB_TRANS_VR);
-//         double xp_rel = LocalParticle_get_xp(part) - everest->t_I;
-//         double t_P = everest->t_P;
-//         double t_c = everest->t_c;
-//         dya *= 1 - (xp_rel-t_P)/(2.*t_c);
     } else {
         // Normal MCS
         if (sc) i_slot = InteractionRecordData_log(record, record_index, part, XC_MULTIPLE_COULOMB_SCATTERING);
@@ -84,8 +72,7 @@ double amorphous_transport(EverestData restrict everest, LocalParticle* part, do
     Drift_single_particle_4d(part, length);
 
     // Energy lost because of ionisation process[GeV]
-    double energy_loss = calcionloss(everest, part, length);
-    pc  = pc - energy_loss*length;
+    pc = calcionloss(everest, part, length, pc, 1);
 
     // Store new angles
     LocalParticle_add_to_xp_yp(part, kxmcs, kymcs);
@@ -96,9 +83,40 @@ double amorphous_transport(EverestData restrict everest, LocalParticle* part, do
     return pc;
 }
 
+
 double Channel(EverestData restrict everest, LocalParticle* part, CrystalGeometry restrict cg, double pc, double length);
+double Amorphous(EverestData restrict everest, LocalParticle* part, CrystalGeometry restrict cg, double pc, double length, int8_t allow_VI);
 
-/*gpufun*/
+double volume_interaction(EverestData restrict everest, LocalParticle* part, CrystalGeometry restrict cg, double pc, double length, int8_t transition){
+#ifdef XCOLL_REFINE_ENERGY
+    calculate_VI_parameters(everest, part, pc);
+#endif
+    // Are we reflecting or captured?
+    if (RandomUniform_generate(part) > everest->Vcapt) {
+        // Volume Reflection
+        volume_reflection(everest, part, transition);
+        // We call the main Amorphous function for the leftover
+        pc = Amorphous(everest, part, cg, pc, length, 0);
+
+    } else {
+        // Volume Capture
+        if (everest->coll->record_scatterings){
+            InteractionRecordData record = everest->coll->record;
+            RecordIndex record_index     = everest->coll->record_index;
+            InteractionRecordData_log(record, record_index, part, XC_VOLUME_CAPTURE);
+        }
+        // We call the main Channel function for the leftover
+        calculate_initial_angle(everest, part, cg);
+        calculate_opening_angle(everest, part, cg);
+        #ifdef XCOLL_REFINE_ENERGY
+            calculate_critical_angle(everest, part, cg, pc);
+        #endif
+        pc = Channel(everest, part, cg, pc, length);
+    }
+    return pc;
+}
+
+// /*gpufun*/
 double Amorphous(EverestData restrict everest, LocalParticle* part, CrystalGeometry restrict cg, double pc, double length, int8_t allow_VI) {
 
     if (LocalParticle_get_state(part) < 1){
@@ -106,10 +124,6 @@ double Amorphous(EverestData restrict everest, LocalParticle* part, CrystalGeome
         return pc;
     }
 
-    InteractionRecordData record = everest->coll->record;
-    RecordIndex record_index     = everest->coll->record_index;
-    int8_t sc = everest->coll->record_scatterings;
-
     calculate_initial_angle(everest, part, cg);
 
     // -----------------------------------------------
@@ -148,71 +162,81 @@ double Amorphous(EverestData restrict everest, LocalParticle* part, CrystalGeome
     // --------------------------------------------------------------
     // This happens when the particle is tangential to the crystal planes.
     // The (straight) trajectory until the point of reflection is r sin(xp - t_I),
-    // hence the longitudinal length is r sin(xp - miscut) cos xp
-    double length_VI = everest->r * sin(xp - everest->t_I) * cos(xp);
-    // If length_VI is negative, VI is not possible, so set to a big value
-    if (length_VI < 0) {length_VI = 1e10;}
+    // hence the longitudinal length is r sin(xp - t_I) cos xp
+    double length_VI = 1e10;
+    if (xp > everest->t_I){
+    // xp has to be larger than t_I to be able to VR (no matter which transition we consider)
+// #ifdef XCOLL_TRANSITION_VRAM
+//         // Transition region between VR and AM for t_B < xp - tI < t_B + t_c  (or t_B + 2t_c if OLD)
+//         length_VI = everest->r * sin(xp - everest->t_I) * cos(xp);
+// // #else
+// // #ifdef XCOLL_TRANSITION_VRAM
+// //         // Transition region between VR and AM for t_B < xp - tI < t_B + t_c
+// //         // We need to start transitioning earlier than t_B
+// //         length_VI = everest->r * sin(xp - everest->t_I + everest->t_c) * cos(xp);
+// #else
+//         // Normal behaviour, no transition
+        length_VI = everest->r * sin(xp - everest->t_I) * cos(xp);
+// // #endif
+// #endif
+    }
     // Calculate extra length to transition region between VR and AM
-    double length_VR_trans = everest->r * sin(xp - everest->t_I - 2.*everest->t_c) * cos(xp - 2.*everest->t_c);
-    if (length_VR_trans < 0) {length_VR_trans = 1e10;}
+    double length_VR_trans = 1e10;
+#ifdef XCOLL_TRANSITION_VRAM_OLD
+    // Transition region between VR and AM for t_B < xp - tI < t_B + 2t_c
+    if (xp - 2.*everest->t_c > everest->t_I){
+        length_VR_trans = everest->r * sin(xp - everest->t_I - 2.*everest->t_c) * cos(xp);
+    }
+#else
+#ifdef XCOLL_TRANSITION_VRAM
+    // Transition region between VR and AM for t_B < xp - tI < t_B + t_c
+    if (xp - everest->t_c > everest->t_I){
+        length_VR_trans = everest->r * sin(xp - everest->t_I - everest->t_c) * cos(xp);
+    }
+#endif
+#endif
 
     // ------------------------------------------------------------------------
     // Compare the 3 lengths: the first one encountered is what will be applied
     // ------------------------------------------------------------------------
-    if (length_VI <= fmin(length_nucl, length_exit) && allow_VI == 1){
-        // MCS to volume interaction
-        pc = amorphous_transport(everest, part, pc, length_VI, 0);
-#ifdef XCOLL_REFINE_ENERGY
-        calculate_VI_parameters(everest, part, pc);
-#endif
-        // Are we reflecting or captured?
-        if (RandomUniform_generate(part) > everest->Vcapt) {
-            // Volume Reflection
-            volume_reflection(everest, part, 0);
-            // We call the main Amorphous function for the leftover
-            pc = Amorphous(everest, part, cg, pc, length - length_VI, 0);
 
+    if (length_nucl < fmin(length_VI, length_exit)) {
+        // MCS to nuclear interaction
+        pc = amorphous_transport(everest, part, pc, length_nucl, 0);
+        // interact
+        pc = nuclear_interaction(everest, part, pc);
+        if (LocalParticle_get_state(part) == XC_LOST_ON_EVEREST_COLL){
+            LocalParticle_set_state(part, XC_LOST_ON_EVEREST_CRYSTAL);
         } else {
-            // Volume Capture
-            if (sc) InteractionRecordData_log(record, record_index, part, XC_VOLUME_CAPTURE);
-            // We call the main Channel function for the leftover
-            pc = Channel(everest, part, cg, pc, length - length_VI);
+            // We call the main Amorphous function for the leftover
+            pc = Amorphous(everest, part, cg, pc, length - length_nucl, 1);
         }
 
-#ifdef XCOLL_TRANSITION
-    } else if (length_VR_trans <= fmin(length_nucl, length_exit) && allow_VI == 1){
-        // Transition region between VR and AM for t_P < xp - tI < t_P + 2t_c
-#ifdef XCOLL_REFINE_ENERGY
-        calculate_critical_angle(everest, part, cg, pc);
-#endif
-        double xp_rel = xp - everest->t_I;
-        double t_P = everest->t_P;
-        double t_c = everest->t_c;
-        double prob_MCS = (xp_rel - t_P) / (2*t_c);
+    } else if (length_VI <= length_exit && allow_VI == 1){
+        // MCS to volume interaction
+        pc = amorphous_transport(everest, part, pc, length_VI, 0);
+        pc = volume_interaction(everest, part, cg, pc, length - length_VI, 0);
+
+    } else if (length_VR_trans <= length_exit && allow_VI == 1){
+        // We estimate where we are in the transition region (rather on the VR side or rather on the AM side)
+        // by looking at how much correction we needed on the length. If length_VI is closest to length_exit,
+        // we are on the VR side. On the other hand, if length_VR_trans is closest to length_exit, we are on the
+        // AM side. Note that, by reaching this part we automatically have length_VI > length_exit > length_VR_trans.
+        double prob_MCS = (length_VI - length_exit) / (length_VI - length_VR_trans);
         if (RandomUniform_generate(part) > prob_MCS){
             // We are on the VR side
             pc = amorphous_transport(everest, part, pc, length_VR_trans, 0);
-            volume_reflection(everest, part, XC_VOLUME_REFLECTION_TRANS_MCS);
-            pc = Amorphous(everest, part, cg,  pc, length - length_VR_trans, 0);
+            pc = volume_interaction(everest, part, cg, pc, length - length_VR_trans, XC_VOLUME_REFLECTION_TRANS_MCS);
+            // // Volume Reflection
+            // volume_reflection(everest, part, XC_VOLUME_REFLECTION_TRANS_MCS);
+            // // We call the main Amorphous function for the leftover
+            // pc = Amorphous(everest, part, cg,  pc, length - length_VR_trans, 0);
         } else {
             // We are on the AM side
             // if (sc) InteractionRecordData_log(record, record_index, part, XC_MULTIPLE_COULOMB_TRANS_VR);
             pc = amorphous_transport(everest, part, pc, length_VR_trans, XC_MULTIPLE_COULOMB_TRANS_VR);
             pc = Amorphous(everest, part, cg, pc, length - length_VR_trans, 0);
         }
-#endif
-
-    } else if (length_nucl < length_exit) {
-        // MCS to nuclear interaction
-        pc = amorphous_transport(everest, part, pc, length_nucl, 0);
-        // interact
-        pc = nuclear_interaction(everest, part, pc);
-        if (LocalParticle_get_state(part) == XC_LOST_ON_EVEREST_COLL){
-            LocalParticle_set_state(part, XC_LOST_ON_EVEREST_CRYSTAL);
-        } else {
-            // We call the main Amorphous function for the leftover
-            pc = Amorphous(everest, part, cg, pc, length - length_nucl, 1);
-        }
 
     } else {
         // Exit crystal