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

nucleardatapy/matter/setup_micro_band.py

@@ -173,10 +173,10 @@ class setupMicroBand():
             #?? esym = nuda.matter.setupMicroEsym( model = model )
             # Prepare spline for E/A and E/A_err
             if matter.lower() == 'nm':
-                cs_e2a = CubicSpline( mic.nm_den, mic.nm_e2a )
+                cs_e2a = CubicSpline( mic.nm_den, mic.nm_e2a_int )
                 cs_e2a_err = CubicSpline( mic.nm_den, mic.nm_e2a_err )
             elif matter.lower() == 'sm':
-                cs_e2a = CubicSpline( mic.sm_den, mic.sm_e2a )
+                cs_e2a = CubicSpline( mic.sm_den, mic.sm_e2a_int )
                 cs_e2a_err = CubicSpline( mic.sm_den, mic.sm_e2a_err )
             elif matter.lower() == 'esym':
                 esym = nuda.matter.setupMicroEsym( model = model )
@@ -193,12 +193,12 @@ class setupMicroBand():
         #
         #    compute centroid and standard deviation as function of the density
         #
-        self.e2a = []; self.e2a_std = [];
+        self.e2a_int = []; self.e2a_std = [];
         for k,kfn in enumerate(self.kfn):
-            self.e2a.append( np.mean(mat[k,:]*e2a)/np.mean(mat[k,:]) )
+            self.e2a_int.append( np.mean(mat[k,:]*e2a)/np.mean(mat[k,:]) )
             self.e2a_std.append(  np.mean(mat[k,:]*e2a**2)/np.mean(mat[k,:]) )
-        self.e2a = np.array(self.e2a, dtype=float )
-        self.e2a_std = xfac * np.sqrt( np.array(self.e2a_std, dtype=float ) - self.e2a**2 )
+        self.e2a_int = np.array(self.e2a_int, dtype=float )
+        self.e2a_std = xfac * np.sqrt( np.array(self.e2a_std, dtype=float ) - self.e2a_int**2 )
         #
         if nuda.env.verb: print("Exit setupMicroBand()")
         #

nucleardatapy/matter/setup_micro_esym.py

@@ -1,5 +1,3 @@
-import os
-import sys
 import math
 import numpy as np  # 1.15.0
 from scipy.interpolate import CubicSpline
@@ -220,24 +218,24 @@ class setupMicroEsym():
             #
             mic = nuda.matter.setupMicro( model = model, var1 = var1, var2 = 0.0 )
             self.sm_den = mic.den
-            self.sm_e2a = mic.e2a
+            self.sm_e2a_int = mic.e2a_int
             self.sm_e2a_err = mic.e2a_err
             #
             # NM
             #
             mic = nuda.matter.setupMicro( model = model, var1 = var1, var2 = 1.0 )
             self.nm_den = mic.den
-            self.nm_e2a = mic.e2a
+            self.nm_e2a_int = mic.e2a_int
             self.nm_e2a_err = mic.e2a_err
             #
         else:
             #
             mic = nuda.matter.setupMicro( model = model )
             self.sm_den = mic.sm_den
-            self.sm_e2a = mic.sm_e2a
+            self.sm_e2a_int = mic.sm_e2a_int
             self.sm_e2a_err = mic.sm_e2a_err
             self.nm_den = mic.nm_den
-            self.nm_e2a = mic.nm_e2a
+            self.nm_e2a_int = mic.nm_e2a_int
             self.nm_e2a_err = mic.nm_e2a_err
             #mic.print_outputs( )
             #
@@ -250,20 +248,20 @@ class setupMicroEsym():
         self.note = mic.note
         self.label = mic.label
         self.marker = mic.marker
-        self.every = 2*mic.every
+        self.every = mic.every
         self.linestyle = mic.linestyle
         self.err = True
         #
         # E/A in SM (cubic spline)
         #
-        x = np.insert( self.sm_den, 0, 0.0 ); y = np.insert( self.sm_e2a, 0, 0.0 )
+        x = np.insert( self.sm_den, 0, 0.0 ); y = np.insert( self.sm_e2a_int, 0, 0.0 )
         cs_sm_e2a = CubicSpline( x, y )
         y_err = np.insert( self.sm_e2a_err, 0, 0.0 )
         cs_sm_e2a_err = CubicSpline( x, y_err )
         #
         # E/A in NM (cubic spline)
         #
