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

nucleardatapy/nuc/setup_rch_exp.py

@@ -21,9 +21,9 @@ def rch_exp_tables():
     #
     tables = [ '2013-Angeli' ]
     #
-    print('tables available in the toolkit:',tables)
+    #print('tables available in the toolkit:',tables)
     tables_lower = [ item.lower() for item in tables ]
-    print('tables available in the toolkit:',tables_lower)
+    #print('tables available in the toolkit:',tables_lower)
     #
     if nuda.env.verb: print("Exit rch_exp_tables()")
     #
@@ -109,13 +109,13 @@ class setupRchExp():
          #
          if nuda.env.verb: print("Exit setupRchExp()")
    #
-   def Rch_isotopes(self, Zref = 50 ):
+   def isotopes(self, Zref = 50 ):
       """
       This method provide a list if radii for an isotopic chain defined by Zref.
 
       """
       #
-      if nuda.env.verb: print("Enter Rch_isotopes()")
+      if nuda.env.verb: print("Enter isotopes()")
       #
       Nref = []
       Aref = []
@@ -132,9 +132,9 @@ class setupRchExp():
       Rchref = np.array( Rchref, dtype = float )
       Rchref_err = np.array( Rchref_err, dtype = float )
       #
-      return Nref, Aref, Rchref, Rchref_err
+      if nuda.env.verb: print("Exit isotopes()")
       #
-      if nuda.env.verb: print("Exit Rch_isotopes()")
+      return Nref, Aref, Rchref, Rchref_err
    #
    def print_outputs( self ):
       """
@@ -157,3 +157,46 @@ class setupRchExp():
       if nuda.env.verb: print("Exit print_outputs()")
       #
 
+class setupRchExpIsotopes():
+   """
+   Instantiate the object with charge radii choosen \
+   from a table.
+
+   This method provide a list if radii for an isotopic chain defined by Zref.
+
+   :param table: Fix the name of `table`. Default value: '2013-Angeli'.
+   :type table: str, optional. 
+
+   **Attributes:**
+   """
+   #
+   def __init__( self, rch, Zref = 50 ):
+      """
+      Parameters
+      ----------
+      model : str, optional
+      The model to consider. Choose between: 1998-VAR-AM-APR (default), 2008-AFDMC-NM, ...
+      """
+      #
+      if nuda.env.verb: print("\nEnter setupRchExpIsotopes()")
+      #
+      self.label = 'Isotope Z='+str(Zref)
+      #
+      Nref = []
+      Aref = []
+      Rchref = []
+      Rchref_err = []
+      for k in range(len(rch.nucZ)):
+         if int( rch.nucZ[k] ) == Zref:
+            Nref.append( rch.nucN[k] )
+            Aref.append( rch.nucA[k] )
+            Rchref.append( rch.nucRch[k] )
+            Rchref_err.append( rch.nucRch_err[k] )
+      self.N = np.array( Nref, dtype = int )
+      self.A = np.array( Aref, dtype = int )
+      self.Z = Zref * np.ones( self.N.size )
+      self.Rch = np.array( Rchref, dtype = float )
+      self.Rch_err = np.array( Rchref_err, dtype = float )
+      #
+      if nuda.env.verb: print("Exit setupRchExpIsotopes()")
+      #

nucleardatapy/nuc/setup_rch_theo.py

@@ -2,11 +2,38 @@ import os
 import sys
 import numpy as np  # 1.15.0
 
-#nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
-#sys.path.insert(0, nucleardatapy_tk)
-
 import nucleardatapy as nuda
 
+def rch_emp( A, Z, formula ):
+   if formula == 'classic':
+      return 1.2 * A**0.3333
+   elif formula == '1994-NPP':
+      # B. Nerlo-Pomorska and K. Pomorski, Z. Phys. A 348, 169 (1994)
+      r0 = 1.240
+      b = 0.191
+      c = 1.646
+   elif formula == '2013-BAKS-1':
+      # T. Bayram, S. Akkoyun, S. Okan Kara, A. Sinan, Acta Phys. Pol. B 44, 1791 (2013)
+      r0 = 0.951
+      b = 0.0
+      c = 0.0
+   elif formula == '2013-BAKS-2':
+      # T. Bayram, S. Akkoyun, S. Okan Kara, A. Sinan, Acta Phys. Pol. B 44, 1791 (2013)
+      r0 = 0.996
+      b = 0.278
+      c = 0.0
+   elif formula == '2013-BAKS-3':
+      # T. Bayram, S. Akkoyun, S. Okan Kara, A. Sinan, Acta Phys. Pol. B 44, 1791 (2013)
+      r0 = 0.966
+      b = 0.182
+      c = 1.652
+   else:
+      print('setup_rch_theo: formula is badly defined ',formula)
+      print('setup_rch_theo: exit')
+      exit()
+      #return ( 1.19 - 0.8 * (1-2*Z/A)**2 ) * A**0.3333 - 0.3* A**0.1666 
+   return r0 * ( 1.0 - b * (1.0-2.0*Z/A) + c/ A  ) * A**0.3333
+
 def rch_theo_tables():
     """
     Return a list of the tables available in this toolkit for the charge radiuus and
