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

nucleardatapy/matter/setup_micro_band.py

@@ -55,10 +55,13 @@ class setupMicroBand():
         #
         if matter.lower() == 'nm':
             print('\nBand in NM')
+            xfac = 1.2
         elif matter.lower() == 'sm':
             print('\nBand in SM')
+            xfac = 1.8
         elif matter.lower() == 'esym':
             print('\nBand for Esym')
+            xfac = 1.4
         #
         self = setupMicroBand.init_self( self )
         #
@@ -112,6 +115,7 @@ class setupMicroBand():
             den_min_tmp = []; den_max_tmp = [];
             for model in models:
                 mic = nuda.matter.setupMicro( model = model )
+                #?? esym = nuda.matter.setupMicroEsym( model = model )
                 if matter.lower() == 'nm':
                     nm_den_min = min( mic.nm_den )
                     nm_den_max = max( mic.nm_den )
@@ -166,12 +170,13 @@ class setupMicroBand():
             if nuda.env.verb: print('model:',model)
             # Load the results from model
             mic = nuda.matter.setupMicro( model = model )
+            #?? 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 )
@@ -188,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 = 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_effmass.py

@@ -8,6 +8,15 @@ import random
 
 import nucleardatapy as nuda
 
+def effmass_emp( den , delta, mb = 'BHF' ):
+    if mb == 'BHF':
+        kfsat = 1.32
+        kfn = nuda.kf_n( nuda.cst.half * ( 1.0 + delta ) * den )
+        kfp = nuda.kf_n( nuda.cst.half * ( 1.0 - delta ) * den )
+        ms_n = 1.0 / ( 1.0 + 0.20 * (kfp/kfsat)**3.5 )
+        ms_p = 1.0 / ( 1.0 + 0.20 * (kfn/kfsat)**3.5 )
+    return ms_n, ms_p
+
 def micro_effmass_models( matter = 'NM' ):
     """
     Return a list with the name of the models available in this toolkit and \
@@ -24,7 +33,7 @@ def micro_effmass_models( matter = 'NM' ):
     #
     if nuda.env.verb: print("\nEnter micro_effmass_models()")
     # '2008-AFDMC-NM', 
-    models_all = [ '2008-BCS-NM', \
+    models_all = [ '2006-BHF-SM-Av18', '2006-BHF-AM-Av18', '2008-BCS-NM', \
             '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' ]
@@ -85,7 +94,51 @@ class setupMicroEffmass():
             print('setup_micro_effmass: -- Exit the code --')
             exit()
         #
-        if model.lower() == '2008-bcs-nm':
+        if model.lower() == '2006-bhf-sm-av18':
+            #
+            file_in = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-effmass-SM.dat')
+            if nuda.env.verb: print('Reads file:',file_in)
+            self.ref = 'L.G. Cao, U. Lombardo, C.W. Shen, N.V. Giai, Phys. Rev. C 73, 014313 (2006)'
+            self.note = ""
+            self.label = 'BHF-2006'
+            self.marker = 'o'
+            self.every = 1
+            #self.linestyle = 'dotted'
+            self.err = False
+            self.nm_effmass_err = None
+            self.sm_den, self.sm_effmass \
+                = np.loadtxt( file_in, usecols=(0,1), unpack = True )
+            self.sm_kfn = nuda.kf_n( nuda.cst.half * self.sm_den )
+            #
+        elif model.lower() == '2006-bhf-am-av18':
+            #
+            file_in_00 = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-effmass-SM.dat')
+            file_in_02 = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-effmass-beta0.2.dat')
+            file_in_04 = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-effmass-beta0.4.dat')
+            self.ref = 'L.G. Cao, U. Lombardo, C.W. Shen, N.V. Giai, Phys. Rev. C 73, 014313 (2006)'
+            self.note = ""
+            self.label = 'BHF-2006'
+            self.marker = 'o'
+            self.every = 1
+            #self.linestyle = 'dotted'
+            self.err = False
+            self.nm_effmass_err = None
+            self.sm_den, self.sm_effmass_p \
+                = np.loadtxt( file_in_00, usecols=(0,1), unpack = True )
+            self.sm_effmass_n = self.sm_effmass_p
+            self.sm_kfn = nuda.kf_n( nuda.cst.half * ( 1.0 + 0.0 ) * self.sm_den )
+            #
+            # asymmetric matter with delta = 0.2
+            self.am02_den, self.am02_effmass_p, self.am02_effmass_n \
+                = np.loadtxt( file_in_02, usecols=(0,1,2), unpack = True )
+            self.am02_kfn = nuda.kf_n( nuda.cst.half * ( 1.0 + 0.2 ) * self.am02_den )
+            #
+            # asymmetric matter with delta = 0.4
+            self.am04_den, self.am04_effmass_p, self.am04_effmass_n \
+                = np.loadtxt( file_in_04, usecols=(0,1,2), unpack = True )
+            self.am04_kfn = nuda.kf_n( nuda.cst.half * ( 1.0 + 0.4 ) * self.am04_den )
+            #
+        elif model.lower() == '2008-bcs-nm':
             #
             file_in = os.path.join(nuda.param.path_data,'matter/micro/2008-BCS-NM.dat')
             if nuda.env.verb: print('Reads file:',file_in)

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
@@ -24,7 +22,7 @@ def micro_esym_mbs():
     #
     if nuda.env.verb: print("\nEnter micro_mbs()")
     #
-    mbs = [ 'VAR', 'BHF', 'MBPT', 'NLEFT' ]
+    mbs = [ 'VAR', 'BHF2', 'BHF23', 'MBPT', 'NLEFT' ]
     mbs_lower = [ item.lower() for item in mbs ]
     #
     if nuda.env.verb: print("Exit micro_mbs()")
@@ -64,13 +62,20 @@ def micro_esym_models_mb( mb ):
     #print('mb:',mb)
     if mb.lower() == 'var':
         models = [ '1981-VAR-AM-FP', '1998-VAR-AM-APR', '1998-VAR-AM-APR-fit' ]
-    elif mb.lower() == 'bhf':
-        models = [ '2024-BHF-AM-2BF-Av8p', '2024-BHF-AM-2BF-Av18', '2024-BHF-AM-2BF-BONN', '2024-BHF-AM-2BF-CDBONN', \
+    elif mb.lower() == 'bhf2':
+        models = [ '2024-BHF-AM-2BF-Av18', '2024-BHF-AM-2BF-BONN', '2024-BHF-AM-2BF-CDBONN', \
             '2024-BHF-AM-2BF-NSC97a', '2024-BHF-AM-2BF-NSC97b', '2024-BHF-AM-2BF-NSC97c', '2024-BHF-AM-2BF-NSC97d', \
-            '2024-BHF-AM-2BF-NSC97e', '2024-BHF-AM-2BF-NSC97f', '2024-BHF-AM-2BF-SSCV14',\
-            '2024-BHF-AM-23BF-Av8p', '2024-BHF-AM-23BF-Av18', '2024-BHF-AM-23BF-BONN', '2024-BHF-AM-23BF-CDBONN', \
-            '2024-BHF-AM-23BF-NSC97a', '2024-BHF-AM-23BF-NSC97b', '2024-BHF-AM-23BF-NSC97c', '2024-BHF-AM-23BF-NSC97d', \
-            '2024-BHF-AM-23BF-NSC97e', '2024-BHF-AM-23BF-NSC97f', '2024-BHF-AM-23BF-SSCV14' ]
+            '2024-BHF-AM-2BF-NSC97e', '2024-BHF-AM-2BF-NSC97f' ]
+        #models = [ '2024-BHF-AM-2BF-Av8p', '2024-BHF-AM-2BF-Av18', '2024-BHF-AM-2BF-BONN', '2024-BHF-AM-2BF-CDBONN', \
+        #    '2024-BHF-AM-2BF-NSC97a', '2024-BHF-AM-2BF-NSC97b', '2024-BHF-AM-2BF-NSC97c', '2024-BHF-AM-2BF-NSC97d', \
+        #    '2024-BHF-AM-2BF-NSC97e', '2024-BHF-AM-2BF-NSC97f', '2024-BHF-AM-2BF-SSCV14' ]
+    elif mb.lower() == 'bhf23':
+        models = [ '2006-BHF-AM-Av18', '2024-BHF-AM-23BF-Av18', '2024-BHF-AM-23BF-BONN', \
+            '2024-BHF-AM-23BF-CDBONN', '2024-BHF-AM-23BF-NSC97a', '2024-BHF-AM-23BF-NSC97b', '2024-BHF-AM-23BF-NSC97c', \
+            '2024-BHF-AM-23BF-NSC97d', '2024-BHF-AM-23BF-NSC97e', '2024-BHF-AM-23BF-NSC97f' ]
+        #models = [ '2006-BHF-AM-Av18', '2024-BHF-AM-23BF-Av8p', '2024-BHF-AM-23BF-Av18', '2024-BHF-AM-23BF-BONN', \
+        #    '2024-BHF-AM-23BF-CDBONN', '2024-BHF-AM-23BF-NSC97a', '2024-BHF-AM-23BF-NSC97b', '2024-BHF-AM-23BF-NSC97c', \
+        #    '2024-BHF-AM-23BF-NSC97d', '2024-BHF-AM-23BF-NSC97e', '2024-BHF-AM-23BF-NSC97f', '2024-BHF-AM-23BF-SSCV14' ]
     elif mb.lower() == 'mbpt':
         models = [ '2019-MBPT-AM-L59', '2016-MBPT-AM', '2019-MBPT-AM-L69', '2020-MBPT-AM' ]
     elif mb.lower() == 'nleft':
@@ -212,26 +217,26 @@ class setupMicroEsym():
             # SM
             #
             mic = nuda.matter.setupMicro( model = model, var1 = var1, var2 = 0.0 )
-            sm_den = mic.den
-            sm_e2a = mic.e2a
-            sm_e2a_err = mic.e2a_err
+            self.sm_den = mic.den
+            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 )
-            nm_den = mic.den
-            nm_e2a = mic.e2a
-            nm_e2a_err = mic.e2a_err
+            self.nm_den = mic.den
+            self.nm_e2a_int = mic.e2a_int
+            self.nm_e2a_err = mic.e2a_err
             #
         else:
             #
             mic = nuda.matter.setupMicro( model = model )
-            sm_den = mic.sm_den
-            sm_e2a = mic.sm_e2a
-            sm_e2a_err = mic.sm_e2a_err
-            nm_den = mic.nm_den
-            nm_e2a = mic.nm_e2a
-            nm_e2a_err = mic.nm_e2a_err
+            self.sm_den = mic.sm_den
+            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_int = mic.nm_e2a_int
+            self.nm_e2a_err = mic.nm_e2a_err
             #mic.print_outputs( )
             #
         #
@@ -243,28 +248,28 @@ 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( sm_den, 0, 0.0 ); y = np.insert( 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( sm_e2a_err, 0, 0.0 )
+        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( nm_den, 0, 0.0 ); y = np.insert( 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( nm_e2a_err, 0, 0.0 )
+        y_err = np.insert( self.nm_e2a_err, 0, 0.0 )
         cs_nm_e2a_err = CubicSpline( x, y_err )
         #
         # density for Esym (no extrapolation, only interpolation)
         #
-        self.den_min = max( min( nm_den), min( sm_den) )
-        self.den_max = min( max( nm_den), max( sm_den) )
+        self.den_min = max( min( self.nm_den), min( self.sm_den) )
+        self.den_max = min( max( self.nm_den), max( self.sm_den) )
         self.kf_min = nuda.kf( self.den_min ); self.kf_max = nuda.kf( self.den_max )
         den_step = ( self.den_max - self.den_min ) / float( self.nesym )
         self.den = self.den_min + np.arange(self.nesym+1) * den_step
@@ -272,17 +277,17 @@ class setupMicroEsym():
         #
         # Symmetry energy for the densities defined in self.den
         #
-        self.e2a_sm = cs_sm_e2a( self.den )
-        self.e2a_nm = cs_nm_e2a( self.den )
-        self.esym = self.e2a_nm - self.e2a_sm
+        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.sm_pre = self.den**2 * cs_sm_e2a( self.den, 1 )
-        self.sym_pre = self.den**2 * cs_nm_e2a( self.den, 1 ) - self.sm_pre
+        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
         #
         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-NM', '2006-BHF-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 = 'BHF-2006'
+            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 = 'BHF-2006'
+            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

@@ -21,9 +21,10 @@ def micro_LP_models():
     :return: The list of models.
     :rtype: list[str].
     """
