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

nucleardatapy/fig/matter_setupMicro_effmass_fig.py

@@ -28,22 +28,36 @@ def matter_setupMicro_effmass_fig( pname, models, matter = 'NM' ):
     #
     axs[0].set_ylabel(r'Landau effective mass $m^*/m$')
     axs[0].set_xlabel(r'$n_\text{nuc}$ (fm$^{-3}$)')
-    axs[0].set_xlim([0, 0.34])
-    axs[0].set_ylim([0.4, 1.2])
     #axs[0].tick_params('x', labelbottom=False)
     #
-    axs[1].set_xlim([0, 2.0])
-    axs[1].set_ylim([0.4, 1.2])
     #axs[1].tick_params('x', labelbottom=False)
     axs[1].tick_params('y', labelleft=False)
     axs[1].set_xlabel(r'$k_{F_n}$ (fm$^{-1}$)')
     #
+    if matter.lower() == 'nm':
+        axs[0].set_xlim([0, 0.34])
+        axs[0].set_ylim([0.6, 1.1])
+        axs[1].set_xlim([0, 2.0])
+        axs[1].set_ylim([0.6, 1.1])
+    elif matter.lower() == 'sm':
+        axs[0].set_xlim([0, 0.34])
+        axs[0].set_ylim([0.6, 1.1])
+        axs[1].set_xlim([0, 2.0])
+        axs[1].set_ylim([0.6, 1.1])
+    elif matter.lower() == 'am':
+        axs[0].set_xlim([0.05, 0.27])
+        axs[0].set_ylim([0.7, 1.0])
+        axs[1].set_xlim([0.7, 1.8])
+        axs[1].set_ylim([0.7, 1.0])
+    #
     #axs[1,0].set_ylabel(r'$\Delta_{1S0}/E_F$')
     #
     for model in models:
         #
         ms = nuda.matter.setupMicroEffmass( model = model, matter = matter )
         #
+        axs[0].text(0.08,0.75,'in '+matter)
+        axs[1].text(0.90,0.75,'in '+matter)
         if matter.lower() == 'nm':
             if ms.nm_effmass is not None:
                 if ms.nm_effmass_err is not None:
@@ -60,6 +74,47 @@ def matter_setupMicro_effmass_fig( pname, models, matter = 'NM' ):
                 else:
                     axs[0].plot( ms.sm_den, ms.sm_effmass, marker=ms.marker, markevery=ms.every, linestyle='none', label=ms.label )
                     axs[1].plot( ms.sm_kfn, ms.sm_effmass, marker=ms.marker, markevery=ms.every, linestyle='none' )
