nucleardatapy 0.2.1__tar.gz → 1.0.0__tar.gz

nucleardatapy-1.0.0/MANIFEST.in

@@ -0,0 +1,4 @@
+include docs/*
+recursive-include docs *
+include version-1.0/nucleardatapy/data/*
+recursive-include version-1.0/nucleardatapy/data *

{nucleardatapy-0.2.1 → nucleardatapy-1.0.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: nucleardatapy
-Version: 0.2.1
-Summary: A toolkit for nuclear data processing and analysis.
+Version: 1.0.0
+Summary: A toolkit for nuclear data processing and meta-analyses.
 Author: Jerome Margueron, Sudhanva Lalit, Mariana Dutra, Guilherme Grams, Rohit Kumar
 License: Attribution-NonCommercial-NoDerivatives 4.0 International
         
@@ -423,22 +423,36 @@ Dynamic: license-file
 
 ## Purpose:
 
-The purpose of this toolkit is to simply the access to data, that can be theoretical data or experimental ones. All data are provided with their reference, so when using these data in a scientific paper, reference to data should be provided explicitely. The reference to this toolkit could be given, but it should not mask the reference to data.
+<img align="right" width="250" src="book/logo.png">
 
-This python toolkit is designed to provide: 
-1) microscopic calculations in nuclear matter, 
-2) phenomenological predictions in nuclear matter,
-3) experimental data for finite nuclei.
+The purpose of this toolkit is to provide an easy access to theoretical or experimental or observational data and allows meta-analyses in a straightforward way.
+
+This python toolkit is designed to provide:
+
+1. microscopic calculations in nuclear matter,
+2. phenomenological predictions in nuclear matter,
+3. experimental data for finite nuclei,
+4. astrophysical observations and theoretical predictions.
+
+All data are provided with their reference, so when using these data in a scientific paper, reference to data should be provided explicitly. The reference to this toolkit could be given, but it should not mask the reference to the original source of data.
 
 ## Installation of the toolkit:
 
 To install the toolkit, launch:
+
 ```
 $ pip install nucleardatapy
 ```
-This installs the lattest version of the toolkit.
 
-Now everything is done about the installation. 
+This installs the latest version of the toolkit.
+
+If the github repository is downloaded, one can also install the toolkit using
+
+```
+$ pip install -e .
+```
+
+from within the root folder of the nucleardatapy directory.
 
 ## Test the python toolkit
 
@@ -453,37 +467,58 @@ $ bash run_tests.sh
 ## Short introduction to the toolkit:
 
 The call of the toolkit in python code is performed in the usual way:
+
 ```Python
 import nucleardatapy as nuda
 ```
 
 The list of functions and global variables available in the toolkit can be printed from the following instruction:
+
 ```Python
 print(dir(nuda))
 ```
 
 A detailed view of the function can be obtained in the following way
+
 ```Python
 print(help(nuda))
 ```
 
-The principle of the toolkit is that it instantiates objects that contain all the information available. For instance, the following command
+The toolkit classes instantiate objects that contain all the information available. For instance, the following command
+
 ```Python
 mass = nuda.astro.setupMasses()
 ```
-instantiate the object `mass` with the default mass of pulsars. In this case, it is the mass of PSR J1614-2230. All the properties that this object provide can be listed in the following way:
+
+instantiates the object `mass` with the mass of PSR J1614-2230 which is the default case. All the properties of this object can be listed in the following way:
+
 ```Python
 mass.__dict__
 ```
 
+## Documentation
+
+The documentation for the toolkit can be found here: [https://nucleardatapy.readthedocs.io/en/latest/index.html](https://nucleardatapy.readthedocs.io/en/latest/index.html). The documentation is also available in the docs/ folder and can be built using the following command:
+
+```
+sphinx-build -b html docs docs/build_html
+```
+
+The pdf version of the documentation can be found by clicking this [link](https://github.com/jeromemargueron/nucleardatapy/blob/main/docs/nucleardatapy.pdf).
+
+## Tutorials
+
+The tutorials to get started with nucleardatapy toolkit can be found here: [https://jeromemargueron.github.io/nucleardatapy/landing.html](https://jeromemargueron.github.io/nucleardatapy/landing.html). The tutorials are written using `jupyter notebook` and can be tried on your computer by downloading them or by using `google-colab`. In the github repository, the tutorials are available in the book/notebooks folder.
+
 ## Use nucleardatapy python toolkit
 
 The GitHub folder `nucleardatapy/nucleardatapy_samples/` contains a lot of examples on how to use the function and to draw figures. They are all python scripts that can be launched with `python3`. For instance, you can grab these samples anywhere in your computer and try:
+
 ```
 $ python3 matter_setupMicro_script.py
 ```
 
-There are also tutorials that can be employed to learn how to use the different functions in the toolkit. The tutorials are written for `jupyter notebook`.
+There are also tutorials that can be employed to learn how to use the different functions in the toolkit.
 
 ## Get started
 
@@ -501,7 +536,6 @@ micro.print_outputs( )
 
 More examples are shown in the associated paper[Give reference here], as well as in the sample folder or tutorials as previously written.
 
-
 ## Contributing
 
 The file `how_to_contribute.md` details how contributors could join our team or share their results.
@@ -512,10 +546,8 @@ CC BY-NC-ND 4.0
 
 ## Report issues
 
-Issues can be reported using GitHub.
+Issues can be reported using [GitHub Issues](https://github.com/jeromemargueron/nucleardatapy/issues).
 
 ## Thanks
 
 A special thanks to all contributors who accepted to share their results in this toolkit.
-
-

nucleardatapy-1.0.0/README.md

@@ -0,0 +1,132 @@
+# The toolkit `nucleardatapy`
+
+## Purpose:
+
+<img align="right" width="250" src="book/logo.png">
+
+The purpose of this toolkit is to provide an easy access to theoretical or experimental or observational data and allows meta-analyses in a straightforward way.
+
+This python toolkit is designed to provide:
+
+1. microscopic calculations in nuclear matter,
+2. phenomenological predictions in nuclear matter,
+3. experimental data for finite nuclei,
+4. astrophysical observations and theoretical predictions.
+
+All data are provided with their reference, so when using these data in a scientific paper, reference to data should be provided explicitly. The reference to this toolkit could be given, but it should not mask the reference to the original source of data.
+
+## Installation of the toolkit:
+
+To install the toolkit, launch:
+
+```
+$ pip install nucleardatapy
+```
+
+This installs the latest version of the toolkit.
+
+If the github repository is downloaded, one can also install the toolkit using
+
+```
+$ pip install -e .
+```
+
+from within the root folder of the nucleardatapy directory.
+
+## Test the python toolkit
+
+A set of tests can be easily performed. They are stored in tests/ folder.
+
+Launch:
+
+```
+$ bash run_tests.sh
+```
+
+## Short introduction to the toolkit:
+
+The call of the toolkit in python code is performed in the usual way:
+
+```Python
+import nucleardatapy as nuda
+```
+
+The list of functions and global variables available in the toolkit can be printed from the following instruction:
+
+```Python
+print(dir(nuda))
+```
+
+A detailed view of the function can be obtained in the following way
+
+```Python
+print(help(nuda))
+```
+
+The toolkit classes instantiate objects that contain all the information available. For instance, the following command
+
+```Python
+mass = nuda.astro.setupMasses()
+```
+
+instantiates the object `mass` with the mass of PSR J1614-2230 which is the default case. All the properties of this object can be listed in the following way:
+
+```Python
+mass.__dict__
+```
+
+## Documentation
+
+The documentation for the toolkit can be found here: [https://nucleardatapy.readthedocs.io/en/latest/index.html](https://nucleardatapy.readthedocs.io/en/latest/index.html). The documentation is also available in the docs/ folder and can be built using the following command:
+
+```
+sphinx-build -b html docs docs/build_html
+```
+
+The pdf version of the documentation can be found by clicking this [link](https://github.com/jeromemargueron/nucleardatapy/blob/main/docs/nucleardatapy.pdf).
+
+## Tutorials
+
+The tutorials to get started with nucleardatapy toolkit can be found here: [https://jeromemargueron.github.io/nucleardatapy/landing.html](https://jeromemargueron.github.io/nucleardatapy/landing.html). The tutorials are written using `jupyter notebook` and can be tried on your computer by downloading them or by using `google-colab`. In the github repository, the tutorials are available in the book/notebooks folder.
+
+## Use nucleardatapy python toolkit
+
+The GitHub folder `nucleardatapy/nucleardatapy_samples/` contains a lot of examples on how to use the function and to draw figures. They are all python scripts that can be launched with `python3`. For instance, you can grab these samples anywhere in your computer and try:
+
+```
+$ python3 matter_setupMicro_script.py
+```
+
+There are also tutorials that can be employed to learn how to use the different functions in the toolkit.
+
+## Get started
+
+Here is an example to obtain microscopic results for APR equation of state:
+
+```Python
+import nucleardatapy as nuda
+
+# Instantiate a micro object
+micro = nuda.matter.setMicro( model = '1998-VAR-AM-APR')
+
+# print outputs
+micro.print_outputs( )
+```
+
+More examples are shown in the associated paper[Give reference here], as well as in the sample folder or tutorials as previously written.
+
+## Contributing
+
+The file `how_to_contribute.md` details how contributors could join our team or share their results.
+
+## License
+
+CC BY-NC-ND 4.0
+
+## Report issues
+
+Issues can be reported using [GitHub Issues](https://github.com/jeromemargueron/nucleardatapy/issues).
+
+## Thanks
+
+A special thanks to all contributors who accepted to share their results in this toolkit.

nucleardatapy-1.0.0/docs/_substitutions.rst

@@ -0,0 +1 @@
+.. ../../../version-1.0/nucleardatapy_samples/figs replace:: ../../../version-1.0/nucleardatapy_samples/figs

{nucleardatapy-0.2.1 → nucleardatapy-1.0.0}/docs/conf.py

@@ -24,7 +24,7 @@ copyright = "2024, Jérôme Margueron, IRL NPA, USA"
 author = "Jérôme Margueron, IRL NPA, USA"
 
 # The full version, including alpha/beta/rc tags
-release = "0.2.0"
+release = "1.0.0"
 
 
 # -- General configuration ---------------------------------------------------

nucleardatapy-1.0.0/docs/requirements.txt

@@ -0,0 +1,8 @@
+numpy
+scipy
+matplotlib
+pytest
+sphinx
+sphinx_rtd_theme
+recommonmark
+myst-nb

{nucleardatapy-0.2.1 → nucleardatapy-1.0.0}/docs/source/api/setup_matter_check.rst

@@ -12,9 +12,9 @@ matter.setupCheck
 
 Here are a set of figures which are produced with the Python sample: /nucleardatapy_sample/matter_setupCheck_plot.py
 
-.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupCheck.png
+.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupCheck_NM_QMC.png
 	:width: 70 %
 	:alt: map to buried treasure
 
-	This figure shows the energy in neutron matter (NM) over the free Fermi gas energy (top) and the energy per particle (bottom) as function of the density (left) and the neutron Fermi momentum (right) for the variational models available in the nucleardatapy toolkit.
+	This figure shows the energy per particle in neutron matter (NM) as function of the density for the QMC models available in the nucleardatapy toolkit.
 

{nucleardatapy-0.2.1 → nucleardatapy-1.0.0}/docs/source/api/setup_matter_micro_band.rst

@@ -10,21 +10,21 @@ matter.setupMicroBand
 .. automodule:: nucleardatapy.matter.setup_micro_band
 	:members:
 
-Here are a set of figures which are produced with the Python sample: /nucleardatapy_sample/matter_setupMicroBand_plot.py
+Here are a set of figures which are produced with the Python sample: /nucleardatapy_sample/matter_setupMicro_band_plot.py
 
-.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupMicroBand_NM.png
+.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupMicro_Band_NM.png
 	:width: 70%
 	:alt: map to buried treasure
 
 	Uncertainty band in NM obtained from the analysis of different predictions: MBPT-2016, QMC-2016 and MBPT-2020.
 
-.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupMicroBand_SM.png
+.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupMicro_Band_SM.png
 	:width: 70%
 	:alt: map to buried treasure
 
 	Uncertainty band in SM obtained from the analysis of different predictions: MBPT-2016 and MBPT-2020.
 
-.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupMicroBand_Esym.png
+.. figure:: ../../../version-0.2/nucleardatapy_samples/figs/plot_matter_setupMicro_Band_Esym.png
 	:width: 70%
 	:alt: map to buried treasure
 

{nucleardatapy-0.2.1 → nucleardatapy-1.0.0}/pyproject.toml

@@ -11,11 +11,11 @@ authors = [
     {name = "Guilherme Grams"},
     {name = "Rohit Kumar"},
 ]
-description = "A toolkit for nuclear data processing and analysis."
+description = "A toolkit for nuclear data processing and meta-analyses."
 license = {file = "LICENSE" }
 readme = "README.md"
 requires-python = ">=3.9"
-version = "0.2.1"
+version = "1.0.0"
 dependencies = [
     "numpy",
     "scipy",
@@ -36,5 +36,5 @@ target-version = ['py39']
 
 [project-urls]
 Homepage = "https://github.com/jeromemargueron/nucleardatapy"
-Documentation = "https://nuclear-data-toolkit.readthedocs.io/en/latest/"
+Documentation = "https://nucleardatapy.readthedocs.io/en/latest/"
 Issues = "https://github.com/jeromemargueron/nucleardatapy/issues"

{nucleardatapy-0.2.1 → nucleardatapy-1.0.0}/setup.cfg

@@ -1,5 +1,5 @@
 [options.package_data]
-nucleardatapy = version-0.2/data/*
+nucleardatapy = version-1.0/data/*
 
 [egg_info]
 tag_build = 

{nucleardatapy-0.2.1 → nucleardatapy-1.0.0}/setup.py

@@ -11,11 +11,17 @@ class CustomInstall(install):
 
 setup(
     name="nucleardatapy",
-    version="0.2.1",
+    version="1.0.0",
     description="A toolkit for nuclear data processing",
-    authors=["Jerome Margueron <marguero@frib.msu.edu>", "Sudhanva Lalit <lalit@frib.msu.edu>", "Mariana Dutra", "Guilherme Grams", "Rohit Kumar"],
-    package_dir={"": "version-0.2"},
-    packages=find_packages(where="version-0.2"),
+    authors=[
+        "Jerome Margueron <marguero@frib.msu.edu>",
+        "Sudhanva Lalit <lalit@frib.msu.edu>",
+        "Mariana Dutra",
+        "Guilherme Grams",
+        "Rohit Kumar",
+    ],
+    package_dir={"": "version-1.0"},
+    packages=find_packages(where="version-1.0"),
     include_package_data=True,
     package_data={"nucleardatapy": ["data/*"]},
     install_requires=["numpy", "scipy", "matplotlib", "pandas", "sphinx"],

{nucleardatapy-0.2.1/version-0.2 → nucleardatapy-1.0.0/version-1.0}/nucleardatapy/__init__.py

@@ -1,9 +1,11 @@
 """
-This module provides microscopic, phenomenological and experimental data constraints.
+This toolkit is a community-driven tool providing data for nuclear and astro-nuclear research community. It contains microscopic, phenomenological, experimental and observational data for the understanding of neutron stars.
+To get some help, please contact: nucleardatapy@gmail.com.
 """
 from nucleardatapy.cst     import *
 from nucleardatapy.env     import *
 from nucleardatapy.param   import *
+from nucleardatapy.hello   import *
 from nucleardatapy.create_folder import *
 #
 from nucleardatapy.matter  import *

{nucleardatapy-0.2.1/version-0.2 → nucleardatapy-1.0.0/version-1.0}/nucleardatapy/astro/setup_gw.py

@@ -95,7 +95,7 @@ class setupGW():
         # fix `file_in` and some properties of the object
         #
         if source.lower()=='gw170817':
-            file_in = nuda.param.path_data+'astro/gw/GW170817.dat'
+            file_in = nuda.param.path_data+'astro/GW/GW170817.dat'
             if hyp==1:
                 #: Attribute providing the full reference to the paper to be citted.
                 self.ref='B.P. Abbott, R. Abbott, T.D. Abbott, et al., PRL 119, 161101 (2017)'
@@ -137,7 +137,7 @@ class setupGW():
                 self.note = "write here notes about this observation."
                 self.marker = 's'
         elif source.lower()=='gw190425':
-            file_in = nuda.param.path_data+'astro/gw/GW190425.dat'
+            file_in = nuda.param.path_data+'astro/GW/GW190425.dat'
             if hyp==1:
                 #: Attribute providing the full reference to the paper to be citted.
                 self.ref='B.P. Abbott, R. Abbott, T.D. Abbott, S. Abraham, et al., ApJL 892, L3 (2020)'
@@ -165,12 +165,12 @@ class setupGW():
                 if int(ele[0]) == hyp:
                     self.mchirp = float(ele[1])
                     self.mchirp_sig_up = float(ele[2])
-                    self.mchirp_sig_do = float(ele[3])
-                    self.q_do = float(ele[4])
+                    self.mchirp_sig_lo = float(ele[3])
+                    self.q_lo = float(ele[4])
                     self.q_up = float(ele[5])
                     self.lam = float(ele[6])
                     self.lam_sig_up = float(ele[7])
-                    self.lam_sig_do = float(ele[8])
+                    self.lam_sig_lo = float(ele[8])
                     self.latexCite = ele[9].replace('\n','').replace(' ','')
         #
         if nuda.env.verb: print("Exit setupGW()")
@@ -188,10 +188,10 @@ class setupGW():
             print("   source:       ",self.source)
             print("   hyp:          ",self.hyp)
             print("   m_chirp:      ",self.mchirp)
-            print("   sig(m_chirp): ",self.mchirp_sig_up,self.mchirp_sig_do)
-            print("   q_do, q_up:   ",self.q_do, self.q_up)
+            print("   sig(m_chirp): ",self.mchirp_sig_up,self.mchirp_sig_lo)
+            print("   q_lo, q_up:   ",self.q_lo, self.q_up)
             print("   lambda:       ",self.lam)
-            print("   sig(lambda):  ",self.lam_sig_up,self.lam_sig_do)
+            print("   sig(lambda):  ",self.lam_sig_up,self.lam_sig_lo)
             print("   latexCite:    ",self.latexCite)
             print("   ref:          ",self.ref)
             print("   label:        ",self.label)
@@ -210,7 +210,7 @@ class setupGW():
         if nuda.env.verb: print("Enter print_latex()")
         #
         if nuda.env.verb_latex:
-            print(rf"- table: {self.source} & {self.hyp} & ${self.mchirp:.4f}^{{{+self.mchirp_sig_up}}}_{{{-self.mchirp_sig_do}}}$ & $[{self.q_do}:{self.q_up}]$ & ${{{self.lam:.2f}}}^{{{+self.lam_sig_up}}}_{{{-self.lam_sig_do}}}$ & \cite{{{self.latexCite}}} \\\\")
+            print(rf"- table: {self.source} & {self.hyp} & ${self.mchirp:.4f}^{{{+self.mchirp_sig_up}}}_{{{-self.mchirp_sig_lo}}}$ & $[{self.q_lo}:{self.q_up}]$ & ${{{self.lam:.2f}}}^{{{+self.lam_sig_up}}}_{{{-self.lam_sig_lo}}}$ & \cite{{{self.latexCite}}} \\\\")
         else:
             print(rf"- No  table for source {self.source}. To get  table, write  'verb_table = True' in env.py.")
         #
@@ -236,14 +236,14 @@ class setupGW():
         #
         self.mchirp = None
         self.mchirp_sig_up = None
-        self.mchirp_sig_do = None
-        self.q_do = None
+        self.mchirp_sig_lo = None
+        self.q_lo = None
         self.q_up = None
         self.lam  = None
         #: Attribute the lower bound of the tidal deformability for the source.
         self.lambda_sig_up = None
         #: Attribute the upper bound of the tidal deformability for the source.
-        self.lambda_sig_do = None
+        self.lambda_sig_lo = None
         #
         if nuda.env.verb: print("Exit init_self()")
         #
@@ -279,9 +279,9 @@ class setupGWAverage():
         for hyp in hyps:
             gw = nuda.astro.setupGW( source = source, hyp = hyp )
             #gw.print_outputs( )
-            lamdo = gw.lam - 3*gw.lam_sig_do
+            lamlo = gw.lam - 3*gw.lam_sig_lo
             lamup = gw.lam + 3*gw.lam_sig_up
-            if lamdo < lammin: lammin = lamdo
+            if lamlo < lammin: lammin = lamlo
             if lamup > lammax: lammax = lamup
         # construct the distribution of observations in ay
         ax = np.linspace(lammin,lammax,300)
@@ -290,7 +290,7 @@ class setupGWAverage():
             #print('hyp:',hyp)
             gw = nuda.astro.setupGW( source = source, hyp = hyp )
             #gw.print_outputs( )
-            ay += gauss(ax,gw.lam,gw.lam_sig_up,gw.lam_sig_do)
+            ay += gauss(ax,gw.lam,gw.lam_sig_up,gw.lam_sig_lo)
         # determine the centroid and standard deviation from the distribution of obs. 
         nor = sum( ay )
         cen = sum( ay*ax )
@@ -355,13 +355,13 @@ class setupGWAverage():
         #
         return self        
 
-def gauss( ax, lam, sig_up, sig_do ):
+def gauss( ax, lam, sig_up, sig_lo ):
     fac = math.sqrt( 2*math.pi )
     gauss = []
     for x in ax:
         if x < lam: 
-            z = ( x - lam ) / sig_do
-            norm = sig_do * fac
+            z = ( x - lam ) / sig_lo
+            norm = sig_lo * fac
         else:
             z = ( x - lam ) / sig_up
             norm = sig_up * fac

{nucleardatapy-0.2.1/version-0.2 → nucleardatapy-1.0.0/version-1.0}/nucleardatapy/astro/setup_mr.py

@@ -39,7 +39,7 @@ def mr_obss( source ):
     if source.lower()=='j0030+0451':
         obss = [ 1, 2, 3, 4 ]
     elif source.lower()=='j0740+6620':
-        obss = [ 1, 2 ]
+        obss = [ 1, 2, 3 ]
     elif source.lower()=='j0437-4715':
         obss = [ 1 ]
     #
@@ -144,6 +144,14 @@ class setupMR():
                 #: Attribute providing additional notes about the observation.
                 self.note = "write notes about this observation."
                 self.marker = 's'
+            elif obs==3:
+                #: Attribute providing the full reference to the paper to be citted.
+                self.ref='T. Salmi, D. Choudhury, Y. Kini, T.E. Riley et al., ApJ 974, 294 (2024).'
+                #: Attribute providing the label the data is references for figures.
+                self.label = 'J0740 Salmi 2024'
+                #: Attribute providing additional notes about the observation.
+                self.note = "write notes about this observation."
+                self.marker = 's'
         elif source.lower()=='j0437-4715':
             file_in = nuda.param.path_data+'astro/NICER/J0437-4715.dat'
             if obs==1:

{nucleardatapy-0.2.1/version-0.2 → nucleardatapy-1.0.0/version-1.0}/nucleardatapy/astro/setup_mup.py

@@ -141,7 +141,7 @@ class setupMup():
         #: Attribute the positive uncertainty.
         self.sig_up = None
         #: Attribute the negative uncertainty.
-        self.sig_do = None
+        self.sig_lo = None
         #: Attribute latexCite.
         self.latexCite = None
         #
@@ -156,7 +156,7 @@ class setupMup():
                 if int(ele[0]) == hyp:
                     self.mup = float(ele[2])
                     self.sig_up = float(ele[3])
-                    self.sig_do = float(ele[4])
+                    self.sig_lo = float(ele[4])
                     self.latexCite = ele[5].replace('\n','').replace(' ','')
         #
         if nuda.env.verb: print("Exit setupMup()")
@@ -173,7 +173,7 @@ class setupMup():
         print("   source:  ",self.source)
         print("   hyp:",self.hyp)
         print("   mup:",self.mup)
-        print("   sigma(mup):",self.sig_up,self.sig_do)
+        print("   sigma(mup):",self.sig_up,self.sig_lo)
         print("   latexCite:",self.latexCite)
         print("   ref:    ",self.ref)
         print("   label:  ",self.label)
@@ -190,7 +190,7 @@ class setupMup():
         if nuda.env.verb: print("Enter print_latex()")
         #
         if nuda.env.verb_latex:
-            print(rf"- table: {self.source} & {self.hyp} & ${self.mup:.2f}^{{{+self.sig_up}}}_{{{-self.sig_do}}}$ & \cite{{{self.latexCite}}} \\\\")
+            print(rf"- table: {self.source} & {self.hyp} & ${self.mup:.2f}^{{{+self.sig_up}}}_{{{-self.sig_lo}}}$ & \cite{{{self.latexCite}}} \\\\")
         else:
             print(rf"- No table for source {self.source}. To get table, write 'verb_latex = True' in env.py.")
         #
@@ -228,9 +228,9 @@ class setupMupAverage():
         for hyp in hyps:
             mup = nuda.setupMup( source = source, hyp = hyp )
             #mup.print_outputs( )
-            mupdo = mup.mup - 3*mup.sig_do
+            muplo = mup.mup - 3*mup.sig_lo
             mupup = mup.mup + 3*mup.sig_up
-            if mupdo < mupmin: mupmin = mupdo
+            if muplo < mupmin: mupmin = muplo
             if mupup > mupmax: mupmax = mupup
         # construct the distribution of observations in ay
         ax = np.linspace(mupmin,mupmax,300)
@@ -240,7 +240,7 @@ class setupMupAverage():
             #print('hyp:',hyp)
             mup = nuda.setupMup( source = source, hyp = hyp )
             #mup.print_outputs( )
-            ay += gauss(ax,mup.mup,mup.sig_up,mup.sig_do)
+            ay += gauss(ax,mup.mup,mup.sig_up,mup.sig_lo)
         # determine the centroid and standard deviation from the distribution of obs. 
         nor = sum( ay )
         cen = sum( ay*ax )
@@ -288,13 +288,13 @@ class setupMupAverage():
         if nuda.env.verb: print("Exit print_latex()")
         #
 
-def gauss( ax, mass, sig_up, sig_do ):
+def gauss( ax, mass, sig_up, sig_lo ):
     fac = math.sqrt( 2*math.pi )
     gauss = []
     for x in ax:
         if x < mass: 
-            z = ( x - mass ) / sig_do
-            norm = sig_do * fac
+            z = ( x - mass ) / sig_lo
+            norm = sig_lo * fac
         else:
             z = ( x - mass ) / sig_up
             norm = sig_up * fac

{nucleardatapy-0.2.1/version-0.2 → nucleardatapy-1.0.0/version-1.0}/nucleardatapy/corr/setup_EsymDen.py

@@ -3,13 +3,8 @@ import sys
 import numpy as np  # 1.15.0
 import random
 
-#nucleardatapy_tk = os.getenv('NUCLEARDATAPY_TK')
-#sys.path.insert(0, nucleardatapy_tk)
-
 import nucleardatapy as nuda
 
-#nsat = 0.16
-
 class setupEsymDen():
     """
     Instantiate the values of Esym and Lsym from the constraint.