Merge pull request #296 from mxcube/cleanup_examples

Cleaned up the config examples
mxcube · Dec 19, 2018 · c752a80 · c752a80
2 parents 0ca969e + e0cade8
commit c752a80
Show file tree

Hide file tree

Showing 59 changed files with 18 additions and 200 deletions.
diff --git a/BlissFramework/Bricks/Qt4_SampleChangerBrick3.py b/BlissFramework/Bricks/Qt4_SampleChangerBrick3.py
@@ -22,7 +22,7 @@
 from BlissFramework.Utils import Qt4_widget_colors
 from BlissFramework.Qt4_BaseComponents import BlissWidget
 from BlissFramework import Qt4_Icons
-from sample_changer import SC3
+from HardwareRepository.HardwareObjects.abstract import AbstractSampleChanger
 from Qt4_sample_changer_helper import *
 
 
@@ -470,7 +470,7 @@ def setIcons(self, scan_one_icon):
         self.scan_basket_button.setIcon(Qt4_Icons.load_icon(scan_one_icon))
 
     def scanBasket(self):
-        self.scanBasketSignal.emitt()
+        self.scanBasketSignal.emit()
 
 class CurrentSampleView(CurrentView):
 
@@ -1210,13 +1210,13 @@ def minidiffGetControl(self):
             self.status.setMinidiffStatus(self.sample_changer_hwobj.minidiffCanMove())
 
     def changeBasket(self, basket_number):
-        address = SC3.Basket.getBasketAddress(basket_number)
+        address = AbstractSampleChanger.Basket.getBasketAddress(basket_number)
         self.sample_changer_hwobj.select(address, wait=False)
 
     def changeSample(self, sample_number):
         basket_index = self.sample_changer_hwobj.getSelectedComponent().getIndex()
         basket_number = basket_index + 1
-        address = SC3.Pin.getSampleAddress(basket_number, sample_number)
+        address = AbstractSampleChanger.Pin.getSampleAddress(basket_number, sample_number)
         self.sample_changer_hwobj.select(address, wait=False)
 
     def user_select_this_sample(self, basket_index, vial_index):
@@ -1273,7 +1273,7 @@ def scanBasket(self):
     def scanAllBaskets(self):
         baskets_to_scan = []
         for index, basket_checkbox in enumerate(self.baskets):
-            baskets_to_scan.append(SC3.Basket.getBasketAddress(index + 1) \
+            baskets_to_scan.append(AbstractSampleChanger.Basket.getBasketAddress(index + 1) \
               if basket_checkbox.isChecked() else None)
         self.sample_changer_hwobj.scan(filter(None, baskets_to_scan),
              recursive=True, wait=False)

diff --git a/BlissFramework/Bricks/Qt4_sample_changer_helper.py b/BlissFramework/Bricks/Qt4_sample_changer_helper.py
@@ -1,5 +1,5 @@
 from BlissFramework.Utils import Qt4_widget_colors
-from sample_changer.GenericSampleChanger import SampleChangerState, SampleChangerMode, SampleChanger
+from HardwareRepository.HardwareObjects.abstract.AbstractSampleChanger import SampleChangerState, SampleChangerMode, SampleChanger
 
 SC_STATE_COLOR = { SampleChangerState.Fault: Qt4_widget_colors.LIGHT_RED,
                    SampleChangerState.Ready: Qt4_widget_colors.LIGHT_GREEN,

diff --git a/ExampleFiles/example_mxcube_python3.gui b/ExampleFiles/example_mxcube_python3.gui
diff --git a/ExampleFiles/rpc_client_example.py b/ExampleFiles/rpc_client_example.py
diff --git a/HardwareRepository b/HardwareRepository
diff --git a/bin/Qt4_startGUI b/bin/Qt4_startGUI
diff --git a/bin/hwr-server b/bin/hwr-server
diff --git a/bin/mxcube b/bin/mxcube
@@ -10,10 +10,10 @@ sys.path.insert(0, MXCUBE_ROOT)
 MXCUBE_GUI_FILE = os.environ.get('MXCUBE_GUI_FILE')
 if not MXCUBE_GUI_FILE:
     MXCUBE_GUI_FILE = os.path.join(MXCUBE_ROOT,
-                                   "ExampleFiles/example_mxcube_qt4.yml")
+                                   "configuration/example_mxcube_qt4.yml")
 if not os.environ.get('HARDWARE_REPOSITORY_SERVER'):
     hr_server = os.path.join(MXCUBE_ROOT,
-                             "ExampleFiles/HardwareObjects.xml")
+                             "HardwareRepository/configuration/xml-qt")
     os.environ['HARDWARE_REPOSITORY_SERVER'] = hr_server
 from BlissFramework import Qt4_startGUI
 Qt4_startGUI.run(MXCUBE_GUI_FILE)
