nucleardatapy 0.2.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

nucleardatapy/eos/setup_am_Leq.py

@@ -86,57 +86,88 @@ class setupAMLeq():
         self.linestyle = esym.linestyle
         self.marker = esym.marker
         #print('type esym:',type(esym.esym))
-        self.den = esym.den
-        self.esym = esym.esym
-        #print('esym:',self.esym)
-        self.x_n = ( 1.0 + self.asy ) / 2.0
-        self.x_p = ( 1.0 - self.asy ) / 2.0
-        self.n_n = self.x_n * self.den
-        self.n_p = self.x_p * self.den
-        #print('n_n:',self.n_n)
-        self.kfn = nuda.kf_n( self.n_n )
-        self.x_el = []
-        self.x_mu = []
-        x_mu = 0.0
-        #print('den:',self.den)
-        #print('x_p:',self.x_p)
-        for ind,den in enumerate(esym.den):
-            x_mu =  fsolve(func_am, (x_mu), args=(self.den[ind],self.x_p) )
-            #print('x_mu:',x_mu[0])
-            #print(f' ind:{ind}, den:{den:.3f}, x_p:{self.x_p:.3f}, x_e:{self.x_p-x_mu[0]:.3f}, x_mu:{x_mu[0]:.3f}')
-            self.x_mu.append( x_mu[0] )
-            self.x_el.append( self.x_p - x_mu[0] )
-        self.x_el = np.array( self.x_el, dtype = float )
-        self.x_mu = np.array( self.x_mu, dtype = float )
-        #print('x_e:',self.x_e)
-        #print('x_mu:',self.x_mu)
-        self.n_el = self.x_el * self.den
-        self.n_mu = self.x_mu * self.den
-        #
-        # Thermodynamical variables
-        self.e2a_nuc = esym.e2a_sm + esym.esym * self.asy**2
-        self.e2v_nuc = self.e2a_nuc * self.den
-        self.pre_nuc = esym.sm_pre + esym.sym_pre * self.asy**2
-        lep = nuda.matter.setupFFGLep( den_el = self.n_el, den_mu = self.n_mu )
-        self.e2a_el = lep.e2a_el
-        self.e2a_mu = lep.e2a_mu
-        self.e2a_lep = lep.e2a_lep
-        self.e2v_lep = lep.e2v_lep
-        self.pre_el = lep.pre_el
-        self.pre_mu = lep.pre_mu
-        self.pre_lep = lep.pre_lep
-        #
-        self.e2a_tot = self.e2a_nuc + self.e2a_lep
-        self.e2v_tot = self.e2v_nuc + self.e2v_lep
-        self.pre_tot = self.pre_nuc + self.pre_lep
-        # self.h2a
-        # self.h2v
-        # self.cs2
-
+        if esym.esym is not None:
+            self.den = esym.den
+            self.nm_den = esym.den
+            self.sm_den = esym.den
+            self.nm_e2a_int = esym.esym_nm_e2a_int
+            self.sm_e2a_int = esym.esym_sm_e2a_int
+            self.esym = esym.esym
+            #print('esym:',self.esym)
+            self.x_n = ( 1.0 + self.asy ) / 2.0
+            self.x_p = ( 1.0 - self.asy ) / 2.0
+            self.n_n = self.x_n * self.den
+            self.n_p = self.x_p * self.den
+            #print('n_n:',self.n_n)
+            self.kfn = nuda.kf_n( self.n_n )
+            self.x_el = []
+            self.x_mu = []
+            x_mu = 0.0
+            #print('den:',self.den)
+            #print('x_p:',self.x_p)
+            for ind,den in enumerate(esym.den):
+                x_mu =  fsolve(func_am, (x_mu), args=(self.den[ind],self.x_p) )
+                #print('x_mu:',x_mu[0])
+                #print(f' ind:{ind}, den:{den:.3f}, x_p:{self.x_p:.3f}, x_e:{self.x_p-x_mu[0]:.3f}, x_mu:{x_mu[0]:.3f}')
+                self.x_mu.append( x_mu[0] )
+                self.x_el.append( self.x_p - x_mu[0] )
+            self.x_el = np.array( self.x_el, dtype = float )
+            self.x_mu = np.array( self.x_mu, dtype = float )
+            #print('x_e:',self.x_e)
+            #print('x_mu:',self.x_mu)
+            self.x_lep = self.x_el + self.x_mu
+            self.n_el = self.x_el * self.den
+            self.n_mu = self.x_mu * self.den
+            #
+            # Thermodynamical variables
+            # nucleons
+            self.rmass = self.x_n * nuda.cst.mnc2 + self.x_p * nuda.cst.mpc2
+            self.e2a_int_nuc = esym.esym_sm_e2a_int + esym.esym * self.asy**2
+            self.e2a_nuc = self.rmass + self.e2a_int_nuc
+            self.eps_int_nuc = self.e2a_int_nuc * self.den
+            self.eps_nuc = self.e2a_nuc * self.den
+            self.pre_nuc = esym.esym_sm_pre + esym.esym_sym_pre * self.asy**2
+            # leptons
+            lep = nuda.matter.setupFFGLep( den_el = self.n_el, den_mu = self.n_mu )
+            self.e2a_el = self.x_el * lep.e2n_el
+            self.e2a_int_el = self.e2a_el - self.x_el * nuda.cst.mec2
+            self.e2a_mu = self.x_mu * lep.e2n_mu
+            self.e2a_int_mu = self.e2a_mu - self.x_mu * nuda.cst.mmuc2
+            self.e2a_lep = self.x_lep * lep.e2n_lep
+            self.eps_lep = self.e2a_lep / self.den
+            self.pre_el = lep.pre_el
+            self.pre_mu = lep.pre_mu
+            self.pre_lep = lep.pre_el + lep.pre_mu
+            # total
+            self.e2a_int_tot = self.e2a_int_nuc + self.e2a_lep
+            self.e2a_tot = self.e2a_nuc + self.e2a_lep
+            self.eps_int_tot = self.eps_int_nuc + self.eps_lep
+            self.eps_tot = self.eps_nuc + self.eps_lep
+            self.pre_tot = self.pre_nuc + self.pre_lep
+            # enthalpy self.h2a
+            self.h2a_lep = self.e2a_lep + self.pre_lep / self.den
+            self.h2a_nuc = self.e2a_nuc + self.pre_nuc / self.den
+            self.h2a_tot = self.e2a_tot + self.pre_tot / self.den
+            # enthaply density self.h2v
+            self.h2v_lep = self.h2a_lep * self.den
+            self.h2v_nuc = self.h2a_nuc * self.den
+            self.h2v_tot = self.h2a_tot * self.den
+            # sound speed self.cs2
+            x = np.insert(self.den, 0, 0.0)
+            y = np.insert(self.pre_lep, 0, 0.0)
+            cs_pre = CubicSpline(x, y)
+            self.cs2_lep = cs_pre(self.den, 1) / self.h2a_lep
+            y = np.insert(self.pre_nuc, 0, 0.0)
+            cs_pre = CubicSpline(x, y)
+            self.cs2_nuc = cs_pre(self.den, 1) / self.h2a_nuc
+            y = np.insert(self.pre_tot, 0, 0.0)
+            cs_pre = CubicSpline(x, y)
+            self.cs2_tot = cs_pre(self.den, 1) / self.h2a_tot
+            #            #
         self.den_unit = 'fm$^{-3}$'
         self.kf_unit = 'fm$^{-1}$'
         self.e2a_unit = 'MeV'