@@ -196,3 +223,45 @@ class setupRchTheo():
       if nuda.env.verb: print("Exit print_outputs()")
       #
 
+class setupRchTheoIsotopes():
+   """
+   Instantiate the object with charge radii choosen \
+   from a table.
+
+   This method provide a list if radii for an isotopic chain defined by Zref.
+
+   :param table: Fix the name of `table`. Default value: '2013-Angeli'.
+   :type table: str, optional. 
+
+   **Attributes:**
+   """
+   #
+   def __init__( self, rch, Zref = 50 ):
+      """
+      Parameters
+      ----------
+      model : str, optional
+      The model to consider. Choose between: 1998-VAR-AM-APR (default), 2008-AFDMC-NM, ...
+      """
+      #
+      if nuda.env.verb: print("\nEnter setupRchExpIsotopes()")
+      #
+      self.label = 'Isotope Z='+str(Zref)
+      #
+      Nref = []
+      Aref = []
+      Rchref = []
+      Rchref_err = []
+      for k in range(len(rch.nucZ)):
+         if int( rch.nucZ[k] ) == Zref:
+            Nref.append( rch.nucN[k] )
+            Aref.append( rch.nucA[k] )
+            Rchref.append( rch.nucRch[k] )
+      self.N = np.array( Nref, dtype = int )
+      self.A = np.array( Aref, dtype = int )
+      self.Z = Zref * np.ones( self.N.size )
+      self.Rch = np.array( Rchref, dtype = float )
+      #
+      if nuda.env.verb: print("Exit setupRchExpIsotopes()")
+      #
+

nucleardatapy/nuc/{setup_nskin_exp.py → setup_rnp_exp.py}

@@ -1,14 +1,9 @@
-import os
-import sys
 import math
-import numpy as np  # 1.15.0
-
-# nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
-# sys.path.insert(0, nucleardatapy_tk)
+#import numpy as np  # 1.15.0
 
 import nucleardatapy as nuda
 
-def nskin_exp():
+def rnp_exp():
     """
     Return a list of the nuclei (source) for which a neutron skin is given
 
@@ -16,7 +11,7 @@ def nskin_exp():
     :rtype: list[str].
     """
     #
-    if nuda.env.verb: print("\nEnter nskin_exp()")
+    if nuda.env.verb: print("\nEnter rnp_exp()")
     #
     sources = [ '48Ca', '208Pb' ]
     #
@@ -24,11 +19,11 @@ def nskin_exp():
     sources_lower = [ item.lower() for item in sources ]
     # print('sources available in the toolkit:',sources_lower)
     #
-    if nuda.env.verb: print("Exit nskin_exp()")
+    if nuda.env.verb: print("Exit rnp_exp()")
     #
     return sources, sources_lower
 
-def nskin_exp_source(source):
+def rnp_exp_source(source):
     """
     Return a list of values for a given source (nuclei).
 
@@ -37,7 +32,7 @@ def nskin_exp_source(source):
     :return: The list of calculations.
     :rtype: list[int].
     """
