nucleardatapy 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

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/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/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}")
         #

nucleardatapy/nuc/setup_be_theo.py

@@ -103,6 +103,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='1988-mj':
@@ -121,6 +122,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='1995-dz':
@@ -139,6 +141,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='1995-etfsi':
@@ -157,6 +160,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='1995-frdm':
@@ -220,6 +224,7 @@ class setupBETheo():
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
             #print('nucZ:',self.nucZ)
+            self.Zmin = min( self.nucZ )
             self.Zmax = max( self.nucZ )
             #
         elif table.lower()=='2005-ktuy':
@@ -238,6 +243,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2007-hfb14':
@@ -256,6 +262,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2010-hfb21':
@@ -277,6 +284,7 @@ class setupBETheo():
             #self.nucBE = self.Mcal * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2010-ws*':
@@ -295,6 +303,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2011-ws3':
@@ -313,6 +322,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2013-hfb22':
@@ -331,6 +341,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2013-hfb23':
@@ -349,6 +360,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2013-hfb24':
@@ -367,6 +379,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2013-hfb25':
@@ -385,6 +398,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2013-hfb26':
@@ -403,6 +417,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2021-bskg1':
@@ -424,6 +439,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2022-bskg2':
@@ -445,6 +461,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2023-bskg3':
@@ -466,6 +483,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         elif table.lower()=='2025-bskg4':
@@ -487,6 +505,7 @@ class setupBETheo():
             #self.nucBE = self.nucBE2A * self.nucA
             self.nucBE = conversionMBE(self.nucMass,self.nucN,self.nucZ)
             self.nucBE2A = self.nucBE / self.nucA
+            self.Zmin = int( min( self.nucZ ) )
             self.Zmax = int( max( self.nucZ ) )
             #
         self.nucI = ( self.nucN - self.nucZ ) / self.nucA
@@ -525,6 +544,8 @@ class setupBETheo():
         #
         if nuda.env.verb: print("Enter isotopes()")
         #
+        self.Zref = Zref
+        #
         if Zref < 0:
             print('setup_be_exp.py: issue with the function isotopes.')
             print('setup_be_exp.py: Bad definition for Zref')
@@ -547,6 +568,8 @@ class setupBETheo():
         self.itp_nucNmin = nucNmin
         self.itp_nucNmax = nucNmax
         #
+        #print('Nmin,Nmax:',nucNmin,nucNmax)
+        #
         if nuda.env.verb: print("Exit isotopes()")
         #
         return self
@@ -563,6 +586,8 @@ class setupBETheo():
         #
         if nuda.env.verb: print("Enter isotones()")
         #
+        self.Nref = Nref
+        #
         if Nref < 0:
             print('setup_be_exp.py: issue with the function isotones.')
             print('setup_be_exp.py: Bad definition for Nref')
@@ -589,7 +614,7 @@ class setupBETheo():
         #
         return self
         #
-    def S2n( self, Zref = 50 ):
+    def S2n( self ):
         """
         Compute the two-neutron separation energy (S2n)
         S2n = E(Z,N)-E(Z,N-2)
@@ -597,11 +622,11 @@ class setupBETheo():
         #
         if nuda.env.verb: print("Enter S2n()")
         #
-        if Zref < 0:
+        if self.Zref < 0:
             print('setup_be_theo: In S2n attribute function of setup_be_theo.py:')
             print('setup_be_theo: Bad definition of Zref')
             print('setup_be_theo: It is expected that Zref>=0')
-            print('setup_be_theo: Zref:',Zref)
+            print('setup_be_theo: Zref:',self.Zref)
             print('setup_be_theo: exit')
             exit()
         #
@@ -618,26 +643,29 @@ class setupBETheo():
             #
             for ind,Z in enumerate(self.nucZ):
                 #
-                if Z == Zref and self.nucN[ind] == N:
+                if Z == self.Zref and self.nucN[ind] == N:
                     indN = ind
                     flagN = True
-                if Z == Zref and self.nucN[ind] == N-2:
+                if Z == self.Zref and self.nucN[ind] == N-2:
                     indNm2 = ind
                     flagNm2 = True
                     #
             if flagN and flagNm2:
                 S2n_N.append( N )
-                S2n_Z.append( Zref )
+                S2n_Z.append( self.Zref )
                 S2n_E.append( self.nucBE[indN] - self.nucBE[indNm2] )
         self.S2n_N = np.array( S2n_N, dtype = int )
         self.S2n_Z = np.array( S2n_Z, dtype = int )
         self.S2n_E = np.array( S2n_E, dtype = float )
         #
+        #print('S2n_N:',self.S2n_N)
+        #print('S2n_Z:',self.S2n_Z)
+        #
         if nuda.env.verb: print("Exit S2n()")
         #
         return self
         #
-    def S2p( self, Nref = 50 ):
+    def S2p( self ):
         """
         Compute the two-proton separation energy (S2p)
         S2p(Z,Nref) = E(Z,Nref)-E(Z-2,Nref)
