xfields 0.23.2__tar.gz → 0.23.4__tar.gz

{xfields-0.23.2 → xfields-0.23.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xfields
-Version: 0.23.2
+Version: 0.23.4
 Summary: Field Maps and Particle In Cell
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xfields

{xfields-0.23.2 → xfields-0.23.4}/tests/test_electroncloud.py

@@ -119,9 +119,16 @@ def test_electroncloud_config(test_context):
         'mqd': {key: ecloud_info['mqd'][key] for key in list(ecloud_info['mqd'].keys())[:5]}
     }
 
-    twiss_without_ecloud, twiss_with_ecloud = xf.full_electroncloud_setup(line=line, 
-                ecloud_info=reduced_ecloud_info, filenames=pinch_filenames, context=test_context, zeta_max=zeta_max)
-
+    twiss_without_ecloud, twiss_with_ecloud = xf.full_electroncloud_setup(line=line,
+                ecloud_info=reduced_ecloud_info, filenames=pinch_filenames,
+                context=test_context, zeta_max=zeta_max)
 
     xo.assert_allclose(twiss_with_ecloud['x'],twiss_without_ecloud['x'], atol=3e-12, rtol=0)
     xo.assert_allclose(twiss_with_ecloud['y'],twiss_without_ecloud['y'], atol=3e-12, rtol=0)
+
+    tt = line.get_table()
+    assert np.all(tt.rows[tt.element_type == 'ElectronCloud'].name == np.array(
+       ['ecloud.mqd.12.0', 'ecloud.mqf.12.0', 'ecloud.mqd.12.1',
+        'ecloud.mqf.12.1', 'ecloud.mqd.12.10', 'ecloud.mqf.12.10',
+        'ecloud.mqd.12.11', 'ecloud.mqf.12.11', 'ecloud.mqd.12.12',
+        'ecloud.mqf.12.12']))

xfields-0.23.4/xfields/_version.py

@@ -0,0 +1 @@
+__version__ = "0.23.4"

{xfields-0.23.2 → xfields-0.23.4}/xfields/config_tools/electroncloud_config_tools.py

@@ -92,17 +92,19 @@ def get_electroncloud_fieldmap_from_h5(
 
 def insert_electronclouds(eclouds, fieldmap=None, line=None):
     assert line is not None
+    insertions = []
+    env = line.env
     for name in eclouds.keys():
         s = eclouds[name]["s"]
         length = 0.
-        line.insert_element(
-            element=ElectronCloud(
+        element=ElectronCloud(
                 length=length,
                 fieldmap=fieldmap,
-                _buffer=fieldmap._buffer),
-            name=name,
-            at_s=s)
+                _buffer=fieldmap._buffer)
+        env.elements[name] = element
+        insertions.append(env.place(name, at=s))
 
+    line.insert(insertions)
 
 def config_electronclouds(line, twiss=None, ecloud_info=None, shift_to_closed_orbit=False,
                           subtract_dipolar_kicks=False, fieldmaps=None):

{xfields-0.23.2 → xfields-0.23.4}/xfields/config_tools/spacecharge_config_tools.py

@@ -22,7 +22,8 @@ def install_spacecharge_frozen(line=None, _buffer=None,
                                tol_spacecharge_position=None,
                                s_spacecharge=None,
                                delta_rms=None,
-                               z_kick_num_integ_per_sigma=0):
+                               z_kick_num_integ_per_sigma=0,
+                               prefix='spacecharge_'):
 
     '''
     Install spacecharge elements (frozen modeling) in a xtrack.Line object.
@@ -106,7 +107,7 @@ def install_spacecharge_frozen(line=None, _buffer=None,
             mean_y=0.,
             sigma_x=1.,
             sigma_y=1.))
-        sc_names.append(f'spacecharge_{ii}')
+        sc_names.append(f'{prefix}{ii}')
 
         insertions.append((ss, [(sc_names[-1], sc_elements[-1])]))
 

{xfields-0.23.2 → xfields-0.23.4}/xfields.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xfields
-Version: 0.23.2
+Version: 0.23.4
 Summary: Field Maps and Particle In Cell
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xfields

xfields-0.23.2/xfields/_version.py

@@ -1 +0,0 @@
-__version__ = "0.23.2"