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

nucleardatapy/matter/setup_micro_esym.py

@@ -24,7 +24,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 +64,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 +219,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 = mic.e2a
+            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 = mic.e2a
+            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 = mic.sm_e2a
+            self.sm_e2a_err = mic.sm_e2a_err
+            self.nm_den = mic.nm_den
+            self.nm_e2a = mic.nm_e2a
+            self.nm_e2a_err = mic.nm_e2a_err
             #mic.print_outputs( )
             #
         #
@@ -249,22 +256,22 @@ class setupMicroEsym():
         #
         # 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, 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, 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,12 +279,12 @@ 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 = 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_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}$'

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-Av18-NM', '2006-BHF-Av18-SM', '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' ]
@@ -98,7 +98,7 @@ class setupMicroGap():
             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'
@@ -118,7 +118,7 @@ class setupMicroGap():
             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'

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')
             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')
             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)

nucleardatapy/matter/setup_pheno.py

@@ -157,8 +157,8 @@ class setupPheno():
             self.label = 'SKY-'+param
             #: Attribute providing additional notes about the data.
             self.note = "write here notes about this EOS."
-            self.sm_den, self.sm_kfn, self.sm_e2a, a, self.sm_pre, self.sm_cs2 = np.loadtxt( file_in1, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
-            self.nm_den, self.nm_kfn, self.nm_e2a, a, self.nm_pre, self.nm_cs2 = np.loadtxt( file_in2, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
+            self.sm_den, self.sm_kfn, self.sm_e2a, self.sm_pre, a, self.sm_cs2 = np.loadtxt( file_in1, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
+            self.nm_den, self.nm_kfn, self.nm_e2a, self.nm_pre, a, self.nm_cs2 = np.loadtxt( file_in2, usecols=(0,1,2,3,4,5), comments='#', unpack = True )
             self.sm_kf = self.sm_kfn
             #
         #

nucleardatapy/matter/setup_pheno_esym.py

@@ -155,10 +155,10 @@ class setupPhenoEsym():
         # =========================
         #
         pheno = nuda.matter.setupPheno( model = model, param = param )
-        sm_den = pheno.sm_den
-        sm_e2a = pheno.sm_e2a
-        nm_den = pheno.nm_den
-        nm_e2a = pheno.nm_e2a
+        self.sm_den = pheno.sm_den
+        self.sm_e2a = pheno.sm_e2a
+        self.nm_den = pheno.nm_den
+        self.nm_e2a = pheno.nm_e2a
         #pheno.print_outputs( )
         #
         # ===========================
@@ -173,18 +173,18 @@ class setupPhenoEsym():
         #
         # 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, 0, 0.0 )
         cs_sm_e2a = CubicSpline( x, y )
         #
         # 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, 0, 0.0 )
         cs_nm_e2a = CubicSpline( x, y )
         #
         # density for Esym (no extroplation, 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
@@ -192,11 +192,11 @@ class setupPhenoEsym():
         #
         # 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.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_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_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}$'

nucleardatapy/nuc/__init__.py

@@ -5,8 +5,8 @@ This module provides microscopic, phenomenological and experimental data constra
 from nucleardatapy.nuc.setup_be_exp     import *
 from nucleardatapy.nuc.setup_be_theo    import *
 from nucleardatapy.nuc.setup_isgmr_exp  import *
-from nucleardatapy.nuc.setup_nskin_exp  import *
-from nucleardatapy.nuc.setup_nskin_theo import *
+from nucleardatapy.nuc.setup_rnp_exp    import *
+from nucleardatapy.nuc.setup_rnp_theo   import *
 from nucleardatapy.nuc.setup_rch_exp    import *
 from nucleardatapy.nuc.setup_rch_theo   import *
 #