nucleardatapy 0.2.0__py3-none-any.whl → 1.0.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- nucleardatapy/__init__.py +3 -1
- nucleardatapy/astro/setup_gw.py +18 -18
- nucleardatapy/astro/setup_mr.py +9 -1
- nucleardatapy/astro/setup_mup.py +10 -10
- nucleardatapy/corr/setup_EsymDen.py +0 -5
- nucleardatapy/corr/setup_EsymLsym.py +50 -17
- nucleardatapy/corr/setup_KsatQsat.py +170 -69
- nucleardatapy/crust/setup_crust.py +403 -120
- nucleardatapy/data/astro/NICER/J0740+6620.dat +1 -0
- nucleardatapy/data/crust/2018-PCPFDDG-BSK22.dat +83 -0
- nucleardatapy/data/crust/2018-PCPFDDG-BSK24.dat +74 -0
- nucleardatapy/data/crust/2018-PCPFDDG-BSK25.dat +130 -0
- nucleardatapy/data/crust/2018-PCPFDDG-BSK26.dat +81 -0
- nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-E2A-NM.dat → 2006-BHF-Av18-E2A-NM.dat} +8 -8
- nucleardatapy/data/matter/micro/2006-BHF/2006-BHF-Av18-effmass-SM.dat +11 -0
- nucleardatapy/data/matter/micro/2006-BHF/2006-BHF-Av18-effmass-beta0.2.dat +11 -0
- nucleardatapy/data/matter/micro/2006-BHF/2006-BHF-Av18-effmass-beta0.4.dat +11 -0
- nucleardatapy/data/matter/nep/NEPESkyrme.dat +2 -3
- nucleardatapy/data/matter/nep/NEPGSkyrme.dat +7 -0
- nucleardatapy/data/matter/nep/NEPSkyrme.dat +4 -2
- nucleardatapy/data/matter/nep/NEPxEFT.dat +8 -0
- nucleardatapy/data/matter/nep/best67DDSkyrme.dat +28 -0
- nucleardatapy/data/matter/nep/best90DDSkyrme.dat +46 -0
- nucleardatapy/data/matter/nep/best95DDSkyrme.dat +54 -0
- nucleardatapy/data/matter/pheno/ESkyrme/BSk31-NM.dat +996 -996
- nucleardatapy/data/matter/pheno/ESkyrme/BSk31-SM.dat +991 -991
- nucleardatapy/data/matter/pheno/ESkyrme/BSkG4-NM.dat +1002 -0
- nucleardatapy/data/matter/pheno/ESkyrme/BSkG4-SM.dat +1002 -0
- nucleardatapy/data/matter/pheno/Skyrme/BSkG1-NM.dat +102 -0
- nucleardatapy/data/matter/pheno/Skyrme/BSkG1-SM.dat +102 -0
- nucleardatapy/data/matter/pheno/Skyrme/BSkG2-NM.dat +102 -0
- nucleardatapy/data/matter/pheno/Skyrme/BSkG2-SM.dat +102 -0
- nucleardatapy/data/nuclei/masses/Theory/2023-BSkG3.txt +0 -4
- nucleardatapy/data/nuclei/masses/Theory/2025-BSkG4.txt +0 -1
- nucleardatapy/env.py +1 -1
- nucleardatapy/eos/__init__.py +4 -3
- nucleardatapy/eos/setupCC.py +429 -0
- nucleardatapy/eos/setup_am.py +71 -34
- nucleardatapy/eos/setup_am_Beq.py +48 -17
- nucleardatapy/eos/setup_am_Leq.py +81 -50
- nucleardatapy/fig/__init__.py +29 -7
- nucleardatapy/fig/astro_setupGW_fig.py +5 -5
- nucleardatapy/fig/astro_setupMR_fig.py +12 -10
- nucleardatapy/fig/astro_setupMasses_fig.py +4 -4
- nucleardatapy/fig/astro_setupMtov_fig.py +4 -4
- nucleardatapy/fig/astro_setupMup_fig.py +5 -5
- nucleardatapy/fig/corr_setupEsymDen_fig.py +12 -5
- nucleardatapy/fig/corr_setupEsymLsym_fig.py +18 -5
- nucleardatapy/fig/corr_setupKsatQsat_fig.py +19 -15
- nucleardatapy/fig/crust_setupCrust_fig.py +7 -7
- nucleardatapy/fig/eos_setupAMBeq_fig.py +1338 -64
- nucleardatapy/fig/eos_setupAMLeq_fig.py +200 -68
- nucleardatapy/fig/eos_setupAM_asy_lep_fig.py +364 -0
- nucleardatapy/fig/eos_setupAM_asy_nuc_fig.py +337 -0
- nucleardatapy/fig/eos_setupAM_asy_tot_fig.py +343 -0
- nucleardatapy/fig/eos_setupAM_fig.py +470 -47
- nucleardatapy/fig/eos_setupCC_fig.py +240 -0
- nucleardatapy/fig/hnuc_setupChart_fig.py +2 -2
- nucleardatapy/fig/hnuc_setupRE1LExp_fig.py +4 -4
- nucleardatapy/fig/matter_all_fig.py +954 -0
- nucleardatapy/fig/matter_setupCheck_fig.py +103 -0
- nucleardatapy/fig/matter_setupFFGLep_fig.py +70 -0
- nucleardatapy/fig/matter_setupFFGNuc_fig.py +268 -104
- nucleardatapy/fig/matter_setupHIC_fig.py +98 -58
- nucleardatapy/fig/matter_setupMicroEsym_fig.py +267 -51
- nucleardatapy/fig/matter_setupMicro_LP_fig.py +175 -78
- nucleardatapy/fig/matter_setupMicro_band_fig.py +116 -47
- nucleardatapy/fig/matter_setupMicro_effmass_fig.py +264 -34
- nucleardatapy/fig/matter_setupMicro_err_NM_fig.py +41 -18
- nucleardatapy/fig/matter_setupMicro_fig.py +332 -98
- nucleardatapy/fig/matter_setupMicro_gap_fig.py +219 -92
- nucleardatapy/fig/matter_setupNEPStats_fig.py +96 -0
- nucleardatapy/fig/matter_setupPhenoEsym_fig.py +201 -61
- nucleardatapy/fig/matter_setupPheno_fig.py +392 -85
- nucleardatapy/fig/nuc_setupBEExp_chart_fig.py +286 -0
- nucleardatapy/fig/nuc_setupBEExp_fig.py +232 -70
- nucleardatapy/fig/nuc_setupBETheo_fig.py +344 -0
- nucleardatapy/fig/nuc_setupISGMRExp_fig.py +59 -0
- nucleardatapy/fig/nuc_setupRchExp_fig.py +139 -0
- nucleardatapy/fig/nuc_setupRchTheo_fig.py +143 -0
- nucleardatapy/fig/nuc_setupRnpExp_fig.py +88 -0
- nucleardatapy/fig/nuc_setupRnpTheo_fig.py +133 -0
- nucleardatapy/hello.py +6 -0
- nucleardatapy/hnuc/__init__.py +3 -3
- nucleardatapy/hnuc/{setup_be1L_exp.py → setup_re1L_exp.py} +6 -6
- nucleardatapy/hnuc/{setup_be1Xi_exp.py → setup_re1Xi_exp.py} +5 -5
- nucleardatapy/hnuc/{setup_be2L_exp.py → setup_re2L_exp.py} +6 -6
- nucleardatapy/matter/__init__.py +14 -13
- nucleardatapy/matter/setup_check.py +97 -0
- nucleardatapy/matter/setup_ffg.py +72 -38
- nucleardatapy/matter/setup_hic.py +91 -74
- nucleardatapy/matter/setup_micro.py +1698 -1019
- nucleardatapy/matter/setup_micro_band.py +11 -6
- nucleardatapy/matter/setup_micro_effmass.py +55 -2
- nucleardatapy/matter/setup_micro_esym.py +39 -34
- nucleardatapy/matter/setup_micro_gap.py +26 -19
- nucleardatapy/matter/setup_micro_lp.py +20 -19
- nucleardatapy/matter/setup_nep.py +175 -92
- nucleardatapy/matter/{setup_nep_model_dist.py → setup_nep_stat_model.py} +13 -8
- nucleardatapy/matter/{setup_nep_dist.py → setup_nep_stat_models.py} +12 -8
- nucleardatapy/matter/setup_pheno.py +121 -45
- nucleardatapy/matter/setup_pheno_esym.py +14 -19
- nucleardatapy/nuc/__init__.py +2 -2
- nucleardatapy/nuc/setup_be_exp.py +345 -333
- nucleardatapy/nuc/setup_be_theo.py +366 -178
- nucleardatapy/nuc/setup_isgmr_exp.py +4 -4
- nucleardatapy/nuc/setup_rch_exp.py +49 -6
- nucleardatapy/nuc/setup_rch_theo.py +72 -3
- nucleardatapy/nuc/{setup_nskin_exp.py → setup_rnp_exp.py} +59 -65
- nucleardatapy/nuc/{setup_nskin_theo.py → setup_rnp_theo.py} +35 -39
- nucleardatapy-1.0.0.dist-info/METADATA +553 -0
- {nucleardatapy-0.2.0.dist-info → nucleardatapy-1.0.0.dist-info}/RECORD +156 -128
- {nucleardatapy-0.2.0.dist-info → nucleardatapy-1.0.0.dist-info}/WHEEL +1 -1
- tests/test_corr_setupKsatQsat.py +3 -1
- tests/test_matter_setupMicro.py +37 -10
- nucleardatapy/data/matter/pheno/ESkyrme/BSkG1-NM.dat +0 -1002
- nucleardatapy/data/matter/pheno/ESkyrme/BSkG1-SM.dat +0 -1002
- nucleardatapy/data/matter/pheno/ESkyrme/BSkG2-NM.dat +0 -1002
- nucleardatapy/data/matter/pheno/ESkyrme/BSkG2-SM.dat +0 -1002
- nucleardatapy/fig/matter_ENM_fig.py +0 -119
- nucleardatapy/fig/matter_ESM_fig.py +0 -119
- nucleardatapy/fig/matter_Esym_fig.py +0 -122
- nucleardatapy/fig/matter_setupNEPModelDist_fig.py +0 -68
- nucleardatapy-0.2.0.dist-info/METADATA +0 -115
- /nucleardatapy/data/LandauParameters/micro/{2006-IBHF-NM-AV18.dat → 2006-EBHF-NM-AV18.dat} +0 -0
- /nucleardatapy/data/LandauParameters/micro/{2006-IBHF-SM-AV18.dat → 2006-EBHF-SM-AV18.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-BSK14.dat → 2022-GMRS-BSK14.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-BSK16.dat → 2022-GMRS-BSK16.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-DHSL59.dat → 2022-GMRS-DHSL59.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-DHSL69.dat → 2022-GMRS-DHSL69.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-F0.dat → 2022-GMRS-F0.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-H1.dat → 2022-GMRS-H1.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-H2.dat → 2022-GMRS-H2.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-H3.dat → 2022-GMRS-H3.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-H4.dat → 2022-GMRS-H4.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-H5.dat → 2022-GMRS-H5.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-H7.dat → 2022-GMRS-H7.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-LNS5.dat → 2022-GMRS-LNS5.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-RATP.dat → 2022-GMRS-RATP.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-SGII.dat → 2022-GMRS-SGII.dat} +0 -0
- /nucleardatapy/data/crust/{2022-crustGMRS-SLY5.dat → 2022-GMRS-SLY5.dat} +0 -0
- /nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-E2A-AM.dat → 2006-BHF-Av18-E2A-AM.dat} +0 -0
- /nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-E2A-SM.dat → 2006-BHF-Av18-E2A-SM.dat} +0 -0
- /nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-Esym2-SM.dat → 2006-BHF-Av18-Esym2-SM.dat} +0 -0
- /nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-GAP-NM-FreeSpectrum.dat → 2006-BHF-Av18-GAP-NM-FreeSpectrum.dat} +0 -0
- /nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-GAP-NM-SelfEnergy.dat → 2006-BHF-Av18-GAP-NM-SelfEnergy.dat} +0 -0
- /nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-GAP-SM-FreeSpectrum.dat → 2006-BHF-Av18-GAP-SM-FreeSpectrum.dat} +0 -0
- /nucleardatapy/data/matter/micro/2006-BHF/{2006-BHF-GAP-SM-SelfEnergy.dat → 2006-BHF-Av18-GAP-SM-SelfEnergy.dat} +0 -0
- /nucleardatapy/data/matter/micro/{2013-QMC-NM.dat → 2013-MBPT-NM.dat} +0 -0
- /nucleardatapy/data/matter/micro/{2020-MBPT-NM-DHSL59.dat → 2019-MBPT-NM-DHSL59.dat} +0 -0
- /nucleardatapy/data/matter/micro/{2020-MBPT-NM-DHSL69.dat → 2019-MBPT-NM-DHSL69.dat} +0 -0
- /nucleardatapy/data/matter/micro/{2020-MBPT-SM-DHSL59.dat → 2019-MBPT-SM-DHSL59.dat} +0 -0
- /nucleardatapy/data/matter/micro/{2020-MBPT-SM-DHSL69.dat → 2019-MBPT-SM-DHSL69.dat} +0 -0
- /nucleardatapy/data/matter/micro/{2023-MBPT-NM.csv → 2020-MBPT-NM.csv} +0 -0
- /nucleardatapy/data/matter/micro/{2023-MBPT-SM.csv → 2020-MBPT-SM.csv} +0 -0
- /nucleardatapy/data/nuclei/{nskin → rnp}/208Pb.dat +0 -0
- /nucleardatapy/data/nuclei/{nskin → rnp}/48Ca.dat +0 -0
- /nucleardatapy/data/{NeutronSkin/ddrhNskin-208Pb.dat → rnp/ddrhrnp-208Pb.dat} +0 -0
- /nucleardatapy/data/{NeutronSkin/ddrhNskin-48Ca.dat → rnp/ddrhrnp-48Ca.dat} +0 -0
- /nucleardatapy/data/{NeutronSkin/nlrhNskin-208Pb.dat → rnp/nlrhrnp-208Pb.dat} +0 -0
- /nucleardatapy/data/{NeutronSkin/nlrhNskin-48Ca.dat → rnp/nlrhrnp-48Ca.dat} +0 -0
- /nucleardatapy/data/{NeutronSkin/skyrmeNskin-208Pb.dat → rnp/skyrmernp-208Pb.dat} +0 -0
- /nucleardatapy/data/{NeutronSkin/skyrmeNskin-48Ca.dat → rnp/skyrmernp-48Ca.dat} +0 -0
- {nucleardatapy-0.2.0.dist-info → nucleardatapy-1.0.0.dist-info/licenses}/LICENSE +0 -0
- {nucleardatapy-0.2.0.dist-info → nucleardatapy-1.0.0.dist-info}/top_level.txt +0 -0
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import os
|
|
2
|
-
import sys
|
|
3
1
|
import numpy as np # 1.15.0
|
|
2
|
+
import os
|
|
4
3
|
from scipy.interpolate import CubicSpline
|
|
5
4
|
|
|
6
|
-
# nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
|
|
7
|
-
# sys.path.insert(0, nucleardatapy_tk)
|
|
8
|
-
|
|
9
5
|
import nucleardatapy as nuda
|
|
10
6
|
|
|
11
|
-
def
|
|
7
|
+
def rnp_theo_models():
|
|
12
8
|
"""
|
|
13
9
|
Return a the neutron skin values of the models available in this toolkit and print them all on the prompt.
|
|
14
10
|
|
|
@@ -16,29 +12,29 @@ def nskin_theo_models():
|
|
|
16
12
|
:rtype: list[str].
|
|
17
13
|
"""
|
|
18
14
|
#
|
|
19
|
-
if nuda.env.verb: print("\nEnter
|
|
15
|
+
if nuda.env.verb: print("\nEnter rnp_theo_models()")
|
|
20
16
|
#
|
|
21
17
|
models = [ 'Skyrme', 'NLRH', 'DDRH' ]
|
|
22
18
|
#print('Phenomenological models available in the toolkit:',models)
|
|
23
19
|
models_lower = [ item.lower() for item in models ]
|
|
24
20
|
#
|
|
25
|
-
if nuda.env.verb: print("Exit
|
|
21
|
+
if nuda.env.verb: print("Exit rnp_theo_models()")
|
|
26
22
|
#
|
|
27
23
|
return models, models_lower
|
|
28
24
|
|
|
29
|
-
# def
|
|
25
|
+
# def rnp_theo_nucleus():
|
|
30
26
|
# #
|
|
31
|
-
# if nuda.env.verb: print("\nEnter
|
|
27
|
+
# if nuda.env.verb: print("\nEnter rnp_theo_nucleus()")
|
|
32
28
|
# #
|
|
33
29
|
# nucleus = [ '48Ca', '208Pb']
|
|
34
30
|
# nucleus_lower = [ item.lower() for item in nucleus ]
|
|
35
31
|
# #
|
|
36
|
-
# if nuda.env.verb: print("Exit
|
|
32
|
+
# if nuda.env.verb: print("Exit rnp_theo_nucleus()")
|
|
37
33
|
# #
|
|
38
34
|
# return nucleus, nucleus_lower
|
|
39
35
|
#
|
|
40
36
|
|
|
41
|
-
def
|
|
37
|
+
def rnp_theo_params( model ):
|
|
42
38
|
"""
|
|
43
39
|
Return a list with the parameterizations available in
|
|
44
40
|
this toolkit for a given model and print them all on the prompt.
|
|
@@ -58,7 +54,7 @@ def nskin_theo_params( model ):
|
|
|
58
54
|
:rtype: list[str].
|
|
59
55
|
"""
|
|
60
56
|
#
|
|
61
|
-
if nuda.env.verb: print("\nEnter
|
|
57
|
+
if nuda.env.verb: print("\nEnter rnp_theo_params()")
|
|
62
58
|
#
|
|
63
59
|
#print('For model:',model)
|
|
64
60
|
if model.lower() == 'skyrme':
|
|
@@ -77,11 +73,11 @@ def nskin_theo_params( model ):
|
|
|
77
73
|
#print('Parameters available in the toolkit:',params)
|
|
78
74
|
params_lower = [ item.lower() for item in params ]
|
|
79
75
|
#
|
|
80
|
-
if nuda.env.verb: print("Exit
|
|
76
|
+
if nuda.env.verb: print("Exit rnp_theo_params()")
|
|
81
77
|
#
|
|
82
78
|
return params, params_lower
|
|
83
79
|
|
|
84
|
-
class
|
|
80
|
+
class setupRnpTheo():
|
|
85
81
|
"""
|
|
86
82
|
Instantiate the object with results based on phenomenological\
|
|
87
83
|
interactions and choosen by the toolkit practitioner. \
|
|
@@ -110,7 +106,7 @@ class SetupNeutronSkinTheo():
|
|
|
110
106
|
#
|
|
111
107
|
def __init__( self, model = 'Skyrme', param = 'SLY5', nucleus = '208Pb' ):
|
|
112
108
|
#
|
|
113
|
-
if nuda.env.verb: print("\nEnter
|
|
109
|
+
if nuda.env.verb: print("\nEnter setupRnpTheo()")
|
|
114
110
|
#
|
|
115
111
|
#: Attribute model.
|
|
116
112
|
self.model = model
|
|
@@ -126,9 +122,9 @@ class SetupNeutronSkinTheo():
|
|
|
126
122
|
if nuda.env.verb: print("nucleus:",nucleus)
|
|
127
123
|
print("-> nucleus:",nucleus)
|
|
128
124
|
#
|
|
129
|
-
self =
|
|
125
|
+
self = nuda.nuc.setupRnpTheo.init_self( self )
|
|
130
126
|
#
|
|
131
|
-
models, models_lower =
|
|
127
|
+
models, models_lower = rnp_theo_models( )
|
|
132
128
|
#
|
|
133
129
|
if model.lower() not in models_lower:
|
|
134
130
|
print('The model name ',model,' is not in the list of models.')
|
|
@@ -136,7 +132,7 @@ class SetupNeutronSkinTheo():
|
|
|
136
132
|
print('-- Exit the code --')
|
|
137
133
|
exit()
|
|
138
134
|
#
|
|
139
|
-
params, params_lower =
|
|
135
|
+
params, params_lower = rnp_theo_params( model = model )
|
|
140
136
|
#
|
|
141
137
|
if param.lower() not in params_lower:
|
|
142
138
|
print('The param set ',param,' is not in the list of param.')
|
|
@@ -144,7 +140,7 @@ class SetupNeutronSkinTheo():
|
|
|
144
140
|
print('-- Exit the code --')
|
|
145
141
|
exit()
|
|
146
142
|
#
|
|
147
|
-
# nucleus, nucleus_lower =
|
|
143
|
+
# nucleus, nucleus_lower = rnp_theo_nucleus( )
|
|
148
144
|
# #
|
|
149
145
|
# if nucleus.lower() not in nucleus_lower:
|
|
150
146
|
# print('The param set ',nucleus,' is not in the list of param.')
|
|
@@ -154,70 +150,70 @@ class SetupNeutronSkinTheo():
|
|
|
154
150
|
# #
|
|
155
151
|
if model.lower() == 'skyrme':
|
|
156
152
|
#
|
|
157
|
-
file_in1 = os.path.join(nuda.param.path_data,'
|
|
153
|
+
file_in1 = os.path.join(nuda.param.path_data,'rnp/skyrmernp-'+nucleus+'.dat')
|
|
158
154
|
if nuda.env.verb: print('Reads file1:',file_in1)
|
|
159
155
|
name = np.loadtxt( file_in1, usecols=(0), comments='#', unpack = True, dtype=str )
|
|
160
|
-
Rn, Rp,
|
|
156
|
+
Rn, Rp, Rnp = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
|
|
161
157
|
#: Attribute providing the label the data is references for figures.
|
|
162
158
|
self.label = 'SKY-'+param
|
|
163
159
|
#: Attribute providing additional notes about the data.
|
|
164
160
|
self.note = "write here notes about this EOS."
|
|
165
161
|
#
|
|
166
162
|
if param in name:
|
|
167
|
-
self.
|
|
163
|
+
self.rnp = True
|
|
168
164
|
ind = np.where(name == param )
|
|
169
165
|
self.Rn = Rn[ind][0];
|
|
170
166
|
self.Rp = Rp[ind][0];
|
|
171
|
-
self.
|
|
167
|
+
self.Rnp = Rnp[ind][0];
|
|
172
168
|
else:
|
|
173
|
-
self.
|
|
169
|
+
self.rnp = False
|
|
174
170
|
#
|
|
175
171
|
elif model.lower() == 'nlrh':
|
|
176
172
|
#
|
|
177
|
-
file_in1 = os.path.join(nuda.param.path_data,'
|
|
173
|
+
file_in1 = os.path.join(nuda.param.path_data,'rnp/nlrhrnp-'+nucleus+'.dat')
|
|
178
174
|
if nuda.env.verb: print('Reads file1:',file_in1)
|
|
179
175
|
name = np.loadtxt( file_in1, usecols=(0), comments='#', unpack = True, dtype=str )
|
|
180
|
-
Rn, Rp,
|
|
176
|
+
Rn, Rp, Rnp = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
|
|
181
177
|
#: Attribute providing the label the data is references for figures.
|
|
182
178
|
self.label = 'NLRH-'+param
|
|
183
179
|
#: Attribute providing additional notes about the data.
|
|
184
180
|
self.note = "write here notes about this EOS."
|
|
185
181
|
#
|
|
186
182
|
if param in name:
|
|
187
|
-
self.
|
|
183
|
+
self.rnp = True
|
|
188
184
|
ind = np.where(name == param )
|
|
189
185
|
self.Rn = Rn[ind][0];
|
|
190
186
|
self.Rp = Rp[ind][0];
|
|
191
|
-
self.
|
|
187
|
+
self.Rnp = Rnp[ind][0];
|
|
192
188
|
else:
|
|
193
|
-
self.
|
|
189
|
+
self.rnp = False
|
|
194
190
|
#
|
|
195
191
|
elif model.lower() == 'ddrh':
|
|
196
192
|
#
|
|
197
|
-
file_in1 = os.path.join(nuda.param.path_data,'
|
|
193
|
+
file_in1 = os.path.join(nuda.param.path_data,'rnp/ddrhrnp-'+nucleus+'.dat')
|
|
198
194
|
if nuda.env.verb: print('Reads file1:',file_in1)
|
|
199
195
|
name = np.loadtxt( file_in1, usecols=(0), comments='#', unpack = True, dtype=str )
|
|
200
|
-
Rn, Rp,
|
|
196
|
+
Rn, Rp, Rnp = np.loadtxt( file_in1, usecols=(1,2,3), comments='#', unpack = True )
|
|
201
197
|
#: Attribute providing the label the data is references for figures.
|
|
202
198
|
self.label = 'DDRH-'+param
|
|
203
199
|
#: Attribute providing additional notes about the data.
|
|
204
200
|
self.note = "write here notes about this EOS."
|
|
205
201
|
#
|
|
206
202
|
if param in name:
|
|
207
|
-
self.
|
|
203
|
+
self.rnp = True
|
|
208
204
|
ind = np.where(name == param )
|
|
209
205
|
self.Rn = Rn[ind][0];
|
|
210
206
|
self.Rp = Rp[ind][0];
|
|
211
|
-
self.
|
|
207
|
+
self.Rnp = Rnp[ind][0];
|
|
212
208
|
else:
|
|
213
|
-
self.
|
|
209
|
+
self.rnp = False
|
|
214
210
|
#
|
|
215
211
|
#
|
|
216
212
|
self.Rn_unit = 'fm'
|
|
217
213
|
self.Rp_unit = 'fm'
|
|
218
|
-
self.
|
|
214
|
+
self.Rnp_unit = 'fm'
|
|
219
215
|
#
|
|
220
|
-
if nuda.env.verb: print("Exit
|
|
216
|
+
if nuda.env.verb: print("Exit setupRnpTheo()")
|
|
221
217
|
#
|
|
222
218
|
def print_outputs( self ):
|
|
223
219
|
"""
|
|
@@ -234,7 +230,7 @@ class SetupNeutronSkinTheo():
|
|
|
234
230
|
#
|
|
235
231
|
print(f" Rn: {np.round(self.Rn,4)} in {self.Rn_unit}")
|
|
236
232
|
print(f" Rp: {np.round(self.Rn,4)} in {self.Rp_unit}")
|
|
237
|
-
print(f"
|
|
233
|
+
print(f" Rnp: {np.round(self.Rnp,4)} in {self.Rnp_unit}")
|
|
238
234
|
#
|
|
239
235
|
if nuda.env.verb: print("Exit print_outputs()")
|
|
240
236
|
#
|
|
@@ -250,7 +246,7 @@ class SetupNeutronSkinTheo():
|
|
|
250
246
|
#: Attribute the symmetric matter density.
|
|
251
247
|
self.Rp = []
|
|
252
248
|
#: Attribute the neutron matter neutron Fermi momentum.
|
|
253
|
-
self.
|
|
249
|
+
self.Rnp = []
|
|
254
250
|
#: Attribute the plot linestyle.
|
|
255
251
|
self.linestyle = None
|
|
256
252
|
#: Attribute the plot marker.
|