From f233608a18f767fc22c8fb55e9b69177dfe4f83d Mon Sep 17 00:00:00 2001 From: Mike Langmayr Date: Tue, 17 Nov 2026 15:33:21 -0800 Subject: [PATCH 1/4] Vendor the newport, galil and schott drivers so install.sh keeps them --- .gitmodules | 9 +++++++++ README.md | 3 +++ pyproject.toml | 16 ++++++++++++++++ src/driver/galil | 1 + src/driver/newport | 1 + src/driver/schott | 1 + systemd/README.md | 10 ++++++++++ 7 files changed, 41 insertions(+) create mode 160000 src/driver/galil create mode 160000 src/driver/newport create mode 160000 src/driver/schott diff --git a/.gitmodules b/.gitmodules index 215c114..6a389ca 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,12 @@ [submodule "src/driver/pdu"] path = src/driver/pdu url = https://github.com/COO-Utilities/pdu.git +[submodule "src/driver/newport"] + path = src/driver/newport + url = https://github.com/COO-Utilities/newport.git +[submodule "src/driver/galil"] + path = src/driver/galil + url = https://github.com/COO-Utilities/galil.git +[submodule "src/driver/schott"] + path = src/driver/schott + url = https://github.com/COO-Utilities/schott.git diff --git a/README.md b/README.md index 7c9b111..7846f84 100644 --- a/README.md +++ b/README.md @@ -70,8 +70,11 @@ This repo uses submodules under `src/driver/`: | Submodule | Path | Import | |-----------|------|--------| | coo-ethercat | `src/driver/coo_ethercat` | `lris2.driver.coo_ethercat` | +| galil | `src/driver/galil` | `galil` (needs the `galil` extra) | | lris2-csu | `src/driver/lris2_csu` | `lris2.driver.lris2_csu` | +| newport | `src/driver/newport` | `cornerstone260`, `smc100pp` | | pdu | `src/driver/pdu` | `lris2.driver.pdu.src` | +| schott | `src/driver/schott` | `coldvision` | | sunpower | `src/driver/sunpower` | `lris2.driver.sunpower` | ### Pull the submodules diff --git a/pyproject.toml b/pyproject.toml index 42a665e..d07ec7e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,11 @@ camera = [ "camera-daemon@git+https://github.com/COO-Utilities/camera-daemon.git", "lris2-camera-interface@git+https://github.com/CaltechOpticalObservatories/lris2-camerad-instrument", ] +# The Galil driver's Python bindings, on a host with Galil's gclib package +# installed: install.sh --extra galil +galil = [ + "gclib", +] [tool.setuptools.package-dir] lris2 = "src" @@ -49,8 +54,11 @@ packages = ["lris2", "lris2.cli", "lris2.driver"] # coo_ethercat does not build as a package yet, and lris2_csu depends on it [tool.uv.workspace] members = [ + "src/driver/galil", "src/driver/inficon", + "src/driver/newport", "src/driver/pdu", + "src/driver/schott", "src/driver/sunpower", ] @@ -60,6 +68,14 @@ override-dependencies = [ "hardware_device_base @ git+https://github.com/COO-Utilities/hardware_device_base@v1.0.1", ] +[tool.uv.sources] +gclib = { index = "galil" } + +[[tool.uv.index]] +name = "galil" +url = "https://www.galil.com/sw/pub/python" +explicit = true + [tool.pytest.ini_options] testpaths = ["tests"] pythonpath = ["gui"] diff --git a/src/driver/galil b/src/driver/galil new file mode 160000 index 0000000..b2864ec --- /dev/null +++ b/src/driver/galil @@ -0,0 +1 @@ +Subproject commit b2864ec778c5d9eedda0da9d4f8bd1a16d040602 diff --git a/src/driver/newport b/src/driver/newport new file mode 160000 index 0000000..142d0fb --- /dev/null +++ b/src/driver/newport @@ -0,0 +1 @@ +Subproject commit 142d0fb0b70f1f89fdd602218c5fd63cad5719a2 diff --git a/src/driver/schott b/src/driver/schott new file mode 160000 index 0000000..4781e30 --- /dev/null +++ b/src/driver/schott @@ -0,0 +1 @@ +Subproject commit 4781e30806ac12aa5d798994882717b4aa4e721e diff --git a/systemd/README.md b/systemd/README.md index 3f1c034..addf849 100644 --- a/systemd/README.md +++ b/systemd/README.md @@ -110,3 +110,13 @@ The extra is recorded in `/etc/lris2/extras`, so later runs keep it, and `config/r/rcam.yaml` reads the camerad config from the checkout, so a pull there moves the ACF the controller is loaded with. Without the module the daemon still starts and serves its keywords, reporting `state: nocamera`. + +## The Galil driver's bindings + +The `galil` driver imports `gclib`, whose Python bindings come from Galil's +own index and load Galil's `libgclib`, so they are an extra too. On a host +with Galil's `gclib` package installed: + +```bash +sudo /opt/lris2/app/systemd/install.sh --extra galil +``` From 50f603e06db95a24d692a5bf37fc0a9715f96c61 Mon Sep 17 00:00:00 2001 From: Mike Langmayr Date: Tue, 17 Nov 2026 15:48:16 -0800 Subject: [PATCH 2/4] Show how to use the lab drivers from the Python console --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 7846f84..7bf285f 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,21 @@ This repo uses submodules under `src/driver/`: | schott | `src/driver/schott` | `coldvision` | | sunpower | `src/driver/sunpower` | `lris2.driver.sunpower` | +### Lab drivers from the Python console + +The AIT lab drivers are installed into the deployment venv, so on `lris2-137`: + +```bash +/opt/lris2/venv/bin/python +>>> from cornerstone260 import Cornerstone260 +>>> mono = Cornerstone260(log=False) +>>> mono.connect("/dev/ttyS0") +>>> mono.initialize() +``` + +- Cornerstone 260 monochromator: [newport README](https://github.com/COO-Utilities/newport#cornerstone-260) +- SCHOTT ColdVision light source: [schott USAGE.md](https://github.com/COO-Utilities/schott/blob/main/USAGE.md) + ### Pull the submodules ```bash From 9d86cd6e1c59163bcc0b7619f16f9856d3380e53 Mon Sep 17 00:00:00 2001 From: Mike Langmayr Date: Tue, 17 Nov 2026 15:49:50 -0800 Subject: [PATCH 3/4] Bump newport to include the Cornerstone console guide --- src/driver/newport | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/driver/newport b/src/driver/newport index 142d0fb..ab14e54 160000 --- a/src/driver/newport +++ b/src/driver/newport @@ -1 +1 @@ -Subproject commit 142d0fb0b70f1f89fdd602218c5fd63cad5719a2 +Subproject commit ab14e54a1c2497e3d658592d60196b59208f5179 From 060289dd4bf508044e8c16a25c06de0a4cdd69ae Mon Sep 17 00:00:00 2001 From: Mike Langmayr Date: Tue, 17 Nov 2026 17:30:23 -0800 Subject: [PATCH 4/4] Drop the newport and schott drivers, which only AIT needs --- .gitmodules | 6 ------ README.md | 17 ----------------- pyproject.toml | 2 -- src/driver/newport | 1 - src/driver/schott | 1 - 5 files changed, 27 deletions(-) delete mode 160000 src/driver/newport delete mode 160000 src/driver/schott diff --git a/.gitmodules b/.gitmodules index 6a389ca..56b3b9b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,12 +13,6 @@ [submodule "src/driver/pdu"] path = src/driver/pdu url = https://github.com/COO-Utilities/pdu.git -[submodule "src/driver/newport"] - path = src/driver/newport - url = https://github.com/COO-Utilities/newport.git [submodule "src/driver/galil"] path = src/driver/galil url = https://github.com/COO-Utilities/galil.git -[submodule "src/driver/schott"] - path = src/driver/schott - url = https://github.com/COO-Utilities/schott.git diff --git a/README.md b/README.md index 7bf285f..9d5308f 100644 --- a/README.md +++ b/README.md @@ -72,26 +72,9 @@ This repo uses submodules under `src/driver/`: | coo-ethercat | `src/driver/coo_ethercat` | `lris2.driver.coo_ethercat` | | galil | `src/driver/galil` | `galil` (needs the `galil` extra) | | lris2-csu | `src/driver/lris2_csu` | `lris2.driver.lris2_csu` | -| newport | `src/driver/newport` | `cornerstone260`, `smc100pp` | | pdu | `src/driver/pdu` | `lris2.driver.pdu.src` | -| schott | `src/driver/schott` | `coldvision` | | sunpower | `src/driver/sunpower` | `lris2.driver.sunpower` | -### Lab drivers from the Python console - -The AIT lab drivers are installed into the deployment venv, so on `lris2-137`: - -```bash -/opt/lris2/venv/bin/python ->>> from cornerstone260 import Cornerstone260 ->>> mono = Cornerstone260(log=False) ->>> mono.connect("/dev/ttyS0") ->>> mono.initialize() -``` - -- Cornerstone 260 monochromator: [newport README](https://github.com/COO-Utilities/newport#cornerstone-260) -- SCHOTT ColdVision light source: [schott USAGE.md](https://github.com/COO-Utilities/schott/blob/main/USAGE.md) - ### Pull the submodules ```bash diff --git a/pyproject.toml b/pyproject.toml index d07ec7e..804e65b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,9 +56,7 @@ packages = ["lris2", "lris2.cli", "lris2.driver"] members = [ "src/driver/galil", "src/driver/inficon", - "src/driver/newport", "src/driver/pdu", - "src/driver/schott", "src/driver/sunpower", ] diff --git a/src/driver/newport b/src/driver/newport deleted file mode 160000 index ab14e54..0000000 --- a/src/driver/newport +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab14e54a1c2497e3d658592d60196b59208f5179 diff --git a/src/driver/schott b/src/driver/schott deleted file mode 160000 index 4781e30..0000000 --- a/src/driver/schott +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4781e30806ac12aa5d798994882717b4aa4e721e