From 18bb0367013395788dcf3c66db4f1b16f4ae4d17 Mon Sep 17 00:00:00 2001
From: Guillaume D <guillaume.demesy@fresnel.fr>
Date: Tue, 14 Feb 2023 21:54:04 +0100
Subject: [PATCH] clean up again

---
 .../grating3D_parallel_Mmatrix.sh             |  7 ++-
 .../grating3D_postplot_Mmatrix.py             | 48 ++++++++-----------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/DiffractionGratings/grating3D_parallel_Mmatrix.sh b/DiffractionGratings/grating3D_parallel_Mmatrix.sh
index 57b1005..9f454c3 100644
--- a/DiffractionGratings/grating3D_parallel_Mmatrix.sh
+++ b/DiffractionGratings/grating3D_parallel_Mmatrix.sh
@@ -3,18 +3,21 @@ export OPENBLAS_NUM_THREADS=1
 export OMP_NUM_THREADS=1
 export NPROC=96
 
+### choose configuration
+### theta loop study for the pillar case
 export flag_angle_study="theta"
 export loop_angle_max=50
 export fixed_angle=90
 export GRATING_CASE="pillar"
 
+### phi loop study for the half_ellipsoid case
 # export flag_angle_study="phi"
 # export loop_angle_max=360
 # export fixed_angle=50
 # export GRATING_CASE="half_ellipsoid"
 
-export nb_angle=2
-export nb_lam=2
+export nb_angle=20
+export nb_lam=100
 export lambda_min=400
 export lambda_max=1200
 export FLAG_TOTAL=0
diff --git a/DiffractionGratings/grating3D_postplot_Mmatrix.py b/DiffractionGratings/grating3D_postplot_Mmatrix.py
index c0b4590..521dfc9 100644
--- a/DiffractionGratings/grating3D_postplot_Mmatrix.py
+++ b/DiffractionGratings/grating3D_postplot_Mmatrix.py
@@ -3,28 +3,6 @@ import matplotlib.pyplot as plt
 import matplotlib as mpl
 import scipy.constants as scc
 import argparse
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-flag_angle_study" , help="flag_angle_study" , type=str   , default='phi')
-parser.add_argument("-nb_angle"         , help="nb_angle"         , type=int   , default=2)
-parser.add_argument("-loop_angle_max"   , help="loop_angle_max"   , type=float , default=360)
-parser.add_argument("-fixed_angle"      , help="fixed_angle"      , type=float , default=50)
-parser.add_argument("-nb_lam"           , help="nb_lam"           , type=int   , default=2)
-parser.add_argument("-lambda_min"       , help="lambda_min"       , type=float , default=400)
-parser.add_argument("-lambda_max"       , help="lambda_max"       , type=float , default=1200)
-args = parser.parse_args()
-
-flag_angle_study  = args.flag_angle_study
-nb_angle          = args.nb_angle
-loop_angle_max    = args.loop_angle_max
-fixed_angle       = args.fixed_angle
-nb_lam            = args.nb_lam
-lambda_min        = args.lambda_min
-lambda_max        = args.lambda_max
-
-FLAG_TOT = 0
-
-
 plt.rcParams.update({"text.usetex": True, "font.family": "serif"})
 
 def add_colorbar(mappable):
@@ -46,6 +24,27 @@ def load_getdp_integral(fname):
     else:
         return temp[:,1]+1j*temp[:,2]
 
+parser = argparse.ArgumentParser()
+parser.add_argument("-flag_angle_study" , help="flag_angle_study" , type=str   , default='theta')
+parser.add_argument("-nb_angle"         , help="nb_angle"         , type=int   , default=20)
+parser.add_argument("-loop_angle_max"   , help="loop_angle_max"   , type=float , default=50)
+parser.add_argument("-fixed_angle"      , help="fixed_angle"      , type=float , default=90)
+parser.add_argument("-nb_lam"           , help="nb_lam"           , type=int   , default=100)
+parser.add_argument("-lambda_min"       , help="lambda_min"       , type=float , default=400)
+parser.add_argument("-lambda_max"       , help="lambda_max"       , type=float , default=1200)
+args = parser.parse_args()
+
+flag_angle_study = args.flag_angle_study
+nb_angle         = args.nb_angle
+loop_angle_max   = args.loop_angle_max
+fixed_angle      = args.fixed_angle
+nb_lam           = args.nb_lam
+lambda_min       = args.lambda_min
+lambda_max       = args.lambda_max
+
+FLAG_TOT = 0
+str_reftrans = 'r'
+
 respath  = 'res_Matrix_nb_lam%g_nb_%s%g_total0/'%(nb_lam,flag_angle_study,nb_angle)
 
 rpp = np.zeros((nb_lam,nb_angle),dtype=complex)
@@ -68,7 +67,6 @@ tab_angle = np.linspace(0,loop_angle_max,nb_angle)
 tab_hnu = 2*scc.pi*scc.c/(tab_lam*1e-9/scc.hbar*scc.eV)
 M = np.zeros((4,4,nb_lam,nb_angle),dtype=complex)
 
-
 ### Convention used e.g. in https://doi.org/10.1364/JOSAB.36.000E78
 # [Ep]      [ rpp    rps ] [Ep]    
 # [  ]    = [            ] [  ]    
@@ -77,8 +75,6 @@ M = np.zeros((4,4,nb_lam,nb_angle),dtype=complex)
 # that are parallel (resp. perpendicular) to the plane of incidence
 # rps : send Es_inc (s-in), project the reflected field along p (p-out)
 
-str_reftrans = 'r'
-
 for i in range(nb_lam):
     print(i)
     for j in range(nb_angle):
@@ -167,8 +163,6 @@ ax=axes[1,1];zplot = ax.pcolormesh(L,P,R00_pin.real  );add_colorbar(zplot);ax.ti
 ax=axes[2,1];zplot = ax.pcolormesh(L,P,Qscat_pin.real);add_colorbar(zplot);ax.title.set_text('Abs pin')
 plt.savefig('BALANCE_new_code.jpg')
 
-
-
 fig, axes = plt.subplots(4, 4, subplot_kw=dict(projection='polar') ,figsize=(12,12))
 flag_lam = False
 rlabel = r"$\hbar \nu$" if not flag_lam else r"$\lambda_0$"
-- 
GitLab