-        self.e2v_unit = 'MeV fm$^{-3}$'
+        self.eps_unit = 'MeV fm$^{-3}$'
         self.pre_unit = 'MeV fm$^{-3}$'
         self.gap_unit = 'MeV'
         #
@@ -159,7 +190,7 @@ class setupAMLeq():
         if self.kfn is not None: print(f"   kfn: {np.round(self.den,3)} in {self.kf_unit}")
         if self.asy is not None: print(f"   asy: {np.round(self.asy,3)}")
         if self.e2a is not None: print(f"   e2a: {np.round(self.e2a,3)} in {self.e2a_unit}")
-        if self.e2v is not None: print(f"   e2v: {np.round(self.e2v,3)} in {self.e2v_unit}")
+        if self.eps is not None: print(f"   eps: {np.round(self.eps,3)} in {self.eps_unit}")
         if self.pre is not None: print(f"   pre: {np.round(self.pre,3)} in {self.pre_unit}")
         if self.cs2 is not None: print(f"   cs2: {np.round(self.cs2,2)}")
         #
@@ -196,7 +227,7 @@ class setupAMLeq():
         #: Attribute the energy per particle.
         self.e2a = None
         #: Attribute the energy per unit volume.
-        self.e2v = None
+        self.eps = None
         #: Attribute the enthalpy per particle.
         self.h2a = None
         #: Attribute the enthalpy per unit volume.

