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

nucleardatapy/fig/nuc_setupBEExp_chart_fig.py

@@ -31,8 +31,8 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
     #
     axs.set_title(r''+table+' mass table version '+version)
-    axs.set_ylabel(r'Z')
-    axs.set_xlabel(r'N')
+    axs.set_ylabel(r'Z',fontsize='14')
+    axs.set_xlabel(r'N',fontsize='14')
     axs.set_xlim([0, 200])
     axs.set_ylim([0, 132])
     axs.text(10,120,'Number of nuclei:')
@@ -41,21 +41,28 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     #
     mas = nuda.nuc.setupBEExp( table = table, version = version )
     ustbl = mas.select( state= 'gs', interp = 'n', nucleus = 'longlive' )
-    axs.scatter( ustbl.sel_nucN, ustbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'grey', label='longlive ('+str(ustbl.sel_nbNucSel)+')' )
+    axs.scatter( ustbl.sel_nucN, ustbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'grey', label='long-lived ('+str(ustbl.sel_nbNucSel)+')' )
     #axs.text(10,96,'long live: '+str(ustbl.sel_nbNucSel))
     #
     # shortlive nuclei
     #
     mas = nuda.nuc.setupBEExp( table = table, version = version )
     ustbl = mas.select( state= 'gs', interp = 'n', nucleus = 'shortlive' )
-    axs.scatter( ustbl.sel_nucN, ustbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'r', label='shortlive ('+str(ustbl.sel_nbNucSel)+')' )
+    axs.scatter( ustbl.sel_nucN, ustbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'r', label='short-lived ('+str(ustbl.sel_nbNucSel)+')' )
     #axs.text(10,88,'short live: '+str(ustbl.sel_nbNucSel))
     #
     # veryshortlive nuclei
     #
     mas = nuda.nuc.setupBEExp( table = table, version = version )
     ustbl = mas.select( state= 'gs', interp = 'n', nucleus = 'veryshortlive' )
-    axs.scatter( ustbl.sel_nucN, ustbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'b', label='veryshortlive ('+str(ustbl.sel_nbNucSel)+')' )
+    axs.scatter( ustbl.sel_nucN, ustbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'b', label='very-short-lived ('+str(ustbl.sel_nbNucSel)+')' )
+    #axs.text(10,80,'very short live: '+str(ustbl.sel_nbNucSel))
+    #
+    # hypershortlive nuclei
+    #
+    mas = nuda.nuc.setupBEExp( table = table, version = version )
+    ustbl = mas.select( state= 'gs', interp = 'n', nucleus = 'hypershortlive' )
+    axs.scatter( ustbl.sel_nucN, ustbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'g', label='hyper-short-lived ('+str(ustbl.sel_nbNucSel)+')' )
     #axs.text(10,80,'very short live: '+str(ustbl.sel_nbNucSel))
     #
     # unstable nuclei:
@@ -73,13 +80,13 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
         s2n = theo.S2n( Zmin=1, Zmax = 95 )
         drip_S2n = s2n.drip_S2n( Zmin = 1, Zmax = 95 )
         if legend == 0:
-            axs.scatter( drip_S2n.drip_S2n_N, drip_S2n.drip_S2n_Z, marker='o', s = 3, linewidth=0, color = 'green', label='Drip Lines' )
+            axs.scatter( drip_S2n.drip_S2n_N, drip_S2n.drip_S2n_Z, marker='o', s = 3, linewidth=0, color = 'purple', label='Drip Lines' )
             legend = 1
         else:
-            axs.scatter( drip_S2n.drip_S2n_N, drip_S2n.drip_S2n_Z, marker='o', s = 3, linewidth=0, color = 'green' )
+            axs.scatter( drip_S2n.drip_S2n_N, drip_S2n.drip_S2n_Z, marker='o', s = 3, linewidth=0, color = 'purple' )
         s2p = theo.S2p( Nmin=1, Nmax = 150 )
         drip_S2p = s2p.drip_S2p( Nmin = 1, Nmax = 150 )
-        axs.scatter( drip_S2p.drip_S2p_N, drip_S2p.drip_S2p_Z, marker='o', s = 3, linewidth=0, color = 'green' )
+        axs.scatter( drip_S2p.drip_S2p_N, drip_S2p.drip_S2p_Z, marker='o', s = 3, linewidth=0, color = 'purple' )
     #
     # First and last isotopes
     #
@@ -94,7 +101,7 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     axs.scatter( stbl.sel_nucN, stbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'k' )
     axs.text(10,112,'stable: '+str(stbl.sel_nbNucSel))
     #
-    axs.text(60,120,str(ustbl.sel_nbNucSel+stbl.sel_nbNucSel))
+    axs.text(49,120,str(ustbl.sel_nbNucSel+stbl.sel_nbNucSel))
     #
     # plot N=Z dotted line
     #
@@ -103,8 +110,10 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     #
     # plot stable_fit
     #
-    N, Z = nuda.stable_fit( Zmin = 1, Zmax = 120 )
+    N, Z = nuda.stable_fit_Z( Zmin = 1, Zmax = 120 )
     axs.plot( N, Z, linestyle='dashed', linewidth=1, color='k')
