slic/bernina
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new slits

Browse Source
This commit is contained in:
augustin_s
2022-07-10 20:50:45 +02:00
parent 1e4c0cbc5c
commit 437254a359
1 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
devices.py
View File

@ -57,7 +57,7 @@ components = [
}, },
{ {
"name": "slit_und", "name": "slit_und",
"type": "slic.devices.xoptics.slits:SlitFourBlades_old", "type": "slic.devices.xoptics.slits:SlitTwinUnit",
"args": ["SARFE10-OAPU044"], "args": ["SARFE10-OAPU044"],
"kwargs": {}, "kwargs": {},
"desc": "Slit after Undulator", "desc": "Slit after Undulator",
@ -94,19 +94,11 @@ components = [
"desc": "Profile monitor after Alvra Mirror 1", "desc": "Profile monitor after Alvra Mirror 1",
"type": "slic.devices.xdiagnostics.profile_monitors:Pprm", "type": "slic.devices.xdiagnostics.profile_monitors:Pprm",
}, },
# {
# "name": "slitSwitch",
# "z_und": 92,
# "desc": "Slit in Optics hutch after Photon switchyard and before Bernina optics",
# "type": "slic.devices.xoptics.slits:SlitBlades_old",
# "args": ["SAROP21-OAPU092"],
# "kwargs": {},
# },
{ {
"name": "slit_switch", "name": "slit_switch",
"z_und": 92, "z_und": 92,
"desc": "Slit in Optics hutch after Photon switchyard and before Bernina optics", "desc": "Slit in Optics hutch after Photon switchyard and before Bernina optics",
"type": "slic.devices.xoptics.slits_new:SlitBlades", "type": "slic.devices.xoptics.slits:SlitUnit",
"args": ["SAROP21-OAPU092"], "args": ["SAROP21-OAPU092"],
"kwargs": {}, "kwargs": {},
}, },
@ -220,17 +212,9 @@ components = [
"kwargs": {}, "kwargs": {},
"z_und": 136, "z_und": 136,
"desc": "Slits behind attenuator", "desc": "Slits behind attenuator",
"type": "slic.devices.xoptics.slits_new:SlitPosWidth", "type": "slic.devices.xoptics.slits:SlitUnitCW",
"lazy": True, "lazy": True,
}, },
# {
# "name": "slitAtt",
# "args": ["SAROP21-OAPU136"],
# "kwargs": {},
# "z_und": 136,
# "desc": "Slits behind attenuator",
# "type": "slic.devices.xoptics.slits:SlitPosWidth_old",
# },
{ {
"name": "mon_att", "name": "mon_att",
"args": ["SAROP21-PBPS138"], "args": ["SAROP21-PBPS138"],
@ -286,8 +270,7 @@ components = [
"kwargs": {"pvname": "SARES20-MF1"}, "kwargs": {"pvname": "SARES20-MF1"},
"z_und": 141, "z_und": 141,
"desc": "Slits behind Kb", "desc": "Slits behind Kb",
"type": "slic.devices.xoptics.slits_new:SlitBlades_JJ", "type": "slic.devices.xoptics.slits:SlitUnitJJ",
#"type": "slic.devices.xoptics.slits:SlitBladesJJ_old",
}, },
{ {
"name": "gps", "name": "gps",
@ -543,10 +526,10 @@ components = [
"lazy": False, "lazy": False,
}, },
{ {
"args": [[Component('slit_und'),Component('slit_switch'),Component('slit_att'),Component('slit_kb')]], "args": ["Slits", [Component('slit_und'),Component('slit_switch'),Component('slit_att'),Component('slit_kb')]],
"name": "slits", "name": "slits",
"desc": "collection of all slits", "desc": "collection of all slits",
"type": "slic.devices.xoptics.slitcollection:SlitCollection", "type": "slic.core.device:SimpleDevice",
"kwargs": {}, "kwargs": {},
"lazy": False, "lazy": False,
}, },