@@ -645,11 +673,11 @@ class setupBETheo():
         #
         if nuda.env.verb: print("Enter S2p()")
         #
-        if Nref < 0:
+        if self.Nref < 0:
             print('setup_be_exp.py: In S2p attribute function of setup_be_exp.py:')
             print('setup_be_exp.py: Bad definition of Nref')
             print('setup_be_exp.py: It is expected that Nref>=0')
-            print('setup_be_exp.py: Nref:',Nref)
+            print('setup_be_exp.py: Nref:',self.Nref)
             print('setup_be_exp.py: exit')
             exit()
         #
@@ -666,16 +694,16 @@ class setupBETheo():
             #
             for ind,N in enumerate(self.nucN):
                 #
-                if N == Nref and self.nucZ[ind] == Z:
+                if N == self.Nref and self.nucZ[ind] == Z:
                     indZ = ind
                     flagZ = True
-                if N == Nref and self.nucZ[ind] == Z-2:
+                if N == self.Nref and self.nucZ[ind] == Z-2:
                     indZm2 = ind
                     flagZm2 = True
                     #
             if flagZ and flagZm2:
                 S2p_Z.append( Z )
-                S2p_N.append( Nref )    
+                S2p_N.append( self.Nref )    
                 S2p_E.append( self.nucBE[indZ] - self.nucBE[indZm2] )
         self.S2p_Z = np.array( S2p_Z, dtype = int )
         self.S2p_N = np.array( S2p_N, dtype = int )
@@ -685,27 +713,29 @@ class setupBETheo():
         #
         return self
         #
-    def drip_S2n(self, Zref=50):
+    def drip_S2n(self):
         """
         Method which find the drip-line nuclei from S2n (neutron side).
 
-        :param Zmin: Fix the minimum charge for the search of the neutron drip line.
-        :type Zmin: int, optional. Default: 1.
-        :param Zmax: Fix the maximum charge for the search of the neutron drip line.
-        :type Zmax: int, optional. Default: 95.
+        :param Zref: Fix the charge for the search of isotopes.
+        :type Zref: int, optional. Default: 50.
 
         **Attributes:**
         """
         #
         if nuda.env.verb: print("Enter drip_S2n()")
         #
-        # if Zmin > Zmax:
-        #     print('setup_be_theo: In drip_S2n attribute function of setup_be_theo.py:')
-        #     print('setup_be_theo: Bad definition of Zmin and Zmax')
-        #     print('setup_be_theo: It is expected that Zmin<=Zmax')
-        #     print('setup_be_theo: Zmin,Zmax:',Zmin,Zmax)
-        #     print('setup_be_theo: exit')
-        #     exit()
+        #print('Zref:',self.Zref)
+        #print('self.nucZ:',self.nucZ)
+        #print('self.nucN:',self.nucN)
+        #
+        if self.Zref not in self.nucZ:
+             print('setup_be_theo: In drip_S2n attribute function of setup_be_theo.py:')
+             print('setup_be_theo: Zref is not in self.nucZ')
+             print('setup_be_theo: Zref:',self.Zref)
+             print('setup_be_theo: self.nucZ:',self.nucZ)
+             print('setup_be_theo: exit')
+             exit()
         #
         if not any(self.S2n_Z):
             print('setup_be_theo: In drip_S2n attribute function of setup_be_theo.py:')