-    if nuda.env.verb: print("\nEnter nskin_exp_source()")
+    if nuda.env.verb: print("\nEnter rnp_exp_source()")
 
     cals = []
     if source.lower() == '48ca':
@@ -47,10 +42,10 @@ def nskin_exp_source(source):
     else:
         raise ValueError(f"Source '{source}' is not supported. Supported sources are: '48Ca' and '208Pb'.")
 
-    if nuda.env.verb: print("Exit nskin_source()")
+    if nuda.env.verb: print("Exit rnp_source()")
     return cals
 
-class SetupNeutronSkinExp():
+class setupRnpExp():
     """
     Instantiate the neutron skin calculations for a given source and cal.
 
@@ -69,11 +64,11 @@ class SetupNeutronSkinExp():
     """
     def __init__(self, source = '208Pb', cal = 1 ):
         #
-        if nuda.env.verb: print("Enter SetupNeutronSkin()")
+        if nuda.env.verb: print("Enter setupRnpExp()")
         #
         # some checks
         #
-        sources, sources_lower = nskin_exp()
+        sources, sources_lower = rnp_exp()
         if source.lower() not in sources_lower:
             print('Source ',source,' is not in the list of sources.')
             print('list of sources:',sources)
@@ -82,7 +77,7 @@ class SetupNeutronSkinExp():
         self.source = source
         if nuda.env.verb: print("source:",source)
         #
-        cals = nskin_exp_source( source = source )
+        cals = rnp_exp_source( source = source )
         if cal not in cals:
             print('cal ',cal,' is not in the list of cal.')
             print('list of cal:',cals)
@@ -95,9 +90,9 @@ class SetupNeutronSkinExp():
         #
         file_in = None
         if source.lower() == '48ca':
-            file_in = nuda.param.path_data + 'nuclei/nskin/48Ca.dat'
+            file_in = nuda.param.path_data + 'nuclei/rnp/48Ca.dat'
         elif source.lower() == '208pb':
-            file_in = nuda.param.path_data + 'nuclei/nskin/208Pb.dat'
+            file_in = nuda.param.path_data + 'nuclei/rnp/208Pb.dat'
         else:
             raise ValueError(f"Unsupported source '{source}'. Expected '48Ca' or '208Pb'.")
         if file_in is None:
@@ -445,11 +440,11 @@ class SetupNeutronSkinExp():
         #: Attribute the negative uncertainty.
         self.prad_sig_do = None
         #: Attributethe neutron skin of the source.
-        self.nskin = None
+        self.rnp = None
         #: Attribute the positive uncertainty.
-        self.nskin_sig_up = None
+        self.rnp_sig_up = None
         #: Attribute the negative uncertainty.
-        self.nskin_sig_do = None
+        self.rnp_sig_lo = None
         #: Attribute latexCite.
         self.latexCite = None
         #
@@ -469,16 +464,16 @@ class SetupNeutronSkinExp():
                 if int(a) == cal:
                     self.nrad = safe_float(ele[1])
                     self.nrad_sig_up = safe_float(ele[2])
-                    self.nrad_sig_do = safe_float(ele[3])
+                    self.nrad_sig_lo = safe_float(ele[3])
                     self.prad = safe_float(ele[4])
                     self.prad_sig_up = safe_float(ele[5])
-                    self.prad_sig_do = safe_float(ele[6])
-                    self.nskin = safe_float(ele[7])
-                    self.nskin_sig_up = safe_float(ele[8])
-                    self.nskin_sig_do = safe_float(ele[9])
+                    self.prad_sig_lo = safe_float(ele[6])
+                    self.rnp = safe_float(ele[7])
+                    self.rnp_sig_up = safe_float(ele[8])
+                    self.rnp_sig_lo = safe_float(ele[9])
                     self.latexCite = ele[10].replace('\n','').replace(' ','')
         #
-        if nuda.env.verb: print("Exit SetupNeutronSkin()")
+        if nuda.env.verb: print("Exit setupRnpExp()")
         #
     #
     def print_outputs( self ):
@@ -492,11 +487,11 @@ class SetupNeutronSkinExp():
         print("   source:  ",self.source)
         print("   cal:",self.cal)
         print("   Rn:",self.nrad,' in fm')
