From a2a6e358a2d83c0e5497706310ce921a09c1ef67 Mon Sep 17 00:00:00 2001 From: Luka Debenjak Date: Mon, 11 Apr 2022 13:45:36 +0200 Subject: [PATCH 1/8] adding PEEM desktops --- X_X11MA.json | 5 +++++ X_X11MA_PEEM.json | 8 +++++--- X_X11MA_RMU.json | 43 +++++++++++++++++++++++++++++++++++++++++++ X_X11MA_desktops.json | 15 +++++++++++++++ 4 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 X_X11MA_RMU.json diff --git a/X_X11MA.json b/X_X11MA.json index 1ea0e4c..259eba1 100644 --- a/X_X11MA.json +++ b/X_X11MA.json @@ -88,6 +88,11 @@ "text": "- ExitSlit -", "file": "X_X11MA_EXSLIT.json" }, + { + "type": "menu", + "text": "- RMU Motors -", + "file": "X_X11MA_RMU.json" + }, { "type": "menu", "text": "- OP2 optics -", diff --git a/X_X11MA_PEEM.json b/X_X11MA_PEEM.json index 06824a1..f928931 100644 --- a/X_X11MA_PEEM.json +++ b/X_X11MA_PEEM.json @@ -10,9 +10,11 @@ "command": "caqtdm -noMsg -attach -macro \"NAME=X11MA-HG,NAME1=X11MA-ES1\" G_HEXGIR_5Dbasic.ui" }, { - "type": "cmd", + "type": "caqtdm", "text": "Status", - "command": "caqtdm -noMsg -attach -macro BML=X11MA,D=DUMMY X_X11MA_SOFT-status.ui" + "panel": "X_X11MA_SOFT-status.ui", + "macros": "BML=X11MA,D=DUMMY", + "param": "-noMsg -attach" }, { "type": "caqtdm", @@ -55,7 +57,7 @@ { "type": "caqtdm", "text": "He Flow", - "panel": "X_X09LA_PC_BRONKHORST_bronkhorstMain.ui", + "panel": "BronkhorstMain.ui", "macros": "IOC=X11MA-PC-BRONKHORST,NAME=PEEM", "param": "-noMsg -attach" }, diff --git a/X_X11MA_RMU.json b/X_X11MA_RMU.json new file mode 100644 index 0000000..0b7d79d --- /dev/null +++ b/X_X11MA_RMU.json @@ -0,0 +1,43 @@ +{ + "menu": [ + { + "type": "title", + "text": "----- RMU Positions -----" + }, + { + "type": "cmd", + "text": "RMU Panel", + "command": "caqtdm -noMsg -attach -macro T=X11MA-RMU,P=X11MA-OP-RMU:,M1=ROX,M2=ROY,M3=ROZ,M4=TRY,M5=TRZ X_X11MA_RMU_MUALL.ui" + }, + { + "type": "title", + "text": "----- RMU Motors -----" + }, + { + "type": "cmd", + "text": "Motor 1 TRY", + "command": "caqtdm -noMsg -attach -macro P=X11MA-OP-RMU:,M=TRY motorx_mp.ui" + }, + { + "type": "cmd", + "text": "Motor 2 ROX", + "command": "caqtdm -noMsg -attach -macro P=X11MA-OP-RMU:,M=ROX motorx_mp.ui" + }, + { + "type": "cmd", + "text": "Motor 3 ROZ", + "command": "caqtdm -noMsg -attach -macro P=X11MA-OP-RMU:,M=ROZ motorx_mp.ui" + }, + { + "type": "cmd", + "text": "Motor 4 TRZ", + "command": "caqtdm -noMsg -attach -macro P=X11MA-OP-RMU:,M=TRZ motorx_mp.ui" + }, + { + "type": "cmd", + "text": "Motor 5 ROY", + "command": "caqtdm -noMsg -attach -macro P=X11MA-OP-RMU:,M=ROY motorx_mp.ui" + } + ] +} + diff --git a/X_X11MA_desktops.json b/X_X11MA_desktops.json index 3fa0b3c..7fe47c9 100644 --- a/X_X11MA_desktops.json +++ b/X_X11MA_desktops.json @@ -19,6 +19,21 @@ "text": "Expert desktop 3 (StripTool's)", "command": "X_X11MA_desktop3.sh" }, + { + "type": "cmd", + "text": "PEEM Desktop 1", + "command": "PEEM_Desktop1" + }, + { + "type": "cmd", + "text": "PEEM esktop 2", + "command": "PEEM_Desktop2" + }, + { + "type": "cmd", + "text": "PEEM Desktop 3", + "command": "PEEM_Desktop3" + }, { "type": "cmd", "text": "Resoxs desktop", From 3222368b1f691a719f7223bcce1d3f53ed70ab30 Mon Sep 17 00:00:00 2001 From: Luka Debenjak Date: Mon, 11 Apr 2022 13:53:39 +0200 Subject: [PATCH 2/8] adding PEEM desktops --- X_X11MA_desktops.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/X_X11MA_desktops.json b/X_X11MA_desktops.json index 7fe47c9..0320bc1 100644 --- a/X_X11MA_desktops.json +++ b/X_X11MA_desktops.json @@ -21,17 +21,17 @@ }, { "type": "cmd", - "text": "PEEM Desktop 1", + "text": "PEEM desktop 1", "command": "PEEM_Desktop1" }, { "type": "cmd", - "text": "PEEM esktop 2", + "text": "PEEM desktop 2", "command": "PEEM_Desktop2" }, { "type": "cmd", - "text": "PEEM Desktop 3", + "text": "PEEM desktop 3", "command": "PEEM_Desktop3" }, { From fbd2719e83c05b18bcd92186808807e47ca2bddb Mon Sep 17 00:00:00 2001 From: Luka Debenjak Date: Wed, 13 Apr 2022 12:06:06 +0200 Subject: [PATCH 3/8] adding PEEM_Desktop4 --- X_X11MA_desktops.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/X_X11MA_desktops.json b/X_X11MA_desktops.json index 0320bc1..7116cc3 100644 --- a/X_X11MA_desktops.json +++ b/X_X11MA_desktops.json @@ -34,6 +34,11 @@ "text": "PEEM desktop 3", "command": "PEEM_Desktop3" }, + { + "type": "cmd", + "text": "PEEM desktop 4", + "command": "PEEM_Desktop4" + }, { "type": "cmd", "text": "Resoxs desktop", From f0eaa44a99adfa5b915da8aba7af4ca160194620 Mon Sep 17 00:00:00 2001 From: Luka Debenjak Date: Wed, 4 May 2022 15:18:02 +0200 Subject: [PATCH 4/8] more titles --- X_X11MA_desktops.json | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/X_X11MA_desktops.json b/X_X11MA_desktops.json index 7116cc3..3e8469b 100644 --- a/X_X11MA_desktops.json +++ b/X_X11MA_desktops.json @@ -2,7 +2,7 @@ "menu": [ { "type": "title", - "text": "Desktops" + "text": "Console 1" }, { "type": "cmd", @@ -19,6 +19,14 @@ "text": "Expert desktop 3 (StripTool's)", "command": "X_X11MA_desktop3.sh" }, + { + + "type": "separator" + }, + { + "type": "title", + "text": "Console 2" + }, { "type": "cmd", "text": "PEEM desktop 1", @@ -39,10 +47,18 @@ "text": "PEEM desktop 4", "command": "PEEM_Desktop4" }, + { + + "type": "separator" + }, + { + "type": "title", + "text": "Resoxs" + }, { "type": "cmd", "text": "Resoxs desktop", "command": "X_X11MA_desktop_resoxs.sh" } ] -} \ No newline at end of file +} From 8e69c1eeb3951778e829666aa8d46cc6621a5624 Mon Sep 17 00:00:00 2001 From: Luka Debenjak Date: Wed, 18 May 2022 10:34:48 +0200 Subject: [PATCH 5/8] adding 4-motors panel --- X_X11MA_ES4.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/X_X11MA_ES4.json b/X_X11MA_ES4.json index 227b346..9e699c7 100644 --- a/X_X11MA_ES4.json +++ b/X_X11MA_ES4.json @@ -9,6 +9,14 @@ "text": "Basler acA1280-60gm", "command": "start_CAM3" }, + { + "type": "caqtdm", + "text": "4 Motors Panel", + "panel": "motor4x.ui", + "macros": "P=X11MA-VME-ES4:,M1=TRX,M2=TRY,M3=TRZ,M4=THT", + "param": "-noMsg -attach" + + }, { "type": "cmd", "text": "Motor X", From 0027db5a649a991d050c7256cbca1c4d0c7ed820 Mon Sep 17 00:00:00 2001 From: Luka Debenjak Date: Wed, 18 May 2022 12:00:10 +0200 Subject: [PATCH 6/8] adding TRTEY desktop --- X_X11MA_desktops.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/X_X11MA_desktops.json b/X_X11MA_desktops.json index 3e8469b..1d1a75f 100644 --- a/X_X11MA_desktops.json +++ b/X_X11MA_desktops.json @@ -47,7 +47,7 @@ "text": "PEEM desktop 4", "command": "PEEM_Desktop4" }, - { + { "type": "separator" }, @@ -59,6 +59,19 @@ "type": "cmd", "text": "Resoxs desktop", "command": "X_X11MA_desktop_resoxs.sh" + }, + { + + "type": "separator" + }, + { + "type": "title", + "text": "TR-TEY" + }, + { + "type": "cmd", + "text": "TR-TEY desktop", + "command": "TR-TEY_Desktop" } ] } From f6f49464a7a0efdc4962722149b1b372ac6884fc Mon Sep 17 00:00:00 2001 From: Xiaoqiang Wang Date: Mon, 27 Jun 2022 10:39:44 +0200 Subject: [PATCH 7/8] use standard sscan panels --- X_X11MA_ES2.json | 4 ++-- X_X11MA_Phsrc.json | 4 ++-- X_X11MA_Xmcd.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/X_X11MA_ES2.json b/X_X11MA_ES2.json index 8014088..808cf34 100644 --- a/X_X11MA_ES2.json +++ b/X_X11MA_ES2.json @@ -7,7 +7,7 @@ { "type": "cmd", "text": "Scan panel", - "command": "caqtdm -noMsg -attach -macro \"P=X11MA-ES2-,S=scan1\" G_SYNAPPS_scan_more.ui" + "command": "caqtdm -noMsg -attach -macro \"P=X11MA-ES2-,S=scan1\" scan_more.ui" }, { "type": "cmd", @@ -25,4 +25,4 @@ "command": "caqtdm $SLSBASE/sls/config/panel/X_X11MA_timing-es2.prc" } ] -} \ No newline at end of file +} diff --git a/X_X11MA_Phsrc.json b/X_X11MA_Phsrc.json index 4ad9a54..1de32bb 100644 --- a/X_X11MA_Phsrc.json +++ b/X_X11MA_Phsrc.json @@ -21,12 +21,12 @@ { "type": "cmd", "text": "ES1 scan1", - "command": "caqtdm -noMsg -attach -dg +791+0 -macro \"P=X11MA-ES1-,N=1,S=scan1\" G_SYNAPPS_scan_more.ui" + "command": "caqtdm -noMsg -attach -dg +791+0 -macro \"P=X11MA-ES1-,N=1,S=scan1\" scan_more.ui" }, { "type": "cmd", "text": "ES1 scan2", - "command": "caqtdm -noMsg -attach -dg +791+433 -macro \"P=X11MA-ES1-,N=2,S=scan2\" G_SYNAPPS_scan_more.ui" + "command": "caqtdm -noMsg -attach -dg +791+433 -macro \"P=X11MA-ES1-,N=2,S=scan2\" scan_more.ui" }, { "type": "cmd", diff --git a/X_X11MA_Xmcd.json b/X_X11MA_Xmcd.json index 1bdde20..7248969 100644 --- a/X_X11MA_Xmcd.json +++ b/X_X11MA_Xmcd.json @@ -12,7 +12,7 @@ { "type": "cmd", "text": "ID & Mono saveData", - "command": "caqtdm -noMsg -attach -dg +2200+600 -macro \"P=X11MA-ES1-\" G_SYNAPPS_scan_saveDataplus.ui" + "command": "caqtdm -noMsg -attach -dg +2200+600 -macro \"P=X11MA-ES1-\" scan_saveDataplus.ui" }, { "type": "title", From 603b9f92e77b59cd1baf231b347343f8a9f0e226 Mon Sep 17 00:00:00 2001 From: Luka Debenjak Date: Fri, 9 Dec 2022 14:42:41 +0100 Subject: [PATCH 8/8] Roper removed --- X_X11MA_ES3_resoxs.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/X_X11MA_ES3_resoxs.json b/X_X11MA_ES3_resoxs.json index 5ca9866..a38a43d 100644 --- a/X_X11MA_ES3_resoxs.json +++ b/X_X11MA_ES3_resoxs.json @@ -29,11 +29,6 @@ "text": "Scaler", "command": "caqtdm -attach -noMsg -dg +680+480 -macro P=X11MA-RSOX:,S=JS scaler16_full.ui" }, - { - "type": "cmd", - "text": "CCD camera", - "command": "caqtdm -attach -noMsg -dg +800+600 -macro P=X11MA-ES3-CCD:,R=cam1: Roper.ui" - }, { "type": "cmd", "text": "Manta camera",