From 3acea8be4f2759d03422a1e62683be6a0f57daba Mon Sep 17 00:00:00 2001 From: zjmorgan Date: Mon, 22 Jul 2024 14:54:29 -0400 Subject: [PATCH] Fixing filename path and extra linespace --- gui/panel_detectors.py | 3 ++- model/experiment.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/panel_detectors.py b/gui/panel_detectors.py index d3de41b..7e3ce00 100644 --- a/gui/panel_detectors.py +++ b/gui/panel_detectors.py @@ -200,7 +200,8 @@ def __init__(self, panel): def load_detectors_dialog(self): """Open a dialog to load detectors from a CSV/detcal file.""" filename = model.config.cfg.default_detector_filename - (path, ignored) = os.path.split( os.path.abspath(filename) ) + filename = os.path.abspath(filename) + (path, filename) = os.path.split( filename ) filters = 'CSV or detcal files|*.csv;*.detcal;*.DetCal|CSV files (*.csv)|*.csv|detcal files (*.detcal)|*.detcal;*.DetCal|All files (*)|*' if gui_utils.is_mac(): filters = '' #This is needed on Mac, for some reason the filters crashes otherwise. diff --git a/model/experiment.py b/model/experiment.py index 755ea73..44c858d 100644 --- a/model/experiment.py +++ b/model/experiment.py @@ -1642,7 +1642,6 @@ def initialize_volume_symmetry_map(self): else: #--------------- Inline C version (about 17x faster than Python) --------------- code = """ - //-- Calculate the hkl array --- int ix, iy, iz; int eix, eiy, eiz, eindex;