Skip to content
Snippets Groups Projects
Commit 2a6948d3 authored by Michael Reuscher's avatar Michael Reuscher
Browse files

communication between simrunner and controller now in

parent 3f0c3a4a
No related branches found
No related tags found
2 merge requests!4Python driver and data analysis part,!2Threading fix
...@@ -21,7 +21,8 @@ class DataFrameCreator: ...@@ -21,7 +21,8 @@ class DataFrameCreator:
inner_dict = dfs[dataframe_type] inner_dict = dfs[dataframe_type]
if dataframe_name in inner_dict: if dataframe_name in inner_dict:
# DataFrame hinzufügen # DataFrame hinzufügen
inner_dict[dataframe_name] = pd.concat([inner_dict[dataframe_name], dataframe], ignore_index=True) inner_dict[dataframe_name] = pd.concat([inner_dict[dataframe_name], dataframe],
ignore_index=True)
else: else:
inner_dict[dataframe_name] = dataframe inner_dict[dataframe_name] = dataframe
else: else:
......
"/home/user/Projekt/detectorwritesim/output1"
\ No newline at end of file
import os import os
import numpy as np import json
import pandas as pd
import datetime
import matplotlib import matplotlib
import matplotlib.pyplot as plt from DataFrameCreator import DataFrameCreator
import seaborn as sns from SeabornPlotter import SeabornPlotter
from .SeabornPlotter import SeabornPlotter
from .DataFrameCreator import DataFrameCreator
matplotlib.use('TkAgg') matplotlib.use('TkAgg')
# --------------Main------------ # --------------Main------------
def main(): def main():
folder_path = '/home/user/C++/detectorwritesim/output' json_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data_folder_path.json')
creator = DataFrameCreator(folder_path) with open(json_path, "r") as file:
data_folder = json.load(file)
creator = DataFrameCreator(data_folder)
dataframes = creator.create_dataframes() dataframes = creator.create_dataframes()
plotter = SeabornPlotter(dataframes['write']) plotter = SeabornPlotter(dataframes['write'])
......
...@@ -4,7 +4,8 @@ import subprocess ...@@ -4,7 +4,8 @@ import subprocess
def read_config(): def read_config():
with open("simrunner/data_config.json", "r") as file: config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data_config.json')
with open(config_path, "r") as file:
d_config = json.load(file) d_config = json.load(file)
return d_config return d_config
...@@ -30,10 +31,10 @@ def set_arguments(data_config): ...@@ -30,10 +31,10 @@ def set_arguments(data_config):
return e_list return e_list
def run_sim(e_list, m_folder, s_path): def run_sim(e_list, d_path, s_path):
for event in e_list: for event in e_list:
folder_name = event[-1] folder_name = event[-1]
relativ_path = os.path.join(m_folder, "output1", folder_name) relativ_path = os.path.join(d_path, "output1", folder_name)
os.makedirs(relativ_path, mode=0o777, exist_ok=True) os.makedirs(relativ_path, mode=0o777, exist_ok=True)
event[-1] = relativ_path event[-1] = relativ_path
arguments = event arguments = event
...@@ -41,14 +42,18 @@ def run_sim(e_list, m_folder, s_path): ...@@ -41,14 +42,18 @@ def run_sim(e_list, m_folder, s_path):
print(output) print(output)
skript_path = os.path.abspath(__file__) def give_controller(d_path):
main_folder = os.path.dirname(os.path.dirname(skript_path)) json_path = os.path.join(main_folder, 'controller', 'controller', 'data_folder_path.json')
data_path = os.path.join(main_folder, "protokoll") with open(json_path, "w") as file:
sim_path = os.path.join(os.path.dirname(__file__), "../build/src/detsim") json.dump(d_path, file)
os.makedirs(data_path, mode=0o777, exist_ok=True)
event_list = set_arguments(read_config())
print(event_list)
run_sim(event_list, main_folder, sim_path)
main_folder = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
data_path = os.path.join(main_folder, "output1")
protokoll_path = os.path.join(main_folder, "protokoll")
os.makedirs(protokoll_path, mode=0o777, exist_ok=True)
sim_path = os.path.join(os.path.dirname(__file__), "../build/src/detsim")
give_controller(data_path)
event_list = set_arguments(read_config())
run_sim(event_list, data_path, sim_path)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment