From c7652193cf4bc7b22f91c4a73e385a0c98b2f9b7 Mon Sep 17 00:00:00 2001 From: Xiaoqiang Wang Date: Wed, 24 Sep 2025 17:59:40 +0200 Subject: [PATCH 1/5] update PEEM eiger panel --- X_X11MA_PEEM.json | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/X_X11MA_PEEM.json b/X_X11MA_PEEM.json index 238f18d..1b50936 100644 --- a/X_X11MA_PEEM.json +++ b/X_X11MA_PEEM.json @@ -85,29 +85,14 @@ "type": "caqtdm", "text": "Eiger detector", "panel": "slsDetector.ui", - "macros": "P=X11MA-ES1-SD1:,R=cam1:", + "macros": "P=X11MA-ES1-EIGER:,R=cam1:", "param": "-noMsg -attach" }, { "type": "cmd", "text": "Image viewer", - "command": "/sls/X11MA/data/X11MA/SW/ADViewer/run X11MA-ES1-SD1:image1:" - }, - { - "type": "cmd", - "text": "Start", - "command": "EigerStart" - }, - { - "type": "cmd", - "text": "Stop", - "command": "EigerStop" - }, - { - "type": "cmd", - "text": "Restart", - "command": "EigerRestart" + "command": "/sls/X11MA/data/X11MA/SW/ADViewer/run X11MA-ES1-EIGER:image1:" } ] } From e6797dc112c16fb8852016c71b1ae6602a5d0ed1 Mon Sep 17 00:00:00 2001 From: Csaba Lombosi Date: Tue, 30 Sep 2025 09:30:32 +0200 Subject: [PATCH 2/5] SLSBL-1438: Cameras menu --- X_X11MA.json | 8 ++++++++ X_X11MA_Cameras.json | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 X_X11MA_Cameras.json diff --git a/X_X11MA.json b/X_X11MA.json index 459ad93..89c1660 100644 --- a/X_X11MA.json +++ b/X_X11MA.json @@ -155,6 +155,14 @@ "text": "- tr-tey -", "file": "X_X11MA_ES4.json" }, + { + "type": "separator" + }, + { + "type": "menu", + "text": "- BL Cameras -", + "file": "X_X11MA_Cameras.json" + }, { "type": "separator" }, diff --git a/X_X11MA_Cameras.json b/X_X11MA_Cameras.json new file mode 100644 index 0000000..5f8981b --- /dev/null +++ b/X_X11MA_Cameras.json @@ -0,0 +1,43 @@ +{ + "menu": [ + { + "type": "title", + "text": "- BL Cameras -" + }, + { + "type": "cmd", + "text": "AU slit camera (X11MA-OP-AUSLCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-AUSLCAM:,R=cam1:\" URLDriver.ui" + }, + { + "type": "cmd", + "text": "Mono camera (X11MA-OP-PGMCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-MONOCAM:,R=cam1:\" URLDriver.ui" + }, + { + "type": "cmd", + "text": "Beam camera (X11MA-OP-BCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-BCAM:,R=cam1:,C=\" URLDriver.ui" + }, + { + "type": "cmd", + "text": "Fast shutter camera (X11MA-OP-FSHCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-FSHCAM:,R=cam1:,C=AVT_Mako_G131B\" ADVimba.ui" + }, + { + "type": "cmd", + "text": "Exit slit camera (X11MA-OP-ESLCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-ESLCAM:,R=cam1:,C=Basler-acA1280-60gc\" ADPylon.ui" + }, + { + "type": "cmd", + "text": "RMU camera (X11MA-OP-RM1CAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-RM1CAM:,R=cam1:,C=Basler-acA1280-60gm\" ADPylon.ui" + }, + { + "type": "cmd", + "text": "Ptycho slit camera (X11MA-OP-PSLCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-PSLCAM:,R=cam1:\" Tucsen.ui" + }, + ] +} From b209cfc60d7c024ff595c08ccc1a8cfd5261c7fd Mon Sep 17 00:00:00 2001 From: Csaba Lombosi Date: Tue, 30 Sep 2025 09:40:49 +0200 Subject: [PATCH 3/5] SLSBL-1438: Cameras end stations --- X_X11MA_Cameras.json | 2 +- X_X11MA_ES3_resoxs.json | 20 +++++++++++++++++++- X_X11MA_ES4.json | 24 +++++++++++++++++++++++- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/X_X11MA_Cameras.json b/X_X11MA_Cameras.json index 5f8981b..7faa502 100644 --- a/X_X11MA_Cameras.json +++ b/X_X11MA_Cameras.json @@ -38,6 +38,6 @@ "type": "cmd", "text": "Ptycho slit camera (X11MA-OP-PSLCAM)", "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-PSLCAM:,R=cam1:\" Tucsen.ui" - }, + } ] } diff --git a/X_X11MA_ES3_resoxs.json b/X_X11MA_ES3_resoxs.json index 12fb7f0..cbe622f 100644 --- a/X_X11MA_ES3_resoxs.json +++ b/X_X11MA_ES3_resoxs.json @@ -184,6 +184,24 @@ "type": "cmd", "text": "VME Crate Status", "command": "caqtdm -attach -noMsg -dg +20+025 -macro IOC=X11MA-VME-ES3 G_IOCMON_ioc_status.ui" - } + }, + "type": "title", + "text": "- Cameras -" + }, + { + "type": "cmd", + "text": "PEEM rear camera (X11MA-ES1-RCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-ES1-RCAM:,R=cam1:\" Tucsen.ui" + }, + { + "type": "cmd", + "text": "PEEM main camera (X11MA-ES1-MCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-ES1-MCAM:,R=cam1:,C=AVT_Mako_G131B\" ADVimba.ui" + }, + { + "type": "cmd", + "text": "PEEM rack camera (X11MA-ES1-HVCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-ES1-HVCAM:,R=cam1:,C=AVT_Mako_G131B\" ADVimba.ui" + } ] } diff --git a/X_X11MA_ES4.json b/X_X11MA_ES4.json index 9e699c7..43306b2 100644 --- a/X_X11MA_ES4.json +++ b/X_X11MA_ES4.json @@ -46,6 +46,28 @@ "type": "cmd", "text": "TR Debug Panel", "command": "caqtdm -noMsg -attach X_X11MA_ES4_debugScreen-2ch.ui" - } + }, + { + "type": "separator" + }, + { + "type": "title", + "text": "- Cameras -" + }, + { + "type": "cmd", + "text": "Sample camera (X11MA-ES2-SCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-ES2-SCAM:,R=cam1:\" ADPylon.ui" + }, + { + "type": "cmd", + "text": "Gold mesh camera (X11MA-ES2-AUCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-ES2-AUCAM:,R=cam1:\" ADPylon.ui" + }, + { + "type": "cmd", + "text": "MultiXAS sample transfer camera (X11MA-ES2-MCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-ES2-MCAM:,R=cam1:,C=Basler-acA1280-60gm\" ADPylon.ui" + } ] } From 7630ba661bd977e3e379001390a7679b975a4251 Mon Sep 17 00:00:00 2001 From: Csaba Lombosi Date: Tue, 30 Sep 2025 10:07:10 +0200 Subject: [PATCH 4/5] SLSBL-1438: Cameras end stations fix --- X_X11MA_ES3_resoxs.json | 1 + 1 file changed, 1 insertion(+) diff --git a/X_X11MA_ES3_resoxs.json b/X_X11MA_ES3_resoxs.json index cbe622f..2d519ec 100644 --- a/X_X11MA_ES3_resoxs.json +++ b/X_X11MA_ES3_resoxs.json @@ -185,6 +185,7 @@ "text": "VME Crate Status", "command": "caqtdm -attach -noMsg -dg +20+025 -macro IOC=X11MA-VME-ES3 G_IOCMON_ioc_status.ui" }, + { "type": "title", "text": "- Cameras -" }, From cf9668e6bfefaeab9e4cba209b46aefa9eb742d2 Mon Sep 17 00:00:00 2001 From: Csaba Lombosi Date: Tue, 30 Sep 2025 10:13:09 +0200 Subject: [PATCH 5/5] SLSBL-1438: Cameras list naming inconsistencies --- X_X11MA_Cameras.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/X_X11MA_Cameras.json b/X_X11MA_Cameras.json index 7faa502..d31fdd0 100644 --- a/X_X11MA_Cameras.json +++ b/X_X11MA_Cameras.json @@ -6,8 +6,8 @@ }, { "type": "cmd", - "text": "AU slit camera (X11MA-OP-AUSLCAM)", - "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-AUSLCAM:,R=cam1:\" URLDriver.ui" + "text": "AU slit camera (X11MA-OP-AUSLTCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-AUSLTCAM:,R=cam1:\" URLDriver.ui" }, { "type": "cmd", @@ -17,27 +17,27 @@ { "type": "cmd", "text": "Beam camera (X11MA-OP-BCAM)", - "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-BCAM:,R=cam1:,C=\" URLDriver.ui" + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-BEAMCAM:,R=cam1:,C=\" URLDriver.ui" }, { "type": "cmd", - "text": "Fast shutter camera (X11MA-OP-FSHCAM)", - "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-FSHCAM:,R=cam1:,C=AVT_Mako_G131B\" ADVimba.ui" + "text": "Fast shutter camera (X11MA-OP-FSHTRCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-FSHTRCAM:,R=cam1:,C=AVT_Mako_G131B\" ADVimba.ui" }, { "type": "cmd", - "text": "Exit slit camera (X11MA-OP-ESLCAM)", - "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-ESLCAM:,R=cam1:,C=Basler-acA1280-60gc\" ADPylon.ui" + "text": "Exit slit camera (X11MA-OP-ESLTCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-ESLTCAM:,R=cam1:,C=Basler-acA1280-60gc\" ADPylon.ui" }, { "type": "cmd", - "text": "RMU camera (X11MA-OP-RM1CAM)", - "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-RM1CAM:,R=cam1:,C=Basler-acA1280-60gm\" ADPylon.ui" + "text": "RMU camera (X11MA-OP-RMU1CAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-RMU1CAM:,R=cam1:,C=Basler-acA1280-60gm\" ADPylon.ui" }, { "type": "cmd", - "text": "Ptycho slit camera (X11MA-OP-PSLCAM)", - "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-PSLCAM:,R=cam1:\" Tucsen.ui" + "text": "Ptycho slit camera (X11MA-OP-PSLTCAM)", + "command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-PSLTCAM:,R=cam1:\" Tucsen.ui" } ] }