Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup and config change for GPhL-specific file #13

Open
wants to merge 38 commits into
base: master
Choose a base branch
from
Open

Cleanup and config change for GPhL-specific file #13

Changes from 3 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e0af92f
Fixes to mock-test GSK stratcal run
rhfogh Nov 21, 2018
2f2892c
GPhL configuration updates, various
rhfogh Dec 13, 2018
695c2f8
Cleanup. Also removed queue_model_objects_v1 reference
rhfogh Dec 14, 2018
f2e8d75
Changed to reflect new location of configuration files
rhfogh Dec 19, 2018
edff34d
Finished merging ALBA_gphl 2.3.0 into master.
rhfogh Mar 25, 2019
1dd8ed6
Cleaned up imports, and bug fixes in latest merge
rhfogh Mar 26, 2019
aca27c2
Fixes to mock-test GSK stratcal run
rhfogh Nov 21, 2018
7808516
GPhL configuration updates, various
rhfogh Dec 13, 2018
5922b7e
Cleanup. Also removed queue_model_objects_v1 reference
rhfogh Dec 14, 2018
caebe76
Changed to reflect new location of configuration files
rhfogh Dec 19, 2018
b6ecf53
Finished merging ALBA_gphl 2.3.0 into master.
rhfogh Mar 25, 2019
6799fae
Cleaned up imports, and bug fixes in latest merge
rhfogh Mar 26, 2019
c0a6732
Merge remote-tracking branch 'rhfogh/master' into rhfogh
rhfogh Mar 28, 2019
63bf3ca
Fixed comment spelling
rhfogh Mar 28, 2019
45ef007
UI and HO changes prior tio ALBA test 20190528
rhfogh May 23, 2019
fe81fbf
Porting to ALBA production branch
rhfogh May 24, 2019
46875e8
Removed api and added config for xml-qt and embl_p14. Not fully tested.
rhfogh Jul 31, 2019
61a4ef3
CHanged over to ALBA config
rhfogh Aug 7, 2019
0391b57
Fixed CODACY style complaints
rhfogh Sep 19, 2019
e079715
Set laptop parameters in new branch
rhfogh Oct 19, 2019
34a21fd
Set laptop parameters in new branch
rhfogh Oct 19, 2019
55dbf01
Added jsonschema, pyqtgraph
rhfogh Mar 28, 2020
3d4ce25
Merge remote-tracking branch 'rhfogh/rhfogh_laptop' into rhfogh_laptop
rhfogh Mar 28, 2020
f9f9d14
snake_case, some fixes, some mockup refactoring. Program now opens.
rhfogh Mar 29, 2020
5033c07
Set config directories etc. to ALBA production values
rhfogh May 28, 2020
e920d73
Change standard directory structure
rhfogh Jun 4, 2020
d0a933d
Ported GPhL code from ALBA branch, Pre-test
rhfogh Aug 11, 2020
327f3f4
Updating GPhL code
rhfogh Oct 15, 2020
b9ec525
Addressed points raised by Gleb
rhfogh Oct 21, 2020
2ec3319
Refactored from HardwareRepository/ to mx3core/
rhfogh Dec 17, 2020
fe597a6
Revert "Refactored from HardwareRepository/ to mx3core/"
rhfogh Dec 17, 2020
91b2693
First cut - porting changes from P14 branch to ALBA branch
rhfogh Feb 17, 2021
e44afc2
First draft qt5 docker file
rhfogh May 10, 2021
eda999a
Docker for Python3/Qt5 - WIP
rhfogh May 25, 2021
b12f139
Added Ubuntu qt5 docker and updated to use it
rhfogh Jun 1, 2021
b2be74f
Merge remote-tracking branch 'origin/master' into rhfogh_laptop
rhfogh Jun 1, 2021
913d4aa
Functional Ubuntu dockers.
rhfogh Jun 9, 2021
76d213d
Furher fixes for porting
rhfogh Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dev/gphl/Debian9_qt4/start_mxcube2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ CONTAINER=mx3_deb9_qt4_gphl2
# MXCuBE additional lookup directories
#
# Examples of alternative path settings:
HO_SERVER="/MXCuBE/mxcube/ExampleFiles/HardwareObjects.xml"
HO_SERVER="/MXCuBE/mxcube/HardwareRepository/"
# HARDWARE_REPOSITORY_SERVER="/MXCuBE/mxcube/ExampleFiles/HardwareObjects.xml:/MXCuBE/mxcube/repo_test_1"
# CUSTOM_HARDWARE_OBJECTS_PATH="/MXCuBE/mxcube/extra_HO_test_1:/MXCuBE/mxcube/extra_HO_test_2"
# CUSTOM_BRICKS_PATH="/MXCuBE/mxcube/extra_brick_test_1:/MXCuBE/mxcube/extra_brick_test_2"
HARDWARE_REPOSITORY_SERVER="${HO_SERVER}/gphl_mock:/${HO_SERVER}:/${HO_SERVER}/embl_hh_p14"
CUSTOM_HARDWARE_OBJECTS_PATH=""
HARDWARE_REPOSITORY_SERVER="${HO_SERVER}/configuration/gphl_mock:/${HO_SERVER}/test/xml-qt:${HO_SERVER}/configuration/alba_xaloc13"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This path is ALBA specific, is that the intention ?

Copy link
Collaborator Author

@rhfogh rhfogh Jan 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort of, yes. This is inside the 'gphl/' directory, which makes it global-phasing specific. Since I test relative to different beamlines I need to have varying specific directories on the lookup path, and it seemed easier to have all the configuring in one place, and checked in, and then change it at need. That way it is visible how things work, in a way it would not be if I relied on some other mechanism, like local environment variables. But if you feel it is not a good idea to have specific locations checked in, even in a gphl/ directory, I can change to a different model

CUSTOM_HARDWARE_OBJECTS_PATH="/MXCuBE/mxcube/HardwareRepository/HardwareObjects/ALBA"
CUSTOM_BRICKS_PATH=""

# User and mac address
Expand Down