@@ -713,54 +743,52 @@ class setupBETheo():
             print('setup_be_theo: exit')
             exit()
         #
-        #Nstable, Zstable = stable_fit( Zmin = Zmin, Zmax = Zmax )
-        #
         self.drip_S2n_Z = []
         self.drip_S2n_N = []
         #
-        print("S2n_Z:",self.S2n_Z)
+        #print("S2n_Z:",self.S2n_Z)
+        #print("S2n_N:",self.S2n_N)
+        #print("S2n_E:",self.S2n_E)
+        #
+        Nmax = 0
         for ind,Z in enumerate(self.S2n_Z):
             #
-            # if Z > Zmax :
-            #     break
-            # if Z < Zref :
-            #     continue
-            #
-            #Nmax = Nstable[ind]
-            Nmax = 0
-            #
-            for ind2,Z2 in enumerate(self.S2n_Z):
-                if Z2 == Z and self.S2n_N[ind2] > Nmax and self.S2n[ind2] > 0.0:
-                    Nmax = self.S2n_N[ind2]
-            self.drip_S2n_Z.append( Z )
-            self.drip_S2n_N.append( Nmax )
+            if self.S2n_N[ind] > Nmax and self.S2n_E[ind] > 0.0:
+                    Nmax = self.S2n_N[ind]
+        self.drip_S2n_Z = Z
+        self.drip_S2n_N = Nmax
+        #
+        #print('drip_S2n_Z',self.drip_S2n_Z)
+        #print('drip_S2n_N',self.drip_S2n_N)
         #
         if nuda.env.verb: print("Exit drip_S2n()")
         #
         return self
         #
     #
-    def drip_S2p(self, Nmin = 1, Nmax = 95 ):
+    def drip_S2p(self ):
         """
         Method which find the drip-line nuclei from S2p (proton side).
 
-        :param Nmin: Fix the minimum neutron number for the search of the proton drip line.
-        :type Nmin: int, optional. Default: 1.
-        :param Nmax: Fix the maximum neutron number for the search of the proton drip line.
-        :type Nmax: int, optional. Default: 95.
+        :param Nref: Fix the charge for the search of isotones.
+        :type Nref: int, optional. Default: 50.
 
         **Attributes:**
         """
         #
         if nuda.env.verb: print("Enter drip_S2p()")
         #
-        if Nmin > Nmax:
-            print('setup_be_theo: In drip_S2p attribute function of setup_be_theo.py:')
-            print('setup_be_theo: Bad definition of Nmin and Nmax')
-            print('setup_be_theo: It is expected that Nmin<=Nmax')
-            print('setup_be_theo: Nmin,Nmax:',Nmin,Nmax)
-            print('setup_be_theo: exit')
-            exit()
+        #print('Nref:',self.Nref)
+        #print('self.nucZ:',self.nucZ)
+        #print('self.nucN:',self.nucN)
+        #
+        if self.Nref not in self.nucN:
+             print('setup_be_theo: In drip_S2p attribute function of setup_be_theo.py:')
+             print('setup_be_theo: Nref is not in self.nucN')
+             print('setup_be_theo: Nref:',self.Nref)
+             print('setup_be_theo: self.nucN:',self.nucN)
+             print('setup_be_theo: exit')
+             exit()
         #
         if not any(self.S2p_N):
             print('setup_be_theo: In drip_S2p attribute function of setup_be_theo.py:')
@@ -771,26 +799,19 @@ class setupBETheo():
         self.drip_S2p_Z = []
         self.drip_S2p_N = []
         #
+        Zmax = 0
         for ind,N in enumerate(self.S2p_N):
             #