+        elif matter.lower() == 'am':
+            if ms.sm_effmass_n is not None:
+                if ms.sm_effmass_err is not None:
+                    axs[0].errorbar( ms.sm_den, ms.sm_effmass, yerr=ms.sm_effmass_err, marker=ms.marker, markevery=ms.every, linestyle='none', label=ms.label )
+                    axs[1].errorbar( ms.sm_kfn, ms.sm_effmass, yerr=ms.sm_effmass_err, marker=ms.marker, markevery=ms.every, linestyle='none' )
+                else:
+                    ms_n_00, ms_p_00 = nuda.matter.effmass_emp( ms.sm_den , 0.0, mb = 'BHF' )
+                    ms_n_02, ms_p_02 = nuda.matter.effmass_emp( ms.am02_den , 0.2, mb = 'BHF' )
+                    ms_n_04, ms_p_04 = nuda.matter.effmass_emp( ms.am04_den , 0.4, mb = 'BHF' )
+                    axs[0].plot( ms.sm_den, ms.sm_effmass_n, marker='^', color=nuda.param.col[1], markevery=ms.every, linestyle='none', label=ms.label+'(neutrons)' )
+                    axs[0].plot( ms.am02_den, ms.am02_effmass_n, marker='^', color=nuda.param.col[1], markevery=ms.every, linestyle='none' )
+                    axs[0].plot( ms.am04_den, ms.am04_effmass_n, marker='^', color=nuda.param.col[1], markevery=ms.every, linestyle='none' )
+                    axs[0].plot( ms.sm_den, ms.sm_effmass_p, marker='v', color=nuda.param.col[2], markevery=ms.every, linestyle='none', label=ms.label+'(protons)' )
+                    axs[0].plot( ms.am02_den, ms.am02_effmass_p, marker='v', color=nuda.param.col[2], markevery=ms.every, linestyle='none' )
+                    axs[0].plot( ms.am04_den, ms.am04_effmass_p, marker='v', color=nuda.param.col[2], markevery=ms.every, linestyle='none' )
+                    axs[0].plot( ms.sm_den, ms_n_00, color=nuda.param.col[1], linestyle='solid', label='Fit(neutrons)' )
+                    axs[0].plot( ms.am02_den, ms_n_02, color=nuda.param.col[1], linestyle='solid' )
+                    axs[0].plot( ms.am04_den, ms_n_04, color=nuda.param.col[1], linestyle='solid' )
+                    axs[0].plot( ms.sm_den, ms_p_00, color=nuda.param.col[2], linestyle='solid', label='Fit(protons)' )
+                    axs[0].plot( ms.am02_den, ms_p_02, color=nuda.param.col[2], linestyle='solid' )
+                    axs[0].plot( ms.am04_den, ms_p_04, color=nuda.param.col[2], linestyle='solid' )
+                    axs[1].plot( ms.sm_kfn, ms.sm_effmass_n, marker='^', color=nuda.param.col[1], markevery=ms.every, linestyle='none' )
+                    axs[1].plot( ms.am02_kfn, ms.am02_effmass_n, marker='^', color=nuda.param.col[1], markevery=ms.every, linestyle='none' )
+                    axs[1].plot( ms.am04_kfn, ms.am04_effmass_n, marker='^', color=nuda.param.col[1], markevery=ms.every, linestyle='none' )
+                    axs[1].plot( ms.sm_kfn, ms.sm_effmass_p, marker='v', color=nuda.param.col[2], markevery=ms.every, linestyle='none' )
+                    axs[1].plot( ms.am02_kfn, ms.am02_effmass_p, marker='v', color=nuda.param.col[2], markevery=ms.every, linestyle='none' )
+                    axs[1].plot( ms.am04_kfn, ms.am04_effmass_p, marker='v', color=nuda.param.col[2], markevery=ms.every, linestyle='none' )
+                    axs[1].plot( ms.sm_kfn, ms_n_00, color=nuda.param.col[1], linestyle='solid' )
+                    axs[1].plot( ms.am02_kfn, ms_n_02, color=nuda.param.col[1], linestyle='solid' )
+                    axs[1].plot( ms.am04_kfn, ms_n_04, color=nuda.param.col[1], linestyle='solid' )
+                    axs[1].plot( ms.sm_kfn, ms_p_00, color=nuda.param.col[2], linestyle='solid' )
+                    axs[1].plot( ms.am02_kfn, ms_p_02, color=nuda.param.col[2], linestyle='solid' )
+                    axs[1].plot( ms.am04_kfn, ms_p_04, color=nuda.param.col[2], linestyle='solid' )
+                    axs[0].text(0.23,0.84,r'$\delta=0.4$',rotation=0)
+                    axs[0].text(0.23,0.81,r'$\delta=0.2$',rotation=0)
+                    axs[0].text(0.23,0.785,'SM',rotation=0)
+                    axs[0].text(0.23,0.76,r'$\delta=0.2$',rotation=0)
+                    axs[0].text(0.23,0.74,r'$\delta=0.4$',rotation=0)
+                    axs[1].text(0.90,0.92,'SM',rotation=0)
+                    axs[1].text(0.90,0.94,r'$\delta=0.2$',rotation=0)
+                    axs[1].text(0.95,0.96,r'$\delta=0.4$',rotation=0)
         if nuda.env.verb_output: ms.print_outputs( )
     #
     #axs[1,0].legend(loc='upper right',fontsize='8')

nucleardatapy/fig/matter_setupMicro_fig.py

@@ -3,7 +3,7 @@ import matplotlib.pyplot as plt
 
 import nucleardatapy as nuda
 
-def matter_setupMicro_E_fig( pname, mb, models, band, matter ):
+def matter_setupMicro_E_fig( pname, mb, models, band ):
     """
     Plot nucleonic energy per particle E/A in matter.\
     The plot is 2x2 with:\
@@ -24,121 +24,123 @@ def matter_setupMicro_E_fig( pname, mb, models, band, matter ):
     """
     #
     print(f'Plot name: {pname}')
+    matter = band.matter
     #
     fig, axs = plt.subplots(2,2)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
     fig.subplots_adjust(left=0.10, bottom=0.12, right=None, top=0.85, wspace=0.05, hspace=0.05 )
     #
-    axs[0,0].set_ylabel(r'$E_\text{NM}/A$ (MeV)')
-    axs[0,0].set_xlim([0, 0.33])
     axs[1,0].set_xlabel(r'$n_\text{nuc}$ (fm$^{-3}$)')
-    axs[1,0].set_ylabel(r'$E_\text{NM}/E_\text{NRFFG}$')
-    axs[1,0].set_xlim([0, 0.33])
     axs[1,1].set_xlabel(r'$k_{F_n}$ (fm$^{-1}$)')
     axs[0,1].tick_params('y', labelleft=False)
     axs[1,1].tick_params('y', labelleft=False)
     axs[0,0].tick_params('x', labelbottom=False)
     axs[0,1].tick_params('x', labelbottom=False)
+    axs[0,0].set_xlim([0, 0.33])
+    axs[1,0].set_xlim([0, 0.33])
+    axs[0,1].set_xlim([0.5, 1.9])
+    axs[1,1].set_xlim([0.5, 1.9])
     if matter.lower() == 'nm':