diff --git a/bin/mxcube_jupyter_notebook.ipynb b/bin/mxcube_jupyter_notebook.ipynb
@@ -48,7 +48,7 @@
    },
    "outputs": [],
    "source": [
-    "hwr_server = mxcube_root +  \"/ExampleFiles/HardwareObjects.xml\"\n",
+    "hwr_server = mxcube_root +  \"/HardwareRepository/configuration/xml-qt\"\n",
     "HardwareRepository.setHardwareRepositoryServer(hwr_server)\n",
     "hardware_repository = HardwareRepository.HardwareRepository()\n",
     "hardware_repository.connect()\n",
@@ -59,7 +59,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Try to load some hardware objects defined in the ExampleFiles:"
+    "Try to load some hardware objects defined in the xml-qt:"
    ]
   },
   {

diff --git a/bin/mxcube_unittest.py b/bin/mxcube_unittest.py
@@ -28,18 +28,16 @@
 
 
 __credits__ = ["MXCuBE colaboration"]
-__version__ = "2.2."
 
 cwd = os.getcwd()
-hwr_server = cwd +  "/ExampleFiles/HardwareObjects.xml"
+hwr_server = cwd +  "/HardwareRepository/configuration/xml-qt"
 
 print "==============================================================="
 print "MXCuBE home directory: %s" % cwd
 print "Hardware repository: %s" % hwr_server
 HardwareRepository.setHardwareRepositoryServer(hwr_server)
 hardware_repository = HardwareRepository.HardwareRepository()
 hardware_repository.connect()
-HardwareRepository.addHardwareObjectsDirs([cwd + "/HardwareObjects"])
 unittest_hwobj = hardware_repository.getHardwareObject("unittest")
 if unittest_hwobj is not None:
     print "UnitTest hardware object loaded"

diff --git a/bin/run_app.sh b/bin/run_app.sh
@@ -46,10 +46,10 @@
 ##########################################################################
 
 # Define MXCuBE defaults
-MXCUBE_BRICKS_PATH=$MXCUBE_ROOT/Bricks # (This could be exported from python script)
-MXCUBE_HWOBJS_PATH=$MXCUBE_ROOT/HardwareObjects # (This could be exported from python script)
-MXCUBE_DEFAULT_GUI_FILE=$MXCUBE_ROOT/ExampleFiles/example_mxcube_qt4.yml
-MXCUBE_DEFAULT_XML_PATH=$MXCUBE_ROOT/ExampleFiles/HardwareObjects.xml
+MXCUBE_BRICKS_PATH=$MXCUBE_ROOT/BlissFramework/Bricks # (This could be exported from python script)
+MXCUBE_HWOBJS_PATH=$MXCUBE_ROOT/HardwareRepository/HardwareObjects # (This could be exported from python script)
+MXCUBE_DEFAULT_GUI_FILE=$MXCUBE_ROOT/configuration/example_mxcube_qt4.yml
+MXCUBE_DEFAULT_XML_PATH=$MXCUBE_ROOT/HardwareRepository/configuration/xml-qt
 
 export PYTHONPATH=$PYTHONPATH:$MXCUBE_ROOT
 export PYTHONPATH=$PYTHONPATH:$MXCUBE_BRICKS_PATH

diff --git a/bin/run_mxcube.csh b/bin/run_mxcube.csh
@@ -1,3 +1,3 @@
 #!/bin/csh -f
 
-python /home/mxuser/mxcube2/bin/mxcube --hardwareRepository=/home/mxuser/mxcube2/ExampleFiles/HardwareObjects.xml --hardwareObjectsDirs=/home/mxuser/mxcube2/HardwareObjects/sample_changer $argv
+python /home/USER/mxcube2/bin/mxcube --hardwareRepository=/home/USER/mxcube2/HardwareRepository/configuration/xml-qt $argv
diff --git a/bin/run_mxcube_python3.csh b/bin/run_mxcube_python3.csh
@@ -1,3 +1,3 @@
 #!/bin/csh -f
 
-/home/mxuser/mxcube/mxcube-2/bin/mxcube_python3 --hardwareRepository=/home/mxuser/mxcube/mxcube-2/ExampleFiles/HardwareObjects.xml --hardwareObjectsDirs=/home/mxuser/mxcube/mxcube-2/HardwareObjects/sample_changer $argv
+python3 /home/USER/mxcube2/bin/mxcube --hardwareRepository=/home/USER/mxcube2/HardwareRepository/configuration/xml-qt $argv
diff --git a/bin/sc.py b/bin/sc.py
diff --git a/bin/startGUI b/bin/startGUI
diff --git a/...es/gui_layout_examples/DESY/desy_gui.json → configuration/desy_p11/desy_gui.json b/...es/gui_layout_examples/DESY/desy_gui.json → configuration/desy_p11/desy_gui.json
diff --git a/ExampleFiles/example_mxcube_qt3.gui → configuration/example_mxcube_qt3.gui b/ExampleFiles/example_mxcube_qt3.gui → configuration/example_mxcube_qt3.gui
diff --git a/ExampleFiles/example_mxcube_qt4.json → configuration/example_mxcube_qt4.json b/ExampleFiles/example_mxcube_qt4.json → configuration/example_mxcube_qt4.json
diff --git a/ExampleFiles/example_mxcube_qt4.yml → configuration/example_mxcube_qt4.yml b/ExampleFiles/example_mxcube_qt4.yml → configuration/example_mxcube_qt4.yml
diff --git a/ExampleFiles/fakeimg.jpg → configuration/fakeimg.jpg b/ExampleFiles/fakeimg.jpg → configuration/fakeimg.jpg
diff --git a/..._layout_examples/embl_p14_main_layout.png → ..._layout_examples/embl_p14_main_layout.png b/..._layout_examples/embl_p14_main_layout.png → ..._layout_examples/embl_p14_main_layout.png
diff --git a/ExampleFiles/sc.gui → configuration/sc.gui b/ExampleFiles/sc.gui → configuration/sc.gui
diff --git a/..._examples/SOLEIL/gui_files/PX1/mxcats.yml → configuration/soleil_px1/mxcats.yml b/..._examples/SOLEIL/gui_files/PX1/mxcats.yml → configuration/soleil_px1/mxcats.yml
diff --git a/..._examples/SOLEIL/gui_files/PX1/mxcube.yml → configuration/soleil_px1/mxcube.yml b/..._examples/SOLEIL/gui_files/PX1/mxcube.yml → configuration/soleil_px1/mxcube.yml
diff --git a/...examples/SOLEIL/gui_files/PX1/mxlight.yml → configuration/soleil_px1/mxlight.yml b/...examples/SOLEIL/gui_files/PX1/mxlight.yml → configuration/soleil_px1/mxlight.yml
diff --git a/...xamples/SOLEIL/gui_files/PX2/aperture.yml → configuration/soleil_px2/aperture.yml b/...xamples/SOLEIL/gui_files/PX2/aperture.yml → configuration/soleil_px2/aperture.yml
diff --git a/..._examples/SOLEIL/gui_files/PX2/camera.yml → configuration/soleil_px2/camera.yml b/..._examples/SOLEIL/gui_files/PX2/camera.yml → configuration/soleil_px2/camera.yml
diff --git a/...ut_examples/SOLEIL/gui_files/PX2/cats.yml → configuration/soleil_px2/cats.yml b/...ut_examples/SOLEIL/gui_files/PX2/cats.yml → configuration/soleil_px2/cats.yml
diff --git a/...ut_examples/SOLEIL/gui_files/PX2/chat.yml → configuration/soleil_px2/chat.yml b/...ut_examples/SOLEIL/gui_files/PX2/chat.yml → configuration/soleil_px2/chat.yml
diff --git a/...LEIL/gui_files/PX2/example_mxcube_qt4.yml → ...uration/soleil_px2/example_mxcube_qt4.yml b/...LEIL/gui_files/PX2/example_mxcube_qt4.yml → ...uration/soleil_px2/example_mxcube_qt4.yml
diff --git a/...ples/SOLEIL/gui_files/PX2/fastshutter.yml → configuration/soleil_px2/fastshutter.yml b/...ples/SOLEIL/gui_files/PX2/fastshutter.yml → configuration/soleil_px2/fastshutter.yml
diff --git a/...OLEIL/gui_files/PX2/fastshutter_buggy.yml → ...guration/soleil_px2/fastshutter_buggy.yml b/...OLEIL/gui_files/PX2/fastshutter_buggy.yml → ...guration/soleil_px2/fastshutter_buggy.yml
diff --git a/.../SOLEIL/gui_files/PX2/fastshutter_duo.yml → configuration/soleil_px2/fastshutter_duo.yml b/.../SOLEIL/gui_files/PX2/fastshutter_duo.yml → configuration/soleil_px2/fastshutter_duo.yml
diff --git a/...ut_examples/SOLEIL/gui_files/PX2/flux.yml → configuration/soleil_px2/flux.yml b/...ut_examples/SOLEIL/gui_files/PX2/flux.yml → configuration/soleil_px2/flux.yml
diff --git a/...xamples/SOLEIL/gui_files/PX2/frontend.yml → configuration/soleil_px2/frontend.yml b/...xamples/SOLEIL/gui_files/PX2/frontend.yml → configuration/soleil_px2/frontend.yml
diff --git a/...es/SOLEIL/gui_files/PX2/hutch_trigger.yml → configuration/soleil_px2/hutch_trigger.yml b/...es/SOLEIL/gui_files/PX2/hutch_trigger.yml → configuration/soleil_px2/hutch_trigger.yml
diff --git a/...LEIL/gui_files/PX2/instanceconnection.yml → ...uration/soleil_px2/instanceconnection.yml b/...LEIL/gui_files/PX2/instanceconnection.yml → ...uration/soleil_px2/instanceconnection.yml
diff --git a/...t_examples/SOLEIL/gui_files/PX2/light.yml → configuration/soleil_px2/light.yml b/...t_examples/SOLEIL/gui_files/PX2/light.yml → configuration/soleil_px2/light.yml
diff --git a/...out_examples/SOLEIL/gui_files/PX2/log.yml → configuration/soleil_px2/log.yml b/...out_examples/SOLEIL/gui_files/PX2/log.yml → configuration/soleil_px2/log.yml
diff --git a/...t_examples/SOLEIL/gui_files/PX2/login.yml → configuration/soleil_px2/login.yml b/...t_examples/SOLEIL/gui_files/PX2/login.yml → configuration/soleil_px2/login.yml
diff --git a/...les/SOLEIL/gui_files/PX2/machine_info.yml → configuration/soleil_px2/machine_info.yml b/...les/SOLEIL/gui_files/PX2/machine_info.yml → configuration/soleil_px2/machine_info.yml
diff --git a/..._files/PX2/microdiff_continous_motors.yml → ...soleil_px2/microdiff_continous_motors.yml b/..._files/PX2/microdiff_continous_motors.yml → ...soleil_px2/microdiff_continous_motors.yml
diff --git a/..._examples/SOLEIL/gui_files/PX2/mxcube.yml → configuration/soleil_px2/mxcube.yml b/..._examples/SOLEIL/gui_files/PX2/mxcube.yml → configuration/soleil_px2/mxcube.yml
diff --git a/...mples/SOLEIL/gui_files/PX2/mxcube_qt4.yml → configuration/soleil_px2/mxcube_qt4.yml b/...mples/SOLEIL/gui_files/PX2/mxcube_qt4.yml → configuration/soleil_px2/mxcube_qt4.yml
diff --git a/...t_examples/SOLEIL/gui_files/PX2/omega.yml → configuration/soleil_px2/omega.yml b/...t_examples/SOLEIL/gui_files/PX2/omega.yml → configuration/soleil_px2/omega.yml
diff --git a/...es/SOLEIL/gui_files/PX2/photon_energy.yml → configuration/soleil_px2/photon_energy.yml b/...es/SOLEIL/gui_files/PX2/photon_energy.yml → configuration/soleil_px2/photon_energy.yml
diff --git a/...xamples/SOLEIL/gui_files/PX2/progress.yml → configuration/soleil_px2/progress.yml b/...xamples/SOLEIL/gui_files/PX2/progress.yml → configuration/soleil_px2/progress.yml
diff --git a/...examples/SOLEIL/gui_files/PX2/px2_qt4.yml → configuration/soleil_px2/px2_qt4.yml b/...examples/SOLEIL/gui_files/PX2/px2_qt4.yml → configuration/soleil_px2/px2_qt4.yml
diff --git a/...mples/SOLEIL/gui_files/PX2/resolution.yml → configuration/soleil_px2/resolution.yml b/...mples/SOLEIL/gui_files/PX2/resolution.yml → configuration/soleil_px2/resolution.yml
diff --git a/...es/SOLEIL/gui_files/PX2/safetyshutter.yml → configuration/soleil_px2/safetyshutter.yml b/...es/SOLEIL/gui_files/PX2/safetyshutter.yml → configuration/soleil_px2/safetyshutter.yml
diff --git a/...s/SOLEIL/gui_files/PX2/sample_changer.yml → configuration/soleil_px2/sample_changer.yml b/...s/SOLEIL/gui_files/PX2/sample_changer.yml → configuration/soleil_px2/sample_changer.yml
diff --git a/...les/SOLEIL/gui_files/PX2/scintillator.yml → configuration/soleil_px2/scintillator.yml b/...les/SOLEIL/gui_files/PX2/scintillator.yml → configuration/soleil_px2/scintillator.yml
diff --git a/...es/SOLEIL/gui_files/PX2/state_machine.yml → configuration/soleil_px2/state_machine.yml b/...es/SOLEIL/gui_files/PX2/state_machine.yml → configuration/soleil_px2/state_machine.yml
diff --git a/..._examples/SOLEIL/gui_files/PX2/status.yml → configuration/soleil_px2/status.yml b/..._examples/SOLEIL/gui_files/PX2/status.yml → configuration/soleil_px2/status.yml
diff --git a/...les/SOLEIL/gui_files/PX2/task_toolbox.yml → configuration/soleil_px2/task_toolbox.yml b/...les/SOLEIL/gui_files/PX2/task_toolbox.yml → configuration/soleil_px2/task_toolbox.yml
diff --git a/...t_examples/SOLEIL/gui_files/PX2/tools.yml → configuration/soleil_px2/tools.yml b/...t_examples/SOLEIL/gui_files/PX2/tools.yml → configuration/soleil_px2/tools.yml
diff --git a/...les/SOLEIL/gui_files/PX2/transmission.yml → configuration/soleil_px2/transmission.yml b/...les/SOLEIL/gui_files/PX2/transmission.yml → configuration/soleil_px2/transmission.yml
diff --git a/...ut_examples/SOLEIL/gui_files/PX2/tree.yml → configuration/soleil_px2/tree.yml b/...ut_examples/SOLEIL/gui_files/PX2/tree.yml → configuration/soleil_px2/tree.yml
diff --git a/...ut_examples/SOLEIL/gui_files/PX2/zoom.yml → configuration/soleil_px2/zoom.yml b/...ut_examples/SOLEIL/gui_files/PX2/zoom.yml → configuration/soleil_px2/zoom.yml