nucleardatapy/fig/__init__.py

@@ -2,6 +2,7 @@
 This module provides microscopic, phenomenological and experimental data constraints.
 """
 from nucleardatapy.fig.matter_setupFFGNuc_fig        import *
+from nucleardatapy.fig.matter_setupFFGLep_fig        import *
 from nucleardatapy.fig.matter_setupMicro_fig         import *
 from nucleardatapy.fig.matter_setupMicro_err_NM_fig  import *
 from nucleardatapy.fig.matter_setupMicro_band_fig    import *
@@ -10,29 +11,50 @@ from nucleardatapy.fig.matter_setupMicro_gap_fig     import *
 from nucleardatapy.fig.matter_setupMicro_LP_fig      import *
 from nucleardatapy.fig.matter_setupMicroEsym_fig     import *
 #
-from nucleardatapy.fig.matter_setupPheno_fig        import *
-from nucleardatapy.fig.matter_setupPhenoEsym_fig    import *
+from nucleardatapy.fig.matter_setupPheno_fig         import *
+from nucleardatapy.fig.matter_setupPhenoEsym_fig     import *
 #
-from nucleardatapy.fig.matter_setupHIC_fig          import *
+from nucleardatapy.fig.matter_setupHIC_fig           import *
 #
-from nucleardatapy.fig.matter_setupNEPModelDist_fig import *
+from nucleardatapy.fig.matter_setupNEPStats_fig      import *
 #
-from nucleardatapy.fig.matter_Esym_fig              import *
-from nucleardatapy.fig.matter_ESM_fig               import *
-from nucleardatapy.fig.matter_ENM_fig               import *
+from nucleardatapy.fig.matter_setupCheck_fig         import *
+#
+from nucleardatapy.fig.matter_all_fig                import *
+#
+#from nucleardatapy.fig.matter_Esym_fig              import *
+#from nucleardatapy.fig.matter_ESM_fig               import *
+#from nucleardatapy.fig.matter_ENM_fig               import *
+#from nucleardatapy.fig.matter_cs2_fig               import *
+#from nucleardatapy.fig.matter_preNM_fig             import *
+#from nucleardatapy.fig.matter_preSM_fig             import *
+#from nucleardatapy.fig.matter_eosNM_fig             import *
+#from nucleardatapy.fig.matter_eosSM_fig             import *
+#from nucleardatapy.fig.matter_cs2NM_fig             import *
 #
 from nucleardatapy.fig.corr_setupKsatQsat_fig       import *
 from nucleardatapy.fig.corr_setupEsymLsym_fig       import *
 from nucleardatapy.fig.corr_setupEsymDen_fig        import *
 #
 from nucleardatapy.fig.nuc_setupBEExp_fig           import *
+from nucleardatapy.fig.nuc_setupBETheo_fig          import *
+from nucleardatapy.fig.nuc_setupBEExp_chart_fig     import *
+from nucleardatapy.fig.nuc_setupRchExp_fig          import *
+from nucleardatapy.fig.nuc_setupRchTheo_fig         import *
+from nucleardatapy.fig.nuc_setupISGMRExp_fig        import *
+from nucleardatapy.fig.nuc_setupRnpExp_fig          import *
+from nucleardatapy.fig.nuc_setupRnpTheo_fig         import *
 #
 from nucleardatapy.fig.hnuc_setupRE1LExp_fig        import *
 from nucleardatapy.fig.hnuc_setupChart_fig          import *
 #
 from nucleardatapy.fig.eos_setupAM_fig              import *
+from nucleardatapy.fig.eos_setupAM_asy_nuc_fig      import *
+from nucleardatapy.fig.eos_setupAM_asy_lep_fig      import *
+from nucleardatapy.fig.eos_setupAM_asy_tot_fig      import *
 from nucleardatapy.fig.eos_setupAMBeq_fig           import *
 from nucleardatapy.fig.eos_setupAMLeq_fig           import *
+from nucleardatapy.fig.eos_setupCC_fig              import *
 #
 from nucleardatapy.fig.crust_setupCrust_fig         import *
 #

nucleardatapy/fig/astro_setupGW_fig.py

@@ -22,10 +22,10 @@ def astro_setupGW_fig( pname, sources ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.14, bottom=0.12, right=None, top=0.8, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.14, bottom=0.12, right=0.95, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_xlabel(r'sources',fontsize='12')
-    axs.set_ylabel(r'$\tilde{\Lambda}_{90\%}$',fontsize='12')
+    axs.set_xlabel(r'sources',fontsize='14')
+    axs.set_ylabel(r'$\tilde{\Lambda}_{90\%}$',fontsize='14')
     axs.set_xlim([0.8, 2.5])
     axs.set_ylim([0, 1200])
     #
@@ -46,7 +46,7 @@ def astro_setupGW_fig( pname, sources ):
             gw = nuda.astro.setupGW( source = source, hyp = hyp )
             if nuda.env.verb_output: gw.print_output( )
             if nuda.env.verb_latex: gw.print_latex( )
-            axs.errorbar( isource+ihyp/10, gw.lam, yerr=np.array([(gw.lam_sig_do,gw.lam_sig_up)]).T, label=gw.label, color=nuda.param.col[isource], marker=gw.marker, linestyle = 'solid', linewidth = 1 )
+            axs.errorbar( isource+ihyp/10, gw.lam, yerr=np.array([(gw.lam_sig_lo,gw.lam_sig_up)]).T, label=gw.label, color=nuda.param.col[isource], marker=gw.marker, linestyle = 'solid', linewidth = 1 )
             ihyp += 1
             #
         gwav = nuda.astro.setupGWAverage( source = source )
@@ -58,7 +58,7 @@ def astro_setupGW_fig( pname, sources ):
     #
     axs.set_xticks( ilabel )
     axs.set_xticklabels( xlabel )
-    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8', ncol=2,frameon=False)
+    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8', ncol=3,frameon=False)
     #
     #
     if pname is not None:

nucleardatapy/fig/astro_setupMR_fig.py

@@ -22,10 +22,10 @@ def astro_setupMR_fig( pname, sources, sources_av ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.85, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.12, bottom=0.12, right=0.95, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_xlabel(r'$R$ (km)',fontsize='12')
-    axs.set_ylabel(r'M (M$_\odot$)',fontsize='12')
+    axs.set_xlabel(r'$R$ (km)',fontsize='14')
+    axs.set_ylabel(r'M (M$_\odot$)',fontsize='14')
     axs.set_xlim([10.5, 16.5])
     axs.set_ylim([1.15, 2.2])
     #
@@ -56,17 +56,19 @@ def astro_setupMR_fig( pname, sources, sources_av ):
             #
         isource += 1
         #
-    isource = 1
-    for source in sources_av:
+    #isource = 1
+    for isource,source in enumerate(sources_av):
+        #if source.lower() == 'j0030+0451': 
+        #    obss = [ 1, 2 ]
+        #if source.lower() == 'j0740+6620': 
+        #    obss = [ 1, 2, 3 ]
+        obss = nuda.astro.mr_obss( source = source )
         if source.lower() == 'j0030+0451': 
             obss = [ 1, 2 ]
-        if source.lower() == 'j0740+6620': 
-            obss = [ 1, 2 ]
         mrav = nuda.astro.setupMRAverage( source = source, obss = obss )
         if nuda.env.verb_output: mrav.print_output( )
         if nuda.env.verb_latex: mrav.print_latex( )
-        axs.errorbar( mrav.rad_cen, mrav.mass_cen, xerr=mrav.rad_sig_std, yerr=mrav.mass_sig_std, ms=12, label=mrav.label, color=nuda.param.col[isource], marker='^', linestyle = 'solid', linewidth = 3 )
-        isource += 1
+        axs.errorbar( mrav.rad_cen, mrav.mass_cen, xerr=mrav.rad_sig_std, yerr=mrav.mass_sig_std, ms=12, label=mrav.label, color=nuda.param.col[isource+1], marker='^', linewidth = 3 )
     #
     # write source name in plot:
     #
@@ -80,7 +82,7 @@ def astro_setupMR_fig( pname, sources, sources_av ):
             axs.text(10.7,1.5,'J0437-4715')
     #
     #axs.legend(loc='upper left',fontsize='8', ncol=2)
-    axs.legend(loc='lower center',bbox_to_anchor=(0.48,1.01),columnspacing=2,fontsize='8',ncol=3,frameon=False)
+    axs.legend(loc='lower center',bbox_to_anchor=(0.48,1.01),columnspacing=2,fontsize='8',ncol=4,frameon=False)
     #
     if pname is not None:
     	plt.savefig(pname, dpi=200)

nucleardatapy/fig/astro_setupMasses_fig.py

@@ -20,10 +20,10 @@ def astro_setupMasses_fig( pname, sources ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.7, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.12, bottom=0.12, right=0.95, top=0.75, wspace=0.3, hspace=0.3)
     #
-    axs.set_ylabel(r'M (M$_\odot$)',fontsize='12')
-    axs.set_xlabel(r'sources',fontsize='12')
+    axs.set_ylabel(r'M (M$_\odot$)',fontsize='14')
+    axs.set_xlabel(r'sources',fontsize='14')
     axs.set_ylim([1.7, 3.5])
     axs.set_xlim([0.8, 5.5])
     #
@@ -56,7 +56,7 @@ def astro_setupMasses_fig( pname, sources ):
     axs.set_xticks( ilabel )
     axs.set_xticklabels( xlabel )
     #axs.legend(loc='upper left',fontsize='8', ncol=2)
-    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8', ncol=2,frameon=False)
+    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8', ncol=3,frameon=False)
     #
     if pname is not None:
     	plt.savefig(pname, dpi=200)

nucleardatapy/fig/astro_setupMtov_fig.py

@@ -28,10 +28,10 @@ def astro_setupMtov_fig( pname, sources_lo_all, sources_lo_dist, sources_up1, so
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.85, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.12, bottom=0.12, right=0.95, top=0.9, wspace=0.3, hspace=0.3)
     #
-    axs.set_xlabel(r'M$_\mathrm{tov}$ (M$_\odot$)',fontsize='12')
-    axs.set_ylabel(r'probability (non-normalised)',fontsize='12')
+    axs.set_xlabel(r'M$_\mathrm{tov}$ (M$_\odot$)',fontsize='14')
+    axs.set_ylabel(r'probability (non-normalised)',fontsize='14')
     axs.set_xlim([1.6, 3.4])
     axs.set_ylim([0.0, 1.03])
     #
@@ -76,7 +76,7 @@ def astro_setupMtov_fig( pname, sources_lo_all, sources_lo_dist, sources_up1, so
     #axs.plot(prob3.mass, prob3.proba_tot, label=prob3.label_tot, color=nuda.param.col[4], linestyle=(1, (4, 8)), linewidth = 3 )
     #
     #axs.legend( loc='upper left',fontsize='8', ncol=1 )
-    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8',ncol=4,frameon=False)
+    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8',ncol=5,frameon=False)
     #
     if pname is not None:
     	plt.savefig(pname, dpi=200)

nucleardatapy/fig/astro_setupMup_fig.py

@@ -20,10 +20,10 @@ def astro_setupMup_fig( pname, sources ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.8, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.12, bottom=0.12, right=0.95, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_xlabel(r'sources',fontsize='12')
-    axs.set_ylabel(r'M (M$_\odot$)',fontsize='12')
+    axs.set_xlabel(r'sources',fontsize='14')
+    axs.set_ylabel(r'M (M$_\odot$)',fontsize='14')
     axs.set_xlim([0.8, 2.5])
     axs.set_ylim([2.4, 3.4])
     #
@@ -45,7 +45,7 @@ def astro_setupMup_fig( pname, sources ):
             mup = nuda.astro.setupMup( source = source, hyp = hyp )
             if nuda.env.verb_output: mup.print_output( )
             if nuda.env.verb_latex: mup.print_latex( )
-            axs.errorbar( isource+ihyp/10, mup.mup, yerr=np.array([(mup.sig_do,mup.sig_up)]).T, label=mup.label, color=nuda.param.col[isource], marker=mup.marker, linestyle = 'solid', linewidth = 1 )
+            axs.errorbar( isource+ihyp/10, mup.mup, yerr=np.array([(mup.sig_lo,mup.sig_up)]).T, label=mup.label, color=nuda.param.col[isource], marker=mup.marker, linestyle = 'solid', linewidth = 1 )
             ihyp += 1
             #
         if source=='GW170817': hyps = [ 3, 4 ]
@@ -60,7 +60,7 @@ def astro_setupMup_fig( pname, sources ):
     axs.set_xticklabels( xlabel )
     #
     #axs.legend(loc='upper left',fontsize='8', ncol=2)
-    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8',ncol=2,frameon=False)
+    axs.legend(loc='lower center',bbox_to_anchor=(0.5,1.01),columnspacing=2,fontsize='8',ncol=3,frameon=False)
     #
     if pname is not None:
     	plt.savefig(pname, dpi=200)

nucleardatapy/fig/corr_setupEsymDen_fig.py

@@ -3,7 +3,7 @@ import matplotlib.pyplot as plt
 
 import nucleardatapy as nuda
 
-def corr_setupEsymDen_fig( pname, constraints, Ksym ):
+def corr_setupEsymDen_fig( pname, constraints, Ksym, origine ):
     """
     Plot upper boundaries for the tov mass.\
     The plot is 1x1 with:\