+    #N, Z = nuda.stable_fit_N( Nmin = 1, Nmax = 200 )
+    #axs.plot( N, Z, linestyle='dashed', linewidth=1, color='r')
     #
     # plot shells for isotopes and isotones
     #
@@ -121,7 +130,7 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
         plt.close()
     #
 
-def nuc_setupBEExp_chart_Rch_fig( pname, table, version, Rch_table ):
+def nuc_setupBEExp_chart_year_fig( pname, sYear, year_min, year_max ):
     """
     Plot nuclear chart (N versus Z).\
     The plot is 1x1 with:\
@@ -140,7 +149,7 @@ def nuc_setupBEExp_chart_Rch_fig( pname, table, version, Rch_table ):
     #
     print(f'Plot name: {pname}')
     #
-    print('Table:',table)
+    #print('Table:',table)
     #
     # plot
     #
@@ -148,35 +157,23 @@ def nuc_setupBEExp_chart_Rch_fig( pname, table, version, Rch_table ):
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
     fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_title(r''+table+' mass table version '+version+' + '+Rch_table+' charge radius table')
+    #axs.set_title(r''+table+' mass table version '+version)
     axs.set_ylabel(r'Z')
     axs.set_xlabel(r'N')
     axs.set_xlim([0, 200])
-    axs.set_xticks([0,25,50,75,100,125,150,175,200])
     axs.set_ylim([0, 132])
-    axs.set_yticks([0,20,40,60,80,100,120])
-    axs.text(10,120,'Number of nuclei:')
-    #
-    # First and last isotopes
-    #
-    mas = nuda.nuc.setupBEExp( table = table, version = version )
-    ustbl = mas.select( state= 'gs', interp = 'n', nucleus = 'unstable' )
-    iso = ustbl.isotopes( Zmin=1, Zmax = 95 )
-    axs.scatter( iso.isotopes_Nmin, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green', label='AME boundaries' )
-    axs.scatter( iso.isotopes_Nmax, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green' )
+    #axs.text(10,120,'Number of nuclei:')
+    axs.text(10,100,'Year: '+str(year_min)+' to '+str(year_max))
     #
-    # stable nuclei:
+    # nuclei given in argument: sYear
     #
-    mas = nuda.nuc.setupBEExp( table = table, version = version )
-    stbl = mas.select( state= 'gs', interp = 'n', nucleus = 'stable' )
-    axs.scatter( stbl.sel_nucN, stbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'k' )
-    axs.text(10,112,'stable: '+str(stbl.sel_nbNucSel))
-    axs.text(60,120,str(ustbl.sel_nbNucSel+stbl.sel_nbNucSel))
+    axs.scatter( sYear.sel_N, sYear.sel_Z, marker='s', s = 3, linewidth=0, color = 'grey' )
     #
-    # Charge radii:
+    # First and last isotopes
     #
-    rch = nuda.nuc.setupRchExp( table = Rch_table )
-    axs.scatter( rch.nucN, rch.nucZ, marker='s', s = 3, linewidth=0, color = 'blue', label = 'charge radii' )
+    #iso = ustbl.isotopes( Zmin=1, Zmax = 95 )
+    #axs.scatter( iso.isotopes_Nmin, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green', label='Isotope bounds' )
+    #axs.scatter( iso.isotopes_Nmax, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green' )
     #
     # plot N=Z dotted line
     #
@@ -185,8 +182,10 @@ def nuc_setupBEExp_chart_Rch_fig( pname, table, version, Rch_table ):
     #
     # plot stable_fit
     #
-    N, Z = nuda.stable_fit( Zmin = 1, Zmax = 120 )
+    N, Z = nuda.stable_fit_Z( Zmin = 1, Zmax = 120 )
     axs.plot( N, Z, linestyle='dashed', linewidth=1, color='k')
+    N, Z = nuda.stable_fit_N( Nmin = 1, Nmax = 170 )
+    axs.plot( N, Z, linestyle='dashed', linewidth=1, color='r')
     #
     # plot shells for isotopes and isotones
     #
@@ -194,7 +193,7 @@ def nuc_setupBEExp_chart_Rch_fig( pname, table, version, Rch_table ):
     #
     # set legend
     #
-    axs.legend(loc='lower right',fontsize='10')
+    #axs.legend(loc='lower right',fontsize='10')
     #
     # set plot name and close
     #
@@ -203,8 +202,7 @@ def nuc_setupBEExp_chart_Rch_fig( pname, table, version, Rch_table ):
         plt.close()
     #
 
-
-def nuc_setupBEExp_chart_year_fig( pname, sYear, year_min, year_max ):
+def nuc_setupBEExp_chart_Rch_fig( pname, table, version, Rch_table ):
     """
     Plot nuclear chart (N versus Z).\
     The plot is 1x1 with:\
@@ -223,7 +221,7 @@ def nuc_setupBEExp_chart_year_fig( pname, sYear, year_min, year_max ):
     #
     print(f'Plot name: {pname}')
     #
-    #print('Table:',table)
+    print('Table:',table)
     #
     # plot
     #