-            if N > Nmax :
-                break
-            if N < Nmin :
-                continue
-            #
-            Zmax = 0
-            #
-            for ind2,N2 in enumerate(self.S2p_N):
-                if N2 == N and self.S2p_Z[ind2] > Zmax and self.S2p[ind2] > 0.0:
-                    Zmax = self.S2p_Z[ind2]
-            self.drip_S2p_N.append( N )
-            self.drip_S2p_Z.append( Zmax )
+            if self.S2p_Z[ind] > Zmax and self.S2p_E[ind] > 0.0:
+                Zmax = self.S2p_Z[ind]
+        self.drip_S2p_N = N
+        self.drip_S2p_Z = Zmax
         #
         if nuda.env.verb: print("Exit drip_S2p()")
         #
         return self
         #
-    def D3n( self, Zref = 50 ):
+    def D3n( self ):
         """
         Compute the three-points odd-even mass staggering (D3n)
         D3n = (-)**N * ( 2*E(Z,N)-E(Z,N+1)-E(Z,N-1) ) / 2
@@ -798,11 +819,11 @@ class setupBETheo():
         #
         if nuda.env.verb: print("Enter D3n()")
         #
-        if Zref < 0:
+        if self.Zref < 0:
             print('setup_be_theo: In D3n attribute function of setup_be_theo.py:')
             print('setup_be_theo: Bad definition of Zref')
             print('setup_be_theo: It is expected that Zref>=0')
-            print('setup_be_theo: Zref:',Zref)
+            print('setup_be_theo: Zref:',self.Zref)
             print('setup_be_theo: exit')
             exit()
         #
@@ -820,17 +841,17 @@ class setupBETheo():
             #
             for ind,Z in enumerate(self.nucZ):
                 #
-                if Z == Zref and self.nucN[ind] == N:
+                if Z == self.Zref and self.nucN[ind] == N:
                     indN = ind
                     flagN = True
                     if N % 2:
                         sign = -1.0 # odd
                     else:
                         sign = 1.0 # even
-                if Z == Zref and self.nucN[ind] == N-1:
+                if Z == self.Zref and self.nucN[ind] == N-1:
                     indNm1 = ind
                     flagNm1 = True
-                if Z == Zref and self.nucN[ind] == N+1:
+                if Z == self.Zref and self.nucN[ind] == N+1:
                     indNp1 = ind
                     flagNp1 = True
                     #
@@ -850,7 +871,7 @@ class setupBETheo():
         #
         return self
         #
-    def D3p( self, Nref = 50 ):
+    def D3p( self ):
         """
         Compute the three-points odd-even mass staggering (D3n)
         D3p = (-)**Z * ( 2*E(Z,N)-E(Z+1,N)-E(Z-1,N) ) / 2
@@ -858,11 +879,11 @@ class setupBETheo():
         #
         if nuda.env.verb: print("Enter D3p()")
         #
-        if Nref < 0:
+        if self.Nref < 0:
             print('setup_be_theo: In D3p attribute function of setup_be_theo.py:')
             print('setup_be_theo: Bad definition of Nref')
             print('setup_be_theo: It is expected that Nref>=0')
-            print('setup_be_theo: Nref:',Nref)
+            print('setup_be_theo: Nref:',self.Nref)
             print('setup_be_theo: exit')
             exit()
         #
@@ -880,17 +901,17 @@ class setupBETheo():
             #
             for ind,N in enumerate(self.nucN):
                 #
-                if N == Nref and self.nucZ[ind] == Z:
+                if N == self.Nref and self.nucZ[ind] == Z:
                     indZ = ind
                     flagZ = True
                     if Z % 2:
                         sign = -1.0 # odd
                     else:
                         sign = 1.0 # even
-                if N == Nref and self.nucZ[ind] == Z-1:
+                if N == self.Nref and self.nucZ[ind] == Z-1:
                     indZm1 = ind
                     flagZm1 = True