-    models = [ '1994-BHF-SM-LP-AV14-GAP', '1994-BHF-SM-LP-AV14-CONT', \
-    '1994-BHF-SM-LP-REID-GAP', '1994-BHF-SM-LP-REID-CONT', '1994-BHF-SM-LP-AV14-CONT-0.7', \
-    '2006-BHF-SM-AV18', '2006-BHF-NM-AV18', '2006-IBHF-SM-AV18', '2006-IBHF-NM-AV18', '2007-BHF-NM-LP-BONNC' ]
+    models = [ '1994-BHF-SM-AV14-GAP', '1994-BHF-SM-AV14-CONT', \
+    '1994-BHF-SM-REID-GAP', '1994-BHF-SM-REID-CONT', '1994-BHF-SM-AV14-CONT-0.7', \
+    '2006-BHF-SM-Av18', '2006-BHF-NM-Av18', '2006-EBHF-SM-Av18', '2006-EBHF-NM-Av18', \
+    '2007-BHF-NM-BONNC' ]
     if nuda.env.verb: print('models available in the toolkit:',models)
     models_lower = [ item.lower() for item in models ]
     return models, models_lower
@@ -45,7 +46,7 @@ class setupMicroLP():
     **Attributes:**
     """
     #
-    def __init__( self, model = '1994-BHF-SM-LP-AV14-GAP' ):
+    def __init__( self, model = '1994-BHF-AV14-SM-GAP' ):
         """
         Parameters
         ----------
@@ -78,7 +79,7 @@ class setupMicroLP():
             self.nm_LP['G'][ell]  = None
         self.every = 1
         #
-        if '1994-bhf-sm-lp' in model.lower():
+        if '1994-bhf-sm' in model.lower():
             #
             file_in = os.path.join(nuda.param.path_data,'LandauParameters/micro/1994-BHF-SM.dat')
             if nuda.env.verb: print('Reads file:',file_in)
@@ -97,7 +98,7 @@ class setupMicroLP():
             #
             lp1, lp2, lp3, lp4, lp5 = np.loadtxt( file_in, usecols=(1,2,3,4,5), unpack = True )
             #
-            if model.lower() == '1994-bhf-sm-lp-av14-gap':
+            if model.lower() == '1994-bhf-sm-av14-gap':
                 self.label = 'BHF-AV14Gap-1994'
                 self.marker = 'o'
                 for ell in range(0,8):
@@ -113,7 +114,7 @@ class setupMicroLP():
                 self.Esym2 = lp1[26]
                 self.sm_effMass = lp1[27]
                 #
-            elif model.lower() == '1994-bhf-sm-lp-av14-cont':
+            elif model.lower() == '1994-bhf-sm-av14-cont':
                 #
                 self.label = 'BHF-AV14Cont-1994'
                 self.marker = 'o'
@@ -130,7 +131,7 @@ class setupMicroLP():
                 self.Esym2 = lp2[26]
                 self.sm_effMass = lp2[27]
                 #
-            elif model.lower() == '1994-bhf-sm-lp-reid-gap':
+            elif model.lower() == '1994-bhf-sm-reid-gap':
                 #
                 self.label = 'BHF-ReidGap-1994'
                 self.marker = 'o'
@@ -147,7 +148,7 @@ class setupMicroLP():
                 self.Esym2 = lp3[26]
                 self.sm_effMass = lp3[27]
                 #
-            elif model.lower() == '1994-bhf-sm-lp-reid-cont':
+            elif model.lower() == '1994-bhf-sm-reid-cont':
                 #
                 self.label = 'BHF-ReidCont-1994'
                 self.marker = 'o'
@@ -164,7 +165,7 @@ class setupMicroLP():
                 self.Esym2 = lp4[26]
                 self.sm_effMass = lp4[27]
                 #
-            elif model.lower() == '1994-bhf-sm-lp-av14-cont-0.7':
+            elif model.lower() == '1994-bhf-sm-av14-cont-0.7':
                 #
                 self.label = 'BHF-AV14Cont-0.7-1994'
                 self.marker = 'o'
@@ -190,7 +191,7 @@ class setupMicroLP():
             self.ref = 'L.G. Cao, U. Lombardo, and P. Schuck, Phys Rev C 74, 064301 (2006)'
             self.note = "write here notes about this EOS."
             self.err = False