-        axs[0,0].set_ylim([0, 35])
-        axs[0,1].set_xlim([0.5, 2.0])
-        axs[0,1].set_ylim([0, 35])
-        axs[1,0].set_ylim([0.3, 0.84])
-        axs[1,1].set_xlim([0.5, 2.0])
-        axs[1,1].set_ylim([0.3, 0.84])
+        axs[0,0].set_ylabel(r'$E_\text{NM}/A$ (MeV)')
+        axs[1,0].set_ylabel(r'$E_\text{NM}/E_\text{NRFFG}$')
+        axs[0,0].set_ylim([0, 30])
+        axs[0,1].set_ylim([0, 30])
+        axs[1,0].set_ylim([0.2, 0.84])
+        axs[1,1].set_ylim([0.2, 0.84])
         delta = 1.0
     elif matter.lower() == 'sm':
+        axs[0,0].set_ylabel(r'$E_\text{SM}/A$ (MeV)')
+        axs[1,0].set_ylabel(r'$E_\text{SM}/E_\text{NRFFG}$')
         axs[0,0].set_ylim([-20, 10])
-        axs[0,1].set_xlim([0, 1.5])
         axs[0,1].set_ylim([-20, 10])
-        axs[1,0].set_ylim([-2.0, 0.1])
-        axs[1,1].set_xlim([0, 1.5])
-        axs[1,1].set_ylim([-2.0, 0.1])
+        axs[1,0].set_ylim([-1.2, 0.5])
+        axs[1,1].set_ylim([-1.2, 0.5])
         delta = 0.0
     #
     for model in models:
         #
         mic = nuda.matter.setupMicro( model = model, var2 = delta )
+        if nuda.env.verb_output: mic.print_outputs( )
+        #
         print('model:',model,' delta:',delta)
-        if mic.nm_e2a is not None and 'FIT' not in model:
+        #
+        check = nuda.matter.setupCheck( eos = mic, band = band )
+        #
+        if check.isInside:
+            lstyle = 'solid'
+        else:
+            lstyle = 'dashed'
+        #
+        if mic.e_err:
+            #
+            print('=> model (with err):',model,mic.e_err)
             if 'NLEFT' in model:
-                if matter.lower() == 'nm':
-                    axs[0,0].errorbar( mic.nm_den, mic.nm_e2adata, yerr=mic.nm_e2adata_err, linestyle = 'dotted', linewidth = 1, alpha=0.6 )
-                    axs[0,1].errorbar( mic.nm_kfn, mic.nm_e2adata, yerr=mic.nm_e2adata_err, linestyle = 'dotted', linewidth = 1, alpha=0.6 )
-                    axs[1,0].errorbar( mic.nm_den, mic.nm_e2adata/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2adata_err/nuda.effg_nr(mic.nm_kfn), linestyle = 'dotted', linewidth = 1, alpha=0.6 )
-                    axs[1,1].errorbar( mic.nm_kfn, mic.nm_e2adata/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2adata_err/nuda.effg_nr(mic.nm_kfn), linestyle = 'dotted', linewidth = 1, alpha=0.6 )
-                elif matter.lower() == 'sm':
-                    axs[0,0].errorbar( mic.sm_den, mic.sm_e2adata, yerr=mic.sm_e2adata_err, linestyle = 'dotted', linewidth = 1, alpha=0.6 )
-                    axs[0,1].errorbar( mic.sm_kfn, mic.sm_e2adata, yerr=mic.sm_e2adata_err, linestyle = 'dotted', linewidth = 1, alpha=0.6 )
-                    axs[1,0].errorbar( mic.sm_den, mic.sm_e2adata/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2adata_err/nuda.effg_nr(mic.sm_kfn), linestyle = 'dotted', linewidth = 1, alpha=0.6 )
-                    axs[1,1].errorbar( mic.sm_kfn, mic.sm_e2adata/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2adata_err/nuda.effg_nr(mic.sm_kfn), linestyle = 'dotted', linewidth = 1, alpha=0.6 )
                 #
+                print('   => model (NLEFT):',model)
                 if matter.lower() == 'nm':
