Merge branch 'develop' of llrgit.in2p3.fr:smilei/smilei into develop

Author: MickaelGrech

doc/Sphinx/tables.rst

@@ -121,6 +121,7 @@ We have computed some tables with several levels of discretizations that you can
 
 This table size is a good compromise between accuracy and memory cost.
 2D tables can fit in L2 cache although the pressure on the cache will be high.
+This set of tables is the one included by default in the sources of :program:`Smilei`
 
 .. code-block:: bash
 
@@ -134,8 +135,6 @@ This table size is a good compromise between accuracy and memory cost.
 
 `multiphoton_breit_wheeler_tables.h5 <http://mdls-internet.extra.cea.fr/projects/Smilei/uploads/tables_256/multiphoton_breit_wheeler_tables.h5>`_
 
-This set of tables is included by default in the sources of :program:`Smilei`
-
 512 points
 """""""""""
 

tools/tables/dump_multiphoton_Breit_Wheeler.py

@@ -5,6 +5,16 @@
 
 import h5py as h5py
 import numpy as np
+import sys
+
+# ______________________________________________________________________________
+# Checks
+
+try:
+    path = sys.argv[1]
+except:
+    print("\n Please, provide a path to the tables.\n")
+    raise
 
 # ______________________________________________________________________________
 # Functions
@@ -17,15 +27,15 @@ def if_file_exist(filename):
     file = open(filename)
   except IOError:
     flag = False
-    print ' No file : ', filename
+    print(' No file: {}'.format(filename))
   return flag
 
 # ______________________________________________________________________________
 # Read the table integration_dt_dchi
 
-if if_file_exist('./multiphoton_Breit_Wheeler_tables.h5'):
+if if_file_exist(path):
 
-    f = h5py.File('./multiphoton_Breit_Wheeler_tables.h5', "r")
+    f = h5py.File(path, "r")
 
     if 'integration_dt_dchi' in f:
 
@@ -48,9 +58,9 @@ def if_file_exist(filename):
 # ______________________________________________________________________________
 # Read the table min particle chi for xi
 
-if if_file_exist('./multiphoton_Breit_Wheeler_tables.h5'):
+if if_file_exist(path):
 
-    f = h5py.File('./multiphoton_Breit_Wheeler_tables.h5', "r")
+    f = h5py.File(path, "r")
 
     if 'min_particle_chi_for_xi' in f:
 
@@ -73,9 +83,9 @@ def if_file_exist(filename):
 # ______________________________________________________________________________
 # Read the table xi
 
-if if_file_exist('./multiphoton_Breit_Wheeler_tables.h5'):
+if if_file_exist(path):
 
-    f = h5py.File('./multiphoton_Breit_Wheeler_tables.h5', "r")
+    f = h5py.File(path, "r")
 
     if 'xi' in f:
 

tools/tables/dump_nonlinear_inverse_Compton_scattering.py

@@ -5,6 +5,15 @@
 
 import h5py as h5py
 import numpy as np
+import sys
+# ______________________________________________________________________________
+# Checks
+
+try:
+    path = sys.argv[1]
+except:
+    print("\n Please, provide a path to the tables.\n")
+    raise
 
 # ______________________________________________________________________________
 # Functions
@@ -17,15 +26,15 @@ def if_file_exist(filename):
     file = open(filename)
   except IOError:
     flag = False
-    print ' No file : ', filename
+    print(' No file: {}'.format(filename))
   return flag
 
 # ______________________________________________________________________________
 # Dump the table integfochi
 
-if if_file_exist('./radiation_tables.h5'):
+if if_file_exist(path):
 
-    f = h5py.File('./radiation_tables.h5', "r")
+    f = h5py.File(path, "r")
 
     if 'integfochi' in f:
 
@@ -48,9 +57,9 @@ def if_file_exist(filename):
 # ______________________________________________________________________________
 # Read the table h
 
-if if_file_exist('./radiation_tables.h5'):
+if if_file_exist(path):
 
-    f = h5py.File('./radiation_tables.h5', "r")
+    f = h5py.File(path, "r")
 
     if 'h' in f:
 
@@ -73,9 +82,9 @@ def if_file_exist(filename):
 # ______________________________________________________________________________
 # Read the table min photon chi for xi
 
-if if_file_exist('./radiation_tables.h5'):
+if if_file_exist(path):
 
-    f = h5py.File('./radiation_tables.h5', "r")
+    f = h5py.File(path, "r")
 
     if 'min_photon_chi_for_xi' in f:
 
@@ -98,9 +107,9 @@ def if_file_exist(filename):
 # ______________________________________________________________________________
 # Read the table xip
 
-if if_file_exist('./radiation_tables.h5'):
+if if_file_exist(path):
 
-    f = h5py.File('./radiation_tables.h5', "r")
+    f = h5py.File(path, "r")
 
     if 'xi' in f:
 

tools/tables/show_multiphoton_Breit_Wheeler.py

@@ -45,7 +45,6 @@
     print("\n Please, provide a path to the tables.\n")
     raise
 
-
 # ______________________________________________________________________________
 # Functions
 
@@ -57,7 +56,7 @@ def if_file_exist(filename):
     file = open(filename)
   except IOError:
     flag = False
-    print ' No file : ', filename
+    print(' No file: {}'.format(filename))
   return flag
 
 

tools/tables/show_nonlinear_inverse_Compton_scattering.py

@@ -57,7 +57,7 @@ def if_file_exist(filename):
     file = open(filename)
   except IOError:
     flag = False
-    print ' No file : ', filename
+    print(' No file: {}'.format(filename))
   return flag
 
 # ______________________________________________________________________________