@@ -20,10 +20,17 @@ def corr_setupEsymDen_fig( pname, constraints, Ksym ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.98, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.12, bottom=0.12, right=0.95, top=0.98, wspace=0.3, hspace=0.3)
     #
-    axs.set_xlabel(r'$n_\text{nuc}$ (fm$^{-3}$)',fontsize='12')
-    axs.set_ylabel(r'$E_\text{sym}$ (MeV)',fontsize='12')
+    axs.set_xlabel(r'$n_\text{nuc}$ (fm$^{-3}$)',fontsize='14')
+    if origine == 'finiteNuclei':
+        axs.set_ylabel(r'$e_{\text{sym},2}(n_\text{nuc})$ (MeV)',fontsize='14')
+    elif origine == 'neutronStar':
+        axs.set_ylabel(r'$e_\text{sym}(n_\text{nuc})$ (MeV)',fontsize='14')
+    else:
+        print('corr_setupEsymDen_fig.py: origine is not well documented, origine=',origine)
+        print('corr_setupEsymDen_fig.py: exit()')
+        exit()
     axs.set_xlim([0.09, 0.27])
     axs.set_ylim([10, 60])
     #
@@ -38,7 +45,7 @@ def corr_setupEsymDen_fig( pname, constraints, Ksym ):
         if esym.plot:
             axs.fill_between( esym.esym_den, y1=esym.esym_e2a_min, y2=esym.esym_e2a_max, label=esym.label, alpha=esym.alpha )
     #
