Merge branch 'linux' into test_fixing

JezSw · Feb 20, 2024 · aa35df1 · aa35df1
2 parents 37118d7 + bd3f07a
commit aa35df1
Show file tree

Hide file tree

Showing 68 changed files with 13,341 additions and 3,120 deletions.
diff --git a/.coverage b/.coverage
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,6 @@ docs/source/_templates/
 JADE.egg-info/
 jade.egg-info/
 build/
+
+venv/*
+.vscode/launch.json
diff --git a/docs/source/dev/insertbenchmarks.rst b/docs/source/dev/insertbenchmarks.rst
@@ -191,4 +191,10 @@ in the following page of the ``Atlas``.
 
 To get this kind of plots is enough to follow the same steps mentioned in :ref:`insbin`,
 but the class ``MultipleSpectrumOutput`` must be used. All the other parameters are set in
-the related configuration file (see :ref:`multspectrumconfig`)
+the related configuration file (see :ref:`multspectrumconfig`)
+
+In the configuration files, the user can also set the factor by which the experimental data
+and the MCNP results are multiplied. The factor is set in the ``<JADE_root>\Configuration\Benchmarks Configuration\<BenchmarkName>.xlsx``
+configuration file; the factor is set in the ``Multiplying factor`` column, for
+each individual tally. This is useful to avoid superposition of the plots from different
+tallies, and to have a direct comparison of the differences between different cases.
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -52,6 +52,7 @@ GitHub repository <https://github.com/JADE-V-V/JADE/issues>`_.
    :caption: JADE API
 
    api/general
+.. API not generated anymore for the moment
    api/initobjects
    api/inputgeneration
    api/postprocessing

diff --git a/jade/MCTAL_READER2.py b/jade/MCTAL_READER2.py
diff --git a/jade/__init__.py b/jade/__init__.py
@@ -1 +1 @@
-from .__version__ import __version__
+from .__version__ import __version__
diff --git a/jade/__version__.py b/jade/__version__.py
@@ -1 +1 @@
-__version__ = '3.0.0'
+__version__ = "3.0.0"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from .__version__ import __version__
		from .__version__ import __version__