Merge branch 'master' of git.psi.ch:grp-sls_x11ma/sls_x11ma_launcher

This commit is contained in:
2025-10-03 16:29:12 +02:00
5 changed files with 96 additions and 19 deletions

View File

@@ -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"
},

43
X_X11MA_Cameras.json Normal file
View File

@@ -0,0 +1,43 @@
{
"menu": [
{
"type": "title",
"text": "- BL Cameras -"
},
{
"type": "cmd",
"text": "AU slit camera (X11MA-OP-AUSLTCAM)",
"command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-AUSLTCAM:,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-BEAMCAM:,R=cam1:,C=\" URLDriver.ui"
},
{
"type": "cmd",
"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-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-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-PSLTCAM)",
"command": "caqtdm -x -noMsg -macro \"P=X11MA-OP-PSLTCAM:,R=cam1:\" Tucsen.ui"
}
]
}

View File

@@ -184,6 +184,25 @@
"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"
}
]
}

View File

@@ -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"
}
]
}

View File

@@ -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:"
}
]
}