Skip to content

Clean up error handling in Newport XPS service #440

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

Open
ivalaginja wants to merge 2 commits into
base: develop
Choose a base branch
from
+7 −6
Open

Clean up error handling in Newport XPS service #440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35675ca
Clean up error handling in Newport XPS service
ivalaginja May 7, 2026
b1aa24d
Put in correct error message
ivalaginja May 7, 2026
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
13 changes: 7 additions & 6 deletions catkit2/services/newport_xps_q8/newport_xps_q8.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
import numpy as np
import traceback

library_path = os.environ.get('CATKIT_NEWPORT_LIB_PATH')
if not library_path:
raise RuntimeError("To use the Newport XPS-Q8, you need to set the CATKIT_NEWPORT_LIB_PATH environment variable.")
sys.path.append(library_path)

try:
library_path = os.environ.get('CATKIT_NEWPORT_LIB_PATH')
if library_path:
sys.path.append(library_path)
import XPS_Q8_drivers
except ImportError:
print("To use the Newport XPS-Q8, you need to set the CATKIT_NEWPORT_LIB_PATH environment variable.")
raise
except ModuleNotFoundError:
raise ModuleNotFoundError(f"Could not import XPS_Q8_drivers from CATKIT_NEWPORT_LIB_PATH={library_path!r}.")


class NewportXpsQ8(Service):
Expand Down
Loading