@@ -231,23 +229,35 @@ def nuc_setupBEExp_chart_year_fig( pname, sYear, year_min, year_max ):
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
     fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
     #
-    #axs.set_title(r''+table+' mass table version '+version)
+    axs.set_title(r''+table+' mass table version '+version+' + '+Rch_table+' charge radius table')
     axs.set_ylabel(r'Z')
     axs.set_xlabel(r'N')
     axs.set_xlim([0, 200])
+    axs.set_xticks([0,25,50,75,100,125,150,175,200])
     axs.set_ylim([0, 132])
-    #axs.text(10,120,'Number of nuclei:')
-    axs.text(10,100,'Year: '+str(year_min)+' to '+str(year_max))
+    axs.set_yticks([0,20,40,60,80,100,120])
+    axs.text(10,120,'Number of nuclei:')
     #
-    # nuclei given in argument: sYear
+    # First and last isotopes
     #
-    axs.scatter( sYear.sel_N, sYear.sel_Z, marker='s', s = 3, linewidth=0, color = 'grey' )
+    mas = nuda.nuc.setupBEExp( table = table, version = version )
+    ustbl = mas.select( state= 'gs', interp = 'n', nucleus = 'unstable' )
+    iso = ustbl.isotopes( Zmin=1, Zmax = 95 )
+    axs.scatter( iso.isotopes_Nmin, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green', label='AME boundaries' )
+    axs.scatter( iso.isotopes_Nmax, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green' )
     #
-    # First and last isotopes
+    # stable nuclei:
     #
-    #iso = ustbl.isotopes( Zmin=1, Zmax = 95 )
-    #axs.scatter( iso.isotopes_Nmin, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green', label='Isotope bounds' )
-    #axs.scatter( iso.isotopes_Nmax, iso.isotopes_Z, marker='s', s = 3, linewidth=0, color = 'green' )
+    mas = nuda.nuc.setupBEExp( table = table, version = version )
+    stbl = mas.select( state= 'gs', interp = 'n', nucleus = 'stable' )
+    axs.scatter( stbl.sel_nucN, stbl.sel_nucZ, marker='s', s = 3, linewidth=0, color = 'k' )
+    axs.text(10,112,'stable: '+str(stbl.sel_nbNucSel))
+    axs.text(60,120,str(ustbl.sel_nbNucSel+stbl.sel_nbNucSel))
+    #
+    # Charge radii:
+    #
+    rch = nuda.nuc.setupRchExp( table = Rch_table )
+    axs.scatter( rch.nucN, rch.nucZ, marker='s', s = 3, linewidth=0, color = 'blue', label = 'charge radii' )
     #
     # plot N=Z dotted line
     #
@@ -265,7 +275,7 @@ def nuc_setupBEExp_chart_year_fig( pname, sYear, year_min, year_max ):
     #
     # set legend
     #
-    #axs.legend(loc='lower right',fontsize='10')
+    axs.legend(loc='lower right',fontsize='10')
     #
     # set plot name and close
     #
@@ -273,3 +283,4 @@ def nuc_setupBEExp_chart_year_fig( pname, sYear, year_min, year_max ):
         plt.savefig(pname, dpi=300)
         plt.close()
     #
+

nucleardatapy/fig/nuc_setupBEExp_fig.py

@@ -34,11 +34,11 @@ def nuc_setupBEExp_year_fig( pname, table, version ):
     #
     fig, axs = plt.subplots(1,2)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.85, wspace=0.2, hspace=0.2)
+    fig.subplots_adjust(left=0.12, bottom=0.15, right=0.95, top=0.85, wspace=0.2, hspace=0.2)
     #
     axs[0].set_title(r''+table+' mass table version '+version)
-    axs[0].set_ylabel(r'number of discovered nuclei')
-    axs[0].set_xlabel(r'year')
+    axs[0].set_ylabel(r'number of discovered nuclei',fontsize='14')
+    axs[0].set_xlabel(r'year',fontsize='14')
     axs[0].set_xlim([1890, 2020])
     #axs.set_yscale('log')
     axs[0].set_ylim([0, 250])
@@ -49,7 +49,7 @@ def nuc_setupBEExp_year_fig( pname, table, version ):
     #axs.plot( mas.dist_year*10, mas.dist_nbNuc, linestyle='solid', linewidth=1, color='k')
     #
     axs[1].set_title(r''+table+' mass table version '+version)
-    axs[1].set_xlabel(r'year')
+    axs[1].set_xlabel(r'year',fontsize='14')
     axs[1].set_xlim([2000, 2020])
     axs[1].set_ylim([0, 100])
     axs[1].hist( mas.nucYear, bins=100 )
@@ -89,26 +89,27 @@ def nuc_setupBEExp_S2n_fig( pname, tables, versions, Zref = 50 ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.14, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.14, bottom=0.15, right=0.95, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_title(r'Experimental mass tables',fontsize='12')
-    axs.set_ylabel(r'$S_{2n}$ (MeV)',fontsize='12')
-    axs.set_xlabel(r'N',fontsize='12')
+    axs.set_title(r'Experimental mass tables',fontsize='14')
+    axs.set_ylabel(r'$S_{2n}$ (MeV)',fontsize='14')
+    axs.set_xlabel(r'N',fontsize='14')
     axs.set_xlim([Zref-5, int(1.85*Zref)])
     axs.set_xticks(np.arange(start=Zref-5,stop=2*Zref,step=5))
     #axs.set_ylim([-10, 10])
-    axs.text(int(Zref),10,'For Z='+str(Zref),fontsize='12')
+    axs.text(int(Zref),10,'For Z='+str(Zref),fontsize='14')
     #
     # loop over the tables
     #
     for i,table in enumerate( tables ):
         #
         version = versions[i]
-        # plot nuclear chart:
         mas_exp = nuda.nuc.setupBEExp( table = table, version = version )
-        s2n_exp = mas_exp.S2n( Zmin = Zref, Zmax = Zref )
-        axs.scatter( s2n_exp.S2n_N, s2n_exp.S2n, label=table+' '+version )
-        #axs.plot( s2n_exp.S2n_N, s2n_exp.S2n, linestyle='solid', linewidth=1, label=exp_table+' '+exp_version )
+        mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+        mas_exp3 = mas_exp2.isotopes( Zref = Zref )
+        s2n_exp = mas_exp3.S2n( Zref = Zref )
+        axs.errorbar( s2n_exp.S2n_N, s2n_exp.S2n_E, yerr=s2n_exp.S2n_E_err, fmt='o', label=table+' '+version )
+        #axs.scatter( s2n_exp.S2n_N, s2n_exp.S2n_E, label=exp_table+' '+exp_version )
     #
     axs.legend(loc='upper right',fontsize='10', ncol=1)
     #
@@ -139,31 +140,29 @@ def nuc_setupBEExp_S2p_fig( pname, tables, versions, Nref = 50 ):
     print('Tables:',tables)
     print('Nref:',Nref)
     #
-    print(f'Plot name: {pname}')
-    #
-    # plot
-    #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.14, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.14, bottom=0.15, right=0.95, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_title(r'Experimental mass tables',fontsize='12')
-    axs.set_ylabel(r'$S_{2p}$ (MeV)',fontsize='12')
-    axs.set_xlabel(r'Z',fontsize='12')
+    axs.set_title(r'Experimental mass tables',fontsize='14')
+    axs.set_ylabel(r'$S_{2p}$ (MeV)',fontsize='14')
+    axs.set_xlabel(r'Z',fontsize='14')
     axs.set_xlim([0.4*Nref, 1.2*Nref])
     axs.set_xticks(np.arange(start=int(0.4*Nref),stop=1.2*Nref,step=5))
     #axs.set_ylim([-10, 10])
-    axs.text(int(0.7*Nref),10,'For N='+str(Nref),fontsize='12')
+    axs.text(int(0.7*Nref),10,'For N='+str(Nref),fontsize='14')
     #
     # loop over the tables
     #
     for i,table in enumerate( tables ):
         #
         version = versions[i]
-        # plot nuclear chart:
         mas_exp = nuda.nuc.setupBEExp( table = table, version = version )
-        s2p_exp = mas_exp.S2p( Nmin = Nref, Nmax = Nref )
-        axs.scatter( s2p_exp.S2p_Z, s2p_exp.S2p, label=table+' '+version )
+        mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+        mas_exp3 = mas_exp2.isotones( Nref = Nref )
+        s2p_exp = mas_exp3.S2p( Nref = Nref )
+        axs.errorbar( s2p_exp.S2p_Z, s2p_exp.S2p_E, yerr=s2p_exp.S2p_E_err, fmt='o', label=table+' '+version )
+        #axs.scatter( s2p_exp.S2p_Z, s2p_exp.S2p_E, label=table+' '+version )
     #
     axs.legend(loc='upper right',fontsize='10', ncol=1)
     #
@@ -196,15 +195,15 @@ def nuc_setupBEExp_D3n_fig( pname, tables, versions, Zref = 50 ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.14, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.14, bottom=0.15, right=0.95, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_title(r'Experimental mass tables',fontsize='12')
-    axs.set_ylabel(r'$\Delta_{3p}$ (MeV)',fontsize='12')
-    axs.set_xlabel(r'N',fontsize='12')
+    axs.set_title(r'Experimental mass tables',fontsize='14')
+    axs.set_ylabel(r'$\Delta_{3n}$ (MeV)',fontsize='14')
+    axs.set_xlabel(r'N',fontsize='14')
     axs.set_xlim([Zref-5, int(1.85*Zref)])
     axs.set_xticks(np.arange(start=Zref-5,stop=2*Zref,step=5))
     #axs.set_ylim([-10, 10])
-    axs.text(int(Zref),1.0,'For Z='+str(Zref),fontsize='12')
+    axs.text(int(Zref),1.0,'For Z='+str(Zref),fontsize='14')
     #
     # loop over the tables
     #
@@ -213,9 +212,13 @@ def nuc_setupBEExp_D3n_fig( pname, tables, versions, Zref = 50 ):
         version = versions[i]
         # plot nuclear chart:
         mas_exp = nuda.nuc.setupBEExp( table = table, version = version )
-        d3n_exp = mas_exp.D3n( Zmin = Zref, Zmax = Zref )
-        axs.scatter( d3n_exp.D3n_N_even, d3n_exp.D3n_even, label=table+' '+version+'(even)' )
-        axs.scatter( d3n_exp.D3n_N_odd,  d3n_exp.D3n_odd,  label=table+' '+version+'(odd)' )
+        mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+        mas_exp3 = mas_exp2.isotopes( Zref = Zref )
+        D3n_exp = mas_exp3.D3n( Zref = Zref )
+        axs.errorbar( D3n_exp.D3n_N_even, D3n_exp.D3n_E_even, yerr=D3n_exp.D3n_E_err_even, fmt='o', label=table+' '+version )
+        axs.errorbar( D3n_exp.D3n_N_odd,  D3n_exp.D3n_E_odd, yerr=D3n_exp.D3n_E_err_odd, fmt='o', label=table+' '+version )
+        #axs.scatter( d3n_exp.D3n_N_even, d3n_exp.D3n_E_even, label=table+' '+version+'(even)' )
+        #axs.scatter( d3n_exp.D3n_N_odd,  d3n_exp.D3n_E_odd,  label=table+' '+version+'(odd)' )
     #
     axs.legend(loc='upper right',fontsize='10', ncol=1)
     #
@@ -248,15 +251,15 @@ def nuc_setupBEExp_D3p_fig( pname, tables, versions, Nref = 50 ):
     #
     fig, axs = plt.subplots(1,1)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.14, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
+    fig.subplots_adjust(left=0.14, bottom=0.15, right=0.95, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_title(r'Experimental mass tables',fontsize='12')
-    axs.set_ylabel(r'$\Delta_{3p}$ (MeV)',fontsize='12')
-    axs.set_xlabel(r'Z',fontsize='12')
+    axs.set_title(r'Experimental mass tables',fontsize='14')
+    axs.set_ylabel(r'$\Delta_{3p}$ (MeV)',fontsize='14')
+    axs.set_xlabel(r'Z',fontsize='14')
     axs.set_xlim([0.4*Nref, 1.2*Nref])
     axs.set_xticks(np.arange(start=int(0.4*Nref),stop=1.2*Nref,step=5))
     #axs.set_ylim([-10, 10])
-    axs.text(int(0.7*Nref),1.4,'For N='+str(Nref),fontsize='12')
+    axs.text(int(0.7*Nref),1.4,'For N='+str(Nref),fontsize='14')
     #
     # loop over the tables
     #
@@ -265,9 +268,13 @@ def nuc_setupBEExp_D3p_fig( pname, tables, versions, Nref = 50 ):
         version = versions[i]
         # plot nuclear chart:
         mas_exp = nuda.nuc.setupBEExp( table = table, version = version )
-        d3p_exp = mas_exp.D3p( Nmin = Nref, Nmax = Nref )
-        axs.scatter( d3p_exp.D3p_Z_even, d3p_exp.D3p_even, label=table+' '+version+'(even)' )
-        axs.scatter( d3p_exp.D3p_Z_odd,  d3p_exp.D3p_odd,  label=table+' '+version+'(odd)' )
+        mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+        mas_exp3 = mas_exp2.isotones( Nref = Nref )
+        D3p_exp = mas_exp3.D3p( Nref = Nref )
+        axs.errorbar( D3p_exp.D3p_Z_even, D3p_exp.D3p_E_even, yerr=D3p_exp.D3p_E_err_even, fmt='o', label=table+' '+version )
+        axs.errorbar( D3p_exp.D3p_Z_odd,  D3p_exp.D3p_E_odd,  yerr=D3p_exp.D3p_E_err_odd,  fmt='o', label=table+' '+version )
+        #axs.scatter( d3p_exp.D3p_Z_even, d3p_exp.D3p_E_even, label=table+' '+version+'(even)' )
+        #axs.scatter( d3p_exp.D3p_Z_odd,  d3p_exp.D3p_E_odd,  label=table+' '+version+'(odd)' )
     #
     axs.legend(loc='upper right',fontsize='10', ncol=1)
     #

nucleardatapy/fig/nuc_setupBETheo_fig.py

@@ -34,16 +34,16 @@ def nuc_setupBETheo_diff_fig( pname, tables, table_ref = '1995-DZ', Zref = 50 ):
     fig.subplots_adjust(left=0.15, bottom=0.13, right=None, top=0.8)#, wspace=0.3, hspace=0.3)
     #
     #axs.set_title(r'Comparison of theoretical mass models',fontsize='12')
-    axs.set_ylabel(r'$E-E_{DZ}$ (MeV)',fontsize='12')
-    axs.set_xlabel(r'N',fontsize='12')
+    axs.set_ylabel(r'$E-E_{DZ}$ (MeV)',fontsize='14')
+    axs.set_xlabel(r'N',fontsize='14')
     axs.set_ylim([-5, 5])
     #axs.text(int(Zref)+5,-7,'For Z='+str(Zref),fontsize='12')
     if Zref == 50:
         axs.set_xlim( [ 40, 100 ] )
-        axs.text(55,4,'For Z='+str(Zref),fontsize='12')
+        axs.text(55,4,'For Z='+str(Zref),fontsize='14')
     elif Zref == 82:
         axs.set_xlim( [ 90, 150 ] )
-        axs.text(110,4,'For Z='+str(Zref),fontsize='12')
+        axs.text(110,4,'For Z='+str(Zref),fontsize='14')
     #
     # loop over the tables
     #
@@ -95,27 +95,33 @@ def nuc_setupBETheo_S2n_fig( pname, tables, Zref = 50 ):
     fig.subplots_adjust(left=0.15, bottom=0.13, right=None, top=0.8)#, wspace=0.3, hspace=0.3)
     #
     #axs.set_title(r'Comparison of theoretical mass models',fontsize='12')
-    axs.set_ylabel(r'$S_{2n}$ (MeV)',fontsize='12')
-    axs.set_xlabel(r'N',fontsize='12')
+    axs.set_ylabel(r'$S_{2n}$ (MeV)',fontsize='14')
+    axs.set_xlabel(r'N',fontsize='14')
     axs.set_xlim([Zref-5, int(2.3*Zref)])
     axs.set_xticks(np.arange(start=Zref-5,stop=2.3*Zref,step=5))
-    axs.set_ylim([0, 40])
-    axs.text(int(Zref),10,'For Z='+str(Zref),fontsize='12')
+    axs.set_ylim([-40, 0])
+    axs.text(int(Zref),-10,'For Z='+str(Zref),fontsize='14')
     #
     # loop over the tables
     #
     for i,table in enumerate( tables ):
         #
         mas = nuda.nuc.setupBETheo( table = table )
-        s2n = mas.S2n( Zmin = Zref, Zmax = Zref )
+        mas2 = mas.isotopes( Zref = Zref )
+        s2n = mas2.S2n( Zref = Zref )
         #
-        axs.plot( s2n.S2n_N, s2n.S2n, linestyle='solid', linewidth=1, label=table )
+        axs.plot( s2n.S2n_N, s2n.S2n_E, linestyle='solid', linewidth=1, label=table )
     #
     exp_table = 'AME'
     exp_version = '2020'
+    #
     mas_exp = nuda.nuc.setupBEExp( table = exp_table, version = exp_version )
-    s2n_exp = mas_exp.S2n( Zmin = Zref, Zmax = Zref )
-    axs.scatter( s2n_exp.S2n_N, s2n_exp.S2n, label=exp_table+' '+exp_version )
+    mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+    mas_exp3 = mas_exp2.isotopes( Zref = Zref )
+    s2n_exp = mas_exp3.S2n( Zref = Zref )
+    #
+    axs.errorbar( s2n_exp.S2n_N, s2n_exp.S2n_E, yerr=s2n_exp.S2n_E_err, fmt='o', label=exp_table+' '+exp_version )
+    #axs.scatter( s2n_exp.S2n_N, s2n_exp.S2n_E, label=exp_table+' '+exp_version )
     #axs.plot( s2n_exp.S2n_N, s2n_exp.S2n, linestyle='solid', linewidth=1, label=exp_table+' '+exp_version )
     #N_diff, A_diff, BE_diff, BE_diff = mas.diff_exp( table_exp = 'AME', version_exp = '2020', Zref = Zref )
     #axs.scatter( N_diff, BE_diff, label='AME2020' )
@@ -156,29 +162,34 @@ def nuc_setupBETheo_S2p_fig( pname, tables, Nref = 50 ):
     fig.subplots_adjust(left=0.15, bottom=0.13, right=None, top=0.8)#, wspace=0.3, hspace=0.3)
     #
     #axs.set_title(r'Comparison of theoretical mass models',fontsize='12')
-    axs.set_ylabel(r'$S_{2p}$ (MeV)',fontsize='12')
-    axs.set_xlabel(r'Z',fontsize='12')
+    axs.set_ylabel(r'$S_{2p}$ (MeV)',fontsize='14')
+    axs.set_xlabel(r'Z',fontsize='14')
     #axs.set_xlim([0.4*Nref, 1.3*Nref])
     axs.set_xlim([0.5*Nref, 1.05*Nref])
     #axs.set_xticks(np.arange(start=int(0.4*Nref),stop=1.3*Nref,step=5))
     axs.set_xticks(np.arange(start=int(0.5*Nref),stop=1.05*Nref,step=5))
-    axs.set_ylim([0, 46])
-    axs.text(int(0.7*Nref),35,'For N='+str(Nref),fontsize='12')
+    axs.set_ylim([-46, 0])
+    axs.text(int(0.7*Nref),-35,'For N='+str(Nref),fontsize='14')
     #
     # loop over the tables
     #
     for i,table in enumerate( tables ):
         #
         mas = nuda.nuc.setupBETheo( table = table )
-        s2p = mas.S2p( Nmin = Nref, Nmax = Nref )
+        mas2 = mas.isotones( Nref = Nref )
+        s2p = mas2.S2p( Nref = Nref )
         #
-        axs.plot( s2p.S2p_Z, s2p.S2p, linestyle='solid', linewidth=1, label=table )
+        axs.plot( s2p.S2p_Z, s2p.S2p_E, linestyle='solid', linewidth=1, label=table )
     #
     exp_table = 'AME'
     exp_version = '2020'
     mas_exp = nuda.nuc.setupBEExp( table = exp_table, version = exp_version )
-    s2p_exp = mas_exp.S2p( Nmin = Nref, Nmax = Nref )
-    axs.scatter( s2p_exp.S2p_Z, s2p_exp.S2p, label=exp_table+' '+exp_version )
+    mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+    mas_exp3 = mas_exp2.isotones( Nref = Nref )
+    s2p_exp = mas_exp3.S2p( Nref = Nref )
+    #
+    axs.errorbar( s2p_exp.S2p_Z, s2p_exp.S2p_E, yerr=s2p_exp.S2p_E_err, fmt='o', label=exp_table+' '+exp_version )
+    #axs.scatter( s2p_exp.S2p_Z, s2p_exp.S2p_E, label=exp_table+' '+exp_version )
     #
     #axs.legend(loc='upper right',fontsize='10', ncol=4)
     fig.legend(loc='upper left',bbox_to_anchor=(0.15,1.0),columnspacing=2,fontsize='8',ncol=4,frameon=False)
@@ -220,7 +231,7 @@ def nuc_setupBETheo_D3n_fig( pname, tables, Zref = 50 ):
     fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.8)#, wspace=0.3, hspace=0.3)
     #
     #axs.set_title(r'Comparison of theoretical mass models',fontsize='12')
-    axs.set_ylabel(r'$\Delta_{3,n}$ (MeV)',fontsize='12')
+    axs.set_ylabel(r'$\Delta_{3n}$ (MeV)',fontsize='12')
     axs.set_xlabel(r'N',fontsize='12')
     axs.set_xlim([Zref-5, int(2.3*Zref)])
     axs.set_xticks(np.arange(start=Zref-5,stop=2.3*Zref,step=5))
@@ -232,15 +243,24 @@ def nuc_setupBETheo_D3n_fig( pname, tables, Zref = 50 ):
     for i,table in enumerate( tables ):
         #
         mas = nuda.nuc.setupBETheo( table = table )
-        d3p = mas.D3n( Zmin = Zref, Zmax = Zref )
+        mas2 = mas.isotopes( Zref = Zref )
+        D3n = mas2.D3n( Zref = Zref )
         #
-        axs.plot( d3p.D3n_N_even, d3p.D3n_even, linestyle='solid', linewidth=1, label=table+'(even)' )
+        axs.plot( D3n.D3n_N_even, D3n.D3n_E_even, linestyle='solid', linewidth=1, label=table+'(even)' )
     #
     exp_table = 'AME'
     exp_version = '2020'
+    #
     mas_exp = nuda.nuc.setupBEExp( table = exp_table, version = exp_version )
-    d3n_exp = mas_exp.D3n( Zmin = Zref, Zmax = Zref )
-    axs.scatter( d3n_exp.D3n_N_even, d3n_exp.D3n_even, label=exp_table+' '+exp_version+'(even)' )
+    mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+    mas_exp3 = mas_exp2.isotopes( Zref = Zref )
+    D3n_exp = mas_exp3.D3n( Zref = Zref )
+    axs.errorbar( D3n_exp.D3n_N_even, D3n_exp.D3n_E_even, yerr=D3n_exp.D3n_E_err_even, fmt='o', label=exp_table+' '+exp_version+'(even)' )
+    #axs.scatter( D3n_exp.D3n_N_even, D3n_exp.D3n_E_even, label=exp_table+' '+exp_version+'(even)' )
+    #
+    # empirical relations:
+    axs.plot( D3n.D3n_N_even, nuda.nuc.delta_emp(D3n.D3n_N_even,Zref,formula='classic'), linestyle='solid', linewidth=3, label='classic' )
+    axs.plot( D3n.D3n_N_even, nuda.nuc.delta_emp(D3n.D3n_N_even,Zref,formula='Vogel'), linestyle='solid', linewidth=3, label='Vogel' )
     #
     #axs.legend(loc='upper right',fontsize='10', ncol=4)
     fig.legend(loc='upper left',bbox_to_anchor=(0.1,1.0),columnspacing=2,fontsize='7',ncol=4,frameon=False)
@@ -282,7 +302,7 @@ def nuc_setupBETheo_D3p_fig( pname, tables, Nref = 50 ):
     fig.subplots_adjust(left=0.12, bottom=0.12, right=None, top=0.8)#, wspace=0.3, hspace=0.3)
     #
     #axs.set_title(r'Comparison of theoretical mass models',fontsize='12')
-    axs.set_ylabel(r'$\Delta_{3,p}$ (MeV)',fontsize='12')
+    axs.set_ylabel(r'$\Delta_{3p}$ (MeV)',fontsize='12')
     axs.set_xlabel(r'Z',fontsize='12')
     axs.set_xlim([0.4*Nref, 1.1*Nref])
     axs.set_xticks(np.arange(start=int(0.4*Nref),stop=1.2*Nref,step=5))
@@ -294,20 +314,28 @@ def nuc_setupBETheo_D3p_fig( pname, tables, Nref = 50 ):
     for i,table in enumerate( tables ):
         #
         mas = nuda.nuc.setupBETheo( table = table )
-        d3p = mas.D3p( Nmin = Nref, Nmax = Nref )
+        mas2 = mas.isotones( Nref = Nref )
+        D3p = mas2.D3p( Nref = Nref )
         #
-        axs.plot( d3p.D3p_Z_even, d3p.D3p_even, linestyle='solid', linewidth=1, label=table+'(even)' )
+        axs.plot( D3p.D3p_Z_even, D3p.D3p_E_even, linestyle='solid', linewidth=1, label=table+'(even)' )
     #
     exp_table = 'AME'
     exp_version = '2020'
+    #
     mas_exp = nuda.nuc.setupBEExp( table = exp_table, version = exp_version )
-    d3p_exp = mas_exp.D3p( Nmin = Nref, Nmax = Nref )
-    axs.scatter( d3p_exp.D3p_Z_even, d3p_exp.D3p_even, label=exp_table+' '+exp_version+'(even)' )
+    mas_exp2 = mas_exp.select( state = 'gs', interp = 'n' )
+    mas_exp3 = mas_exp2.isotones( Nref = Nref )
+    D3p_exp = mas_exp3.D3p( Nref = Nref )
+    axs.errorbar( D3p_exp.D3p_Z_even, D3p_exp.D3p_E_even, yerr=D3p_exp.D3p_E_err_even, fmt='o', label=exp_table+' '+exp_version+'(even)' )
+    #axs.scatter( D3p_exp.D3p_Z_even, D3p_exp.D3p_E_even, label=exp_table+' '+exp_version+'(even)' )
+    #
+    # empirical relations:
+    axs.plot( D3p.D3p_Z_even, nuda.nuc.delta_emp(Nref,D3p.D3p_Z_even,formula='classic'), linestyle='solid', linewidth=3, label='classic' )
+    axs.plot( D3p.D3p_Z_even, nuda.nuc.delta_emp(Nref,D3p.D3p_Z_even,formula='Vogel'), linestyle='solid', linewidth=3, label='Vogel' )
     #
     #axs.legend(loc='upper right',fontsize='8', ncol=4)
     fig.legend(loc='upper left',bbox_to_anchor=(0.1,1.0),columnspacing=2,fontsize='7',ncol=4,frameon=False)
     #
-    #
     if pname is not None: 
         plt.savefig(pname, dpi=200)
         plt.close()

nucleardatapy/fig/nuc_setupISGMRExp_fig.py

@@ -28,14 +28,14 @@ def nuc_setupISGMRExp_fig( pname, tables ):
     #
     fig, axs = plt.subplots(1,3)
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
-    fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.85, wspace=0.1, hspace=0.3)
+    fig.subplots_adjust(left=0.12, bottom=0.15, right=0.95, top=0.85, wspace=0.1, hspace=0.3)
     #
     if obs == 'M12M0':
-        axs[0].set_ylabel(r'$E_{ISGMR}$ ($m_1/m_0$)')
+        axs[0].set_ylabel(r'$E_{ISGMR}$ from $m_1/m_0$ (MeV)',fontsize='14')
     elif obs == 'M12Mm1':
-        axs[0].set_ylabel(r'$E_{ISGMR}$ ($\sqrt{m_1/m_{-1}}$)')
+        axs[0].set_ylabel(r'$E_{ISGMR}$ from $\sqrt{m_1/m_{-1}}$ (MeV)',fontsize='14')
     elif obs == 'M12Mm1':
-        axs[0].set_ylabel(r'$E_{ISGMR}$ ($\sqrt{m_3/m_1}$)')
+        axs[0].set_ylabel(r'$E_{ISGMR}$ from $\sqrt{m_3/m_1}$ (MeV)',fontsize='14')
     #
     for k,table in enumerate( tables ):
         #
@@ -44,7 +44,7 @@ def nuc_setupISGMRExp_fig( pname, tables ):
         for i in [0,1,2]:
             print('For Z = ',nucZ[i])
             axs[i].set_title(nuda.param.elements[nucZ[i]-1])
-            axs[i].set_xlabel(r'A')
+            axs[i].set_xlabel(r'A',fontsize='14')
             axs[i].set_ylim([13, 18])
             if i>0: axs[i].tick_params('y', labelleft=False)
             gmrs = gmr.select( Zref = nucZ[i], obs = obs )

nucleardatapy/fig/nuc_setupRchExp_fig.py

@@ -26,8 +26,8 @@ def nuc_setupRchExp_fig( pname, tables ):
     fig.tight_layout() # Or equivalently,  "plt.tight_layout()"
     fig.subplots_adjust(left=0.12, bottom=0.15, right=None, top=0.85, wspace=0.3, hspace=0.3)
     #
-    axs.set_ylabel(r'$R_{ch}$')
-    axs.set_xlabel(r'N')
+    axs.set_ylabel(r'$R_{ch}$ (fm)',fontsize='14')
+    axs.set_xlabel(r'N',fontsize='14')
     axs.set_xlim([10, 140])
     axs.set_ylim([3.2, 5.8])
     #