-                if N == Nref and self.nucZ[ind] == Z+1:
+                if N == self.Nref and self.nucZ[ind] == Z+1:
                     indZp1 = ind
                     flagZp1 = True
                     #
@@ -910,148 +931,6 @@ class setupBETheo():
         #
         return self
         #
-    def D3n_old( self, Zmin = 1, Zmax = 95 ):
-        """
-        Compute the three-points odd-even mass staggering (D3n)
-        D3N = (-)**N * ( 2*E(Z,N)-E(Z,N+1)-E(Z,N-1) ) / 2
-        """
-        #
-        if nuda.env.verb: print("Enter D3n()")
-        #
-        if Zmin > Zmax:
-            print('setup_be_theo: In D3n attribute function of setup_be_exp.py:')
-            print('setup_be_theo: Bad definition of Zmin and Zmax')
-            print('setup_be_theo: It is expected that Zmin<=Zmax')
-            print('setup_be_theo: Zmin,Zmax:',Zmin,Zmax)
-            print('setup_be_theo: exit')
-            exit()
-        #
-        D3n_Z_even = []
-        D3n_Z_odd = []
-        D3n_N_even = []
-        D3n_N_odd = []
-        D3n_even = []
-        D3n_odd = []
-        #
-        for ind,Z in enumerate(self.nucZ):
-            #
-            if Z > Zmax :
-                continue
-            if Z < Zmin :
-                continue
-            #
-            N = self.nucN[ind]
-            #
-            if N % 2 == 0:
-                sign = 1.0 #even
-            else:
-                sign = -1.0 # odd
-            #
-            #print('For Z,N:',Z,N)
-            #
-            # search index for Z,N+2
-            #
-            flag_find1 = 0
-            for ind1,Z1 in enumerate(self.nucZ):
-                if Z == Z1 and self.nucN[ind1] == N+1:
-                    flag_find1 = 1
-                    break
-            flag_find2 = 0
-            for ind2,Z2 in enumerate(self.nucZ):
-                if Z == Z2 and self.nucN[ind2] == N-1:
-                    flag_find2 = 1
-                    break
-            if flag_find1*flag_find2 == 1: 
-                if sign > 0: #even
-                    D3n_Z_even.append( self.nucZ[ind] )
-                    D3n_N_even.append( self.nucN[ind] )
-                    D3n_even.append( sign/2.0*( -2*self.nucBE[ind] + self.nucBE[ind1] + self.nucBE[ind2] ) )
-                else:
-                    D3n_Z_odd.append( self.nucZ[ind] )
-                    D3n_N_odd.append( self.nucN[ind] )
-                    D3n_odd.append( sign/2.0*( -2*self.nucBE[ind] + self.nucBE[ind1] + self.nucBE[ind2] ) )
-        self.D3n_N_even = np.array( D3n_N_even, dtype = int )
-        self.D3n_N_odd  = np.array( D3n_N_odd,  dtype = int )
-        self.D3n_Z_even = np.array( D3n_Z_even, dtype = int )
-        self.D3n_Z_odd  = np.array( D3n_Z_odd,  dtype = int )
-        self.D3n_even   = np.array( D3n_even,   dtype = float )
-        self.D3n_odd    = np.array( D3n_odd,    dtype = float )            
-        #
-        if nuda.env.verb: print("Exit D3n()")
-        #
-        return self
-    #
-    def D3p_old( self, Nmin = 1, Nmax = 95 ):
-        """
-        Compute the three-points odd-even mass staggering (D3p)
-        D3Z = (-)**Z * ( 2*E(Z,N)-E(Z+1,N)-E(Z-1,N) ) / 2
-        """
-        #
-        if nuda.env.verb: print("Enter D3p()")
-        #
-        if Nmin > Nmax:
-            print('setup_be_theo: In D3p attribute function of setup_be_exp.py:')
-            print('setup_be_theo: Bad definition of Nmin and Nmax')
-            print('setup_be_theo: It is expected that Nmin<=Nmax')
-            print('setup_be_theo: Nmin,Nmax:',Nmin,Nmax)
-            print('setup_be_theo: exit')
-            exit()
-        #
-        D3p_Z_even = []
-        D3p_Z_odd = []
-        D3p_N_even = []
-        D3p_N_odd = []
-        D3p_even = []
-        D3p_odd = []
-        #
-        for ind,N in enumerate(self.nucN):
-            #
-            if N > Nmax :
-                continue
-            if N < Nmin :
-                continue
-            #
-            Z = self.nucZ[ind]
-            #
-            if Z % 2 == 0:
-                sign = 1.0 #even
-            else:
-                sign = -1.0 # odd
-            #
-            #print('For Z,N:',Z,N)
-            #
-            # search index for Z,N+2
-            #
-            flag_find1 = 0
-            for ind1,N1 in enumerate(self.nucN):
-                if N == N1 and self.nucZ[ind1] == Z+1:
-                    flag_find1 = 1
-                    break
-            flag_find2 = 0
-            for ind2,N2 in enumerate(self.nucN):
-                if N == N2 and self.nucZ[ind2] == Z-1:
-                    flag_find2 = 1
-                    break
-            if flag_find1*flag_find2 == 1: 
-                if sign > 0: #even
-                    D3p_Z_even.append( self.nucZ[ind] )
-                    D3p_N_even.append( self.nucN[ind] )
-                    D3p_even.append( sign/2.0*( -2*self.nucBE[ind] + self.nucBE[ind1] + self.nucBE[ind2] ) )
-                else:
-                    D3p_Z_odd.append( self.nucZ[ind] )
-                    D3p_N_odd.append( self.nucN[ind] )
-                    D3p_odd.append( sign/2.0*( -2*self.nucBE[ind] + self.nucBE[ind1] + self.nucBE[ind2] ) )
-        self.D3p_N_even = np.array( D3p_N_even, dtype = int )
-        self.D3p_N_odd  = np.array( D3p_N_odd,  dtype = int )
-        self.D3p_Z_even = np.array( D3p_Z_even, dtype = int )
-        self.D3p_Z_odd  = np.array( D3p_Z_odd,  dtype = int )
-        self.D3p_even   = np.array( D3p_even,   dtype = float )
-        self.D3p_odd    = np.array( D3p_odd,    dtype = float )            
-        #
-        if nuda.env.verb: print("Exit D3p()")
-        #
-        return self
-    #
     def diff(self, table, Zref = 50 ):
         """
         Method calculates the difference between a given mass 

{nucleardatapy-1.0.1.dist-info → nucleardatapy-1.0.2.dist-info}/METADATA

@@ -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.dist-info → nucleardatapy-1.0.2.dist-info}/RECORD

@@ -481,7 +481,7 @@ nucleardatapy/fig/eos_setupAM_asy_nuc_fig.py,sha256=9dSNz8J6F3EXw5sPX6q4IhE1VZJQ
 nucleardatapy/fig/eos_setupAM_asy_tot_fig.py,sha256=eQNiCwaMxR-mVi2_4co8KXZeRPOgUOhbO7KSWxSL0zE,13350
 nucleardatapy/fig/eos_setupAM_fig.py,sha256=XDV1npzXhVwz844biS8AajLraxIqbV2TXhqiuugwKpI,23217
 nucleardatapy/fig/eos_setupCC_fig.py,sha256=P0p93Y-C3LLz4Fyt_1CGA9l7x8N8wHLWV_RBkyYWehY,10725
-nucleardatapy/fig/hnuc_setupChart_fig.py,sha256=xt94AadDRra0HuDV_w90yrFRt9I2X2Z7T_ks4sOmLI0,2001
+nucleardatapy/fig/hnuc_setupChart_fig.py,sha256=r_64gf1YbWZfwxOJEEUkNQ9QP-fZKRhUXBJIJJ2c4Ac,2053
 nucleardatapy/fig/hnuc_setupRE1LExp_fig.py,sha256=yLxcNSvsX8eYWrIbL3a-k1mr4Syh-OB9op51F6vg7ZA,1797
 nucleardatapy/fig/matter_all_fig.py,sha256=XXSPSClty6VzdwB4yILsrAx3zbLvfi5D2HEZfeTTqEE,50458
 nucleardatapy/fig/matter_setupCheck_fig.py,sha256=t0Sr7yFuYs9yZUKTWZn232F-0P4swrw0fBPTtIwt9ww,4799
@@ -498,7 +498,7 @@ nucleardatapy/fig/matter_setupMicro_gap_fig.py,sha256=dwqoe4xqOKb-EQutrTXPTn336i
 nucleardatapy/fig/matter_setupNEPStats_fig.py,sha256=A216kp3DIDhSMr51oDwBEP1VUYBedmHXyC7CKduKHbI,3928
 nucleardatapy/fig/matter_setupPhenoEsym_fig.py,sha256=iz59IbwnunGYXN2dr_isuGuKQoC3-fElxt7kAKeSZHg,8242
 nucleardatapy/fig/matter_setupPheno_fig.py,sha256=mrQ7dd_4JBNdl-SOLyzKShPp1h7UfDVtHkCcSAqCLYc,16832
-nucleardatapy/fig/nuc_setupBEExp_chart_fig.py,sha256=Lp_aABqapGU9XLfoaVlEyNlayrWgwvqNmQ-fuurn608,10293
+nucleardatapy/fig/nuc_setupBEExp_chart_fig.py,sha256=qwUweYPu7SctSeBPnmo1RMkZGWKSnUrorba-bRNpNsU,10895
 nucleardatapy/fig/nuc_setupBEExp_fig.py,sha256=dorX8Q94Kvn6JP79gpE4Hn5EpHWlZIJywljUIxvBTN8,9947
 nucleardatapy/fig/nuc_setupBETheo_fig.py,sha256=PaQPsbvnhv-LYVi8dcLoDGJHYmDqTdbslLKCeHQ2vsM,12918
 nucleardatapy/fig/nuc_setupISGMRExp_fig.py,sha256=NqN6LF22_cpZhnIGGAZ2U2738yXKvPLeBJBfPGexKVU,1778
@@ -515,7 +515,7 @@ nucleardatapy/matter/setup_check.py,sha256=DnJQr47hg-VKwp12XtV2PnHl_rxoNZCXhgLMi
 nucleardatapy/matter/setup_ffg.py,sha256=A5fYLzN1ASjbOix-n3WqmtJRuYu47waJLOvGgMdiYhg,17604
 nucleardatapy/matter/setup_hic.py,sha256=Lehk4oCSYtxAMetWdaa8MFsGtK3Vbly3Vdztje2-HvI,17231
 nucleardatapy/matter/setup_micro.py,sha256=M0h4bgDbO4XgxiUpoN9fp-OUbvB4JIG6ZXrjmfWY7fk,115181
-nucleardatapy/matter/setup_micro_band.py,sha256=_4RuOgyHEwT3tGPUKUqqGto5h_YCntGZh7g7kvmp5Gc,10067
+nucleardatapy/matter/setup_micro_band.py,sha256=qfv-Bhq-idnxUDjviS6t8dUZXBjLoW1uBXlbiQzY1R4,10071
 nucleardatapy/matter/setup_micro_effmass.py,sha256=v_u3XIIri-5KiBrTh2H4Ht861lEWtXwU5NYOb0l5WD8,12274
 nucleardatapy/matter/setup_micro_esym.py,sha256=p_xXeOgdU3adxRbeU27Q3tid3od2yt52I_bm0fsIzss,14713
 nucleardatapy/matter/setup_micro_gap.py,sha256=avJpLMnW3OfDzH30qPUj5qTqWTgZYamwv1QtLJWzJlU,20910
@@ -527,19 +527,19 @@ nucleardatapy/matter/setup_pheno.py,sha256=UPu5MM_XJkF2UKMv7H4tyAok-QERTpbhwkGCS
 nucleardatapy/matter/setup_pheno_esym.py,sha256=jp_1nRu7Nb8JP6lQJXXupVEMPK8ce6COnANSwcxlf6U,10711
 nucleardatapy/nuc/__init__.py,sha256=83hkFkuS66poI0IYebcyKVthdkvUZINfyGrJ9LaTRlc,441
 nucleardatapy/nuc/setup_be_exp.py,sha256=96-lmoq_1RvyXSBjdzEfxfo2GtaOSzHXPQEqyC8lWNk,43551
-nucleardatapy/nuc/setup_be_theo.py,sha256=7JknCUJ3jbBDOxFpbXiDby89JFXu-XcJbLI-nZjfSh8,53646
+nucleardatapy/nuc/setup_be_theo.py,sha256=L_bXQ5qTQf89NYfCnR8zQ1q-7eC4O0WVBwg_e9kJX3o,49065
 nucleardatapy/nuc/setup_isgmr_exp.py,sha256=5v8wQVCUt-JhKQZudrhTWFm6zGN5DvKWEtgWTKV2f64,21981
 nucleardatapy/nuc/setup_rch_exp.py,sha256=VAsmKeshP1wj81iLJfziCmudkaC3l_7fTJgX-egRJmI,6470
 nucleardatapy/nuc/setup_rch_theo.py,sha256=UsLaZH6Ii49oH4KjArJ7WGOApFNZ8lxYBFqZoe6z8ic,10322
 nucleardatapy/nuc/setup_rnp_exp.py,sha256=69tpLKQBDU4JiANqeRoiE9gwCb8mOm9ajyNnfCM55W0,36596
 nucleardatapy/nuc/setup_rnp_theo.py,sha256=YaNR8ts4Y8jmtoqFwlwTyx9ytCqzdw4I8_UQk8wxUsc,9863
-nucleardatapy-1.0.1.dist-info/licenses/LICENSE,sha256=doPNswWMPXbkhplb9cnZLwJoqqS72pJPhkSib8kIF08,19122
+nucleardatapy-1.0.2.dist-info/licenses/LICENSE,sha256=doPNswWMPXbkhplb9cnZLwJoqqS72pJPhkSib8kIF08,19122
 tests/__init__.py,sha256=o-blBq1tTx47wR_SJk-iPHRAdpPvcnPAWPJ-h7QwoD8,392
 tests/test_astro_setupMasses.py,sha256=vUa9QskmdDGHIBKYo1H8F3_8Lql_p_26ZI-euvJLebQ,371
 tests/test_corr_setupKsatQsat.py,sha256=lxq0L8_OLABPalOysURYIxdtUOvMx37eCEeLNwO6XQQ,751
 tests/test_matter_setupFFGNuc.py,sha256=Rpgla2VtzfYakkXB3dOTfYu5vT48PbBLUcv82n2aEKY,471
 tests/test_matter_setupMicro.py,sha256=HR58vkcuxnMiYC7C_d0fXzaiOp7avHlran07UqC81OM,753
-nucleardatapy-1.0.1.dist-info/METADATA,sha256=0N-8CKbKI7m8xAVS-vv92UZxgxULkS7XRFTblb2qbp8,27127
-nucleardatapy-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucleardatapy-1.0.1.dist-info/top_level.txt,sha256=5s1lKIlvQZYDk8g2VaCb4-hP4omORMMiUw2n7gozg-4,20
-nucleardatapy-1.0.1.dist-info/RECORD,,
+nucleardatapy-1.0.2.dist-info/METADATA,sha256=5WmFnZppQaIsLimfVpo8aes2tX8FT0ByQWXTsl7Lw1U,27127
+nucleardatapy-1.0.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+nucleardatapy-1.0.2.dist-info/top_level.txt,sha256=5s1lKIlvQZYDk8g2VaCb4-hP4omORMMiUw2n7gozg-4,20
+nucleardatapy-1.0.2.dist-info/RECORD,,

{nucleardatapy-1.0.1.dist-info → nucleardatapy-1.0.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any