-    axs.text(0.15,12,r'$K_\text{sym}$='+str(int(Ksym))+' MeV',fontsize='12')
+    axs.text(0.15,12,r'$K_\text{sym}$='+str(int(Ksym))+' MeV',fontsize='14')
     axs.legend(loc='lower right',fontsize='9')
     #
     if pname is not None:

nucleardatapy/fig/corr_setupEsymLsym_fig.py

@@ -3,7 +3,7 @@ import matplotlib.pyplot as plt
 
 import nucleardatapy as nuda
 
-def corr_setupEsymLsym_fig( pname, constraints ):
+def corr_setupEsymLsym_fig( pname, constraints, origine ):
     """
     Plot the correlation between Esym and Lsym.\
     The plot is 1x1 with:\
@@ -17,13 +17,23 @@ def corr_setupEsymLsym_fig( pname, constraints ):
     """
     #
     print(f'Plot name: {pname}')
+    print('list of constraints:',constraints)
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.98, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.12, bottom=0.12, right=0.95, top=0.98, wspace=0.3, hspace=0.3)
+    #
+    if origine == 'finiteNuclei':
+        axs.set_xlabel(r'$E_{\mathrm{sym},2}$ (MeV)',fontsize='14')
+        axs.set_ylabel(r'$L_{\mathrm{sym},2}$ (MeV)',fontsize='14')
+    elif origine == 'neutronStar':
+        axs.set_xlabel(r'$E_\mathrm{sym}$ (MeV)',fontsize='14')
+        axs.set_ylabel(r'$L_\mathrm{sym}$ (MeV)',fontsize='14')
+    else:
+        print('corr_setupEsymLsym_fig.py: origine is not well documented, origine=',origine)
+        print('corr_setupEsymLsym_fig.py: exit()')
+        exit()
     #
