Merge pull request #6 from zjmorgan/detector_filename

Issue selecting detector file

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.

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;