-        x = np.insert( self.nm_den, 0, 0.0 ); y = np.insert( self.nm_e2a, 0, 0.0 )
+        x = np.insert( self.nm_den, 0, 0.0 ); y = np.insert( self.nm_e2a_int, 0, 0.0 )
         cs_nm_e2a = CubicSpline( x, y )
         y_err = np.insert( self.nm_e2a_err, 0, 0.0 )
         cs_nm_e2a_err = CubicSpline( x, y_err )
@@ -279,9 +277,9 @@ class setupMicroEsym():
         #
         # Symmetry energy for the densities defined in self.den
         #
-        self.esym_sm_e2a = cs_sm_e2a( self.den )
-        self.esym_nm_e2a = cs_nm_e2a( self.den )
-        self.esym = self.esym_nm_e2a - self.esym_sm_e2a
+        self.esym_sm_e2a_int = cs_sm_e2a( self.den )
+        self.esym_nm_e2a_int = cs_nm_e2a( self.den )
+        self.esym = self.esym_nm_e2a_int - self.esym_sm_e2a_int
         self.esym_err = np.sqrt( cs_nm_e2a_err( self.den )**2 + cs_sm_e2a_err( self.den )**2 )
         self.esym_sm_pre = self.den**2 * cs_sm_e2a( self.den, 1 )
         self.esym_sym_pre = self.den**2 * cs_nm_e2a( self.den, 1 ) - self.esym_sm_pre
@@ -289,7 +287,7 @@ class setupMicroEsym():
         self.den_unit = 'fm$^{-3}$'
         self.kf_unit = 'fm$^{-1}$'
         self.esym_unit = 'MeV'
-        self.e2v_unit = 'MeV fm$^{-3}$'
+        self.eps_unit = 'MeV fm$^{-3}$'
         self.pre_unit = 'MeV fm$^{-3}$'
         #
         if nuda.env.verb: print("Exit setupMicroEsym()")

nucleardatapy/matter/setup_micro_gap.py

@@ -28,7 +28,7 @@ def micro_gap_models( matter = 'NM' ):
     #
     if nuda.env.verb: print("\nEnter micro_gap_models()")
     #
