Skip to content
Snippets Groups Projects
Commit e8ff7017 authored by Laurent Mercadier's avatar Laurent Mercadier
Browse files

Merge branch 'camera_mnemonics' into 'master'

Adds mnemonics for Vertical FDM and ILH 8CAM1

See merge request !56
parents 05e006a0 b174de8b
No related branches found
No related tags found
No related merge requests found
...@@ -209,6 +209,10 @@ mnemonics = { ...@@ -209,6 +209,10 @@ mnemonics = {
"PP800_TeleLens": {'source':'SCS_ILH_LAS/MOTOR/LT7', "PP800_TeleLens": {'source':'SCS_ILH_LAS/MOTOR/LT7',
'key':'actualPosition.value', 'key':'actualPosition.value',
'dim':None}, 'dim':None},
"ILH_8CAM1": {'source':'SCS_ILH_LAS/CAM/8CAM1:daqOutput',
'key':'data.image.pixels',
'dim':['8cam1_y', '8cam1_x']},
# FFT # FFT
"scannerX": {'source':'SCS_CDIFFT_SAM/LMOTOR/SCANNERX', "scannerX": {'source':'SCS_CDIFFT_SAM/LMOTOR/SCANNERX',
...@@ -229,6 +233,10 @@ mnemonics = { ...@@ -229,6 +233,10 @@ mnemonics = {
"magnet_old": {'source':'SCS_CDIFFT_MAG/SUPPLY/CURRENT', "magnet_old": {'source':'SCS_CDIFFT_MAG/SUPPLY/CURRENT',
'key':'actualCurrent.value', 'key':'actualCurrent.value',
'dim':None}, 'dim':None},
"Vertical_FDM": {'source':'SCS_CDIFFT_LDM/CAM/CAMERA1A:daqOutput',
'key':'data.image.pixels',
'dim':['vfdm_y', 'vfdm_x']},
# FastCCD, if in raw folder, raw images # FastCCD, if in raw folder, raw images
# if in proc folder, dark substracted and relative gain corrected # if in proc folder, dark substracted and relative gain corrected
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment