Generalize Analysis Scripts: Number of Digits (plt) (#2683)

* Update Scripts to Handle New File Names

* Use glob in Analysis of Collision Tests

* Use rstrip in Analysis of Collision Tests

* Regex: Match ends-in-digits

Thanks Phil! :)

Co-authored-by: Edoardo Zoni <ezoni@lbl.gov>
Co-authored-by: Phil Miller <unmobile+gh@gmail.com>

11 files changed, 21 insertions, 13 deletions

diff --git a/Examples/Modules/RigidInjection/analysis_rigid_injection_LabFrame.py b/Examples/Modules/RigidInjection/analysis_rigid_injection_LabFrame.py
index 5038ecc21..c764ef357 100755
--- a/Examples/Modules/RigidInjection/analysis_rigid_injection_LabFrame.py
+++ b/Examples/Modules/RigidInjection/analysis_rigid_injection_LabFrame.py
@@ -23,6 +23,7 @@ in which case a warning is raised.
 import sys
 import yt
 import numpy as np
+import os
 yt.funcs.mylog.setLevel(0)
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
 import checksumAPI
@@ -82,5 +83,5 @@ print("tolerance_rel: " + str(tolerance_rel))
 
 assert( error_rel < tolerance_rel )
 
-test_name = filename[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, filename)
diff --git a/Examples/Modules/ionization/analysis_ionization.py b/Examples/Modules/ionization/analysis_ionization.py
index 8b0670fdc..f11662b0a 100755
--- a/Examples/Modules/ionization/analysis_ionization.py
+++ b/Examples/Modules/ionization/analysis_ionization.py
@@ -21,6 +21,7 @@ ions are N5+, in agreement with theory from Chen's article.
 import sys
 import yt
 import numpy as np
+import os
 yt.funcs.mylog.setLevel(0)
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
 import checksumAPI
@@ -90,5 +91,5 @@ print("tolerance_rel: " + str(tolerance_rel))
 
 assert( error_rel < tolerance_rel )
 
-test_name = filename[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, filename)
diff --git a/Examples/Modules/laser_injection/analysis_2d.py b/Examples/Modules/laser_injection/analysis_2d.py
index 1ea477dbd..e26ae4478 100755
--- a/Examples/Modules/laser_injection/analysis_2d.py
+++ b/Examples/Modules/laser_injection/analysis_2d.py
@@ -23,6 +23,7 @@ import matplotlib
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import numpy as np
+import os
 from scipy.signal import hilbert
 from mpl_toolkits.axes_grid1 import make_axes_locatable
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
@@ -198,7 +199,7 @@ def main():
 
     check_laser(filename_end)
 
-    test_name = filename_end[:-9] # Could also be os.path.split(os.getcwd())[1]
+    test_name = os.path.split(os.getcwd())[1]
     checksumAPI.evaluate_checksum(test_name, filename_end)
 
 if __name__ == "__main__":
diff --git a/Examples/Modules/laser_injection/analysis_laser.py b/Examples/Modules/laser_injection/analysis_laser.py
index e2ed2e1bb..5e2234c30 100755
--- a/Examples/Modules/laser_injection/analysis_laser.py
+++ b/Examples/Modules/laser_injection/analysis_laser.py
@@ -13,6 +13,7 @@ import matplotlib
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import numpy as np
+import os
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
 import checksumAPI
 
@@ -25,5 +26,5 @@ s = 1 + np.sin(2*np.pi*t)
 plt.plot(t, s)
 plt.savefig("laser_analysis.png")
 
-test_name = fn[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, fn)
diff --git a/Examples/Modules/qed/breit_wheeler/analysis_opmd.py b/Examples/Modules/qed/breit_wheeler/analysis_opmd.py
index be86f2dd5..e06bfe127 100755
--- a/Examples/Modules/qed/breit_wheeler/analysis_opmd.py
+++ b/Examples/Modules/qed/breit_wheeler/analysis_opmd.py
@@ -7,7 +7,6 @@
 
 # -*- coding: utf-8 -*-
 
-
 import sys
 import openpmd_api as io
 #sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
@@ -64,7 +63,7 @@ def main():
 
     ac.check(dt, particle_data)
 
-    #test_name = filename_end[:-9] # Could also be os.path.split(os.getcwd())[1]
+    #test_name = os.path.split(os.getcwd())[1]
     #checksumAPI.evaluate_checksum(test_name, filename_end)
 
 if __name__ == "__main__":
diff --git a/Examples/Modules/qed/breit_wheeler/analysis_yt.py b/Examples/Modules/qed/breit_wheeler/analysis_yt.py
index 47b6a3428..ef377d55a 100755
--- a/Examples/Modules/qed/breit_wheeler/analysis_yt.py
+++ b/Examples/Modules/qed/breit_wheeler/analysis_yt.py
@@ -7,7 +7,7 @@
 
 # -*- coding: utf-8 -*-
 
-
+import os
 import sys
 import yt
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
@@ -55,7 +55,7 @@ def main():
 
     ac.check(dt, particle_data)
 
-    test_name = filename_end[:-9] # Could also be os.path.split(os.getcwd())[1]
+    test_name = os.path.split(os.getcwd())[1]
     checksumAPI.evaluate_checksum(test_name, filename_end)
 
 if __name__ == "__main__":
diff --git a/Examples/Modules/qed/quantum_synchrotron/analysis.py b/Examples/Modules/qed/quantum_synchrotron/analysis.py
index a38aff595..2abafa24a 100755
--- a/Examples/Modules/qed/quantum_synchrotron/analysis.py
+++ b/Examples/Modules/qed/quantum_synchrotron/analysis.py
@@ -10,6 +10,7 @@
 
 import yt
 import numpy as np
+import os
 import sys
 import scipy.special as spe
 import scipy.integrate as integ
@@ -297,7 +298,7 @@ def check():
 
         print("*************\n")
 
-    test_name = filename_end[:-9] # Could also be os.path.split(os.getcwd())[1]
+    test_name = os.path.split(os.getcwd())[1]
     checksumAPI.evaluate_checksum(test_name, filename_end)
 
 def main():
diff --git a/Examples/Modules/qed/schwinger/analysis_schwinger.py b/Examples/Modules/qed/schwinger/analysis_schwinger.py
index 33e82652d..8af14a425 100755
--- a/Examples/Modules/qed/schwinger/analysis_schwinger.py
+++ b/Examples/Modules/qed/schwinger/analysis_schwinger.py
@@ -13,6 +13,7 @@
 
 import yt
 import numpy as np
+import os
 import sys
 import re
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
@@ -120,5 +121,5 @@ def do_analysis(Ex,Ey,Ez,Bx,By,Bz):
 
 do_analysis(Ex_test, Ey_test, Ez_test, Bx_test, By_test, Bz_test)
 
-test_name = filename[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, filename)
diff --git a/Examples/Modules/relativistic_space_charge_initialization/analysis.py b/Examples/Modules/relativistic_space_charge_initialization/analysis.py
index 66c47cca6..19dc84ef2 100755
--- a/Examples/Modules/relativistic_space_charge_initialization/analysis.py
+++ b/Examples/Modules/relativistic_space_charge_initialization/analysis.py
@@ -17,6 +17,7 @@ matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import yt
 import numpy as np
+import os
 import scipy.constants as scc
 yt.funcs.mylog.setLevel(0)
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
@@ -84,5 +85,5 @@ def check(E, E_th, label):
 
 check( Ex_array, Ex_th, 'Ex' )
 
-test_name = filename[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, filename, do_particles=False)
diff --git a/Examples/Modules/resampling/analysis_leveling_thinning.py b/Examples/Modules/resampling/analysis_leveling_thinning.py
index 32e85d2c5..ffa2a4333 100755
--- a/Examples/Modules/resampling/analysis_leveling_thinning.py
+++ b/Examples/Modules/resampling/analysis_leveling_thinning.py
@@ -11,6 +11,7 @@
 
 import yt
 import numpy as np
+import os
 import sys
 from scipy.special import erf
 sys.path.insert(1, '../../../../warpx/Regression/Checksum/')
@@ -134,5 +135,5 @@ assert(numparts_unaffected == numparts_unaffected_anticipated)
 # Check that particles with weight higher than level weight are unaffected by resampling.
 assert(np.all(w[-numparts_unaffected:] == w0[-numparts_unaffected:]))
 
-test_name = fn_final[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, fn_final)
diff --git a/Examples/Modules/space_charge_initialization/analysis.py b/Examples/Modules/space_charge_initialization/analysis.py
index feb965733..130a54207 100755
--- a/Examples/Modules/space_charge_initialization/analysis.py
+++ b/Examples/Modules/space_charge_initialization/analysis.py
@@ -17,6 +17,7 @@ matplotlib.use('Agg')
 import matplotlib.pyplot as plt
 import yt
 import numpy as np
+import os
 import scipy.constants as scc
 from scipy.special import gammainc
 yt.funcs.mylog.setLevel(0)
@@ -106,5 +107,5 @@ check( Ey_array, Ey_th, 'Ey' )
 if ds.dimensionality == 3:
     check( Ez_array, Ez_th, 'Ez' )
 
-test_name = filename[:-9] # Could also be os.path.split(os.getcwd())[1]
+test_name = os.path.split(os.getcwd())[1]
 checksumAPI.evaluate_checksum(test_name, filename, do_particles=0)