-        print("   sigma(Rn):",self.nrad_sig_up,self.nrad_sig_do,' in fm')
+        print("   sigma(Rn):",self.nrad_sig_up,self.nrad_sig_lo,' in fm')
         print("   Rp:",self.prad,' in fm')
-        print("   sigma(Rp):",self.prad_sig_up,self.prad_sig_do,' in fm')
-        print("   Rskin:",self.nskin,' in fm')
-        print("   sigma(Rskin):",self.nskin_sig_up,self.nskin_sig_do,' in fm')
+        print("   sigma(Rp):",self.prad_sig_up,self.prad_sig_lo,' in fm')
+        print("   Rnp:",self.rnp,' in fm')
+        print("   sigma(Rnp):",self.rnp_sig_up,self.rnp_sig_lo,' in fm')
         print("   latexCite:",self.latexCite)
         print("   ref:    ",self.ref)
         print("   label:  ",self.label)
@@ -505,7 +500,7 @@ class SetupNeutronSkinExp():
         if nuda.env.verb: print("Exit print_output()")
         #
     #
-class setupNeutronSkinAverage():
+class setupRnpAverage():
     """
     Instantiate the experimental/analitical data for a given source and averaged over cal.
 
@@ -520,7 +515,7 @@ class setupNeutronSkinAverage():
     """
     def __init__(self, source = '208Pb' ):
         #
-        if nuda.env.verb: print("Enter setupNeutronSkinAverage()")
+        if nuda.env.verb: print("Enter setupRnpAverage()")
         #
         self.source = source
         self.latexCite = None
@@ -528,22 +523,20 @@ class setupNeutronSkinAverage():
         self.label = source+' average'
         self.note = 'compute the centroid and standard deviation from the data.'
         #
-        cals = nskin_exp_source( source = source )
+        cals = rnp_exp_source( source = source )
         # print('cals:',cals)
         #
         # search for the boundary for the neutron skin:
         nsmin = 0.5; nsmax = 0.0;
         for cal in cals:
-            nskin = nuda.SetupNeutronSkinExp( source = source, cal = cal )
-            # nskin.print_outputs( )
-            # print(f"Valor de nskin_sig_do: {nskin.nskin_sig_do}")
-            if nskin.nskin_sig_do is None or nskin.nskin_sig_do >= 1000:
-               nskin.nskin_sig_do = 0
-            if nskin.nskin_sig_up is None or nskin.nskin_sig_up >= 1000:
-               nskin.nskin_sig_up = 0   
-            nsdo = nskin.nskin - 0.5*nskin.nskin_sig_do
-            nsup = nskin.nskin + 0.5*nskin.nskin_sig_up
-            if nsdo < nsmin: nsmin = nsdo
+            rnp = nuda.nuc.setupRnpExp( source = source, cal = cal )
+            if rnp.rnp_sig_lo is None or rnp.rnp_sig_lo >= 1000:
+               rnp.rnp_sig_lo = 0
+            if rnp.rnp_sig_up is None or rnp.rnp_sig_up >= 1000:
+               rnp.rnp_sig_up = 0   
+            nslo = rnp.rnp - 0.5*rnp.rnp_sig_lo
+            nsup = rnp.rnp + 0.5*rnp.rnp_sig_up
+            if nslo < nsmin: nsmin = nslo
             if nsup > nsmax: nsmax = nsup
         #print('nsmin:',nsmin)
         #print('nsmax:',nsmax)
@@ -552,20 +545,20 @@ class setupNeutronSkinAverage():
         #print('ax:',ax)
         ay = np.zeros(300)
         for cal in cals:
-            nskin = nuda.SetupNeutronSkinExp( source = source, cal = cal )
-            #nskin.print_outputs( )
-            ay += gauss(ax,nskin.nskin,nskin.nskin_sig_up,nskin.nskin_sig_do)
+            rnp = nuda.nuc.setupRnpExp( source = source, cal = cal )
+            #rnp.print_outputs( )
+            ay += gauss(ax,rnp.rnp,rnp.rnp_sig_up,rnp.rnp_sig_lo)
         # determine the centroid and standard deviation from the distribution of cal. 
         nor = sum( ay )
         cen = sum( ay*ax )
         std = sum ( ay*ax**2 )
