Merge branch 'develop'

PyCOMPLETE · Jan 27, 2020 · c67d7b4 · c67d7b4
2 parents 3a9eb00 + ac64dfe
commit c67d7b4
Show file tree

Hide file tree

Showing 43 changed files with 333 additions and 51 deletions.
diff --git a/002_change_version_number.py b/002_change_version_number.py
@@ -9,7 +9,7 @@
         with open(filename) as fid:
             content = fid.read()
         if 'giovanni.iadarola@cern.ch' in content:
-            content = content.replace('PyECLOUD Version 8.4.0', 'PyECLOUD Version 8.4.0')
+            content = content.replace('PyECLOUD Version 8.4.1', 'PyECLOUD Version 8.4.1')
             with open(filename, 'w') as fid:
                 fid.write(content)
 

diff --git a/003_change_preamble.py b/003_change_preamble.py
@@ -20,7 +20,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/MP_system.py b/MP_system.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/PyEC4PyHT.py b/PyEC4PyHT.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA
@@ -238,7 +238,7 @@ def __init__(
 
         """
 
-        print("PyECLOUD Version 8.4.0")
+        print("PyECLOUD Version 8.4.1")
 
         # These git commands return the hash and the branch of the specified git directory.
         path_to_git = os.path.dirname(os.path.abspath(__file__)) + "/.git"

diff --git a/beam_and_timing.py b/beam_and_timing.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/buildup_simulation.py b/buildup_simulation.py
@@ -9,7 +9,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA
@@ -71,7 +71,7 @@ def __init__(
         **kwargs
     ):
 
-        print("PyECLOUD Version 8.4.0")
+        print("PyECLOUD Version 8.4.1")
         (
             beamtim,
             spacech_ele,

diff --git a/cloud_manager.py b/cloud_manager.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Author and contact:   Giovanni IADAROLA

diff --git a/cross_ionization.py b/cross_ionization.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/dynamics_Boris_f2py.py b/dynamics_Boris_f2py.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/dynamics_Boris_multipole.py b/dynamics_Boris_multipole.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/dynamics_dipole.py b/dynamics_dipole.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/dynamics_strong_B_generalized.py b/dynamics_strong_B_generalized.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/electron_emission.py b/electron_emission.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/gas_ionization_class.py b/gas_ionization_class.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/gen_photoemission_class.py b/gen_photoemission_class.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/geom_impact_ellip.py b/geom_impact_ellip.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/geom_impact_poly.py b/geom_impact_poly.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/geom_impact_poly_fast_impact.py b/geom_impact_poly_fast_impact.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/geom_impact_rect_fast_impact.py b/geom_impact_rect_fast_impact.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/h000_find_and_modify_preamble.py b/h000_find_and_modify_preamble.py
@@ -16,7 +16,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/impact_management_class.py b/impact_management_class.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/init.py b/init.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/main.py b/main.py
@@ -7,7 +7,7 @@
 #
 #     This file is part of the code:
 #
-#                   PyECLOUD Version 8.4.0
+#                   PyECLOUD Version 8.4.1
 #
 #
 #     Main author:          Giovanni IADAROLA

diff --git a/mystyle.py b/mystyle.py
@@ -6,20 +6,22 @@
 import numpy as np
 
 
-def mystyle(fontsz=16):
+def mystyle(fontsz=16, traditional_look=True):
     rcdefaults()
     version = matplotlib.__version__.split('.')[0]
-    if version == '2':
-        print('Reverting matplotlib look to v1.5')
-        plt.rcParams['axes.autolimit_mode'] = 'round_numbers'
-        plt.rcParams['axes.xmargin'] = 0
-        plt.rcParams['axes.ymargin'] = 0
-        plt.rcParams['xtick.direction'] = 'in'
-        plt.rcParams['ytick.direction'] = 'in'
-        plt.rcParams['xtick.top'] = True
-        plt.rcParams['ytick.right'] = True
-        plt.rcParams['legend.numpoints'] = 1
-        plt.style.use('classic')
+
+    if traditional_look:
+        if int(version) >= '2':
+            print('Reverting matplotlib look to v1.5')
+            plt.rcParams['axes.autolimit_mode'] = 'round_numbers'
+            plt.rcParams['axes.xmargin'] = 0
+            plt.rcParams['axes.ymargin'] = 0
+            plt.rcParams['xtick.direction'] = 'in'
+            plt.rcParams['ytick.direction'] = 'in'
+            plt.rcParams['xtick.top'] = True
+            plt.rcParams['ytick.right'] = True
+            plt.rcParams['legend.numpoints'] = 1
+            plt.style.use('classic')
 
     font = {  # 'family' : 'normal',
         #'weight' : 'bold',

diff --git a/other/follow_electrons/000_run_simulation.py b/other/follow_electrons/000_run_simulation.py
@@ -0,0 +1,89 @@
+import numpy as np
+
+from PyECLOUD.buildup_simulation import BuildupSimulation
+
+sim_input_folder = '../../testing/tests_buildup/LHC_ArcDipReal_450GeV_sey1.70_2.5e11ppb_bl_1.00ns'
+sim_input_folder = 'input_files'
+t_stop_list = [1800e-9]
+
+i_observe = range(0, 60000, 100)
+
+def observe_electrons(sim):
+
+    ec = sim.cloud_list[0]
+
+    if not hasattr(ec, 'x_follow'):
+        ec.x_follow = []
+        ec.y_follow = []
+        ec.z_follow = []
+        ec.nel_follow = []
+
+    mask_observe = np.zeros_like(ec.MP_e.x_mp, dtype=np.bool)
+    mask_observe[i_observe] = True
+
+    x_temp = ec.MP_e.x_mp[mask_observe]
+    y_temp = ec.MP_e.y_mp[mask_observe]
+    z_temp = ec.MP_e.z_mp[mask_observe]
+    nel_temp = ec.MP_e.nel_mp[mask_observe]
+
+    temp_mask = mask_observe.copy()
+    temp_mask[ec.MP_e.N_mp:] = False
+    N_keep = np.sum(temp_mask)
+
+    x_temp[N_keep:] = np.nan
+    y_temp[N_keep:] = np.nan
+    z_temp[N_keep:] = np.nan
+    nel_temp [N_keep:] = np.nan
+
+    ec.x_follow.append(x_temp)
+    ec.y_follow.append(y_temp)
+    ec.z_follow.append(z_temp)
+    ec.nel_follow.append(nel_temp)
+
+    return np.sum(nel_temp)
+
+step_by_step_custom_observables = {
+        'N_observed': observe_electrons,
+        }
+
+pass_by_pass_custom_observables = {
+        }
+
+save_once_custom_observables = {
+        }
+
+sim = BuildupSimulation(pyecl_input_folder=sim_input_folder,
+        logfile_path='logfile.txt',
+        progress_path='progress.txt',
+        filen_main_outp='./Pyecltest.mat',
+        secondary_angle_distribution = 'cosine_3D',
+        fact_clean = 0.,  # cleanings would move electrons around
+        extract_sey=False,
+        step_by_step_custom_observables = step_by_step_custom_observables,
+        pass_by_pass_custom_observables = pass_by_pass_custom_observables,
+        save_once_custom_observables = save_once_custom_observables)
+
+ec = sim.cloud_list[0]
+
+for ii, t_stop in enumerate(t_stop_list):
+    print('\n\n==============================')
+    print(('Simulation run %d - t_stop = %s s'%(ii, repr(t_stop))))
+    print((' starting at tt=%s s'%repr(sim.beamtim.tt_curr)))
+
+    sim.run(t_end_sim = t_stop)
+
+    print((' after run a tt=%s'%repr(sim.beamtim.tt_curr)))
+
+
+x_foll = np.array(ec.x_follow)
+y_foll = np.array(ec.y_follow)
+z_foll = np.array(ec.z_follow)
+nel_foll = np.array(ec.nel_follow)
+
+import scipy.io as sio
+sio.savemat('followed_electrons.mat',{
+    'x': x_foll,
+    'y': y_foll,
+    'z': z_foll,
+    'nel': nel_foll,
+    }, oned_as='row')