-    axs.set_xlabel(r'$E_{\mathrm{sym},2}$ (MeV)')
-    axs.set_ylabel(r'$L_{\mathrm{sym},2}$ (MeV)')
     axs.set_xlim([23, 44])
     axs.set_ylim([10, 120])
     #
@@ -40,6 +50,9 @@ def corr_setupEsymLsym_fig( pname, constraints ):
         elif el.plot == 'curve':
             axs.plot( el.Esym, el.Lsym, linestyle='solid', linewidth=3, label=el.label )
         elif el.plot == 'contour':
+            print('plot:',el.plot)
+            print('Esym:',el.Esym)
+            print('Lsym:',el.Lsym)
             axs.plot( el.Esym, el.Lsym, linestyle='solid', label=el.label )
         elif el.plot == 'band_y':
             axs.fill_between( el.Esym, y1=el.Lsym-el.Lsym_err, y2=el.Lsym+el.Lsym_err, label=el.label, alpha=el.alpha )
@@ -49,7 +62,7 @@ def corr_setupEsymLsym_fig( pname, constraints ):
             #axs.errorbar( el.Esym, el.Lsym, yerr=el.Lsym_err, linestyle='solid', label=el.label )
         if nuda.env.verb: el.print_outputs( )
     #
-    axs.legend(loc='lower right',fontsize='9')
+    axs.legend(loc='lower right',fontsize='10')
     #
     if pname is not None:
     	plt.savefig(pname, dpi=300)

