nucleardatapy 1.0.1__tar.gz → 1.0.2__tar.gz

{nucleardatapy-1.0.1/version-1.0/nucleardatapy.egg-info → nucleardatapy-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucleardatapy
-Version: 1.0.1
+Version: 1.0.2
 Summary: A toolkit for nuclear data processing and meta-analyses.
 Author: Jerome Margueron, Sudhanva Lalit, Mariana Dutra, Guilherme Grams, Rohit Kumar
 License: Attribution-NonCommercial-NoDerivatives 4.0 International

{nucleardatapy-1.0.1 → nucleardatapy-1.0.2}/pyproject.toml

@@ -15,7 +15,7 @@ description = "A toolkit for nuclear data processing and meta-analyses."
 license = {file = "LICENSE" }
 readme = "README.md"
 requires-python = ">=3.9"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
     "numpy",
     "scipy",

{nucleardatapy-1.0.1 → nucleardatapy-1.0.2}/version-1.0/nucleardatapy/fig/hnuc_setupChart_fig.py

@@ -37,6 +37,7 @@ def hnuc_setupChart_fig( pname, tables1L, tables2L, tables1Xi ):
     axs.set_ylim([0.8, 90.0])
     #
     for table1L in tables1L:
+        print(f'Processing table: {table1L}')
         hnuc1L = nuda.hnuc.setupRE1LExp( table = table1L )
         axs.scatter( hnuc1L.N,      hnuc1L.Z,      marker='s', s=12, color=nuda.param.col[0], label=r'1$\Lambda$ from table '+table1L )
     for table2L in tables2L:
@@ -52,6 +53,6 @@ def hnuc_setupChart_fig( pname, tables1L, tables2L, tables1Xi ):
     axs.text(1.1,60,'Chart of hypernuclides in nuda toolkit',fontsize='14')
     #
     if pname is not None:
-    	plt.savefig(pname, dpi=200)
-    	plt.close()
+        plt.savefig(pname, dpi=200)
+        plt.close()
     #

{nucleardatapy-1.0.1 → nucleardatapy-1.0.2}/version-1.0/nucleardatapy/fig/nuc_setupBEExp_chart_fig.py

@@ -34,26 +34,32 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     axs.set_title(r''+table+' mass table version '+version)
     axs.set_ylabel(r'Z',fontsize='14')
     axs.set_xlabel(r'N',fontsize='14')
-    axs.set_xlim([0, 200])
+    axs.set_xlim([0, 220])
     axs.set_ylim([0, 132])
     axs.text(10,120,'Number of nuclei:')
     #
-    # longlive nuclei
+    # longlived nuclei
     #
+    print(20*'-')
+    print('longlived nuclei:')
     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='long-lived ('+str(ustbl.sel_nbNucSel)+')' )
     #axs.text(10,96,'long live: '+str(ustbl.sel_nbNucSel))
     #
-    # shortlive nuclei
+    # shortlived nuclei
     #
+    print(20*'-')
+    print('shortlived 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='short-lived ('+str(ustbl.sel_nbNucSel)+')' )
     #axs.text(10,88,'short live: '+str(ustbl.sel_nbNucSel))
     #
-    # veryshortlive nuclei
+    # veryshortlived nuclei
     #
+    print(20*'-')
+    print('veryshortlived 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='very-short-lived ('+str(ustbl.sel_nbNucSel)+')' )
@@ -61,6 +67,8 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     #
     # hypershortlive nuclei
     #
+    print(20*'-')
+    print('hypershortlived 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)+')' )
@@ -68,20 +76,31 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     #
     # unstable nuclei:
     #
+    print(20*'-')
+    print('unstable nuclei:')
     mas = nuda.nuc.setupBEExp( table = table, version = version )
     ustbl = mas.select( state= 'gs', interp = 'n', nucleus = 'unstable' )
     #axs.scatter( ustbl.sel_nucN, ustbl.sel_Z, marker='.', s = 1, linewidth=0, color = 'b' )
     axs.text(10,104,'unstable: '+str(ustbl.sel_nbNucSel))
     #
-    # drip line nuclei
+    # dripline nuclei
     #
+    print(20*'-')
+    print('dripline nuclei:')
+    print('theo_tables:',theo_tables)
     legend = 0
     for i,theo_table in enumerate( theo_tables ):
+        print('theo_table:',theo_table)
         theo = nuda.nuc.setupBETheo( table = theo_table )
-        for zref in range(1,96):
+        print('   Zmin, Zmax:',theo.Zmin,theo.Zmax)
+        for zref in range(theo.Zmin+4,theo.Zmax-4):
+            #print('zref:',zref)
+            #print('isotopes:')
             itp = theo.isotopes( Zref= zref)
-            s2n = itp.S2n( Zref= zref )
-            drip_S2n = itp.drip_S2n(Zref = zref)
+            #print('S2n:')
+            s2n = itp.S2n()
+            #print('drip_S2n:')
+            drip_S2n = itp.drip_S2n()
             if legend == 0:
                 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
@@ -101,12 +120,14 @@ def nuc_setupBEExp_chart_lt_fig( pname, table, version, theo_tables ):
     #
     # stable nuclei:
     #
+    print(20*'-')
+    print('stable nuclei:')
     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(49,120,str(ustbl.sel_nbNucSel+stbl.sel_nbNucSel))
+    axs.text(70,120,str(ustbl.sel_nbNucSel+stbl.sel_nbNucSel))
     #
     # plot N=Z dotted line
     #

{nucleardatapy-1.0.1 → nucleardatapy-1.0.2}/version-1.0/nucleardatapy/matter/setup_micro_band.py

@@ -215,7 +215,7 @@ class setupMicroBand():
         print("   den_max:",self.den_max)
         print("   den :",np.round(self.den,3))
         print("   kfn :",np.round(self.kfn,2))
-        print("   e2a :",np.round(self.e2a,2))
+        print("   e2a :",np.round(self.e2a_int,2))
         print("   std :",np.round(self.e2a_std,3))
         #if self.sm_den is not None: print(f"   sm_den: {np.round(self.sm_den,3)} in {self.den_unit}")
         #