-        self.nskin_cen = cen / nor
-        self.sig_std = round( math.sqrt( std/nor - self.nskin_cen**2 ), 3 )
-        self.nskin_cen = round( self.nskin_cen, 3)
-        #print('nskin:',self.nskin_cen)
+        self.rnp_cen = cen / nor
+        self.sig_std = round( math.sqrt( std/nor - self.rnp_cen**2 ), 3 )
+        self.rnp_cen = round( self.rnp_cen, 3)
+        #print('rnp:',self.rnp_cen)
         #print('std:',self.sig_std)
         #
-        if nuda.env.verb: print("Exit setupNeutronSkinAverage()")
+        if nuda.env.verb: print("Exit setupRnpAverage()")
     #
     def print_output( self ):
         """
@@ -578,7 +571,7 @@ class setupNeutronSkinAverage():
         if nuda.env.verb_output:
             print("- Print output:")
             print("   source:  ",self.source)
-            print("   nskin_cen:",self.nskin_cen)
+            print("   rnp_cen:",self.rnp_cen)
             print("   sig_std:",self.sig_std)
             print("   latexCite:",self.latexCite)
             print("   ref:    ",self.ref)
@@ -591,20 +584,20 @@ class setupNeutronSkinAverage():
         #
     #
 
-def gauss( ax, nskin, nskin_sig_up, nskin_sig_do ):
-    if nskin_sig_do is None or nskin_sig_do == 0 or nskin_sig_do >= 1000:
-        nskin_sig_do = 0.0001
-    if nskin_sig_up is None or nskin_sig_up == 0 or nskin_sig_up >= 1000:
-        nskin_sig_up = 0.0001
-    fac = math.sqrt( 2*math.pi )
+def gauss( ax, rnp, rnp_sig_up, rnp_sig_lo ):
+    if rnp_sig_lo is None or rnp_sig_lo == 0 or rnp_sig_lo >= 1000:
+        rnp_sig_lo = 0.0001
+    if rnp_sig_up is None or rnp_sig_up == 0 or rnp_sig_up >= 1000:
+        rnp_sig_up = 0.0001
+    fac = math.sqrt( 2.0 * math.pi )
     gauss = []
     for x in ax:
-        if x < nskin: 
-            z = ( x - nskin ) / nskin_sig_do
-            norm = nskin_sig_do * fac
+        if x < rnp: 
+            z = ( x - rnp ) / rnp_sig_lo
+            norm = rnp_sig_lo * fac
         else:
-            z = ( x - nskin ) / nskin_sig_up
-            norm = nskin_sig_up * fac
-        gauss.append( math.exp( -0.5*z**2 ) / norm )
+            z = ( x - rnp ) / rnp_sig_up
+            norm = rnp_sig_up * fac
+        gauss.append( math.exp( -0.5 * z**2 ) / norm )
     return gauss
 

nucleardatapy/nuc/{setup_nskin_theo.py → setup_rnp_theo.py}

@@ -1,14 +1,9 @@
-import os
-import sys
 import numpy as np  # 1.15.0
 from scipy.interpolate import CubicSpline
 
-# nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
-# sys.path.insert(0, nucleardatapy_tk)
-
 import nucleardatapy as nuda
 
-def nskin_theo_models():
+def rnp_theo_models():
     """
     Return a the neutron skin values of the models available in this toolkit and print them all on the prompt.
 
