diff --git a/src/cristallina/channels.py b/src/cristallina/channels.py index bae3242..413cd1e 100644 --- a/src/cristallina/channels.py +++ b/src/cristallina/channels.py @@ -20,4 +20,7 @@ PSSS_COM = 'SARFE10-PSSS059:SPECT-COM' # Beam position monitors PBPS149_intensity = "SAROP31-PBPS149:INTENSITY_UJ" PBPS113_intensity = "SAROP31-PBPS113:INTENSITY_UJ" -PBPS053_intensity = "SARFE10-PBPS053:INTENSITY" \ No newline at end of file +PBPS053_intensity = "SARFE10-PBPS053:INTENSITY" + +# X-ray eye +XEYE = "SARES30-CAMS156-XE:FPICTURE" diff --git a/src/cristallina/jupyter_helper.py b/src/cristallina/jupyter_helper.py index cf70615..83d8b32 100644 --- a/src/cristallina/jupyter_helper.py +++ b/src/cristallina/jupyter_helper.py @@ -19,10 +19,12 @@ import jupyter_collaboration if Version(jupyter_collaboration.__version__) < Version("1.9"): from ypy_websocket.ystore import SQLiteYStore - -else: - # approach for >=2.0 +elif Version(jupyter_collaboration.__version__) >= Version("2.0") and Version(jupyter_collaboration.__version__) < Version("3.0a1"): + # approach for >=2.0 but smaller than 3.0 from jupyter_collaboration.stores import SQLiteYStore +elif Version(jupyter_collaboration.__version__) >= Version("3.0a1"): + # approach for >=3.0 + from jupyter_server_ydoc.stores import SQLiteYStore class MySQLiteYStore(SQLiteYStore): """