Merge pull request JADE-V-V#217 from JezSw/status_changes

Handling circular import

jade/expoutput.py

@@ -30,6 +30,7 @@
 from jade.output import BenchmarkOutput
 from jade.output import MCNPoutput
 from tqdm import tqdm
+from jade.status import EXP_TAG
 from jade.plotter import Plotter
 from scipy.interpolate import interp1d
 from abc import abstractmethod
@@ -45,7 +46,6 @@
                        'TUD-Fe': 'energy bins',
                        'TUD-W': 'energy bins',
                        'TUD-FNG': 'energy bins'}
-EXP_TAG = "Exp"
 
 
 class ExperimentalOutput(BenchmarkOutput):
@@ -809,7 +809,7 @@ def _dump_ce_table(self):
                 writer.sheets[input].set_column(0, 4, 18)
 
         # Close the Pandas Excel writer and output the Excel file.
-            writer.save()
+            writer.close()
         return
 
     def _data_collect(self, input, tallynum, quantity_CE, e_intervals):

jade/gui.py

@@ -21,6 +21,8 @@
 You should have received a copy of the GNU General Public License
 along with JADE.  If not, see <http://www.gnu.org/licenses/>.
 """
+from __future__ import annotations
+from typing import TYPE_CHECKING
 import os
 import sys
 
@@ -30,13 +32,15 @@
 import jade.utilitiesgui as uty
 from jade.__version__ import __version__
 from tqdm import tqdm
+from jade.status import EXP_TAG
+
+if TYPE_CHECKING:
+    from jade.main import Session
 
 
 date = "10/05/2022"
 version = __version__
 POWERED_BY = "NIER, UNIBO, F4E, UKAEA"
-EXP_TAG = "Exp"
-
 
 def clear_screen():
     if os.name == "nt":
@@ -94,7 +98,7 @@ def clear_screen():
 )
 
 
-def mainloop(session):
+def mainloop(session: Session):
     """
     This handle the actions related to the main menu
 
@@ -277,7 +281,7 @@ def mainloop(session):
 )
 
 
-def comploop(session):
+def comploop(session: Session):
     """
     This handle the actions related to the computational benchmarck menu
 
@@ -409,7 +413,7 @@ def comploop(session):
 )
 
 
-def exploop(session):
+def exploop(session: Session):
     """
     This handle the actions related to the experimental benchmarck menu
 
@@ -511,7 +515,7 @@ def exploop(session):
 )
 
 
-def pploop(session):
+def pploop(session: Session):
     """
     This handle the actions related to the post-processing menu
 

jade/status.py

@@ -22,10 +22,12 @@
 along with JADE.  If not, see <http://www.gnu.org/licenses/>.
 """
 from __future__ import annotations
+from typing import TYPE_CHECKING
 import os
 import re
-from jade.main import Session
 
+if TYPE_CHECKING:
+    from jade.main import Session
 
 MULTI_TEST = [
     "Sphere",