nucleardatapy/fig/corr_setupKsatQsat_fig.py

@@ -20,12 +20,12 @@ def corr_setupKsatQsat_fig( pname, constraints ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.15, bottom=0.12, right=None, top=0.98, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.15, bottom=0.12, right=0.95, top=0.98, wspace=0.3, hspace=0.3)
     #
-    axs.set_xlabel(r'$K_\mathrm{sat}$ (MeV)')
-    axs.set_ylabel(r'$Q_\mathrm{sat}$ (MeV)')
-    axs.set_xlim([190, 360])
-    axs.set_ylim([-1000, 1500])
+    axs.set_xlabel(r'$K_\mathrm{sat}$ (MeV)',fontsize='14')
+    axs.set_ylabel(r'$Q_\mathrm{sat}$ (MeV)',fontsize='14')
+    axs.set_xlim([100, 360])
+    axs.set_ylim([-2500, 2200])
     #axs.tick_params(labelbottom=True, labeltop=False, labelleft=True, labelright=False,
     #                 bottom=True, top=True, left=True, right=True)
 #    axs.xaxis.set_major_locator(MultipleLocator(5))
@@ -44,20 +44,24 @@ def corr_setupKsatQsat_fig( pname, constraints ):
         if nuda.env.verb: print('Qsat:',kq.Qsat)
         if nuda.env.verb: print('len(Ksat):',kq.Ksat.size)
         #
