From ecd44441f69b1b723ae0391de3709f56730cb0cd Mon Sep 17 00:00:00 2001 From: Frederik Van der Veken Date: Mon, 24 Oct 2022 17:10:33 +0200 Subject: [PATCH] Do not force ML loading unless needed. --- xdyna/__init__.py | 1 - xdyna/da.py | 9 ++++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/xdyna/__init__.py b/xdyna/__init__.py index 300f328..57a9230 100644 --- a/xdyna/__init__.py +++ b/xdyna/__init__.py @@ -1,6 +1,5 @@ from .da import DA from .da_meta import regenerate_da_metadata from .protectfile import ProtectFile, get_hash -#from .sixtrack import particles_to_sixtrack_initial, sixtrack_initial_to_particles, sixtrack_dump2_to_particles __version__ = '0.0.2' diff --git a/xdyna/da.py b/xdyna/da.py index a47166f..ac2e3f7 100644 --- a/xdyna/da.py +++ b/xdyna/da.py @@ -14,10 +14,9 @@ import xobjects as xo # import xtrack as xt import xpart as xp - + from .protectfile import ProtectFile from .da_meta import _DAMetaData -from .ml import MLBorder from .geometry import _bleed, distance_to_polygon_2D @@ -72,7 +71,6 @@ def __init__(self, filename, *, min_turns=None, max_turns=None, nseeds=0, emitta # ================ Generation of intial conditions ================ # ================================================================= - def _prepare_generation(self, emittance=None, nseeds=None, pairs_shift=0, pairs_shift_var=None): # Does survival already exist? if self._surv is not None: @@ -134,7 +132,7 @@ def _create_pairs(self): def generate_random_initial(self, *, num_part=1000, r_max=25, px_norm=0, py_norm=0, zeta=0, delta=0.00027, emittance=None, nseeds=None, pairs_shift=0, pairs_shift_var=None): """Generate the initial conditions in a 2D random grid. - + traditionally this is .000000001 """ self._prepare_generation(emittance, nseeds, pairs_shift, pairs_shift_var) @@ -189,7 +187,7 @@ def generate_initial_radial(self, *, angles, r_min, r_max, r_step=None, r_num=No px_norm=0, py_norm=0, zeta=0, delta=0.00027, emittance=None, nseeds=None, pairs_shift=0, pairs_shift_var=None): """Generate the initial conditions in a 2D polar grid. - + traditionally this is .000000001 """ self._prepare_generation(emittance, nseeds, pairs_shift, pairs_shift_var) @@ -255,6 +253,7 @@ def generate_initial_radial(self, *, angles, r_min, r_max, r_step=None, r_num=No # Not allowed on parallel process def add_random_initial(self, *, num_part=5000, min_turns=None): + from .ml import MLBorder # TODO: make compatible with seeds and with pairs if self.meta.nseeds > 0 or self.meta.pairs_shift != 0: