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

nucleardatapy/matter/setup_micro.py

@@ -29,7 +29,7 @@ def micro_mbs():
     #
     if nuda.env.verb: print("\nEnter micro_mbs()")
     #
-    mbs = [ 'VAR', 'AFDMC', 'BHF', 'QMC', 'MBPT', 'NLEFT' ]
+    mbs = [ 'VAR', 'AFDMC', 'BHF2', 'BHF23', 'QMC', 'MBPT', 'NLEFT' ]
     mbs_lower = [ item.lower() for item in mbs ]
     #
     if nuda.env.verb: print("Exit micro_mbs()")
@@ -44,7 +44,7 @@ def micro_models_mb( mb ):
     :param mb: The mb approach for which there are parametrizations. \
     They should be chosen among the following options: 'VAR', 'AFDMC', 'BHF', 'QMC', 'MBPT', 'NLEFT'.
     :type mb: str.
-    :return: The list of parametrizations. \
+    :return: The list of parametrizations.
 
     These models are the following ones: \
     If `mb` == 'VAR': \
@@ -55,18 +55,19 @@ def micro_models_mb( mb ):
     '2012-AFDMC-NM-FIT-1', '2012-AFDMC-NM-FIT-2', '2012-AFDMC-NM-FIT-3', '2012-AFDMC-NM-FIT-4', \
     '2012-AFDMC-NM-FIT-5', '2012-AFDMC-NM-FIT-6', '2012-AFDMC-NM-FIT-7', \
     '2022-AFDMC-NM',
-    If `mb` == 'BHF': \
-    '2006-BHF-AM', \
+    If `mb` == 'BHF2': \
     '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',\
+    If `mb` == 'BHF23': \
+    '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',\
     '2024-BHF-AM-23BFmicro-Av18', '2024-BHF-AM-23BFmicro-BONNB', '2024-BHF-AM-23BFmicro-NSC93',\
     If `mb` == 'QMC': \
     '2008-QMC-NM-swave', '2010-QMC-NM-AV4', '2009-DLQMC-NM',  \
-    '2013-QMC-NM', '2014-AFQMC-NM', '2016-QMC-NM', '2016-MBPT-AM', \
+    '2013-QMC-NM', '2014-AFQMC-NM', '2016-QMC-NM', \
     '2018-QMC-NM', '2024-QMC-NM', \
     If `mb` == 'MBPT': \
     '2010-MBPT-NM', '2020-MBPT-AM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69'
@@ -84,19 +85,27 @@ def micro_models_mb( mb ):
             '2012-AFDMC-NM-RES-5', '2012-AFDMC-NM-RES-6', '2012-AFDMC-NM-RES-7', \
             '2012-AFDMC-NM-FIT-1', '2012-AFDMC-NM-FIT-2', '2012-AFDMC-NM-FIT-3', '2012-AFDMC-NM-FIT-4', \
             '2012-AFDMC-NM-FIT-5', '2012-AFDMC-NM-FIT-6', '2012-AFDMC-NM-FIT-7', '2022-AFDMC-NM' ]