@@ -16,29 +11,29 @@ def nskin_theo_models():
     :rtype: list[str].
     """
     #
-    if nuda.env.verb: print("\nEnter nskin_theo_models()")
+    if nuda.env.verb: print("\nEnter rnp_theo_models()")
     #
     models = [ 'Skyrme', 'NLRH', 'DDRH' ]
     #print('Phenomenological models available in the toolkit:',models)
     models_lower = [ item.lower() for item in models ]
     #
-    if nuda.env.verb: print("Exit nskin_theo_models()")
+    if nuda.env.verb: print("Exit rnp_theo_models()")
     #
     return models, models_lower
 
-# def nskin_theo_nucleus():
+# def rnp_theo_nucleus():
 #     #
-#     if nuda.env.verb: print("\nEnter nskin_theo_nucleus()")
+#     if nuda.env.verb: print("\nEnter rnp_theo_nucleus()")
 #     #
 #     nucleus = [ '48Ca', '208Pb']
 #     nucleus_lower = [ item.lower() for item in nucleus ]
 #     #
-#     if nuda.env.verb: print("Exit nskin_theo_nucleus()")
+#     if nuda.env.verb: print("Exit rnp_theo_nucleus()")
 #     #
 #     return nucleus, nucleus_lower
 # 
 
-def nskin_theo_params( model ):
+def rnp_theo_params( model ):
     """
     Return a list with the parameterizations available in 
     this toolkit for a given model and print them all on the prompt.
@@ -58,7 +53,7 @@ def nskin_theo_params( model ):
     :rtype: list[str].
     """
     #
-    if nuda.env.verb: print("\nEnter nskin_theo_params()")
+    if nuda.env.verb: print("\nEnter rnp_theo_params()")
     #
     #print('For model:',model)
     if model.lower() == 'skyrme':
@@ -77,11 +72,11 @@ def nskin_theo_params( model ):
     #print('Parameters available in the toolkit:',params)
     params_lower = [ item.lower() for item in params ]
     #
-    if nuda.env.verb: print("Exit nskin_theo_params()")
+    if nuda.env.verb: print("Exit rnp_theo_params()")
     #
     return params, params_lower
 
-class SetupNeutronSkinTheo():
+class setupRnpTheo():
     """
     Instantiate the object with results based on phenomenological\
     interactions and choosen by the toolkit practitioner. \
@@ -110,7 +105,7 @@ class SetupNeutronSkinTheo():
     #
     def __init__( self, model = 'Skyrme', param = 'SLY5', nucleus = '208Pb' ):
         #
-        if nuda.env.verb: print("\nEnter SetupNeutronSkinTheo()")
+        if nuda.env.verb: print("\nEnter setupRnpTheo()")
         #
         #: Attribute model.
         self.model = model
@@ -126,9 +121,9 @@ class SetupNeutronSkinTheo():
         if nuda.env.verb: print("nucleus:",nucleus)
         print("-> nucleus:",nucleus)
         # 
-        self = SetupNeutronSkinTheo.init_self( self )
+        self = nuda.nuc.setupRnpTheo.init_self( self )
         #
-        models, models_lower = nskin_theo_models( )
+        models, models_lower = rnp_theo_models( )
         #
         if model.lower() not in models_lower:
             print('The model name ',model,' is not in the list of models.')
@@ -136,7 +131,7 @@ class SetupNeutronSkinTheo():
             print('-- Exit the code --')
             exit()
         #
-        params, params_lower = nskin_theo_params( model = model )
+        params, params_lower = rnp_theo_params( model = model )
         #
         if param.lower() not in params_lower:
             print('The param set ',param,' is not in the list of param.')
@@ -144,7 +139,7 @@ class SetupNeutronSkinTheo():
             print('-- Exit the code --')
             exit()
         #
-        # nucleus, nucleus_lower = nskin_theo_nucleus( )
+        # nucleus, nucleus_lower = rnp_theo_nucleus( )
         # #
         # if nucleus.lower() not in nucleus_lower:
         #     print('The param set ',nucleus,' is not in the list of param.')
@@ -154,70 +149,70 @@ class SetupNeutronSkinTheo():
         # #            
         if model.lower() == 'skyrme':
             #
-             file_in1 = os.path.join(nuda.param.path_data,'NeutronSkin/skyrmeNskin-'+nucleus+'.dat')
+             file_in1 = os.path.join(nuda.param.path_data,'Neutrornp/skyrmernp-'+nucleus+'.dat')
              if nuda.env.verb: print('Reads file1:',file_in1)
              name = np.loadtxt( file_in1, usecols=(0), comments='#', unpack = True, dtype=str )