-        if k == 2:
-            kk = 0
+        #if k == 2:
+        #    kk = 0
+        #else:
+        #    kk = k
+        if k == 5 or k == 9 or k == 10 or k == 11: 
+            lstyle = 'dashed'
         else:
-            kk = k
-        axs.scatter( kq.Ksat, kq.Qsat, label=kq.label, color=nuda.param.col[kk], marker=kq.marker )
-        x = np.linspace(min(kq.Ksat),max(kq.Ksat),10)
-        if k == 3 or k == 4 or k == 5:
-            axs.plot( x, nuda.corr.flinear(x,kq.m,kq.c), color=nuda.param.col[kk], linestyle='dashed' )
-        else:
-            axs.plot( x, nuda.corr.flinear(x,kq.m,kq.c), color=nuda.param.col[kk], linestyle='solid' )
+            lstyle = 'solid'
+        if kq.Ksat is not None:
+            axs.scatter( kq.Ksat, kq.Qsat, label=kq.label, color = nuda.param.col[k], marker = kq.marker )
+        if kq.Ksat_lin is not None:
+            axs.plot( kq.Ksat_lin, kq.Qsat_lin, color = nuda.param.col[k], linestyle = lstyle )
+        if kq.Ksat_band is not None:
+            axs.fill_between( kq.Ksat_band, kq.Qsat_lo, kq.Qsat_up, label=kq.label, color = nuda.param.col[k], alpha = 0.2 )
         #
         if nuda.env.verb: kq.print_outputs( )
     #
-    axs.legend(loc='upper left',ncol=3, fontsize='9')
+    axs.legend(loc='upper left',ncol=4, fontsize='10')
     #
     if pname is not None: 
         plt.savefig(pname, dpi=200)

nucleardatapy/fig/crust_setupCrust_fig.py

@@ -20,16 +20,16 @@ def crust_setupCrust_fig( pname, models ):
     #
     fig, axs = plt.subplots(1,2)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.10, bottom=0.12, right=None, top=0.8, wspace=0.3, hspace=0.3 )
+    fig.subplots_adjust(left=0.10, bottom=0.12, right=None, top=0.78, wspace=0.3, hspace=0.3 )
     #
-    axs[0].set_xlabel(r'n (fm$^{-3}$)')
-    axs[0].set_ylabel(r'$e_{int}(n)$')
+    axs[0].set_xlabel(r'$n_\text{nuc}$ (fm$^{-3}$)',fontsize='14')
+    axs[0].set_ylabel(r'$e_\text{int}(n_\text{nuc})$ (MeV)',fontsize='14')
     axs[0].set_xlim([1e-4, 1e-1])
     axs[0].set_ylim([-2, 10])
     axs[0].set_xscale('log')
     #
-    axs[1].set_xlabel(r'n (fm$^{-3}$)')
-    axs[1].set_ylabel(r'$Z$')
+    axs[1].set_xlabel(r'$n_\text{nuc}$ (fm$^{-3}$)',fontsize='14')
+    axs[1].set_ylabel(r'$Z$',fontsize='14')
     axs[1].set_xlim([1e-4, 1e-1])
     axs[1].set_ylim([10, 100])
     axs[1].set_xscale('log')
@@ -44,9 +44,9 @@ def crust_setupCrust_fig( pname, models ):
             axs[1].plot( crust.den, crust.Z, linestyle=crust.linestyle )
     #axs[0].legend(loc='upper left',fontsize='8', ncol=1)
     #axs[1].legend(loc='upper left',fontsize='8', ncol=1)
-    fig.legend(loc='upper left',bbox_to_anchor=(0.01,1.01),columnspacing=2,fontsize='8',ncol=4,frameon=False)
+    fig.legend(loc='upper left',bbox_to_anchor=(0.08,1.01),columnspacing=2,fontsize='7.5',ncol=4,frameon=False)
     #
     if pname is not None:
     	plt.savefig(pname, dpi=200)
     	plt.close()
-    #
+    #