-    elif mb.lower() == 'bhf':
-        models = [ '2006-BHF-AM', '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() == 'qmc':
         models = [ '2008-QMC-NM-swave', '2010-QMC-NM-AV4', '2009-DLQMC-NM', \
-            '2013-QMC-NM', '2014-AFQMC-NM', '2016-QMC-NM', '2016-MBPT-AM', \
+            '2013-QMC-NM', '2014-AFQMC-NM', '2016-QMC-NM', \
             '2018-QMC-NM', '2024-QMC-NM' ]
     elif mb.lower() == 'mbpt':
-        models = [ '2010-MBPT-NM', '2016-MBPT-AM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69', '2020-MBPT-AM' ]
+        models = [ '2016-MBPT-AM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69', '2020-MBPT-AM' ]
+# '2010-MBPT-NM' is removed because they do not provide e2a, only pressure 
     elif mb.lower() == 'nleft':
         models = [ '2024-NLEFT-AM' ]
     #
@@ -178,7 +187,7 @@ def micro_models_old():
             '2013-QMC-NM', '2014-AFQMC-NM', '2016-QMC-NM', '2016-MBPT-AM', \
             '2018-QMC-NM', '2019-MBPT-AM-L59', '2019-MBPT-AM-L69', \
             '2020-MBPT-AM', '2022-AFDMC-NM', '2024-NLEFT-AM', \
-            '2006-BHF-AM', \
+            '2006-BHF-AM-Av18', \
             '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',\
@@ -200,22 +209,21 @@ def micro_models_mb_matter( mb, matter ):
     #
     if nuda.env.verb: print("\nEnter micro_models_mb_matter()")
     #
-    print('For mb (in SM):',mb)
+    print('For mb (in '+matter+'):',mb)
     #
-    models, models_lower = micro_models()
+    models, models_lower = micro_models_mb( mb )
     #
     models2 = []
     for j,model in enumerate(models):
-        if mb in model and '2BF' not in model and ( matter.upper() in model or 'AM' in model ):
+        if matter.upper() in model or 'AM' in model:
             models2.append( model )
-            #print('   models:',model)
     #
     print('models2:',models2)
     models2_lower = [ item.lower() for item in models2 ]
     #
     return models2, models2_lower
 
-def micro_models_mb_SM( mb ):
+def micro_models_mb_SM_old( mb ):
     """
     """
     #
@@ -236,7 +244,7 @@ def micro_models_mb_SM( mb ):
     #
     return models2, models2_lower
 
-def micro_models_mb_NM( mb ):
+def micro_models_mb_NM_old( mb ):
     """
     """
     #
@@ -387,6 +395,10 @@ class setupMicro():
             print('setup_micro: -- Exit the code --')
             exit()
         #
+        # ==============================
+        # Read files associated to model
+        # ==============================
+        #
         if model.lower() == '1981-var-am-fp':
             #
             self.flag_nm = True
@@ -403,7 +415,9 @@ class setupMicro():
             self.label = 'FP-1981'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'dashed'
+            self.e_err = False
+            self.p_err = False
+            self.linestyle = 'solid'
             self.nm_den, self.nm_e2a = np.loadtxt( file_in1, usecols=(0,1), unpack = True )
             self.sm_den, self.sm_e2a = np.loadtxt( file_in2, usecols=(0,1), unpack = True )
             self.nm_e2v = self.nm_e2a * self.nm_den
@@ -431,7 +445,9 @@ class setupMicro():
             self.label = 'APR-1998'
             self.marker = '^'
             self.every = 1
-            #self.linestyle = 'dashed'
+            self.e_err = False
+            self.p_err = False
+            self.linestyle = 'solid'
             self.nm_den, self.nm_e2a = np.loadtxt( file_in1, usecols=(0,1), unpack = True )
             self.sm_den, self.sm_e2a = np.loadtxt( file_in2, usecols=(0,1), unpack = True )
             self.nm_e2v = self.nm_e2a * self.nm_den
@@ -453,14 +469,19 @@ class setupMicro():
             self.ref = 'Akmal, Pandharipande and Ravenhall, Phys. Rev. C 58, 1804 (1998)'
             self.note = "Use interpolation functions suggested in APR paper."
             self.label = 'APR-1998-Fit'
-            self.marker = None
+            self.marker = '.'
             self.every = 1
-            self.linestyle = 'solid'
+            self.e_err = False
+            self.p_err = False
+            self.linestyle = 'dashed'
             # Define constants for APRfit and for A18+dv+UIX*
             global p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21
             ( p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21 ) = \
             ( 337.2, -382.0, 89.8, 0.457, -59.0, -19.1, 214.6, -384.0, 6.4, 69.0, -33.0, 0.35, 0.0, 0.0, 287.0, -1.54, 175.0, -1.45, 0.32, 0.195, 0.0 )
             #
+            # density
+            #self.nm_den = self.den
+            #self.sm_den = self.den
             # energy per unit volume
             self.e2v = APRfit_compute( self.den, self.xpr )
             # energy per particle
@@ -479,24 +500,25 @@ class setupMicro():
             cs_pre = CubicSpline( self.den, self.pre )
             self.cs2 = cs_pre( self.den, 1 ) / self.h2a
             #
-        elif model.lower() == '2006-bhf-am':
+        elif model.lower() == '2006-bhf-am-av18':
             #
             self.flag_nm = True
             self.flag_sm = True
             self.flag_kf = False
             self.flag_den = False
             #
-            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-E2A-NM.dat')
-            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-E2A-SM.dat')
+            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-E2A-NM.dat')
+            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2006-BHF/2006-BHF-Av18-E2A-SM.dat')
             if nuda.env.verb: print('Reads file:',file_in1)
             if nuda.env.verb: print('Reads file:',file_in2)
             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.label = 'BHF-2006-23BF-Av18'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = False
+            self.p_err = False
             #
             self.nm_den, self.nm_e2a \
                 = np.loadtxt( file_in1, usecols=(0,1), unpack = True )
@@ -526,8 +548,9 @@ class setupMicro():
             self.label = 'QMC-swave-2008'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
             self.nm_kfn, gap2ef, gap2ef_err, e2effg, e2effg_err \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
             self.nm_den     = nuda.den_n( self.nm_kfn )
@@ -550,8 +573,9 @@ class setupMicro():
             self.label = 'AFDMC-2009'
             self.marker = 'o'
             self.every = 1
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False            
             self.nm_kfn, self.nm_e2a, self.nm_e2a_err \
                 = np.loadtxt( file_in, usecols=(0,1,2), unpack = True )
             self.nm_den     = nuda.den_n( self.nm_kfn )
@@ -573,8 +597,9 @@ class setupMicro():
             self.label = 'dLQMC-2009'
             self.marker = 'v'
             self.every = 1
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
             self.nm_kfn, gap2ef, gap2ef_err, e2effg, e2effg_err \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
             self.nm_den     = nuda.den_n( self.nm_kfn )
@@ -597,8 +622,9 @@ class setupMicro():
             self.label = 'QMC-AV4-2008'
             self.marker = 's'
             self.every = 1
-            #self.linestyle = 'solid'
-            self.err = True
+            self.e_err = True
+            self.p_err = False
+            self.linestyle = 'solid'
             self.nm_kfn, gap2ef, gap2ef_err, e2effg, e2effg_err \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
             self.nm_den     = nuda.den_n( self.nm_kfn )
@@ -621,7 +647,9 @@ class setupMicro():
             self.label = 'MBPT-2010'
             self.marker = 's'
             self.every = 1
-            #self.linestyle = 'solid'
+            self.e_err = False
+            self.p_err = False
+            self.linestyle = 'solid'
             self.nm_den, self.nm_pre = np.loadtxt( file_in, usecols=(0,1), unpack = True )
             self.nm_kfn = nuda.kf_n( self.nm_den )
             #self.nm_pre_err = np.abs( 0.01 * self.nm_pre )
@@ -647,8 +675,13 @@ class setupMicro():
             self.note = "We do not have the data for this model, but we have a fit of the data."
             self.label = 'AFDMC-2012-'+str(k)
             self.marker = 's'
-            self.every = 1
-            self.linestyle = 'None'
+            self.every = 3
+            if k==1: self.every = 4
+            if k==7: self.every = 4
+            self.e_err = True
+            self.p_err = False
+            self.linestyle = 'solid'
+            #self.linestyle = 'None'
             if k in [ 1, 7 ]:
                 self.nm_den, ETOT, ETOT_ERR = np.loadtxt( file_in, usecols=(0,1,2), unpack = True )
             elif k in [ 2, 3, 4, 5, 6 ]:
@@ -682,7 +715,9 @@ class setupMicro():
             self.label = 'AFDMC-2012-'+str(k)+'-FIT'
             self.marker = 's'
             self.every = 1
-            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
+            self.linestyle = 'dashed'
             ind, a, alfa, b, beta = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
             #name = np.loadtxt( file_in, usecols=(5), unpack = True )
             nmodel = np.size(alfa)
@@ -733,8 +768,9 @@ class setupMicro():
             self.label = 'QMC-2013'
             self.marker = 's'
             self.every = 1
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
             self.nm_den, self.nm_e2a_low, self.nm_e2a_up, self.nm_pre_low, self.nm_pre_up \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
             self.nm_kfn = nuda.kf_n( self.nm_den )
@@ -772,7 +808,9 @@ class setupMicro():
             self.label = 'AFQMC-2014'
             self.marker = 's'
             self.every = 1
-            #self.linestyle = 'solid'
+            self.e_err = False
+            self.p_err = False
+            self.linestyle = 'solid'
             self.nm_den, self.nm_e2a_2bf, self.nm_e2a_23bf \
                 = np.loadtxt( file_in, usecols=(0,1,2), unpack = True )
             self.nm_kfn = nuda.kf_n( self.nm_den )
@@ -795,8 +833,9 @@ class setupMicro():
             self.note = ""
             self.label = 'QMC-2016'
             self.marker = 's'
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
             self.every = 1
             self.nm_den, self.nm_e2a_low, self.nm_e2a_up \
                 = np.loadtxt( file_in, usecols=(0,1,2), unpack = True )
@@ -817,8 +856,9 @@ class setupMicro():
             self.note = ""
             self.label = 'MBPT-2016'
             self.marker = 's'
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
             self.every = 4
             # read the results for the 7 hamiltonians
             length = np.zeros( (11), dtype=int )
@@ -893,8 +933,9 @@ class setupMicro():
             self.label = 'QMC-2018'
             self.marker = 's'
             self.every = 2
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
             self.nm_den, self.nm_e2a_low, self.nm_e2a_up, self.nm_e2a, self.nm_e2a_err \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
             self.nm_kfn = nuda.kf_n( self.nm_den )
@@ -911,8 +952,8 @@ class setupMicro():
             # here, the L59 case is compute alone, it would be interesting to compute the uncertainty
             # in the previous MBPT calculation (based on H1-H7) adding this new calculation.
             #
-            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2020-MBPT-SM-DHSL59.dat')
-            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2020-MBPT-NM-DHSL59.dat')
+            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2019-MBPT-SM-DHSL59.dat')
+            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2019-MBPT-NM-DHSL59.dat')
             if nuda.env.verb: print('Reads file1:',file_in1)
             if nuda.env.verb: print('Reads file2:',file_in2)
             self.ref = 'C. Drischler, K. Hebeler, A. Schwenk, Phys. Rev. Lett. 122, 042501 (2019)'
@@ -920,7 +961,9 @@ class setupMicro():
             self.label = 'MBPT-2019-L59'
             self.marker = 's'
             self.every = 2
-            #self.linestyle = 'solid'
+            self.e_err = False
+            self.p_err = False
+            self.linestyle = 'solid'
             self.sm_kfn, self.sm_den, Kin, HF_tot, Scnd_tot, Trd_tot, Fth_tot, self.sm_e2a \
                  = np.loadtxt( file_in1, usecols = (0, 1, 2, 3, 4, 5, 6, 7), comments='#', unpack = True)
             self.sm_e2a_err = np.abs( uncertainty_stat(self.sm_den,err='MBPT') * self.sm_e2a )
@@ -941,8 +984,8 @@ class setupMicro():
             #
             # same remarck as for L59
             #
-            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2020-MBPT-SM-DHSL69.dat')
-            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2020-MBPT-NM-DHSL69.dat')
+            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2019-MBPT-SM-DHSL69.dat')
+            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2019-MBPT-NM-DHSL69.dat')
             if nuda.env.verb: print('Reads file1:',file_in1)
             if nuda.env.verb: print('Reads file2:',file_in2)
             self.ref = 'C. Drischler, K. Hebeler, A. Schwenk, Phys. Rev. Lett. 122, 042501 (2019)'
@@ -950,7 +993,9 @@ class setupMicro():
             self.label = 'MBPT-2019-L69'
             self.marker = 's'
             self.every = 2
-            #self.linestyle = 'solid'
+            self.e_err = False
+            self.p_err = False
+            self.linestyle = 'solid'
             self.sm_kfn, self.sm_den, Kin, HF_tot, Scnd_tot, Trd_tot, Fth_tot, self.sm_e2a \
                  = np.loadtxt( file_in1, usecols = (0, 1, 2, 3, 4, 5, 6, 7), comments='#', unpack = True)
             self.sm_e2a_err = np.abs( uncertainty_stat(self.sm_den,err='MBPT') * self.sm_e2a )
@@ -969,17 +1014,18 @@ class setupMicro():
             self.flag_kf = False
             self.flag_den = True
             #
-            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2023-MBPT-SM.csv')
-            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2023-MBPT-NM.csv')
+            file_in1 = os.path.join(nuda.param.path_data,'matter/micro/2020-MBPT-SM.csv')
+            file_in2 = os.path.join(nuda.param.path_data,'matter/micro/2020-MBPT-NM.csv')
             if nuda.env.verb: print('Reads file1:',file_in1)
             if nuda.env.verb: print('Reads file2:',file_in2)
             self.ref = 'C. Drischler, R.J. Furnstahl, J.A. Melendez, D.R. Phillips, Phys. Rev. Lett. 125(20), 202702 (2020).; C. Drischler, J. A. Melendez, R. J. Furnstahl, and D. R. Phillips, Phys. Rev. C 102, 054315'
             self.note = ""
             self.label = 'MBPT-2020'
-            self.marker = 's'
-            #self.linestyle = 'solid'
+            self.marker = 'o'
+            self.linestyle = 'solid'
             self.every = 6
-            self.err = True
+            self.e_err = True
+            self.p_err = False
             self.sm_den, self.sm_e2a_lo, self.sm_e2a_lo_err, self.sm_e2a_nlo, self.sm_e2a_nlo_err, \
                 self.sm_e2a_n2lo, self.sm_e2a_n2lo_err, self.sm_e2a_n3lo, self.sm_e2a_n3lo_err \
                 = np.loadtxt( file_in1, usecols = (0, 1, 2, 3, 4, 5, 6, 7, 8), delimiter=',', comments='#', unpack = True)
@@ -1011,9 +1057,10 @@ class setupMicro():
             self.label = 'AFDMC+corr.-2022'
             self.linestyle = 'solid'
             self.marker = 'o'
-            #self.linestyle = 'solid'
+            self.linestyle = 'solid'
             self.every = 1
-            self.err = True
+            self.e_err = True
+            self.p_err = False
             # read e2a
             self.nm_kfn, e2effg, e2effg_err = np.loadtxt( file_in, usecols=(0,1,2), delimiter=',', comments='#', unpack = True )
             self.nm_den     = nuda.den_n( self.nm_kfn )
@@ -1041,9 +1088,10 @@ class setupMicro():
             self.note = ""
             self.label = 'NLEFT-2024'
             self.marker = 's'
-            #self.linestyle = 'solid'
+            self.linestyle = 'solid'
             self.every = 2
-            self.err = True
+            self.e_err = True
+            self.p_err = False
             #
             # Read SM results
             #
@@ -1302,10 +1350,11 @@ class setupMicro():
             if nuda.env.verb: print('Reads file:',file_in2)
             self.ref = 'I. Vida\\~na, J. Margueron, H.J. Schulze, Universe 10, 5 (2024).'
             self.note = ""
-            self.marker = 's'
-            #self.linestyle = 'solid'
+            self.marker = 'o'
+            self.linestyle = 'solid'
             self.every = 2
-            self.err = False
+            self.e_err = False
+            self.p_err = False
             #
             self.sm_den, self.sm_vS0T0, self.sm_vS0T1, self.sm_vS1T0, self.sm_vS1T1, self.sm_vtot, self.sm_kin, self.sm_etot \
                 = np.loadtxt( file_in1, usecols = (0, 1, 2, 3, 4, 5, 6, 7), comments='#', unpack = True)
@@ -1340,8 +1389,9 @@ class setupMicro():
             self.label = 'QMC-2024'
             self.marker = 's'
             self.every = 1
-            #self.linestyle = 'solid'
-            self.err = True
+            self.linestyle = 'solid'
+            self.e_err = True
+            self.p_err = False
             self.nm_den, self.nm_e2a, self.nm_e2a_err_stat, self.nm_e2a_err_ekm, self.nm_e2a_err_gp \
                 = np.loadtxt( file_in, usecols=(0,1,2,3,4), unpack = True )
             self.nm_kfn = nuda.kf_n( self.nm_den )
@@ -1349,16 +1399,26 @@ class setupMicro():
             self.nm_e2v     = self.nm_e2a * self.nm_den
             self.nm_e2v_err = self.nm_e2a_err * self.nm_den
         #
+        # ==============================
+        # END OF
+        # Read files associated to model
+        # ==============================
+        #
+        #
+        # ==============================
+        # Compute thermodynamic quantities
+        # ==============================
+        #
         if self.flag_nm:
             if self.flag_kf:
                 # pressure in NM
                 x = np.insert( self.nm_kfn, 0, 0.0 )
                 y = np.insert( self.nm_e2a, 0, 0.0 )
                 cs_nm_e2a = CubicSpline( x, y )
-                self.nm_pre = np.array( nuda.cst.three * self.nm_kfn * self.nm_den * cs_nm_e2a( self.nm_kfn, 1 ) )
+                self.nm_pre = np.array( nuda.cst.third * self.nm_kfn * self.nm_den * cs_nm_e2a( self.nm_kfn, 1 ) )
                 y_err = np.insert( self.nm_e2a_err, 0, 0.0 )
                 cs_nm_e2a_err = CubicSpline( x, y_err )
-                self.nm_pre_err = nuda.cst.three * self.nm_kfn * self.nm_den * cs_nm_e2a_err( self.nm_kfn, 1 )
+                self.nm_pre_err = nuda.cst.third * self.nm_kfn * self.nm_den * cs_nm_e2a_err( self.nm_kfn, 1 )
                 # chemical potential
                 self.nm_chempot = ( np.array(self.nm_pre) + np.array(self.nm_e2v) ) / np.array(self.nm_den)
                 self.nm_chempot_err = ( np.array(self.nm_pre_err) + np.array(self.nm_e2v_err) ) / np.array(self.nm_den)
@@ -1376,10 +1436,10 @@ class setupMicro():
                 x = np.insert( self.nm_den, 0, 0.0 )
                 y = np.insert( self.nm_e2a, 0, 0.0 )
                 cs_nm_e2a = CubicSpline( x, y )
-                self.nm_pre = np.array( cs_nm_e2a( self.nm_den, 1 ) )
+                self.nm_pre = np.array( self.nm_den**2 * cs_nm_e2a( self.nm_den, 1 ) )
                 y_err = np.insert( self.nm_e2a_err, 0, 0.0 )
                 cs_nm_e2a_err = CubicSpline( x, y_err )
-                self.nm_pre_err = cs_nm_e2a_err( self.nm_den, 1 )
+                self.nm_pre_err = self.nm_den**2 * cs_nm_e2a_err( self.nm_den, 1 )
                 #
                 # chemical potential
                 self.nm_chempot = ( np.array(self.nm_pre) + np.array(self.nm_e2v) ) / np.array(self.nm_den)
@@ -1400,10 +1460,10 @@ class setupMicro():
                 x = np.insert( self.sm_kfn, 0, 0.0 )
                 y = np.insert( self.sm_e2a, 0, 0.0 )
                 cs_sm_e2a = CubicSpline( x, y )
-                self.sm_pre = np.array( nuda.cst.three * self.sm_kfn * self.sm_den * cs_sm_e2a( self.sm_kfn, 1 ) )
+                self.sm_pre = np.array( nuda.cst.third * self.sm_kfn * self.sm_den * cs_sm_e2a( self.sm_kfn, 1 ) )
                 y_err = np.insert( self.sm_e2a_err, 0, 0.0 )
                 cs_sm_e2a_err = CubicSpline( x, y_err )
-                self.sm_pre_err = nuda.cst.three * self.sm_kfn * self.sm_den * cs_sm_e2a_err( self.sm_kfn, 1 )
+                self.sm_pre_err = nuda.cst.third * self.sm_kfn * self.sm_den * cs_sm_e2a_err( self.sm_kfn, 1 )
                 #
                 # chemical potential
                 self.sm_chempot = ( np.array(self.sm_pre) + np.array(self.sm_e2v) ) / np.array(self.sm_den)
@@ -1423,10 +1483,10 @@ class setupMicro():
                 x = np.insert( self.sm_den, 0, 0.0 )
                 y = np.insert( self.sm_e2a, 0, 0.0 )
                 cs_sm_e2a = CubicSpline( x, y )
-                self.sm_pre = np.array( cs_sm_e2a( self.sm_den, 1 ) )
+                self.sm_pre = np.array( self.sm_den**2 * cs_sm_e2a( self.sm_den, 1 ) )
                 y_err = np.insert( self.sm_e2a_err, 0, 0.0 )
                 cs_sm_e2a_err = CubicSpline( x, y_err )
-                self.sm_pre_err = cs_sm_e2a_err( self.sm_den, 1 )
+                self.sm_pre_err = self.sm_den**2 * cs_sm_e2a_err( self.sm_den, 1 )
                 #
                 # chemical potential
                 self.sm_chempot = ( np.array(self.sm_pre) + np.array(self.sm_e2v) ) / np.array(self.sm_den)
@@ -1442,6 +1502,11 @@ class setupMicro():
                 sm_cs2 = cs_sm_pre( self.sm_den, 1) / self.sm_h2a
                 #
         #
+        # ==============================
+        # END OF
+        # Compute thermodynamic quantities
+        # ==============================
+        #
         self.den_unit = 'fm$^{-3}$'
         self.kf_unit = 'fm$^{-1}$'
         self.e2a_unit = 'MeV'

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,6 +170,7 @@ 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 )
@@ -193,7 +198,7 @@ class setupMicroBand():
             self.e2a.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_std = xfac * np.sqrt( np.array(self.e2a_std, dtype=float ) - self.e2a**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)