-             Rn, Rp, Rskin = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
+             Rn, Rp, Rnp = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
              #: Attribute providing the label the data is references for figures.
              self.label = 'SKY-'+param
              #: Attribute providing additional notes about the data.
              self.note = "write here notes about this EOS."
              #
              if param in name:
-                 self.nskin = True
+                 self.rnp = True
                  ind = np.where(name == param )
                  self.Rn = Rn[ind][0]; 
                  self.Rp = Rp[ind][0]; 
-                 self.Rskin = Rskin[ind][0];
+                 self.Rnp = Rnp[ind][0];
              else:
-                 self.nskin = False
+                 self.rnp = False
             #
         elif model.lower() == 'nlrh':
             #
-             file_in1 = os.path.join(nuda.param.path_data,'NeutronSkin/nlrhNskin-'+nucleus+'.dat')
+             file_in1 = os.path.join(nuda.param.path_data,'rnp/nlrhrnp-'+nucleus+'.dat')
              if nuda.env.verb: print('Reads file1:',file_in1)
              name = np.loadtxt( file_in1, usecols=(0), comments='#', unpack = True, dtype=str )
-             Rn, Rp, Rskin = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
+             Rn, Rp, Rnp = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
              #: Attribute providing the label the data is references for figures.
              self.label = 'NLRH-'+param
              #: Attribute providing additional notes about the data.
              self.note = "write here notes about this EOS."
              #
              if param in name:
-                 self.nskin = True
+                 self.rnp = True
                  ind = np.where(name == param )
                  self.Rn = Rn[ind][0]; 
                  self.Rp = Rp[ind][0]; 
-                 self.Rskin = Rskin[ind][0];
+                 self.Rnp = Rnp[ind][0];
              else:
-                 self.nskin = False
+                 self.rnp = False
             #
         elif model.lower() == 'ddrh':
             #
-             file_in1 = os.path.join(nuda.param.path_data,'NeutronSkin/ddrhNskin-'+nucleus+'.dat')
+             file_in1 = os.path.join(nuda.param.path_data,'rnp/ddrhrnp-'+nucleus+'.dat')
              if nuda.env.verb: print('Reads file1:',file_in1)
              name = np.loadtxt( file_in1, usecols=(0), comments='#', unpack = True, dtype=str )
-             Rn, Rp, Rskin = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
+             Rn, Rp, Rnp = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
              #: Attribute providing the label the data is references for figures.
              self.label = 'DDRH-'+param
              #: Attribute providing additional notes about the data.
              self.note = "write here notes about this EOS."
              #
              if param in name:
-                 self.nskin = True
+                 self.rnp = True
                  ind = np.where(name == param )
                  self.Rn = Rn[ind][0]; 
                  self.Rp = Rp[ind][0]; 
-                 self.Rskin = Rskin[ind][0];
+                 self.Rnp = Rnp[ind][0];
              else:
-                 self.nskin = False
+                 self.rnp = False
             #
         # 
         self.Rn_unit = 'fm'
         self.Rp_unit = 'fm'
-        self.Rskin_unit = 'fm'
+        self.Rnp_unit = 'fm'
         #
-        if nuda.env.verb: print("Exit SetupNeutronSkinThe()")
+        if nuda.env.verb: print("Exit setupRnpTheo()")
     #
     def print_outputs( self ):
         """
@@ -234,7 +229,7 @@ class SetupNeutronSkinTheo():
         #
         print(f"   Rn: {np.round(self.Rn,4)} in {self.Rn_unit}")
         print(f"   Rp: {np.round(self.Rn,4)} in {self.Rp_unit}")
-        print(f"   Rskin: {np.round(self.Rskin,4)} in {self.Rskin_unit}")
+        print(f"   Rnp: {np.round(self.Rnp,4)} in {self.Rnp_unit}")
         #
         if nuda.env.verb: print("Exit print_outputs()")
         #
@@ -250,7 +245,7 @@ class SetupNeutronSkinTheo():
         #: Attribute the symmetric matter density.
         self.Rp = []
         #: Attribute the neutron matter neutron Fermi momentum.
-        self.Rskin = []
+        self.Rnp = []
         #: Attribute the plot linestyle.
         self.linestyle = None
         #: Attribute the plot marker.