diff --git a/simrunner/simrunner.py b/simrunner/simrunner.py index efa3021b63b575e78c781e61a0d42d10148970d0..709702a362e72f3bcb4a4e344d0a524d5c62408c 100644 --- a/simrunner/simrunner.py +++ b/simrunner/simrunner.py @@ -43,7 +43,7 @@ def run_sim(e_list, d_path, s_path): def give_controller(d_path): - json_path = os.path.join(main_folder, 'controller', 'controller', 'data_folder_path.json') + json_path = os.path.join(main_folder, 'visualizer', 'data_folder_path.json') with open(json_path, "w") as file: json.dump(d_path, file) diff --git a/controller/README.md b/visualizer/README.md similarity index 100% rename from controller/README.md rename to visualizer/README.md diff --git a/controller/controller/data_folder_path.json b/visualizer/data_folder_path.json similarity index 100% rename from controller/controller/data_folder_path.json rename to visualizer/data_folder_path.json diff --git a/controller/pyproject.toml b/visualizer/pyproject.toml similarity index 100% rename from controller/pyproject.toml rename to visualizer/pyproject.toml diff --git a/controller/setup.py b/visualizer/setup.py similarity index 53% rename from controller/setup.py rename to visualizer/setup.py index 82953ab5d7bac55797334c3e85a6c0573b8503fb..48481f620d7aac2403c517963d50e0196b102e91 100644 --- a/controller/setup.py +++ b/visualizer/setup.py @@ -1,12 +1,11 @@ -import os -from setuptools import setup +from setuptools import setup, find_packages setup( - name='controller', + name='visualizer', version='1.0', - description='Controller zur steuerung einer Detektor Sim', + description='visualizer for detector-sim', author='Michael Reuscher', - packages=['controller'], + packages=find_packages(), install_requires=[ 'numpy', 'pandas', @@ -15,7 +14,7 @@ setup( ], entry_points={ 'console_scripts': [ - 'controller_run=controller.main:main' + 'visualizer=visualizer.main:main' ] } ) diff --git a/controller/controller/DataFrameCreator.py b/visualizer/visualizer/DataFrameCreator.py similarity index 100% rename from controller/controller/DataFrameCreator.py rename to visualizer/visualizer/DataFrameCreator.py diff --git a/controller/controller/SeabornPlotter.py b/visualizer/visualizer/SeabornPlotter.py similarity index 100% rename from controller/controller/SeabornPlotter.py rename to visualizer/visualizer/SeabornPlotter.py diff --git a/controller/controller/UtilityClasses.py b/visualizer/visualizer/UtilityClasses.py similarity index 100% rename from controller/controller/UtilityClasses.py rename to visualizer/visualizer/UtilityClasses.py diff --git a/controller/controller/__init__.py b/visualizer/visualizer/__init__.py similarity index 100% rename from controller/controller/__init__.py rename to visualizer/visualizer/__init__.py diff --git a/controller/controller/main.py b/visualizer/visualizer/main.py similarity index 74% rename from controller/controller/main.py rename to visualizer/visualizer/main.py index d1d8a568e56d05c583fb7f7609a307cd8430fa9d..98e7a7d3662020e7433c8d0c56a425944fa4072d 100644 --- a/controller/controller/main.py +++ b/visualizer/visualizer/main.py @@ -8,7 +8,8 @@ matplotlib.use('TkAgg') # --------------Main------------ def main(): - json_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data_folder_path.json') + json_path = file_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), + 'data_folder_path.json') with open(json_path, "r") as file: data_folder = json.load(file)