Merge branch 'JADE-V-V:linux' into linux

JezSw · Feb 13, 2024 · 95a6e3c · 95a6e3c
2 parents 968e031 + 606d15b
commit 95a6e3c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/jade/expoutput.py b/jade/expoutput.py
@@ -30,7 +30,6 @@
 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
@@ -46,6 +45,7 @@
                        'TUD-Fe': 'energy bins',
                        'TUD-W': 'energy bins',
                        'TUD-FNG': 'energy bins'}
+EXP_TAG = "Exp"
 
 
 class ExperimentalOutput(BenchmarkOutput):

diff --git a/jade/gui.py b/jade/gui.py
@@ -29,13 +29,13 @@
 import jade.testrun as testrun
 import jade.utilitiesgui as uty
 from jade.__version__ import __version__
-from jade.status import EXP_TAG
 from tqdm import tqdm
-from jade.main import Session
+
 
 date = "10/05/2022"
 version = __version__
 POWERED_BY = "NIER, UNIBO, F4E, UKAEA"
+EXP_TAG = "Exp"
 
 
 def clear_screen():
@@ -277,7 +277,7 @@ def mainloop(session):
 )
 
 
-def comploop(session: Session):
+def comploop(session):
     """
     This handle the actions related to the computational benchmarck menu