-    models_all = [ '2006-BHF-Av18-NM', '2006-BHF-Av18-SM', '2008-BCS-NM', '2008-QMC-NM-swave', '2009-DLQMC-NM', '2010-QMC-NM-AV4', \
+    models_all = [ '2006-BHF-NM-Av18', '2006-BHF-SM-Av18', '2008-BCS-NM', '2008-QMC-NM-swave', '2009-DLQMC-NM', '2010-QMC-NM-AV4', \
             '2017-MBPT-NM-GAP-EMG-450-500-N2LO', '2017-MBPT-NM-GAP-EMG-450-500-N3LO', '2017-MBPT-NM-GAP-EMG-450-700-N2LO', \
             '2017-MBPT-NM-GAP-EMG-450-700-N3LO', '2017-MBPT-NM-GAP-EM-500-N2LO', '2017-MBPT-NM-GAP-EM-500-N3LO', \
             '2022-AFDMC-NM' ]
@@ -90,18 +90,18 @@ class setupMicroGap():
             print('setup_micro_gap: -- Exit the code --')
             exit()
         #
-        if model.lower() == '2006-bhf-nm':
+        if model.lower() == '2006-bhf-nm-av18':
             #
-            file_in_fs = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-GAP-NM-FreeSpectrum.dat')
+            file_in_fs = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-GAP-NM-FreeSpectrum.dat')
             if nuda.env.verb: print('Reads file (free spectrum):',file_in_fs)
-            file_in_se = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-GAP-NM-SelfEnergy.dat')
+            file_in_se = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-GAP-NM-SelfEnergy.dat')
             if nuda.env.verb: print('Reads file (self energy):',file_in_se)
             self.ref = 'L.G. Cao, U. Lombardo, and P. Schuck, Phys. Rev. C 74, 64301 (2006)'
             self.note = ""
             self.label = 'EBHF-Av18-2006'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'dotted'
+            self.lstyle = 'solid'
             self.gap_err = False
             self.nm_kfn_1s0_fs, self.nm_gap_bare_1s0_fs, self.nm_gap_bare_onebubble_1s0_fs, self.nm_gap_bare_full_1s0_fs \
                 = np.loadtxt( file_in_fs, usecols=(0,1,2,3), unpack = True )
@@ -110,18 +110,18 @@ class setupMicroGap():
                 = np.loadtxt( file_in_se, usecols=(0,1,2), unpack = True )
             self.nm_den_1s0 = nuda.den_n( self.nm_kfn_1s0 )
             #
-        elif model.lower() == '2006-bhf-sm':
+        elif model.lower() == '2006-bhf-sm-av18':
             #
-            file_in_fs = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-GAP-SM-FreeSpectrum.dat')
+            file_in_fs = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-GAP-SM-FreeSpectrum.dat')
             if nuda.env.verb: print('Reads file (free spectrum):',file_in_fs)
-            file_in_se = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-GAP-SM-SelfEnergy.dat')
+            file_in_se = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-GAP-SM-SelfEnergy.dat')
             if nuda.env.verb: print('Reads file (self energy):',file_in_se)
             self.ref = 'L.G. Cao, U. Lombardo, and P. Schuck, Phys. Rev. C 74, 64301 (2006)'
             self.note = ""
             self.label = 'EBHF-Av18-2006'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'dotted'
+            self.lstyle = 'solid'
             self.gap_err = False
             self.sm_kfn_1s0_fs, self.sm_gap_bare_1s0_fs, self.sm_gap_bare_onebubble_1s0_fs, self.sm_gap_bare_full_1s0_fs \
                 = np.loadtxt( file_in_fs, usecols=(0,1,2,3), unpack = True )
@@ -139,7 +139,7 @@ class setupMicroGap():
             self.label = 'BCS-2008'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'dotted'
+            self.lstyle = 'dashed'
             self.gap_err = False
             self.nm_kfn_1s0, self.nm_gap_1s0, self.nm_chempot, self.nm_effmass \
                 = np.loadtxt( file_in, usecols=(0,1,2,3), unpack = True )
@@ -156,7 +156,7 @@ class setupMicroGap():
             self.label = 'AFDMC-2008'
             self.marker = 'D'
             self.every = 1
-            #self.linestyle = 'solid'
+            self.lstyle = 'solid'
             self.gap_err = False
             self.nm_kfn_1s0, self.nm_gap_1s0, self.nm_chempot, self.nm_effmass \
                 = np.loadtxt( file_in, usecols=(0,1,2,3), unpack = True )
@@ -173,7 +173,7 @@ class setupMicroGap():
             self.label = 'QMC-swave-2008'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'solid'
+            self.lstyle = 'solid'
             self.gap_err = True
             self.nm_kfn_1s0, gap2ef, gap2ef_err, e2effg, e2effg_err \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
@@ -190,7 +190,7 @@ class setupMicroGap():
             self.label = 'dLQMC-2009'
             self.marker = 'v'
             self.every = 1
-            #self.linestyle = 'solid'
+            self.lstyle = 'solid'
             self.gap_err = True
             self.nm_kfn_1s0, gap2ef, gap2ef_err, e2effg, e2effg_err \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
@@ -207,7 +207,7 @@ class setupMicroGap():
             self.label = 'QMC-AV4-2008'
             self.marker = 's'
             self.every = 1
-            #self.linestyle = 'solid'
+            self.lstyle = 'solid'
             self.gap_err = True
             self.nm_kfn_1s0, gap2ef, gap2ef_err, e2effg, e2effg_err \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
@@ -220,7 +220,7 @@ class setupMicroGap():
             self.ref = 'C. Drischler, T. Kr\"uger, K. Hebeler, and A. Schwenk, Phys. Rev. C 95, 024302 (2017).'
             self.note = ""
             self.marker = 's'
-            #self.linestyle = 'solid'
+            self.lstyle = 'dashed'
             self.every = 2
             self.err = True
             if model.lower() == '2017-mbpt-nm-gap-emg-450-500-n2lo':
@@ -280,9 +280,8 @@ class setupMicroGap():
             self.ref = 'S. Gandolfi, G. Palkanoglou, J. Carlson, A. Gezerlis, K.E. Schmidt, Condensed Matter 7(1) (2022).'
             self.note = ""
             self.label = 'AFDMC+corr.-2022'
-            self.linestyle = 'solid'
             self.marker = 'o'
-            #self.linestyle = 'solid'
+            self.lstyle = 'solid'
             self.every = 1
             self.gap_err = True
             # read gap
@@ -310,6 +309,7 @@ class setupMicroGap():
         print("   label: ",self.label)
         print("   marker:",self.marker)
         print("   every: ",self.every)
+        # NM
         if self.nm_den_effmass is not None: print(f"   nm_den_effmass: {np.round(self.nm_den_effmass,3)} in {self.den_unit}")
         if self.nm_kfn_effmass is not None: print(f"   nm_kfn_effmass: {np.round(self.nm_kfn_effmass,3)} in {self.kf_unit}")
         if self.nm_den_1s0 is not None: print(f"   nm_den_1s0: {np.round(self.nm_den_1s0,3)} in {self.den_unit}")
@@ -321,6 +321,11 @@ class setupMicroGap():
         if self.nm_gap_1s0_err is not None: print(f"   nm_gap_1s0_err: {np.round(self.nm_gap_1s0_err,3)} in {self.gap_unit}")
         if self.nm_gap_3pf2 is not None: print(f"   nm_gap_3pf2: {np.round(self.nm_gap_3pf2,3)} in {self.gap_unit}")
         if self.nm_gap_3pf2_err is not None: print(f"   nm_gap_3pf2_err: {np.round(self.nm_gap_3pf2_err,3)} in {self.gap_unit}")
+        # SM
+        if self.sm_den_1s0 is not None: print(f"   sm_den_1s0: {np.round(self.sm_den_1s0,3)} in {self.den_unit}")
+        if self.sm_kfn_1s0 is not None: print(f"   sm_kfn_1s0: {np.round(self.sm_kfn_1s0,3)} in {self.kf_unit}")
+        if self.sm_gap_1s0 is not None: print(f"   sm_gap_1s0: {np.round(self.sm_gap_1s0,3)} in {self.gap_unit}")
+        if self.sm_gap_1s0_err is not None: print(f"   sm_gap_1s0_err: {np.round(self.sm_gap_1s0_err,3)} in {self.gap_unit}")
         #
         if nuda.env.verb: print("Exit print_outputs()")
         #
@@ -370,6 +375,8 @@ class setupMicroGap():
         self.sm_gap_3pf2_err = None
         #: Attribute the plot label data.
         self.label = ''
+        #: Attribute the plot linestyle.
+        self.lstyle = None
         #: Attribute the plot marker.
         self.marker = None
         #: Attribute the plot every data.

nucleardatapy/matter/setup_micro_lp.py

@@ -212,7 +212,7 @@ class setupMicroLP():
         #
         elif model.lower() == '2006-ebhf-sm-av18':
             #
-            file_in = os.path.join(nuda.param.path_data,'LandauParameters/micro/2006-IBHF-SM-AV18.dat')
+            file_in = os.path.join(nuda.param.path_data,'LandauParameters/micro/2006-EBHF-SM-AV18.dat')
             if nuda.env.verb: print('Reads file:',file_in)
             self.ref = 'L.G. Cao, U. Lombardo, and P. Schuck, Phys Rev C 74, 064301 (2006)'
             self.note = "write here notes about this EOS."
@@ -225,7 +225,7 @@ class setupMicroLP():
         #
         elif model.lower() == '2006-ebhf-nm-av18':
             #
-            file_in = os.path.join(nuda.param.path_data,'LandauParameters/micro/2006-IBHF-NM-AV18.dat')
+            file_in = os.path.join(nuda.param.path_data,'LandauParameters/micro/2006-EBHF-NM-AV18.dat')
             if nuda.env.verb: print('Reads file:',file_in)
             self.ref = 'L.G. Cao, U. Lombardo, and P. Schuck, Phys Rev C 74, 064301 (2006)'
             self.note = "write here notes about this EOS."