-            self.label = 'BHF-AV18-2006'
+            self.label = 'BHF-Av18-2006'
             self.marker = 's'
             self.sm_kfn, self.sm_LP['F'][0], self.sm_LP['Fp'][0], self.sm_LP['G'][0], self.sm_LP['Gp'][0] = \
               np.loadtxt( file_in, usecols=(0,1,2,3,4), comments='#', unpack = True, dtype=float )
@@ -203,39 +204,39 @@ class setupMicroLP():
             self.ref = 'L.G. Cao, U. Lombardo, and P. Schuck, Phys Rev C 74, 064301 (2006)'
             self.note = "write here notes about this EOS."
             self.err = False
-            self.label = 'BHF-AV18-2006'
+            self.label = 'BHF-Av18-2006'
             self.marker = 's'
             self.nm_kfn, self.nm_LP['F'][0], self.nm_LP['G'][0] = \
               np.loadtxt( file_in, usecols=(0,1,2), comments='#', unpack = True, dtype=float )
             self.every = 300
         #
-        elif model.lower() == '2006-ibhf-sm-av18':
+        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."
             self.err = False
-            self.label = 'IBHF-AV18-2006'
+            self.label = 'EBHF-Av18-2006'
             self.marker = 'o'
             self.sm_kfn, self.sm_LP['F'][0], self.sm_LP['Fp'][0], self.sm_LP['G'][0], self.sm_LP['Gp'][0] = \
               np.loadtxt( file_in, usecols=(0,1,2,3,4), comments='#', unpack = True, dtype=float )
             self.every = 300
         #
-        elif model.lower() == '2006-ibhf-nm-av18':
+        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."
             self.err = False
-            self.label = 'IBHF-AV18-2006'
+            self.label = 'EBHF-Av18-2006'
             self.marker = 'o'
             self.nm_kfn, self.nm_LP['F'][0], self.nm_LP['G'][0] = \
               np.loadtxt( file_in, usecols=(0,1,2), comments='#', unpack = True, dtype=float )
             self.every = 300
         #
-        elif model.lower() == '2007-bhf-nm-lp-bonnc':
+        elif model.lower() == '2007-bhf-nm-bonnc':
             #
             file_in = os.path.join(nuda.param.path_data,'LandauParameters/micro/2007-BHF-NM.dat')
             if nuda.env.verb: print('Reads file:',file_in)