orGUI 1.1.2__tar.gz → 1.2.0__tar.gz

{orgui-1.1.2 → orgui-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: orGUI
-Version: 1.1.2
+Version: 1.2.0
 Summary: orGUI: Orientation and Integration with 2D detectors
 Author-email: Timo Fuchs <tfuchs@cornell.edu>
 License: MIT License
@@ -43,6 +43,7 @@ Provides-Extra: full
 Requires-Dist: qtconsole; extra == "full"
 Requires-Dist: ase; extra == "full"
 Requires-Dist: numba; extra == "full"
+Requires-Dist: PyOpenGL; extra == "full"
 
 
 orGUI: Orientation and Integration with 2D detectors

{orgui-1.1.2 → orgui-1.2.0}/orGUI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: orGUI
-Version: 1.1.2
+Version: 1.2.0
 Summary: orGUI: Orientation and Integration with 2D detectors
 Author-email: Timo Fuchs <tfuchs@cornell.edu>
 License: MIT License
@@ -43,6 +43,7 @@ Provides-Extra: full
 Requires-Dist: qtconsole; extra == "full"
 Requires-Dist: ase; extra == "full"
 Requires-Dist: numba; extra == "full"
+Requires-Dist: PyOpenGL; extra == "full"
 
 
 orGUI: Orientation and Integration with 2D detectors

{orgui-1.1.2 → orgui-1.2.0}/orGUI.egg-info/SOURCES.txt

@@ -16,10 +16,12 @@ orgui.egg-info/entry_points.txt
 orgui.egg-info/requires.txt
 orgui.egg-info/top_level.txt
 orgui/app/ArrayTableDialog.py
+orgui/app/QHKLDialog.py
 orgui/app/QReflectionSelector.py
 orgui/app/QScanSelector.py
 orgui/app/QUBCalculator.py
 orgui/app/__init__.py
+orgui/app/bgroi.py
 orgui/app/database.py
 orgui/app/orGUI.py
 orgui/app/qutils.py
@@ -63,18 +65,17 @@ orgui/datautils/xrayutils/unitcells/a-PtO2(0001).bul
 orgui/resources/__init__.py
 orgui/resources/icons/alpha.png
 orgui/resources/icons/alpha.svg
-orgui/resources/icons/diffractometer_v2.png
-orgui/resources/icons/diffractometer_v2.svg
 orgui/resources/icons/diffractometer_v3.png
-orgui/resources/icons/diffractometer_v3.svg
-orgui/resources/icons/diffractometer_v3_norm.svg
-orgui/resources/icons/diffractometer_v3_opt.svg
 orgui/resources/icons/disable-image.png
 orgui/resources/icons/disable-image.svg
 orgui/resources/icons/document-nx-open.png
 orgui/resources/icons/document-nx-open.svg
 orgui/resources/icons/document-nx-save.png
 orgui/resources/icons/document-nx-save.svg
+orgui/resources/icons/intersect_s1.png
+orgui/resources/icons/intersect_s1.svg
+orgui/resources/icons/intersect_s2.png
+orgui/resources/icons/intersect_s2.svg
 orgui/resources/icons/lattice-all-link.png
 orgui/resources/icons/lattice-all-link.svg
 orgui/resources/icons/lattice-horizontal-link.png

{orgui-1.1.2 → orgui-1.2.0}/orGUI.egg-info/requires.txt

@@ -18,6 +18,7 @@ ase
 qtconsole
 ase
 numba
+PyOpenGL
 
 [speedup]
 numba

{orgui-1.1.2 → orgui-1.2.0}/orgui/__init__.py

@@ -29,7 +29,7 @@ __author__ = "Timo Fuchs"
 __copyright__ = "Copyright 2020-2024 Timo Fuchs"
 __credits__ = []
 __license__ = "MIT License"
-__version__ = "1.1.2"
+__version__ = "1.2.0"
 __maintainer__ = "Timo Fuchs"
 __email__ = "tfuchs@cornell.edu"
 

orgui-1.2.0/orgui/app/QHKLDialog.py

@@ -0,0 +1,83 @@
+from silx.gui import qt
+from . import qutils
+import numpy as np
+from contextlib import contextmanager
+
+@contextmanager
+def blockSignals(qobjects):
+    try:
+        for obj in qobjects:
+            obj.blockSignals(True)
+        yield
+        for obj in qobjects:
+            obj.blockSignals(False)
+    except TypeError:
+        qobject.blockSignals(True)
+        yield
+        qobject.blockSignals(False)
+
+class HKLDialog(qt.QDialog):
+    sigHKLchanged = qt.pyqtSignal(np.ndarray)
+    
+    def __init__(self, msg='', title='' ,parent=None):
+        qt.QDialog.__init__(self, parent)
+        self.savedParams = np.array([0.,0.,0.])
+        layout = qt.QVBoxLayout()
+        self.setWindowTitle(title)
+        
+        hkl_layout = qt.QHBoxLayout()
+        
+        self.hkl_editors = [qt.QDoubleSpinBox() for i in range(3)]
+        [h.setRange(-20000,20000) for h in self.hkl_editors]
+        [h.setDecimals(3) for h in self.hkl_editors]
+        [h.setValue(0.) for h in self.hkl_editors]
+        for editor, lbll in zip(self.hkl_editors, ["H:", "K:", "L:"]):
+            hkl_layout.addWidget(qt.QLabel(lbll))
+            hkl_layout.addWidget(editor)
+            editor.valueChanged.connect(self._onAnyHKLChanged)
+
+        
+        self.label = qt.QLabel()
+        self.label.setText(msg)
+        
+        buttons = qt.QDialogButtonBox(qt.QDialogButtonBox.Ok | qt.QDialogButtonBox.Cancel | qt.QDialogButtonBox.Reset)
+        buttons.button(qt.QDialogButtonBox.Ok).clicked.connect(self.accept)
+        buttons.button(qt.QDialogButtonBox.Cancel).clicked.connect(self.onCancel)
+        buttons.button(qt.QDialogButtonBox.Reset).clicked.connect(self.resetParameters)
+        
+        layout.addWidget(self.label)
+        layout.addLayout(hkl_layout)
+        layout.addWidget(buttons)
+        self.setLayout(layout)
+        
+
+    def _onAnyHKLChanged(self):
+        self.sigHKLchanged.emit(self.get_hkl())
+        
+    def get_hkl(self):
+        return np.array([h.value() for h in self.hkl_editors])
+        
+    def set_hkl(self, hkl):
+        assert len(hkl) == 3
+        with blockSignals(self.hkl_editors):
+            for h, e in zip(hkl, self.hkl_editors):
+                e.setValue(h)
+        self.sigHKLchanged.emit(self.get_hkl())
+        
+    def showEvent(self, event):
+        if event.spontaneous():
+            super().showEvent(event)
+        else:
+            self.savedParams = self.get_hkl()
+            super().showEvent(event)
+            
+    #def hideEvent(self, event):
+    #    self.sigHide.emit()
+    #    super().hideEvent(event)
+            
+    def resetParameters(self):
+        self.set_hkl(self.savedParams)
+            
+    def onCancel(self):
+        self.resetParameters()
+        self.reject()

{orgui-1.1.2 → orgui-1.2.0}/orgui/app/QScanSelector.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # /*##########################################################################
 #
-# Copyright (c) 2020-2024 Timo Fuchs
+# Copyright (c) 2020-2024 Timo Fuchs, Finn Schroeter
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -23,9 +23,9 @@
 #
 # ###########################################################################*/
 __author__ = "Timo Fuchs"
-__copyright__ = "Copyright 2020-2024 Timo Fuchs"
+__copyright__ = "Copyright 2020-2024 Timo Fuchs, Finn Schroeter"
 __license__ = "MIT License"
-__version__ = "1.0.0"
+__version__ = "1.2.0"
 __maintainer__ = "Timo Fuchs"
 __email__ = "fuchs@physik.uni-kiel.de"
 
@@ -51,8 +51,12 @@ import traceback
 
 import warnings
 from .. import resources
-from ..backend import backends
+from ..backend import backends, scans
+from . import qutils
 from .QReflectionSelector import QReflectionAnglesDialog
+from .QHKLDialog import HKLDialog
+import runpy
+
 
 class QScanSelector(qt.QMainWindow):
     sigScanChanged = qt.pyqtSignal(object)
@@ -79,6 +83,8 @@ class QScanSelector(qt.QMainWindow):
         self.closeFileAction = qt.QAction(icons.getQIcon('close'),"Close file",self)
         self.closeFileAction.triggered.connect(self._onCloseFile)
         
+        self.loadBackendAction = qt.QAction("Load backend file",self)
+        self.loadBackendAction.triggered.connect(self._onLoadBackend)
         
         self.hdfTreeView = silx.gui.hdf5.Hdf5TreeView(self)
         self.hdfTreeView.setSortingEnabled(True)
@@ -87,6 +93,11 @@ class QScanSelector(qt.QMainWindow):
         self.hdfTreeView.setModel(self.hdf5model)
         self.hdfTreeView.setExpandsOnDoubleClick(False)
         self.hdf5model.setFileMoveEnabled(True)
+
+        #self.hdf5model.sigH5pyObjectLoaded.connect(self.__h5FileLoaded)
+        self.hdf5model.sigH5pyObjectRemoved.connect(self.__h5FileRemoved)
+        self.hdf5model.sigH5pyObjectSynchronized.connect(self.__h5FileSynchonized)
+
         self.__treeModelSorted = silx.gui.hdf5.NexusSortFilterProxyModel(self.hdfTreeView)
         self.__treeModelSorted.setSourceModel(self.hdf5model)
         self.__treeModelSorted.sort(0, qt.Qt.AscendingOrder)
@@ -132,11 +143,18 @@ class QScanSelector(qt.QMainWindow):
         openScanButton.clicked.connect(self._onLoadScan)
 
         btidsplit = qt.QSplitter(self)
-        qt.QLabel("Beamtime id:",btidsplit)
+        qt.QLabel("Backend:",btidsplit)
         self.btid = qt.QComboBox(btidsplit)
-        [self.btid.addItem(bt) for bt in backends.beamtimes]
+        [self.btid.addItem(bt) for bt in backends.fscans]
         self.btid.setCurrentText("id31_default")
         
+        self._selectBackendBtn = qt.QPushButton("...", btidsplit)
+        width = self._selectBackendBtn.fontMetrics().boundingRect("  ...  ").width() + 7
+        height = self._selectBackendBtn.fontMetrics().boundingRect("  M  ").height() + 7
+        self._selectBackendBtn.setMaximumWidth(width)
+        self._selectBackendBtn.setMaximumHeight(height)
+        self._selectBackendBtn.clicked.connect(self.loadBackendAction.trigger)
+        
         self.bt_autodetect_enable = qt.QCheckBox("auto detect", btidsplit)
         self.bt_autodetect_enable.toggled.connect(lambda s : self.btid.setEnabled(not s))
         self.bt_autodetect_enable.setChecked(True)
@@ -397,9 +415,6 @@ class QScanSelector(qt.QMainWindow):
         #setroi_btn.setToolTip("Select roi location by double clicking")
         setroi_btn.setDefaultAction(self.select_roi_action)
         
-        
-        
-        
         static_loc_Group = qt.QGroupBox(u"Static ROI location")
         static_loc_GroupMainVLayout = qt.QVBoxLayout()
         
@@ -428,13 +443,135 @@ class QScanSelector(qt.QMainWindow):
         static_loc_GroupMainVLayout.addWidget(static_hkl_box)
         
         static_loc_Group.setLayout(static_loc_GroupMainVLayout)
+
+
+
+        # rocking scan
+        
+        rocking_integration_group = qt.QGroupBox("Rocking scan integration")
+        
+        self._selectH_0_btn = qt.QPushButton("sel H_0")
+        #width = self._selectH_0_btn.fontMetrics().boundingRect("  ...  ").width() + 7
+        height = self._selectH_0_btn.fontMetrics().boundingRect("  M  ").height() + 7
+        #self._selectH_0_btn.setMaximumWidth(width)
+        self._selectH_0_btn.setMaximumHeight(height)
         
         
+        self._selectH_1_btn = qt.QPushButton("sel H_1")
+        #width = self._selectH_1_btn.fontMetrics().boundingRect("  ...  ").width() + 7
+        height = self._selectH_1_btn.fontMetrics().boundingRect("  M  ").height() + 7
+        #self._selectH_1_btn.setMaximumWidth(width)
+        self._selectH_1_btn.setMaximumHeight(height)
+        
+        
+        self._H_0_label = qt.QLabel("")
+        self._H_1_label = qt.QLabel("")
+
+        
+        ro_panel_layout = qt.QGridLayout()
+        ro_panel_layout.addWidget(qt.QLabel(u"Rocking points along H(s) = H₁ 🞄 s + H₀"),0,0, 1, -1)
+        
+        ro_panel_layout.addWidget(qt.QLabel("Start H_0:"),1,0)
+        ro_panel_layout.addWidget(self._H_0_label,1, 1, 1, 2)
+        ro_panel_layout.addWidget(self._selectH_0_btn, 1, 3)
+        
+        ro_panel_layout.addWidget(qt.QLabel("Direction H_1:"),2,0)
+        ro_panel_layout.addWidget(self._H_1_label, 2, 1, 1, 2)
+        ro_panel_layout.addWidget(self._selectH_1_btn,2,3)
+        
+        self._H_max_label = qt.QLabel("")
+        self.roscanMaxS = qt.QDoubleSpinBox()
+        self.roscanMaxS.setRange(-20000,20000)
+        self.roscanMaxS.setDecimals(3)
+        self.roscanMaxS.setValue(6.)
+        self.roscanMaxS.valueChanged.connect(lambda : self.sigROIChanged.emit())
+        self.roscanDeltaS = qt.QDoubleSpinBox()
+        self.roscanDeltaS.setRange(0.00000001,20000)
+        self.roscanDeltaS.setDecimals(5)
+        self.roscanDeltaS.setValue(0.1)
+        self.roscanDeltaS.setSingleStep(0.1)
+        self.roscanDeltaS.valueChanged.connect(lambda : self.sigROIChanged.emit())
+        
+        maxSlayout = qt.QHBoxLayout()
+        maxSlayout.addWidget(qt.QLabel("Max S:"))
+        maxSlayout.addWidget(self.roscanMaxS)
+        #ro_panel_layout.addWidget(qt.QLabel("Max S:"),4,0)
+        #ro_panel_layout.addWidget(self.roscanMaxS, 4, 1)
+        #ro_panel_layout.addLayout(maxSlayout,4,0, 1, 2)
+        
+        #delSlayout = qt.QHBoxLayout()
+        maxSlayout.addWidget(qt.QLabel("ΔS:"))
+        maxSlayout.addWidget(self.roscanDeltaS)
+        ro_panel_layout.addLayout(maxSlayout,4,0, 1, -1)
+        #ro_panel_layout.addWidget(qt.QLabel("ΔS:"),4,2)
+        #ro_panel_layout.addWidget(self.roscanDeltaS,4,3)
+
+        self.intersectgrp = qt.QActionGroup(self)
+        self.intersectgrp.setExclusive(True)
+        self.intersS1Act = self.intersectgrp.addAction(resources.getQicon("intersect_s1"), "use Ewald intersect s1")
+        self.intersS2Act = self.intersectgrp.addAction(resources.getQicon("intersect_s2"), "use Ewald intersect s2")
+        self.intersS1Act.setCheckable(True)
+        self.intersS2Act.setCheckable(True)
+
+        self.intersect_menu = qt.QMenu()
+        self.intersect_menu.addAction(self.intersS1Act)
+        self.intersect_menu.addAction(self.intersS2Act)
+        
+        self.intersect_btn = qt.QToolButton()
+        self.intersect_btn.setIcon(resources.getQicon("alpha"))
+        self.intersect_btn.setToolTip("Set the intersect point with Ewald sphere")
+        self.intersect_btn.setPopupMode(qt.QToolButton.InstantPopup)
+        self.intersect_btn.setMenu(self.intersect_menu)
+        
+        self.intersect_label = qt.QLabel("")
+        self.intersS1Act.triggered.connect(self._onIntersectChanged)
+        self.intersS2Act.triggered.connect(self._onIntersectChanged)
+        self.intersS1Act.trigger()
+        
+        calc_HKL_roi_btn2 = qt.QToolButton()
+        self.roi_fromHKL_action2 = qt.QAction(resources.getQicon("search"), "Search and select correct intersect poisition", self)
+        self.roi_fromHKL_action2.triggered.connect(self.search_intersect_pos)
+        calc_HKL_roi_btn2.setDefaultAction(self.roi_fromHKL_action2)
+        
+        
+        ro_panel_layout.addWidget(qt.QLabel("Intersect:"), 3, 0)
+        #ro_panel_layout.addWidget(qt.QLabel("Max S:"),3,0)
+        ro_panel_layout.addWidget(self.intersect_label, 3, 1)
+        ro_panel_layout.addWidget(self.intersect_btn,3,2)
+        ro_panel_layout.addWidget(calc_HKL_roi_btn2,3,3)
+        
+        self.autoSize_label = qt.QLabel("")
+        self.autoROIHsize = qt.QCheckBox("auto h")
+        self.autoROIVsize = qt.QCheckBox("auto v")
+        
+        self.autoROIVsize.toggled.connect(lambda : self.sigROIChanged.emit())
+        self.autoROIHsize.toggled.connect(lambda : self.sigROIChanged.emit())
+        
+        ro_panel_layout.addWidget(qt.QLabel("ROI size (hxv):"), 5, 0)
+        ro_panel_layout.addWidget(self.autoSize_label,5,1)
+        ro_panel_layout.addWidget(self.autoROIHsize,5,2)
+        ro_panel_layout.addWidget(self.autoROIVsize,5,3)
+        
+        rocking_integration_group.setLayout(ro_panel_layout)
+        
+        self.ro_H_0_dialog = HKLDialog("Select H_0: the rocking integration start HKL value", "Start HKL", self)
+        self.ro_H_0 = self.ro_H_0_dialog.hkl_editors
+        self.ro_H_0_dialog.sigHKLchanged.connect(self._on_ro_H_0_changed)
+        self._selectH_0_btn.clicked.connect(self.ro_H_0_dialog.exec)
+        self.ro_H_0_dialog.set_hkl([1.,0.,0.])
+        
+        self.ro_H_1_dialog = HKLDialog("Select H_1: the rocking integration direction", "Direction HKL", self)
+        self.ro_H_1 = self.ro_H_1_dialog.hkl_editors
+        self.ro_H_1_dialog.sigHKLchanged.connect(self._on_ro_H_1_changed)
+        self._selectH_1_btn.clicked.connect(self.ro_H_1_dialog.exec)
+        self.ro_H_1_dialog.set_hkl([0.,0.,1.])
+
         #  roi scan tab
         
         self.scanstab = qt.QTabWidget()
         self.scanstab.addTab(hklscanwidget, "hklscan")
         self.scanstab.addTab(static_loc_Group, "fixed roi loc")
+        self.scanstab.addTab(rocking_integration_group, "rocking scan integration")
         self.scanstab.currentChanged.connect(lambda : self.sigROIChanged.emit())
 
         
@@ -471,7 +608,33 @@ class QScanSelector(qt.QMainWindow):
         
         
         maintab.addTab(self.roiIntegrateTab,"ROI integration")
+        
+    def _on_ro_H_0_changed(self, hkl):
+        label = "H: %s K: %s L: %s" % tuple(hkl)
+        self._H_0_label.setText(label)
+        self.sigROIChanged.emit()
     
+    def _on_ro_H_1_changed(self, hkl):
+        label = "H: %s K: %s L: %s" % tuple(hkl)
+        self._H_1_label.setText(label)
+        self.sigROIChanged.emit()
+
+    def __h5FileLoaded(self, loadedH5, filename):
+        return
+
+
+    def __h5FileRemoved(self, removedH5):
+        try:
+            removedH5.close()
+        except:
+            pass # some supported files are not open 
+
+    def __h5FileSynchonized(self, removedH5, loadedH5):
+        try:
+            removedH5.close()
+        except:
+            pass # some supported files are not open 
+
     def set_xy_static_loc(self, x, y):
         [h.blockSignals(True) for h in self.xy_static]
         self.xy_static[0].setValue(x)
@@ -480,9 +643,37 @@ class QScanSelector(qt.QMainWindow):
         self.sigROIChanged.emit()
         
     def search_hkl_static_loc(self):
-        hkl = [h.value() for h in self.hkl_static]
-        self.sigSearchHKL.emit(hkl)
-        
+        if self.scanstab.currentIndex() == 2:
+            hkl = [h.value() for h in self.hkl_static1]
+            self.sigSearchHKL.emit(hkl)    
+        else:
+            hkl = [h.value() for h in self.hkl_static]
+            self.sigSearchHKL.emit(hkl)
+
+    def _onIntersectChanged(self, checked):
+        self.intersect_btn.setIcon(self.intersectgrp.checkedAction().icon())
+        if self.intersS1Act.isChecked():
+            self.intersect_label.setText("s_1")
+        elif self.intersS2Act.isChecked():
+            self.intersect_label.setText("s_2")
+        else:
+            self.intersect_label.setText("error")
+        self.sigROIChanged.emit()
+            
+    def search_intersect_pos(self):
+        hkl = [h.value() for h in self.ro_H_0]
+        try:
+            refldict = self.parentmainwindow.searchPixelCoordHKL(hkl)
+        except Exception as e:
+            qutils.warning_detailed_message(self, "Cannot calculate location of reflection", "Cannot calculate position of reflection:\n%s" % e, traceback.format_exc())
+            return
+        refl_dialog = QReflectionAnglesDialog(refldict,"Select reflection with desired intersect", self)
+        if qt.QDialog.Accepted == refl_dialog.exec():
+            for i, (cb, act) in enumerate(zip(refl_dialog.checkboxes, [self.intersS1Act, self.intersS2Act]),1):
+                if cb.isChecked():
+                    act.trigger()
+                    return
+                    
     def view_data_callback(self,obj):
         self.dataviewer.setData(obj)
         self.dataviewerDialog.open()
@@ -500,6 +691,43 @@ class QScanSelector(qt.QMainWindow):
         ddict['scanno'] = self.scannoBox.value()
         self.sigScanChanged.emit(ddict)
         
+    def _onLoadBackend(self):
+        fileTypeDict = {'Python backend files (*.py)': '.py', 'All files (*)': '' }
+        fileTypeFilter = ""
+        for f in fileTypeDict:
+            fileTypeFilter += f + ";;"
+        filename, filetype = qt.QFileDialog.getOpenFileName(self,"Open Backend file",
+                                                  self.parentmainwindow.filedialogdir,
+                                                  fileTypeFilter[:-2])
+        if filename == '':
+            return
+        self.parentmainwindow.filedialogdir = os.path.splitext(filename)[0]
+        
+        try:
+            self.loadBackendFile(filename)
+        except:
+            qutils.warning_detailed_message(self, "Cannot load backend", "Cannot load backend", traceback.format_exc())
+
+    def loadBackendFile(self, filename):
+        backend_file = runpy.run_path(filename)
+        found_backends = []
+        for e in backend_file:
+            try:
+                if issubclass(backend_file[e], scans.Scan) and backend_file[e] != scans.Scan:
+                    found_backends.append((e, backend_file[e]))
+            except:
+                pass
+                #traceback.print_exc()
+        if not found_backends:
+            raise ValueError("Found no backend in file %s" % filename)
+        if len(found_backends) > 1:
+            raise ValueError("Found more than one Scan class in backend file %s. Only one is permitted" % filename)
+        name, scancls = found_backends[0]
+        self.btid.addItem(name)
+        backends.fscans[name] = scancls
+        self.btid.setCurrentText(name)
+        self.bt_autodetect_enable.setChecked(False)
+        
     def _onOpenFile(self):
         fileTypeDict = {'NEXUS files (*.h5 *.hdf5)': '.h5', "SPEC files (*.spec *.spc)": '.spec', 'All files (*)': '' }
         fileTypeFilter = ""
@@ -548,7 +776,7 @@ class QScanSelector(qt.QMainWindow):
             menu = event.menu()
             action = qt.QAction("Refresh", menu)
             action.triggered.connect(lambda:  self.hdf5model.synchronizeH5pyObject(obj))
-            menu.addAction(action)
+            #menu.addAction(action)
             #if obj.ntype is h5py.Dataset:
             action = qt.QAction("display data", menu)
             action.triggered.connect(lambda:  self.view_data_callback(obj))
@@ -559,17 +787,124 @@ class QScanSelector(qt.QMainWindow):
                 menu.addAction(action)
             
      
-    def _onRefreshFile(self):
+    def _onRefreshFileOld(self):
         objects = list(self.hdfTreeView.selectedH5Nodes())
         if len(objects) > 0:
             obj = objects[0]
             self.hdf5model.synchronizeH5pyObject(obj)
+
+
+
+    def __getRelativePath(self, model, rootIndex, index):
+        """Returns a relative path from an index to his rootIndex.
+
+        If the path is empty the index is also the rootIndex.
+        """
+        path = ""
+        while index.isValid():
+            if index == rootIndex:
+                return path
+            name = model.data(index)
+            if path == "":
+                path = name
+            else:
+                path = name + "/" + path
+            index = index.parent()
+
+        # index is not a children of rootIndex
+        raise ValueError("index is not a children of the rootIndex")
+
+
+    def _onRefreshFile(self):
+        qt.QApplication.setOverrideCursor(qt.Qt.WaitCursor)
+
+        selection = self.hdfTreeView.selectionModel()
+        indexes = selection.selectedIndexes()
+        if indexes == []:
+            qt.QApplication.restoreOverrideCursor()
+            qt.QMessageBox.warning(self, "No file selected", "Cannot refresh file: No file selected.")
+            return
+
+
+        model = self.hdfTreeView.model()
+        selectedItems = []
+        h5files = []
+        while len(indexes) > 0:
+            index = indexes.pop(0)
+            if index.column() != 0:
+                continue
+            rootIndex = index
+            # Reach the root of the tree
+            while rootIndex.parent().isValid():
+                rootIndex = rootIndex.parent()
+            rootRow = rootIndex.row()
+            relativePath = self.__getRelativePath(model, rootIndex, index)
+            selectedItems.append((rootRow, relativePath))
+
+            h5 = model.data(
+                rootIndex, role=silx.gui.hdf5.Hdf5TreeModel.H5PY_OBJECT_ROLE
+            )
+
+            item = model.data(
+                rootIndex, role=silx.gui.hdf5.Hdf5TreeModel.H5PY_ITEM_ROLE
+            )
+            
+            h5files.append((h5, item._openedPath)) 
+
+        model = self.hdfTreeView.findHdf5TreeModel()
+        model.clear()
+        '''
+        import gc
+        for obj in gc.get_objects():   # Browse through ALL objects
+            if isinstance(obj, Hdf5TreeModel):
+                try:
+                    obj.close()
+                except:
+                    pass # Was already closed
+
+            elif isinstance(obj, silx.gui.hdf5.Hdf5TreeView):
+                try:
+                    obj.close()
+                except:
+                    pass # Was already closed
+        '''
+
+        self.createTreeView()
+
+        maintab = self.mainwidget.findChildren(qt.QTabWidget)[0]
+        maintab.removeTab(0)
+        maintab.insertTab(0,self.hdfTreeView,"NEXUS")
+        maintab.setCurrentIndex(0)
+        
+        modelnew = self.hdfTreeView.findHdf5TreeModel()
+        for h5, filename in h5files:
+            modelnew.insertFile(filename, 0)
+        
+        #self.__expandNodesFromPaths(self.hdfTreeView, index, paths)
+        #self.hdf5model.appendFile(filename)
+        qt.QApplication.restoreOverrideCursor()
+
+    def createTreeView(self):
+        self.hdfTreeView = silx.gui.hdf5.Hdf5TreeView(self)
+        self.hdfTreeView.setSortingEnabled(True)
+        self.hdfTreeView.addContextMenuCallback(self.nexus_treeview_callback)
+        self.hdf5model = Hdf5TreeModel(self.hdfTreeView,ownFiles=True)
+        self.hdfTreeView.setModel(self.hdf5model)
+        self.hdfTreeView.setExpandsOnDoubleClick(False)
+        self.hdf5model.setFileMoveEnabled(True)
+
+        self.hdf5model.sigH5pyObjectLoaded.connect(self.__h5FileLoaded)
+        self.hdf5model.sigH5pyObjectRemoved.connect(self.__h5FileRemoved)
+        self.hdf5model.sigH5pyObjectSynchronized.connect(self.__h5FileSynchonized)
+
+        self.__treeModelSorted = silx.gui.hdf5.NexusSortFilterProxyModel(self.hdfTreeView)
+        self.__treeModelSorted.setSourceModel(self.hdf5model)
+        self.__treeModelSorted.sort(0, qt.Qt.AscendingOrder)
+        self.__treeModelSorted.setSortCaseSensitivity(qt.Qt.CaseInsensitive)
+
+        self.hdfTreeView.setModel(self.__treeModelSorted)
         
-        
-        #if 'NX_class' in obj.ntype.attrs:
-        #    if obj.ntype.attrs['NX_class'] == 'NX_':
-              
-    
+        self.hdfTreeView.doubleClicked.connect(self._onNEXUSDoubleClicked)
     
     def getScanToolbar(self):
         return self.toolbar
@@ -647,7 +982,7 @@ class QScanSelector(qt.QMainWindow):
                             dt = dateparser.parse(obj.h5py_target['start_time'][()])
                         except Exception as e:
                             msgbox = qt.QMessageBox(qt.QMessageBox.Critical,'Cannot open scan', 
-                                'Cannot parse start time of the scan.', qt.QMessageBox.Ok, self)
+                                'Cannot parse start time of the scan. Please manually select the beamtime id', qt.QMessageBox.Ok, self)
                             msgbox.setDetailedText(traceback.format_exc())
                             clickedbutton = msgbox.exec()
                             return
@@ -664,7 +999,7 @@ class QScanSelector(qt.QMainWindow):
                     else:
                         btid = self.btid.currentText()
                     try:
-                        ddict = backends.scannoConverter[btid](obj)
+                        ddict = backends.fscans[btid].parse_h5_node(obj)
                     except Exception as e:
                         msgbox = qt.QMessageBox(qt.QMessageBox.Critical,'Cannot open scan', 
                             'Cannot parse scan number: %s' % str(e), qt.QMessageBox.Ok, self)