+                    axs[0,0].errorbar( mic.nm_den, mic.nm_e2adata, yerr=mic.nm_e2adata_err, linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[0,0].fill_between( mic.nm_den, y1=(mic.nm_e2a-mic.nm_e2a_err), y2=(mic.nm_e2a+mic.nm_e2a_err), alpha=0.3 )
+                    axs[0,1].errorbar( mic.nm_kfn, mic.nm_e2adata, yerr=mic.nm_e2adata_err, linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[0,1].fill_between( mic.nm_kfn, y1=(mic.nm_e2a-mic.nm_e2a_err), y2=(mic.nm_e2a+mic.nm_e2a_err), alpha=0.3 )
+                    axs[1,0].errorbar( mic.nm_den, mic.nm_e2adata/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2adata_err/nuda.effg_nr(mic.nm_kfn), linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[1,0].fill_between( mic.nm_den, y1=(mic.nm_e2a-mic.nm_e2a_err)/nuda.effg_nr(mic.nm_kfn), y2=(mic.nm_e2a+mic.nm_e2a_err)/nuda.effg_nr(mic.nm_kfn), alpha=0.3 )
+                    axs[1,1].errorbar( mic.nm_kfn, mic.nm_e2adata/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2adata_err/nuda.effg_nr(mic.nm_kfn), linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[1,1].fill_between( mic.nm_kfn, y1=(mic.nm_e2a-mic.nm_e2a_err)/nuda.effg_nr(mic.nm_kfn), y2=(mic.nm_e2a+mic.nm_e2a_err)/nuda.effg_nr(mic.nm_kfn), alpha=0.3 )
                 elif matter.lower() == 'sm':
+                    axs[0,0].errorbar( mic.sm_den, mic.sm_e2adata, yerr=mic.sm_e2adata_err, linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[0,0].fill_between( mic.sm_den, y1=(mic.sm_e2a-mic.sm_e2a_err), y2=(mic.sm_e2a+mic.sm_e2a_err), alpha=0.3 )
+                    axs[0,1].errorbar( mic.sm_kfn, mic.sm_e2adata, yerr=mic.sm_e2adata_err, linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[0,1].fill_between( mic.sm_kfn, y1=(mic.sm_e2a-mic.sm_e2a_err), y2=(mic.sm_e2a+mic.sm_e2a_err), alpha=0.3 )
+                    axs[1,0].errorbar( mic.sm_den, mic.sm_e2adata/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2adata_err/nuda.effg_nr(mic.sm_kfn), linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[1,0].fill_between( mic.sm_den, y1=(mic.sm_e2a-mic.sm_e2a_err)/nuda.effg_nr(mic.sm_kfn), y2=(mic.sm_e2a+mic.sm_e2a_err)/nuda.effg_nr(mic.sm_kfn), alpha=0.3 )
+                    axs[1,1].errorbar( mic.sm_kfn, mic.sm_e2adata/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2adata_err/nuda.effg_nr(mic.sm_kfn), linestyle = 'dotted', markevery=mic.every, linewidth = 1, alpha=0.6 )
                     axs[1,1].fill_between( mic.sm_kfn, y1=(mic.sm_e2a-mic.sm_e2a_err)/nuda.effg_nr(mic.sm_kfn), y2=(mic.sm_e2a+mic.sm_e2a_err)/nuda.effg_nr(mic.sm_kfn), alpha=0.3 )
+                #
             if mic.marker:
-                if mic.err:
-                    if matter.lower() == 'nm':
-                        axs[0,0].errorbar( mic.nm_den, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle='None', label=mic.label, errorevery=mic.every )
-                        axs[0,1].errorbar( mic.nm_kfn, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle='None', errorevery=mic.every )
-                        axs[1,0].errorbar( mic.nm_den, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None', errorevery=mic.every )
-                        axs[1,1].errorbar( mic.nm_kfn, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None', errorevery=mic.every )
-                    elif matter.lower() == 'sm':
-                        axs[0,0].errorbar( mic.sm_den, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle='None', label=mic.label, errorevery=mic.every )
-                        axs[0,1].errorbar( mic.sm_kfn, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle='None', errorevery=mic.every )
-                        axs[1,0].errorbar( mic.sm_den, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None', errorevery=mic.every )
-                        axs[1,1].errorbar( mic.sm_kfn, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None', errorevery=mic.every )
-                else:
-                    if matter.lower() == 'nm':
-                        axs[0,0].plot( mic.nm_den, mic.nm_e2a, marker=mic.marker, markevery=mic.every, linestyle='None', label=mic.label )
-                        axs[0,1].plot( mic.nm_kfn, mic.nm_e2a, marker=mic.marker, markevery=mic.every, linestyle='None' )
-                        axs[1,0].plot( mic.nm_den, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None' )
-                        axs[1,1].plot( mic.nm_kfn, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None' )
-                    elif matter.lower() == 'sm':
-                        axs[0,0].plot( mic.sm_den, mic.sm_e2a, marker=mic.marker, markevery=mic.every, linestyle='None', label=mic.label )
-                        axs[0,1].plot( mic.sm_kfn, mic.sm_e2a, marker=mic.marker, markevery=mic.every, linestyle='None' )
-                        axs[1,0].plot( mic.sm_den, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None' )
-                        axs[1,1].plot( mic.sm_kfn, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle='None' )
+                #
+                print('with marker:',mic.marker)
+                if matter.lower() == 'nm':
+                    axs[0,0].errorbar( mic.nm_den, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, label=mic.label, errorevery=mic.every )
+                    axs[0,1].errorbar( mic.nm_kfn, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,0].errorbar( mic.nm_den, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,1].errorbar( mic.nm_kfn, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                elif matter.lower() == 'sm':
+                    axs[0,0].errorbar( mic.sm_den, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, label=mic.label, errorevery=mic.every )
+                    axs[0,1].errorbar( mic.sm_kfn, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,0].errorbar( mic.sm_den, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,1].errorbar( mic.sm_kfn, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                #
             else:
-                if mic.err:
-                    if matter.lower() == 'nm':
-                        axs[0,0].errorbar( mic.nm_den, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, label=mic.label, errorevery=mic.every )
-                        axs[0,1].errorbar( mic.nm_kfn, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, errorevery=mic.every )
-                        axs[1,0].errorbar( mic.nm_den, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, errorevery=mic.every )
-                        axs[1,1].errorbar( mic.nm_kfn, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, errorevery=mic.every )
-                    elif matter.lower() == 'sm':
-                        axs[0,0].errorbar( mic.sm_den, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, label=mic.label, errorevery=mic.every )
-                        axs[0,1].errorbar( mic.sm_kfn, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, errorevery=mic.every )
-                        axs[1,0].errorbar( mic.sm_den, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, errorevery=mic.every )
-                        axs[1,1].errorbar( mic.sm_kfn, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, errorevery=mic.every )
-                else:
-                    if matter.lower() == 'nm':
-                        axs[0,0].plot( mic.nm_den, mic.nm_e2a, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, label=mic.label )
-                        axs[0,1].plot( mic.nm_kfn, mic.nm_e2a, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle )
-                        axs[1,0].plot( mic.nm_den, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle )
-                        axs[1,1].plot( mic.nm_kfn, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle )
-                    elif matter.lower() == 'sm':
-                        axs[0,0].plot( mic.sm_den, mic.sm_e2a, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle, label=mic.label )
-                        axs[0,1].plot( mic.sm_kfn, mic.sm_e2a, marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle )
-                        axs[1,0].plot( mic.sm_den, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle )
-                        axs[1,1].plot( mic.sm_kfn, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=mic.linestyle )
-        elif mic.e2a is not None: 
+                #
+                print('with no marker:',mic.marker)
+                if matter.lower() == 'nm':
+                    axs[0,0].errorbar( mic.nm_den, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, label=mic.label, errorevery=mic.every )
+                    axs[0,1].errorbar( mic.nm_kfn, mic.nm_e2a, yerr=mic.nm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,0].errorbar( mic.nm_den, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,1].errorbar( mic.nm_kfn, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), yerr=mic.nm_e2a_err/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                elif matter.lower() == 'sm':
+                    axs[0,0].errorbar( mic.sm_den, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, label=mic.label, errorevery=mic.every )
+                    axs[0,1].errorbar( mic.sm_kfn, mic.sm_e2a, yerr=mic.sm_e2a_err, marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,0].errorbar( mic.sm_den, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+                    axs[1,1].errorbar( mic.sm_kfn, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), yerr=mic.sm_e2a_err/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, markevery=mic.every, linestyle=lstyle, errorevery=mic.every )
+        else:
+            print('=> model (no err):',model,mic.e_err)
             if 'fit' in model:
-                #print('den:',mic.den)
-                #print('e2a:',mic.e2a)                
-                axs[0,0].plot( mic.den, mic.e2a, marker=mic.marker, linestyle=mic.linestyle, markevery=mic.every, label=mic.label )
-                axs[0,1].plot( mic.kfn, mic.e2a, marker=mic.marker, linestyle=mic.linestyle )
-                axs[1,0].plot( mic.den, mic.e2a/nuda.effg_nr(mic.kfn), marker=mic.marker, linestyle=mic.linestyle )
-                axs[1,1].plot( mic.kfn, mic.e2a/nuda.effg_nr(mic.kfn), marker=mic.marker, linestyle=mic.linestyle )
-        #
-        if nuda.env.verb_output: mic.print_outputs( )
+                axs[0,0].plot( mic.den, mic.e2a, marker=mic.marker, linestyle=lstyle, markevery=mic.every, label=mic.label )
+                axs[0,1].plot( mic.kfn, mic.e2a, marker=mic.marker, linestyle=lstyle )
+                axs[1,0].plot( mic.den, mic.e2a/nuda.effg_nr(mic.kfn), marker=mic.marker, linestyle=lstyle )
+                axs[1,1].plot( mic.kfn, mic.e2a/nuda.effg_nr(mic.kfn), marker=mic.marker, linestyle=lstyle )
+            else:
+                if matter.lower() == 'nm':
+                    axs[0,0].plot( mic.nm_den, mic.nm_e2a, marker=mic.marker, linestyle=lstyle, markevery=mic.every, label=mic.label )
+                    axs[0,1].plot( mic.nm_kfn, mic.nm_e2a, marker=mic.marker, linestyle=lstyle, markevery=mic.every )
+                    axs[1,0].plot( mic.nm_den, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, linestyle=lstyle, markevery=mic.every )
+                    axs[1,1].plot( mic.nm_kfn, mic.nm_e2a/nuda.effg_nr(mic.nm_kfn), marker=mic.marker, linestyle=lstyle, markevery=mic.every )
+                elif matter.lower() == 'sm':
+                    axs[0,0].plot( mic.sm_den, mic.sm_e2a, marker=mic.marker, linestyle=lstyle, markevery=mic.every, label=mic.label )
+                    axs[0,1].plot( mic.sm_kfn, mic.sm_e2a, marker=mic.marker, linestyle=lstyle, markevery=mic.every )
+                    axs[1,0].plot( mic.sm_den, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, linestyle=lstyle, markevery=mic.every )
+                    axs[1,1].plot( mic.sm_kfn, mic.sm_e2a/nuda.effg_nr(mic.sm_kfn), marker=mic.marker, linestyle=lstyle, markevery=mic.every )
         #
     axs[0,0].fill_between( band.den, y1=(band.e2a-band.e2a_std), y2=(band.e2a+band.e2a_std), color=band.color, alpha=band.alpha, visible=True )
     axs[0,0].plot( band.den, (band.e2a-band.e2a_std), color='k', linestyle='dashed' )

nucleardatapy/fig/matter_setupPhenoEsym_fig.py

@@ -49,32 +49,33 @@ def matter_setupPhenoEsym_fig( pname, models, band ):
         for param in params:
             #
             print('in Sample: model, param',model,param)
-            esym = nuda.matter.setupPhenoEsym( model = model, param = param )
+            pheno = nuda.matter.setupPhenoEsym( model = model, param = param )
+            if nuda.env.verb_output: pheno.print_outputs( )
             #
-            #print("esym:",esym.esym)
-            #print("den:",esym.den)
-            if esym.esym is not None:
-                print("esym_err:",esym.esym_err)
-                if esym.esym_err is not None:
-                    if not nuda.matter.checkPheno(esym,band,'Esym'):
-                        axs[0,0].errorbar( esym.den, esym.esym, yerr=esym.esym_err, marker=esym.marker, linestyle='none', errorevery=esym.every )
+            check = nuda.matter.setupCheck( eos = pheno, band = band )
+            #
+            if check.isInside:
+                lstyle = 'solid'
+            else:
+                lstyle = 'dashed'
+            #
+            #print("esym:",pheno.esym)
+            #print("den:",pheno.den)
+            if pheno.esym is not None:
+                print("esym_err:",pheno.esym_err)
+                if pheno.esym_err is None:
+                    if check.isInside:
+                        axs[0,0].plot( pheno.den, pheno.esym, marker=pheno.marker, linestyle=lstyle, label=pheno.label )
                     else:
-                        axs[0,0].errorbar( esym.den, esym.esym, yerr=esym.esym_err, marker=esym.marker, linestyle='none', errorevery=esym.every, label=esym.label )
-                    axs[0,1].errorbar( esym.kf,  esym.esym, yerr=esym.esym_err, marker=esym.marker, linestyle='none', errorevery=esym.every )
-                    axs[1,0].errorbar( esym.den, esym.esym/nuda.esymffg_nr(esym.kf), yerr=esym.esym_err/nuda.esymffg_nr(esym.kf), marker=esym.marker, linestyle='none', errorevery=esym.every )
-                    axs[1,1].errorbar( esym.kf,  esym.esym/nuda.esymffg_nr(esym.kf), yerr=esym.esym_err/nuda.esymffg_nr(esym.kf), marker=esym.marker, linestyle='none', errorevery=esym.every )
+                        axs[0,0].plot( pheno.den, pheno.esym, marker=pheno.marker, linestyle=lstyle )
+                    axs[0,1].plot( pheno.kf,  pheno.esym, marker=pheno.marker, linestyle=lstyle )
+                    axs[1,0].plot( pheno.den, pheno.esym/nuda.esymffg_nr(pheno.kf), marker=pheno.marker, linestyle=lstyle )
+                    axs[1,1].plot( pheno.kf,  pheno.esym/nuda.esymffg_nr(pheno.kf), marker=pheno.marker, linestyle=lstyle )
                 else:
-                    if not nuda.matter.checkPheno(esym,band,'Esym'):
-                        axs[0,0].plot( esym.den, esym.esym, marker=esym.marker, linestyle='dotted' )
-                        axs[0,1].plot( esym.kf,  esym.esym, marker=esym.marker, linestyle='dotted' )
-                        axs[1,0].plot( esym.den, esym.esym/nuda.esymffg_nr(esym.kf), marker=esym.marker, linestyle='dotted' )
-                        axs[1,1].plot( esym.kf,  esym.esym/nuda.esymffg_nr(esym.kf), marker=esym.marker, linestyle='dotted' )
-                    else:
-                        axs[0,0].plot( esym.den, esym.esym, marker=esym.marker, linestyle=esym.linestyle, label=esym.label )
-                        axs[0,1].plot( esym.kf,  esym.esym, marker=esym.marker, linestyle=esym.linestyle )
-                        axs[1,0].plot( esym.den, esym.esym/nuda.esymffg_nr(esym.kf), marker=esym.marker, linestyle=esym.linestyle )
-                        axs[1,1].plot( esym.kf,  esym.esym/nuda.esymffg_nr(esym.kf), marker=esym.marker, linestyle=esym.linestyle )
-            if nuda.env.verb_output: esym.print_outputs( )
+                    axs[0,0].errorbar( pheno.den, pheno.esym, yerr=pheno.esym_err, marker=pheno.marker, linestyle=lstyle, errorevery=pheno.every, label=pheno.label )
+                    axs[0,1].errorbar( pheno.kf,  pheno.esym, yerr=pheno.esym_err, marker=pheno.marker, linestyle=lstyle, errorevery=pheno.every )
+                    axs[1,0].errorbar( pheno.den, pheno.esym/nuda.esymffg_nr(pheno.kf), yerr=pheno.esym_err/nuda.esymffg_nr(pheno.kf), marker=pheno.marker, linestyle=lstyle, errorevery=pheno.every )
+                    axs[1,1].errorbar( pheno.kf,  pheno.esym/nuda.esymffg_nr(pheno.kf), yerr=pheno.esym_err/nuda.esymffg_nr(pheno.kf), marker=pheno.marker, linestyle=lstyle, errorevery=pheno.every )
             #
         axs[0,0].fill_between( band.den, y1=(band.e2a-band.e2a_std), y2=(band.e2a+band.e2a_std), color=band.color, alpha=band.alpha, visible=True  )
         axs[0,0].plot( band.den, (band.e2a-band.e2a_std), color='k', linestyle='dashed', visible=True  )
@@ -89,12 +90,13 @@ def matter_setupPhenoEsym_fig( pname, models, band ):
         axs[1,1].plot( band.kfn, (band.e2a-band.e2a_std)/nuda.esymffg_nr(band.kfn), color='k', linestyle='dashed', visible=True  )
         axs[1,1].plot( band.kfn, (band.e2a+band.e2a_std)/nuda.esymffg_nr(band.kfn), color='k', linestyle='dashed', visible=True  )
     #
-    axs[0,0].plot( esym.den, nuda.esymffg_nr(esym.kf), linestyle='dashed' )
-    axs[0,1].plot( esym.kf,  nuda.esymffg_nr(esym.kf), linestyle='dashed' )
+    axs[0,0].plot( pheno.den, nuda.esymffg_nr(pheno.kf), linestyle='dashed' )
+    axs[0,1].plot( pheno.kf,  nuda.esymffg_nr(pheno.kf), linestyle='dashed' )
 
     #axs[1,0].legend(loc='upper right',fontsize='8')
     fig.legend(loc='upper left',bbox_to_anchor=(0.1,1.0),columnspacing=2,fontsize='8',ncol=4,frameon=False)
     #
     if pname is not None:
     	plt.savefig(pname, dpi=300)
-    	plt.close()
+    	plt.close()
+    #

nucleardatapy/fig/matter_setupPheno_fig.py

@@ -3,7 +3,7 @@ import matplotlib.pyplot as plt
 
 import nucleardatapy as nuda
 
-def matter_setupPheno_E_fig( pname, model, band, matter ):
+def matter_setupPheno_E_fig( pname, model, band ):
     """
     Plot nucleonic energy per particle E/A in matter.\
     The plot is 2x2 with:\
@@ -22,6 +22,7 @@ def matter_setupPheno_E_fig( pname, model, band, matter ):
     """
     #
     print(f'Plot name: {pname}')
+    matter = band.matter
     #
     # plot
     #
@@ -29,12 +30,12 @@ def matter_setupPheno_E_fig( pname, model, band, matter ):
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
     fig.subplots_adjust(left=0.15, bottom=0.12, right=None, top=0.88, wspace=0.05, hspace=0.05)
     #
-    axs[0,0].set_xlim([0, 0.33])
     axs[1,0].set_xlabel(r'$n_\text{nuc}$ (fm$^{-3}$)',fontsize='12')
-    axs[1,0].set_xlim([0, 0.33])
-    axs[0,1].set_xlim([0.5, 1.5])
     axs[1,1].set_xlabel(r'$k_{F_n}$ (fm$^{-1}$)',fontsize='12')
-    axs[1,1].set_xlim([0.5, 1.5])
+    axs[0,0].set_xlim([0, 0.33])
+    axs[1,0].set_xlim([0, 0.33])
+    axs[0,1].set_xlim([0.5, 1.9])
+    axs[1,1].set_xlim([0.5, 1.9])
     #
     axs[0,0].tick_params('x', labelbottom=False)
     axs[0,1].tick_params('x', labelbottom=False)
@@ -43,16 +44,16 @@ def matter_setupPheno_E_fig( pname, model, band, matter ):
     #
     if matter.lower() == 'nm':
         axs[0,0].set_ylabel(r'$E_\text{NM}/A$ (MeV)',fontsize='12')
-        axs[0,0].set_ylim([0, 35])
-        axs[0,1].set_ylim([0, 15])
         axs[1,0].set_ylabel(r'$E_\text{NM}/E_\text{NRFFG,NM}$',fontsize='12')
+        axs[0,0].set_ylim([0, 30])
+        axs[0,1].set_ylim([0, 30])
         axs[1,0].set_ylim([0.2, 0.84])
         axs[1,1].set_ylim([0.2, 0.84])
     elif matter.lower() == 'sm':
         axs[0,0].set_ylabel(r'$E_\text{SM}/A$ (MeV)',fontsize='12')
+        axs[1,0].set_ylabel(r'$E_\text{SM}/E_\text{NRFFG,SM}$',fontsize='12')
         axs[0,0].set_ylim([-20, 10])
         axs[0,1].set_ylim([-20, 10])
-        axs[1,0].set_ylabel(r'$E_\text{SM}/E_\text{NRFFG,SM}$',fontsize='12')
         axs[1,0].set_ylim([-2.0, 0.1])
         axs[1,1].set_ylim([-2.0, 0.1])
     #
@@ -61,27 +62,36 @@ def matter_setupPheno_E_fig( pname, model, band, matter ):
     for param in params:
         #
         pheno = nuda.matter.setupPheno( model = model, param = param )
+        #
+        check = nuda.matter.setupCheck( eos = pheno, band = band )
+        #
+        if check.isInside:
+            lstyle = 'solid'
+        else:
+            lstyle = 'dashed'
+        #
         if matter.lower() == 'nm':
-            if any(pheno.nm_e2a): 
-                if model == 'Skyrme' and not nuda.matter.checkPheno(pheno,band,matter):
-                    axs[0,0].plot( pheno.nm_den, pheno.nm_e2a, linestyle='solid' )
+            if any(pheno.nm_e2a):
+                if model == 'Skyrme' and check.isInside:
+                    axs[0,0].plot( pheno.nm_den, pheno.nm_e2a, linestyle=lstyle, label=pheno.label )
+                elif model == 'Skyrme' and check.isOutside:
+                    axs[0,0].plot( pheno.nm_den, pheno.nm_e2a, linestyle=lstyle )
                 else:
-                    axs[0,0].plot( pheno.nm_den, pheno.nm_e2a, linestyle='solid', label=pheno.label )
-                    #print('model:',model,' param:',param,' inside band')
-                axs[0,1].plot( pheno.nm_kfn, pheno.nm_e2a, linestyle='solid' )
-                axs[1,0].plot( pheno.nm_den, pheno.nm_e2a/nuda.effg_nr(pheno.nm_kfn), linestyle='solid' )
-                axs[1,1].plot( pheno.nm_kfn, pheno.nm_e2a/nuda.effg_nr(pheno.nm_kfn), linestyle='solid' )
+                    axs[0,0].plot( pheno.nm_den, pheno.nm_e2a, linestyle=lstyle, label=pheno.label )
+                axs[0,1].plot( pheno.nm_kfn, pheno.nm_e2a, linestyle=lstyle )
+                axs[1,0].plot( pheno.nm_den, pheno.nm_e2a/nuda.effg_nr(pheno.nm_kfn), linestyle=lstyle )
+                axs[1,1].plot( pheno.nm_kfn, pheno.nm_e2a/nuda.effg_nr(pheno.nm_kfn), linestyle=lstyle )
         elif matter.lower() == 'sm':
             if any(pheno.sm_e2a): 
-                if model == 'Skyrme' and not nuda.matter.checkPheno(pheno,band,matter):
-                    axs[0,0].plot( pheno.sm_den, pheno.sm_e2a, linestyle='solid' )
+                if model == 'Skyrme' and check.isInside:
+                    axs[0,0].plot( pheno.sm_den, pheno.sm_e2a, linestyle=lstyle, label=pheno.label )
+                elif model == 'Skyrme' and check.isOutside:
+                    axs[0,0].plot( pheno.sm_den, pheno.sm_e2a, linestyle=lstyle )
                 else:
-                    axs[0,0].plot( pheno.sm_den, pheno.sm_e2a, linestyle='solid', label=pheno.label )
-                    #print('model:',model,' param:',param,' inside band')
-                #axs[0,0].plot( pheno.sm_den, pheno.sm_e2a, linestyle='solid', label=pheno.label )
-                axs[0,1].plot( pheno.sm_kf, pheno.sm_e2a, linestyle='solid' )
-                axs[1,0].plot( pheno.sm_den, pheno.sm_e2a/nuda.effg_nr(pheno.sm_kf), linestyle='solid' )
-                axs[1,1].plot( pheno.sm_kf, pheno.sm_e2a/nuda.effg_nr(pheno.sm_kf), linestyle='solid' )
+                    axs[0,0].plot( pheno.sm_den, pheno.sm_e2a, linestyle=lstyle, label=pheno.label )
+                axs[0,1].plot( pheno.sm_kf, pheno.sm_e2a, linestyle=lstyle )
+                axs[1,0].plot( pheno.sm_den, pheno.sm_e2a/nuda.effg_nr(pheno.sm_kf), linestyle=lstyle )
+                axs[1,1].plot( pheno.sm_kf, pheno.sm_e2a/nuda.effg_nr(pheno.sm_kf), linestyle=lstyle )
         if nuda.env.verb_output: pheno.print_outputs( )
     if matter.lower() == 'nm':
         axs[0,0].fill_between( band.den, y1=(band.e2a-band.e2a_std), y2=(band.e2a+band.e2a_std), color=band.color, alpha=band.alpha )