Skip to content

Commit

Permalink
Merge branch 'development' of github.com:proy30/impactx into development
Browse files Browse the repository at this point in the history
  • Loading branch information
proy30 committed Aug 5, 2024
2 parents 5fa1120 + d40b5fd commit c0e73a9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def adjusted_settings_plot(self, num_bins=50, root_rank=0):
# Matplotlib canvas: figure and plottable axes areas
fig, axes = plt.subplots(1, 3, figsize=(12, 3))
(ax_xpx, ax_ypy, ax_tpt) = axes

# Plotting data points if df is not None
if df is not None:
# update for plot unit system
Expand Down
7 changes: 4 additions & 3 deletions src/python/impactx/dashboard/Analyze/plotsMain.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os

from trame.widgets import plotly, vuetify, matplotlib
from trame.app import get_server
from trame.widgets import matplotlib, plotly, vuetify

from .analyzeFunctions import AnalyzeFunctions
from .plot_ParameterEvolutionOverS.overS import line_plot_1d
Expand Down Expand Up @@ -54,7 +55,7 @@ def load_dataTable_data():
"""
Loads and processes data from combined beam and reference particle files.
"""

combined_files = AnalyzeFunctions.combine_files(
REDUCED_BEAM_DATA, REF_PARTICLE_DATA
)
Expand Down Expand Up @@ -124,7 +125,7 @@ def update_plot():


@state.change("selected_headers")
def on_header_selection_change (selected_headers, **kwargs):
def on_header_selection_change(selected_headers, **kwargs):
state.filtered_headers = AnalyzeFunctions.filter_headers(
state.all_headers, selected_headers
)
Expand Down
2 changes: 1 addition & 1 deletion src/python/impactx/dashboard/Toolbar/toolbarMain.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,4 @@ def analyze_toolbar():
ToolbarElements.plot_options()
ToolbarElements.run_simulation_button()
# ToolbarElements.export_input_data()
# ToolbarElements.switch_theme()
# ToolbarElements.switch_theme()
3 changes: 1 addition & 2 deletions src/python/impactx/dashboard/__main__.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import sys
from trame.ui.router import RouterViewLayout
from trame.ui.vuetify import SinglePageWithDrawerLayout
from trame.widgets import router, vuetify, xterm
from trame.widgets import router, vuetify

from .Analyze.plotsMain import AnalyzeSimulation
from .Input.distributionParameters.distributionMain import DistributionParameters
from .Input.inputParameters.inputMain import InputParameters
from .Input.latticeConfiguration.latticeMain import LatticeConfiguration
from .Input.trameFunctions import TrameFunctions
from .Input.Visualiztion.twiss_phase_space_ellipse.x_px import VisualizeTwiss
from .Optimize.optimizeMain import Optimize
from .start import main
from .Toolbar.toolbarMain import Toolbars

Expand Down

0 comments on commit c0e73a9

Please sign in to comment.